Update build scripts to bundle all packages via microbundle

.circleci/config.yml

@@ -105,7 +105,7 @@ jobs:
  - run:
  name: Apply semver updates (if any)
  command: |
- AUTO_VERSION=$(yarn --silent auto version)
+ AUTO_VERSION=$(yarn auto version)
  if [[ $AUTO_VERSION ]]; then
  yarn lerna version $(echo $AUTO_VERSION) --no-git-tag-version --yes
  fi

.gitignore

@@ -17,6 +17,13 @@
 /package-lock.json
 /**/package-lock.json
 /**/yarn-error.log
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*
 
 # Output files
 /**/dist

.yarnrc.yml

@@ -0,0 +1,9 @@
+nmHoistingLimits: workspaces
+
+nodeLinker: node-modules
+
+plugins:
+ - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+ spec: "@yarnpkg/plugin-workspace-tools"
+
+yarnPath: ./.yarn/releases/yarn-berry.js

lerna.json

@@ -1,6 +1,4 @@
 {
- "packages": ["packages/@magic-sdk/*", "packages/magic-sdk"],
- "workspaces": ["packages/@magic-sdk/*", "packages/magic-sdk"],
  "version": "independent",
  "npmClient": "yarn",
  "useWorkspaces": true

package.json

@@ -3,23 +3,26 @@
  "name": "magic-sdk-monorepo",
  "version": "0.0.0",
  "scripts": {
- "bootstrap": "yarn install && lerna link",
- "wsrun": "wsrun --bin $INIT_CWD/scripts/bin/wsrun/bin.ts -p $PKG",
- "wsrun:paths": "yarn --silent wsrun --parallel --no-prefix -r -c $INIT_CWD/scripts/bin/wsrun/resolve-paths.ts",
+ "wsrun": "$INIT_CWD/scripts/bin/wsrun-wrapper.ts",
+ "wsrun:all": "$INIT_CWD/scripts/bin/wsrun-wrapper.ts --all",
+ "wsrun:paths": "yarn wsrun --stages --no-prefix -r -c $INIT_CWD/scripts/bin/wsrun/resolve-paths.ts",
  "dev": "$INIT_CWD/scripts/bin/clean.ts && $INIT_CWD/scripts/bin/dev.ts",
  "build": "$INIT_CWD/scripts/bin/clean.ts && $INIT_CWD/scripts/bin/build.ts",
  "clean": "$INIT_CWD/scripts/bin/clean.ts",
  "lint": "$INIT_CWD/scripts/bin/lint.ts",
  "test": "$INIT_CWD/scripts/bin/test.ts",
- "postinstall": "husky install"
+ "postinstall": "husky install && lerna link"
  },
  "devDependencies": {
  "@ikscodes/browser-env": "~0.3.1",
  "@ikscodes/eslint-config": "~7.0.2",
  "@ikscodes/prettier-config": "~2.0.1",
  "@istanbuljs/nyc-config-typescript": "~0.1.3",
+ "@types/inquirer": "^8.1.1",
+ "@types/is-ci": "^3.0.0",
  "@types/jest": "^27.0.0",
  "@types/jsdom": "~12.2.4",
+ "@types/lodash": "^4.14.172",
  "@types/react": "^16.9.34",
  "@types/react-native": "^0.62.2",
  "@types/rimraf": "^3.0.2",
@@ -37,9 +40,12 @@
  "eslint-plugin-react-hooks": "~4.0.4",
  "execa": "~5.1.1",
  "husky": "^7.0.1",
+ "inquirer": "^8.1.2",
+ "is-ci": "^3.0.0",
  "jest": "^27.0.6",
  "lerna": "^3.21.0",
  "lint-staged": "^10.0.7",
+ "lodash": "^4.17.21",
  "meow": "9.0.0",
  "microbundle": "0.13.3",
  "npm-run-all": "^4.1.5",
@@ -48,25 +54,20 @@
  "prettier": "~2.3.2",
  "react": "^16.13.1",
  "react-native": "^0.62.2",
+ "regenerator-runtime": "0.13.9",
  "replace-in-file": "^6.1.0",
  "rimraf": "~3.0.2",
  "ts-jest": "^27.0.4",
- "tslib": "^2.3.1",
  "ts-node": "^10.2.0",
  "tsc-watch": "^4.2.9",
+ "tslib": "^2.3.1",
  "typescript": "~4.4.2",
  "wsrun": "^5.2.1"
  },
  "workspaces": {
  "packages": [
  "packages/@magic-sdk/*",
  "packages/magic-sdk"
- ],
- "nohoist": [
- "@magic-sdk/react-native/buffer",
- "@magic-sdk/react-native/buffer/**",
- "@magic-sdk/react-native/process",
- "@magic-sdk/react-native/process/**"
  ]
  },
  "repository": "magiclabs/magic-js",

packages/@magic-sdk/commons/package.json

@@ -14,7 +14,6 @@
  "dist/**/*.js.map",
  "dist/**/*.d.ts"
  ],
