Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor to a Lerna Monorepo #101

Merged
merged 36 commits into from
Jun 4, 2020
Merged

Refactor to a Lerna Monorepo #101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b5e403b
Add 'PromiEvent' type to improve developer flexibility for certain flows
smithki May 24, 2020
48f6379
Add mechanism for emitting payload-related events from the iframe
smithki May 24, 2020
3631472
Add structure for Lerna monorepo
smithki May 24, 2020
1ddc059
Build CDN bundle to the expected location
smithki May 24, 2020
82f6185
Add '@magic-sdk/types' package
smithki May 24, 2020
341972f
Cleanup tsconfigs
smithki May 24, 2020
05a3006
Remove Webpack & document development scripts
smithki May 24, 2020
b75fac0
Remove Webpack dependencies
smithki May 24, 2020
f1fc7b0
Split out SDK implementation into environment-specific entry-points
smithki May 25, 2020
bc00676
Adjust monorepo implementation to get into a working state on Web env…
smithki May 25, 2020
507a102
Adjust PromiEvent implementation & cleanup end-to-end
smithki May 26, 2020
0f552c5
Rename '@magic-sdk/core' to '@magic-sdk/provider'
smithki May 26, 2020
7431968
Extend from 'EventEmitter' for 'BaseModule'
smithki May 26, 2020
cb2638b
Default to 'void' if missing event definitions
smithki May 27, 2020
ef33cc8
Disallow simultaneous EventEmitter/Promise interface access
smithki May 27, 2020
8e977cd
Remove obsolete source code
smithki May 28, 2020
522f19c
Apply PromiEvent patches from 'feature/experimental-promievents' branch
smithki May 28, 2020
e570ade
Backport a few PromiEvent fixes to the monorepo branch
smithki May 31, 2020
61e976b
Start porting tests into each monorepo package
smithki May 31, 2020
d2896b3
Port core code tests to monorepo
smithki May 31, 2020
5288f3d
Port module tests to monorepo
smithki May 31, 2020
bc6f937
Port util tests to monorepo
smithki May 31, 2020
bccd624
Fix 'test.sh' script
smithki May 31, 2020
2bcffc0
Fix circular dependency that was breaking tests
smithki May 31, 2020
48ea79c
Add tests for magic-sdk (web entry-point)
smithki Jun 2, 2020
d6a4c48
Add @magic-sdk/react-native tests
smithki Jun 2, 2020
4aa6865
Update CircleCI config for monorepo
smithki Jun 2, 2020
da969b0
Remove old test files
smithki Jun 2, 2020
8be5b3e
Switch to use independent versioning scheme
smithki Jun 2, 2020
501e99e
Fix merge conflicts
smithki Jun 2, 2020
e0a57e8
Re-generate yarn.lock
smithki Jun 2, 2020
47065fd
Add individual CHANGELOGs and update README.md
smithki Jun 2, 2020
58c8eb2
Fix linter
smithki Jun 2, 2020
1962931
Update to pre-release versions
smithki Jun 2, 2020
ac5ed24
Bump canary versions
smithki Jun 3, 2020
d4d827a
Cleanup scripts
smithki Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Build CDN bundle to the expected location
  • Loading branch information
@smithki
smithki committed May 24, 2020
commit 1ddc0590b7da25d229083202042b08e5c0eb316a
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"main": "dist/index.js",
"module": "dist/index.m.js",
"esmodule": "dist/index.modern.js",
"types": "dist/core/src/index.d.ts",
"types": "dist/index.d.ts",

"scripts": {
"dev": "microbundle watch src/index.ts --target web --format modern,es,cjs",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"main": "dist/index.js",
"module": "dist/index.m.js",
"esmodule": "dist/index.modern.js",
"types": "dist/react-native/src/index.d.ts",
"types": "dist/index.d.ts",

"scripts": {
"dev": "microbundle watch src/index.ts --target node --format modern,es,cjs --external react,react-native-webview,whatwg-url",
Expand Down
14 changes: 8 additions & 6 deletions packages/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@
"homepage": "https://magic.link",

"files": ["dist/**/*"],
"main": "dist/index.js",
"main": "dist/main/index.js",
"umd:main": "dist/magic.js",
"module": "dist/index.m.js",
"esmodule": "dist/index.modern.js",
"types": "dist/web/src/index.d.ts",
"module": "dist/main/index.m.js",
"esmodule": "dist/main/index.modern.js",
"types": "dist/main/index.d.ts",

"scripts": {
"dev": "microbundle watch src/index.ts --target web --format modern,es,cjs,umd",
"build": "microbundle build src/index.ts --target web --format modern,es,cjs,umd"
"dev": "microbundle watch src/index.ts --target web --format modern,es,cjs",
"build": "yarn run build:main && yarn run build:cdn",
"build:main": "microbundle build src/index.ts --target web --format modern,es,cjs",
"build:cdn": "microbundle build src/index.cdn.ts --output dist/magic.js --target web --name Magic --format umd"
},

"dependencies": {},
Expand Down
3 changes: 3 additions & 0 deletions packages/web/src/index.cdn.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {
hello: 'world'
}