Upgrade tsup to support --inject (aws-amplify#1051)

dpilch · Dec 27, 2021 · ebbae0e · ebbae0e
1 parent 119d0c8
commit ebbae0e
Show file tree

Hide file tree

Showing 8 changed files with 143 additions and 114 deletions.
diff --git a/.husky/post-merge b/.husky/post-merge
@@ -4,7 +4,3 @@
 
 yarn install
 yarn build
-
-# React's build doesn't pick up on patch changes, so we need to run it twice
-yarn patch-package
-yarn react build
diff --git a/package.json b/package.json
@@ -1,7 +1,6 @@
 {
   "private": true,
   "scripts": {
-    "postinstall": "patch-package",
     "build": "npx ultra -r --filter '@aws-amplify/*' build",
     "angular": "yarn workspace @aws-amplify/ui-angular",
     "react": "yarn workspace @aws-amplify/ui-react",
@@ -41,17 +40,13 @@
     "vscode-vue-languageservice": "0.27.26",
     "ws": "^7.4.6"
   },
-  "dependencies": {
-    "patch-package": "^6.4.7",
-    "postinstall-postinstall": "^2.1.0",
-    "tsup": "^4.14.0"
-  },
   "devDependencies": {
-    "@changesets/cli": "^2.16.0",
     "@changesets/changelog-github": "0.4.1",
+    "@changesets/cli": "^2.16.0",
     "husky": ">=6",
     "lint-staged": ">=10",
     "prettier": "2.4.1",
+    "tsup": "^5.11.9",
     "ultra-runner": "^3.10.5",
     "wait-on": "^6.0.0"
   },

diff --git a/packages/react/src/globals.js → packages/react/src/react-shim.js b/packages/react/src/globals.js → packages/react/src/react-shim.js
diff --git a/packages/react/tsup.config.js b/packages/react/tsup.config.js
@@ -13,6 +13,7 @@ module.exports = {
   // `aws-amplify` is external, but sub-dependencies weren't automatically externalized ("require" statements were included)
   external: ['aws-amplify', /^@aws-amplify\//],
   format: ['cjs', 'esm'],
+  inject: ['src/react-shim.js'],
   // ! .cjs/.mjs doesn't work with Angular's webpack4 config by default!
   legacyOutput: true,
   sourcemap: 'external',

diff --git a/packages/ui/src/globals.js b/packages/ui/src/globals.js
diff --git a/patches/klaw-sync+6.0.0.patch b/patches/klaw-sync+6.0.0.patch
diff --git a/patches/tsup+4.14.0.patch b/patches/tsup+4.14.0.patch
diff --git a/yarn.lock b/yarn.lock