Skip to content

Commit 69b4cd3

Browse files
authored
Merge pull request #220 from magiclabs/feat/faster-builds
Switch from `microbundle` to `esbuild`
2 parents 21f089a + ef2c778 commit 69b4cd3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+731
-3094
lines changed

Diff for: package.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@
3131
"@typescript-eslint/eslint-plugin": "~3.4.0",
3232
"auto": "^10.31.0",
3333
"babel-jest": "^27.0.6",
34+
"brotli-size": "^4.0.0",
3435
"chalk": "~4.1.2",
36+
"enquirer": "^2.3.6",
37+
"esbuild": "^0.13.15",
3538
"eslint": "~7.3.1",
3639
"eslint-import-resolver-typescript": "~2.0.0",
3740
"eslint-plugin-import": "~2.21.0",
@@ -41,6 +44,7 @@
4144
"eslint-plugin-react-hooks": "~4.0.4",
4245
"execa": "~5.1.1",
4346
"fs-extra": "^10.0.0",
47+
"gzip-size": "^6.0.0",
4448
"husky": "^7.0.1",
4549
"inquirer": "^8.1.2",
4650
"is-ci": "^3.0.0",
@@ -49,12 +53,12 @@
4953
"lint-staged": "^10.0.7",
5054
"lodash": "^4.17.21",
5155
"meow": "9.0.0",
52-
"microbundle": "0.13.3",
5356
"npm-run-all": "^4.1.5",
5457
"nyc": "13.1.0",
5558
"ora": "~5.4.1",
5659
"p-limit": "^3.1.0",
5760
"prettier": "~2.3.2",
61+
"pretty-bytes": "^5.6.0",
5862
"react": "^16.13.1",
5963
"react-native": "^0.62.2",
6064
"regenerator-runtime": "0.13.9",

