Fix CDN build targets

.eslintrc.js

@@ -18,14 +18,15 @@ module.exports = {
     "@typescript-eslint/ban-types": 0,
     "@typescript-eslint/no-unsafe-call": 0,
     "@typescript-eslint/await-thenable": 0,
+    "@typescript-eslint/ban-ts-comment": 0,
     "@typescript-eslint/no-unsafe-return": 0,
     "@typescript-eslint/no-empty-function": 0,
     "@typescript-eslint/no-floating-promises": 0,
     "@typescript-eslint/no-unsafe-assignment": 0,
     "@typescript-eslint/no-useless-constructor": 0,
     "@typescript-eslint/no-unsafe-member-access": 0,
-    "@typescript-eslint/explicit-module-boundary-types": 0,
     "@typescript-eslint/restrict-template-expressions": 0,
+    "@typescript-eslint/explicit-module-boundary-types": 0,
   },
 
   settings: {

package.json

@@ -34,7 +34,7 @@
     "brotli-size": "^4.0.0",
     "chalk": "~4.1.2",
     "enquirer": "^2.3.6",
-    "esbuild": "^0.13.15",
+    "esbuild": "^0.14.13",
     "eslint": "~7.3.1",
     "eslint-import-resolver-typescript": "~2.0.0",
     "eslint-plugin-import": "~2.21.0",

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

@@ -1,4 +1,3 @@
 import { AlgorandExtension } from './index';
 
-export type { AlgorandExtension as default };
-module.exports = AlgorandExtension;
+export default AlgorandExtension;

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

@@ -1,4 +1,3 @@
 import { AvalancheExtension } from './index';
 
-export type { AvalancheExtension as default };
-module.exports = AvalancheExtension;
+export default AvalancheExtension;

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

@@ -1,4 +1,3 @@
 import { BitcoinExtension } from './index';
 
-export type { BitcoinExtension as default };
-module.exports = BitcoinExtension;
+export default BitcoinExtension;

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

@@ -1,4 +1,3 @@
 import { CosmosExtension } from './index';
 
-export type { CosmosExtension as default };
-module.exports = CosmosExtension;
+export default CosmosExtension;

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

@@ -1,4 +1,3 @@
 import { FlowExtension } from './index';
 
-export type { FlowExtension as default };
-module.exports = FlowExtension;
+export default FlowExtension;

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

@@ -1,4 +1,3 @@
 import { HarmonyExtension } from './index';
 
-export type { HarmonyExtension as default };
-module.exports = HarmonyExtension;
+export default HarmonyExtension;

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

@@ -1,4 +1,3 @@
 import { IconExtension } from './index';
 
-export type { IconExtension as default };
-module.exports = IconExtension;
+export default IconExtension;

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

@@ -1,4 +1,3 @@
 import { NearExtension } from './index';
 
-export type { NearExtension as default };
-module.exports = NearExtension;
+export default NearExtension;

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

@@ -5,5 +5,4 @@ Object.assign(OAuthExtension, {
   ...types,
 });
 
-export type { OAuthExtension as default };
-module.exports = OAuthExtension;
+export default OAuthExtension;

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

@@ -1,4 +1,3 @@
 import { PolkadotExtension } from './index';
 
-export type { PolkadotExtension as default };
-module.exports = PolkadotExtension;
+export default PolkadotExtension;

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

@@ -1,4 +1,3 @@
 import { SolanaExtension } from './index';
 
-export type { SolanaExtension as default };
-module.exports = SolanaExtension;
+export default SolanaExtension;

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

@@ -1,4 +1,3 @@
 import { TezosExtension } from './index';
 
-export type { TezosExtension as default };
-module.exports = TezosExtension;
+export default TezosExtension;

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

@@ -1,4 +1,3 @@
 import { WebAuthnExtension } from './index';
 
-export type { WebAuthnExtension as default };
-module.exports = WebAuthnExtension;
+export default WebAuthnExtension;

packages/@magic-ext/zilliqa/src/index.cdn.ts

@@ -1,4 +1,3 @@
 import { ZilliqaExtension } from './index';
 
-export type { ZilliqaExtension as default };
-module.exports = ZilliqaExtension;
+export default ZilliqaExtension;

packages/magic-sdk/src/index.cdn.ts

@@ -3,7 +3,7 @@
 import { SDKBase, createSDK } from '@magic-sdk/provider';
 import * as publicAPI from '@magic-sdk/commons';
 import localForage from 'localforage';
-import memoryDriver from 'localforage-driver-memory';
+import * as memoryDriver from 'localforage-driver-memory';
 import { IframeController } from './iframe-controller';
 
 // NOTE: enums are emitted by TypeScript -- in the CDN bundle we attach public
@@ -31,5 +31,4 @@ const Magic = Object.assign(
   { ...publicAPI },
 );
 
-module.exports = Magic;
-export type { Magic as default };
+export default Magic;

scripts/bin/scaffold/template/hybrid/src/index.cdn.ts

@@ -1,4 +1,3 @@
 import { <%= className %> } from './index';
 
-export type { <%= className %> as default };
-module.exports = <%= className %>;
+export default <%= className %>;

scripts/bin/scaffold/template/web/src/index.cdn.ts

@@ -1,4 +1,3 @@
 import { <%= className %> } from './index';
 
-export type { <%= className %> as default };
-module.exports = <%= className %>;
+export default <%= className %>;

scripts/utils/esbuild.ts

@@ -41,6 +41,17 @@ export async function build(options: ESBuildOptions) {
           Object.entries(environment).map(([key, value]) => [`process.env.${key}`, JSON.stringify(value)]),
         ),
         plugins: [...globalsPlugin(options.globals || {})],
+
+        // We need this footer because: https://github.com/evanw/esbuild/issues/1182
+        footer:
+          options.format === 'iife'
+            ? {
+                // This snippet replaces `window.{name}` with
+                // `window.{name}.default`, with any additional named exports
+                // assigned. Finally, it removes `window.{name}.default`.
+                js: `if (${options.name} && ${options.name}.default != null) { ${options.name} = Object.assign(${options.name}.default, ${options.name}); delete ${options.name}.default; }`,
+              }
+            : undefined,
       });
 
       // Log the type and size of the output(s)...