- "builder": "tsc",
  "target": "web",
  "main": "./dist/cjs/index.js",
  "module": "./dist/es/index.js",

packages/@magic-sdk/commons/tsconfig.json

@@ -5,7 +5,6 @@
  "rootDir": "src",
  "outDir": "dist/es",
  "declarationDir": "dist/types",
- "tsBuildInfoFile": "node_modules/.cache/.tsbuildinfo/es",
  },
 
  "include": [

packages/@magic-sdk/provider/package.json

@@ -14,7 +14,6 @@
  "dist/**/*.js.map",
  "dist/**/*.d.ts"
  ],
- "builder": "tsc",
  "target": "web",
  "main": "./dist/cjs/index.js",
  "module": "./dist/es/index.js",
@@ -23,12 +22,15 @@
  "@babel/plugin-transform-runtime": "^7.9.6",
  "@peculiar/webcrypto": "^1.1.7",
  "@types/semver": "^7.3.4",
- "@magic-sdk/types": "^4.0.0",
  "eventemitter3": "^4.0.4",
- "semver": "^7.3.2",
- "web3-core": "1.5.2",
  "localforage": "^1.7.4",
- "localforage-driver-memory": "^1.0.5"
+ "localforage-driver-memory": "^1.0.5",
+ "semver": "^7.3.2",
+ "tslib": "^2.3.1",
+ "web3-core": "1.5.2"
+ },
+ "dependencies": {
+ "@magic-sdk/types": "^4.0.0"
  },
  "peerDependencies": {
  "localforage": "^1.7.4"

packages/@magic-sdk/provider/src/core/sdk-environment.ts

@@ -1,7 +1,7 @@
-import localForage from 'localforage';
-import { ViewController } from './view-controller';
-import { SDKBase } from './sdk';
-import { WithExtensions } from '../modules/base-extension';
+import type localForage from 'localforage';
+import type { ViewController } from './view-controller';
+import type { SDKBase } from './sdk';
+import type { WithExtensions } from '../modules/base-extension';
 
 type ConstructorOf<C> = { new (...args: any[]): C };
 

packages/@magic-sdk/provider/src/core/sdk.ts

@@ -166,6 +166,12 @@ export class SDKBase {
  protected get overlay(): ViewController {
  if (!SDKBase.__overlays__.has(this.parameters)) {
  const controller = new SDKEnvironment.ViewController(this.endpoint, this.parameters);
+
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore - We don't want to expose this method to the user, but we
+ // need to invoke in here so that the `ViewController` is ready for use.
+ controller.init();
+
  SDKBase.__overlays__.set(this.parameters, controller);
  }
 

packages/@magic-sdk/provider/src/core/view-controller.ts

@@ -100,7 +100,6 @@ export abstract class ViewController {
  */
  constructor(protected readonly endpoint: string, protected readonly parameters: string) {
  this.ready = this.waitForReady();
- this.init();
  this.listen();
  }
 

packages/@magic-sdk/provider/src/modules/base-module.ts

@@ -1,10 +1,10 @@
 import { JsonRpcRequestPayload, MagicOutgoingWindowMessage, MagicIncomingWindowMessage } from '@magic-sdk/types';
 import { createMalformedResponseError, MagicRPCError } from '../core/sdk-exceptions';
-import { SDKBase } from '../core/sdk';
+import type { SDKBase } from '../core/sdk';
 import { standardizeJsonRpcRequestPayload } from '../core/json-rpc';
 import { createPromiEvent } from '../util/promise-tools';
-import { ViewController } from '../core/view-controller';
-import { EventsDefinition } from '../util/events';
+import type { ViewController } from '../core/view-controller';
+import type { EventsDefinition } from '../util/events';
 
 export class BaseModule {
  constructor(protected sdk: SDKBase) {}

packages/@magic-sdk/provider/test/spec/core/view-controller/constructor.spec.ts

@@ -8,11 +8,9 @@ beforeEach(() => {
 });
 
 test('Instantiates `ViewController`', async () => {
- const initStub = jest.fn().mockImplementation(() => new Promise(() => {}));
  const listenStub = jest.fn();
  const waitForReadyStub = jest.fn();
 
- (ViewController.prototype as any).init = initStub;
  (ViewController.prototype as any).listen = listenStub;
  (ViewController.prototype as any).waitForReady = waitForReadyStub;
 
@@ -21,7 +19,6 @@ test('Instantiates `ViewController`', async () => {
  expect(overlay instanceof ViewController).toBe(true);
  expect(overlay.endpoint).toBe('testing123');
  expect(overlay.parameters).toBe('qwerty');
- expect(initStub).toBeCalledTimes(1);
  expect(listenStub).toBeCalledTimes(1);
  expect(waitForReadyStub).toBeCalledTimes(1);
 });

packages/@magic-sdk/provider/tsconfig.json

@@ -5,7 +5,6 @@
  "rootDir": "src",
  "outDir": "dist/es",
  "declarationDir": "dist/types",
- "tsBuildInfoFile": "node_modules/.cache/.tsbuildinfo/es",
  },
 
  "include": [

packages/@magic-sdk/react-native/package.json

@@ -14,34 +14,33 @@
  "dist/**/*.js.map",
  "dist/**/*.d.ts"
  ],
- "builder": "tsc",
  "target": "node",
  "main": "./dist/cjs/index.js",
+ "module": "./dist/es/index.js",
  "types": "./dist/types/index.d.ts",
- "dependencies": {
+ "devDependencies": {
  "@aveq-research/localforage-asyncstorage-driver": "^3.0.1",
  "@babel/core": "~7.10.4",
+ "@babel/plugin-transform-flow-strip-types": "^7.14.5",
  "@babel/runtime": "~7.10.4",
- "@magic-sdk/commons": "^1.2.1",
- "@magic-sdk/provider": "^5.1.0",
- "@magic-sdk/types": "^4.0.0",
  "@react-native-async-storage/async-storage": "^1.15.5",
  "@types/lodash": "^4.14.158",
+ "babel-jest": "^27.0.6",
  "buffer": "~5.6.0",
  "localforage": "^1.7.4",
  "localforage-driver-memory": "^1.0.5",
  "lodash": "^4.17.19",
- "process": "~0.11.10",
- "tslib": "^2.3.1",
- "whatwg-url": "~8.1.0"
- },
- "devDependencies": {
- "@babel/plugin-transform-flow-strip-types": "^7.14.5",
- "babel-jest": "^27.0.6",
  "metro-react-native-babel-preset": "^0.66.2",
+ "process": "~0.11.10",
  "react": "^16.13.1",
  "react-native": "^0.62.2",
- "react-native-webview": "8.1.2"
+ "react-native-webview": "8.1.2",
+ "whatwg-url": "~8.1.0"
+ },
+ "dependencies": {
+ "@magic-sdk/commons": "^1.2.1",
+ "@magic-sdk/provider": "^5.1.0",
+ "@magic-sdk/types": "^4.0.0"
  },
  "peerDependencies": {
  "react": ">=16",

packages/@magic-sdk/react-native/src/index.ts

@@ -7,6 +7,8 @@
 
 /* istanbul ignore file */
 
+import 'regenerator-runtime/runtime';
+
 import { createSDK } from '@magic-sdk/provider';
 import * as processPolyfill from 'process';
 import localForage from 'localforage';
@@ -18,6 +20,9 @@ import * as memoryDriver from 'localforage-driver-memory';
 import { ReactNativeWebViewController } from './react-native-webview-controller';
 import { SDKBaseReactNative } from './react-native-sdk-base';
 
+// Web3 assumes a browser context, so we need
+// to provide `btoa` and `atob` shims.
+
 // We expect `global.process` to be a Node Process for web3.js usage
 // so we replace it here.
 global.process = _.merge(global.process, processPolyfill);
@@ -31,9 +36,6 @@ global.Buffer = Buffer;
 global.URL = URLPolyfill as any;
 global.URLSearchParams = URLSearchParamsPolyfill as any;
 
-// Web3 assumes a browser context, so we need
-// to provide `btoa` and `atob` shims.
-
 /* istanbul ignore next */
 global.btoa = (str) => Buffer.from(str, 'binary').toString('base64');
 /* istanbul ignore next */
@@ -44,7 +46,7 @@ export * from '@magic-sdk/commons';
 export const Magic = createSDK(SDKBaseReactNative, {
  platform: 'react-native',
  sdkName: '@magic-sdk/react-native',
- version: '%REACT_NATIVE_VERSION%',
+ version: process.env.REACT_NATIVE_VERSION!,
  defaultEndpoint: 'https://box.magic.link/',
  ViewController: ReactNativeWebViewController,
  configureStorage: /* istanbul ignore next */ async () => {

packages/@magic-sdk/react-native/tsconfig.json

@@ -5,7 +5,6 @@
  "rootDir": "src",
  "outDir": "dist/es",
  "declarationDir": "dist/types",
- "tsBuildInfoFile": "node_modules/.cache/.tsbuildinfo/es",
  },
 
  "include": [
@@ -14,8 +13,8 @@
  ],
 
  "references": [
- { "path": "../types/tsconfig.json" },
- { "path": "../provider/tsconfig.json" },
- { "path": "../commons/tsconfig.json" },
+ { "path": "../types" },
+ { "path": "../provider" },
+ { "path": "../commons" },
  ]
 }