Diff for: packages/@magic-ext/algorand/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"files": [
1212
"dist"
1313
],
14-
"target": "web",
14+
"target": "neutral",
1515
"cdnGlobalName": "MagicAlgorandExtension",
1616
"main": "./dist/cjs/index.js",
1717
"module": "./dist/es/index.js",
1818
"types": "./dist/types/index.d.ts",
1919
"jsdelivr": "./dist/extension.js",
2020
"react-native": "./dist/react-native/index.native.js",
2121
"exports": {
22-
"import": "./dist/modern/index.mjs",
22+
"import": "./dist/es/index.mjs",
2323
"require": "./dist/cjs/index.js"
2424
},
2525
"externals": {

Diff for: packages/@magic-ext/algorand/src/index.cdn.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
import { AlgorandExtension } from './index';
22

3-
export { AlgorandExtension as default };
3+
export type { AlgorandExtension as default };
4+
module.exports = AlgorandExtension;

Diff for: packages/@magic-ext/avalanche/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"files": [
1212
"dist"
1313
],
14-
"target": "web",
14+
"target": "neutral",
1515
"cdnGlobalName": "MagicSolanaExtension",
1616
"main": "./dist/cjs/index.js",
1717
"module": "./dist/es/index.js",
1818
"types": "./dist/types/index.d.ts",
1919
"jsdelivr": "./dist/extension.js",
2020
"react-native": "./dist/react-native/index.native.js",
2121
"exports": {
22-
"import": "./dist/modern/index.mjs",
22+
"import": "./dist/es/index.mjs",
2323
"require": "./dist/cjs/index.js"
2424
},
2525
"externals": {

Diff for: packages/@magic-ext/avalanche/src/index.cdn.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
import { AvalancheExtension } from './index';
22

3-
export { AvalancheExtension as default };
3+
export type { AvalancheExtension as default };
4+
module.exports = AvalancheExtension;

Diff for: packages/@magic-ext/bitcoin/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"files": [
1212
"dist"
1313
],
14-
"target": "web",
14+
"target": "neutral",
1515
"cdnGlobalName": "MagicBitcoinExtension",
1616
"main": "./dist/cjs/index.js",
1717
"module": "./dist/es/index.js",
1818
"types": "./dist/types/index.d.ts",
1919
"jsdelivr": "./dist/extension.js",
2020
"react-native": "./dist/react-native/index.native.js",
2121
"exports": {
22-
"import": "./dist/modern/index.mjs",
22+
"import": "./dist/es/index.mjs",
2323
"require": "./dist/cjs/index.js"
2424
},
2525
"externals": {

Diff for: packages/@magic-ext/bitcoin/src/index.cdn.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
import { BitcoinExtension } from './index';
22

3-
export { BitcoinExtension as default };
3+
export type { BitcoinExtension as default };
4+
module.exports = BitcoinExtension;

Diff for: packages/@magic-ext/conflux/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"files": [
1212
"dist"
1313
],
14-
"target": "web",
14+
"target": "neutral",
1515
"cdnGlobalName": "MagicConfluxExtension",
1616
"main": "./dist/cjs/index.js",
1717
"module": "./dist/es/index.js",
1818
"types": "./dist/types/index.d.ts",
1919
"jsdelivr": "./dist/extension.js",
2020
"react-native": "./dist/react-native/index.native.js",
2121
"exports": {
22-
"import": "./dist/modern/index.mjs",
22+
"import": "./dist/es/index.mjs",
2323
"require": "./dist/cjs/index.js"
2424
},
2525
"externals": {

Diff for: packages/@magic-ext/cosmos/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"files": [
1212
"dist"
1313
],
14-
"target": "web",
14+
"target": "neutral",
1515
"cdnGlobalName": "MagicCosmosExtension",
1616
"main": "./dist/cjs/index.js",
1717
"module": "./dist/es/index.js",
1818
"types": "./dist/types/index.d.ts",
1919
"jsdelivr": "./dist/extension.js",
2020
"react-native": "./dist/react-native/index.native.js",
2121
"exports": {
22-
"import": "./dist/modern/index.mjs",
22+
"import": "./dist/es/index.mjs",
2323
"require": "./dist/cjs/index.js"
2424
},
2525
"externals": {

Diff for: packages/@magic-ext/cosmos/src/index.cdn.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
import { CosmosExtension } from './index';
22

3-
export { CosmosExtension as default };
3+
export type { CosmosExtension as default };
4+
module.exports = CosmosExtension;

Diff for: packages/@magic-ext/flow/package.json

+7-6
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,28 @@
1111
"files": [
1212
"dist"
1313
],
14-
"target": "web",
15-
"cdnGlobalName": "MagicFlowExtension",
14+
"target": "neutral",
1615
"main": "./dist/cjs/index.js",
1716
"module": "./dist/es/index.js",
1817
"types": "./dist/types/index.d.ts",
1918
"jsdelivr": "./dist/extension.js",
2019
"react-native": "./dist/react-native/index.native.js",
2120
"exports": {
22-
"import": "./dist/modern/index.mjs",
21+
"import": "./dist/es/index.mjs",
2322
"require": "./dist/cjs/index.js"
2423
},
2524
"externals": {
2625
"include": [
27-
"@magic-sdk/commons",
28-
"@onflow/fcl",
29-
"@onflow/types"
26+
"@magic-sdk/commons"
3027
]
3128
},
3229
"devDependencies": {
3330
"@magic-sdk/commons": "^3.0.0",
3431
"@onflow/fcl": "0.0.41",
3532
"@onflow/types": "0.0.3"
33+
},
34+
"peerDependencies": {
35+
"@onflow/fcl": "0.0.41",
36+
"@onflow/types": "0.0.3"
3637
}
3738
}

Diff for: packages/@magic-ext/flow/src/index.cdn.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
import { FlowExtension } from './index';
22

3-
export { FlowExtension as default };
3+
export type { FlowExtension as default };
4+
module.exports = FlowExtension;

Diff for: packages/@magic-ext/harmony/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
"dist/**/*.js.map",
1414
"dist/**/*.d.ts"
1515
],
16-
"target": "web",
16+
"target": "neutral",
1717
"cdnGlobalName": "MagicHarmonyExtension",
1818
"main": "./dist/cjs/index.js",
1919
"module": "./dist/es/index.js",
2020
"types": "./dist/types/index.d.ts",
2121
"jsdelivr": "./dist/extension.js",
2222
"react-native": "./dist/react-native/index.native.js",
2323
"exports": {
24-
"import": "./dist/modern/index.mjs",
24+
"import": "./dist/es/index.mjs",
2525
"require": "./dist/cjs/index.js"
2626
},
2727
"externals": {

Diff for: packages/@magic-ext/harmony/src/index.cdn.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
import { HarmonyExtension } from './index';
22

3-
export { HarmonyExtension as default };
3+
export type { HarmonyExtension as default };
4+
module.exports = HarmonyExtension;

Diff for: packages/@magic-ext/icon/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"files": [
1212
"dist"
1313
],
14-
"target": "web",
14+
"target": "neutral",
1515
"cdnGlobalName": "MagicIconExtension",
1616
"main": "./dist/cjs/index.js",
1717
"module": "./dist/es/index.js",
1818
"types": "./dist/types/index.d.ts",
1919
"jsdelivr": "./dist/extension.js",
2020
"react-native": "./dist/react-native/index.native.js",
2121
"exports": {
22-
"import": "./dist/modern/index.mjs",
22+
"import": "./dist/es/index.mjs",
2323
"require": "./dist/cjs/index.js"
2424
},
2525
"externals": {

Diff for: packages/@magic-ext/icon/src/index.cdn.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
import { IconExtension } from './index';
22

3-
export { IconExtension as default };
3+
export type { IconExtension as default };
4+
module.exports = IconExtension;

Diff for: packages/@magic-ext/near/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"files": [
1212
"dist"
1313
],
14-
"target": "web",
14+
"target": "neutral",
1515
"cdnGlobalName": "MagicNearExtension",
1616
"main": "./dist/cjs/index.js",
1717
"module": "./dist/es/index.js",
1818
"types": "./dist/types/index.d.ts",
1919
"jsdelivr": "./dist/extension.js",
2020
"react-native": "./dist/react-native/index.native.js",
2121
"exports": {
22-
"import": "./dist/modern/index.mjs",
22+
"import": "./dist/es/index.mjs",
2323
"require": "./dist/cjs/index.js"
2424
},
2525
"externals": {

Diff for: packages/@magic-ext/near/src/index.cdn.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
import { NearExtension } from './index';
22

3-
export { NearExtension as default };
3+
export type { NearExtension as default };
4+
module.exports = NearExtension;

Diff for: packages/@magic-ext/oauth/README.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<!-- force publish -->
2-
31
# 🔒 Magic OAuth Extension for Web Browsers
42

53
[![<MagicLabs>](https://circleci.com/gh/magiclabs/magic-js.svg?style=shield)](https://circleci.com/gh/magiclabs/magic-js)

Diff for: packages/@magic-ext/oauth/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
"files": [
1212
"dist"
1313
],
14-
"target": "web",
14+
"target": "browser",
1515
"cdnGlobalName": "MagicOAuthExtension",
1616
"main": "./dist/cjs/index.js",
1717
"module": "./dist/es/index.js",
1818
"types": "./dist/types/index.d.ts",
1919
"jsdelivr": "./dist/extension.js",
2020
"exports": {
21-
"import": "./dist/modern/index.mjs",
21+
"import": "./dist/es/index.mjs",
2222
"require": "./dist/cjs/index.js"
2323
},
2424
"externals": {

Diff for: packages/@magic-ext/oauth/src/index.cdn.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ Object.assign(OAuthExtension, {
55
...types,
66
});
77

8-
export { OAuthExtension as default };
8+
export type { OAuthExtension as default };
9+
module.exports = OAuthExtension;

Diff for: packages/@magic-ext/polkadot/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"files": [
1212
"dist"
1313
],
14-
"target": "web",
14+
"target": "neutral",
1515
"cdnGlobalName": "MagicPolkadotExtension",
1616
"main": "./dist/cjs/index.js",
1717
"module": "./dist/es/index.js",
1818
"types": "./dist/types/index.d.ts",
1919
"jsdelivr": "./dist/extension.js",
2020
"react-native": "./dist/react-native/index.native.js",
2121
"exports": {
22-
"import": "./dist/modern/index.mjs",
22+
"import": "./dist/es/index.mjs",
2323
"require": "./dist/cjs/index.js"
2424
},
2525
"externals": {

Diff for: packages/@magic-ext/polkadot/src/index.cdn.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
import { PolkadotExtension } from './index';
22

3-
export { PolkadotExtension as default };
3+
export type { PolkadotExtension as default };
4+
module.exports = PolkadotExtension;

Diff for: packages/@magic-ext/react-native-oauth/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"module": "./dist/es/index.js",
1717
"types": "./dist/types/index.d.ts",
1818
"exports": {
19-
"import": "./dist/modern/index.mjs",
19+
"import": "./dist/es/index.mjs",
2020
"require": "./dist/cjs/index.js"
2121
},
2222
"externals": {

Diff for: packages/@magic-ext/solana/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"files": [
1212
"dist"
1313
],
14-
"target": "web",
14+
"target": "neutral",
1515
"cdnGlobalName": "MagicSolanaExtension",
1616
"main": "./dist/cjs/index.js",
1717
"module": "./dist/es/index.js",
1818
"types": "./dist/types/index.d.ts",
1919
"jsdelivr": "./dist/extension.js",
2020
"react-native": "./dist/react-native/index.native.js",
2121
"exports": {
22-
"import": "./dist/modern/index.mjs",
22+
"import": "./dist/es/index.mjs",
2323
"require": "./dist/cjs/index.js"
2424
},
2525
"externals": {

Diff for: packages/@magic-ext/solana/src/index.cdn.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
import { SolanaExtension } from './index';
22

3-
export { SolanaExtension as default };
3+
export type { SolanaExtension as default };
4+
module.exports = SolanaExtension;

Diff for: packages/@magic-ext/solana/src/index.native.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from './index.ts';
1+
export * from './index';

Diff for: packages/@magic-ext/tezos/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"files": [
1212
"dist"
1313
],
14-
"target": "web",
14+
"target": "neutral",
1515
"cdnGlobalName": "MagicTezosExtension",
1616
"main": "./dist/cjs/index.js",
1717
"module": "./dist/es/index.js",
1818
"types": "./dist/types/index.d.ts",
1919
"jsdelivr": "./dist/extension.js",
2020
"react-native": "./dist/react-native/index.native.js",
2121
"exports": {
22-
"import": "./dist/modern/index.mjs",
22+
"import": "./dist/es/index.mjs",
2323
"require": "./dist/cjs/index.js"
2424
},
2525
"externals": {

Diff for: packages/@magic-ext/tezos/src/index.cdn.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
import { TezosExtension } from './index';
22

3-
export { TezosExtension as default };
3+
export type { TezosExtension as default };
4+
module.exports = TezosExtension;

Diff for: packages/@magic-ext/webauthn/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"files": [
1212
"dist"
1313
],
14-
"target": "web",
14+
"target": "neutral",
1515
"cdnGlobalName": "MagicWebAuthnExtension",
1616
"main": "./dist/cjs/index.js",
1717
"module": "./dist/es/index.js",
1818
"types": "./dist/types/index.d.ts",
1919
"jsdelivr": "./dist/extension.js",
2020
"react-native": "./dist/react-native/index.native.js",
2121
"exports": {
22-
"import": "./dist/modern/index.mjs",
22+
"import": "./dist/es/index.mjs",
2323
"require": "./dist/cjs/index.js"
2424
},
2525
"externals": {

Diff for: packages/@magic-ext/webauthn/src/index.cdn.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
import { WebAuthnExtension } from './index';
22

3-
export { WebAuthnExtension as default };
3+
export type { WebAuthnExtension as default };
4+
module.exports = WebAuthnExtension;

0 commit comments

Comments
 (0)