Merge pull request #63 from davidmyersdev/47-unexpected-string

davidmyersdev · web-flow · commit b02e6c9c2559 · 2023-12-22T14:16:06.000-05:00
Improve global shims
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
       - uses: ./.github/actions/install-dependencies
       - run: pnpm build:core
       - run: pnpm build:shims
-      - run: pnpm build:shims:banner
+      - run: pnpm build:banner
       - run: pnpm test
   typecheck:
     needs:
@@ -39,5 +39,5 @@ jobs:
       - uses: ./.github/actions/install-dependencies
       - run: pnpm build:core
       - run: pnpm build:shims
-      - run: pnpm build:shims:banner
+      - run: pnpm build:banner
       - run: pnpm typecheck
diff --git a/package.json b/package.json
@@ -33,7 +33,19 @@
     },
     "./shims/banner": {
       "require": "./shims/banner/dist/index.cjs",
-      "import": "./shims/banner/dist/index.cjs"
+      "import": "./shims/banner/dist/index.js"
+    },
+    "./shims/buffer": {
+      "require": "./shims/buffer/dist/index.cjs",
+      "import": "./shims/buffer/dist/index.js"
+    },
+    "./shims/global": {
+      "require": "./shims/global/dist/index.cjs",
+      "import": "./shims/global/dist/index.js"
+    },
+    "./shims/process": {
+      "require": "./shims/process/dist/index.cjs",
+      "import": "./shims/process/dist/index.js"
     }
   },
   "main": "./dist/index.cjs",
@@ -44,10 +56,13 @@
     "shims"
   ],
   "scripts": {
-    "build": "run-s build:core build:shims build:shims:banner build:types",
+    "build": "run-s build:core build:shims build:banner build:types",
+    "build:banner": "vite-node ./shims/banner/build.ts",
     "build:core": "vite build",
-    "build:shims": "vite build ./shims",
-    "build:shims:banner": "vite-node ./shims/banner/build.ts",
+    "build:shims": "run-p build:shims:*",
+    "build:shims:buffer": "vite build -c ./shims/vite.config.ts ./shims/buffer",
+    "build:shims:global": "vite build -c ./shims/vite.config.ts ./shims/global",
+    "build:shims:process": "vite build -c ./shims/vite.config.ts ./shims/process",
     "build:types": "run-s typecheck",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
@@ -70,16 +85,16 @@
   },
   "dependencies": {
     "@rollup/plugin-inject": "^5.0.5",
-    "buffer-polyfill": "npm:buffer@^6.0.3",
-    "node-stdlib-browser": "^1.2.0",
-    "process": "^0.11.10"
+    "node-stdlib-browser": "^1.2.0"
   },
   "devDependencies": {
     "@types/node": "^18.18.8",
+    "buffer": "6.0.3",
     "esbuild": "^0.19.8",
     "eslint": "^8.54.0",
     "eslint-config-artisan": "^0.2.1",
     "npm-run-all": "^4.1.5",
+    "process": "^0.11.10",
     "rollup": "^4.6.0",
     "typescript": "4.8.3",
     "vite": "^5.0.2",
@@ -92,6 +107,9 @@
     "access": "public"
   },
   "pnpm": {
+    "overrides": {
+      "buffer": "6.0.3"
+    },
     "patchedDependencies": {
       "buffer@6.0.3": "patches/buffer@6.0.3.patch"
     }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/shims/banner/build.ts b/shims/banner/build.ts
@@ -8,7 +8,11 @@ await build({
   bundle: true,
   entryPoints: [join(thisDir, './index.cjs')],
   format: 'iife',
-  inject: [join(thisDir, '..')],
+  inject: [
+    join(thisDir, '../buffer'),
+    join(thisDir, '../global'),
+    join(thisDir, '../process'),
+  ],
   outdir: join(thisDir, './dist'),
   outExtension: { '.js': '.cjs' },
 })
diff --git a/shims/banner/package.json b/shims/banner/package.json
@@ -0,0 +1,5 @@
+{
+  "type": "module",
+  "sideEffects": false,
+  "main": "./dist/index.cjs"
+}
diff --git a/shims/buffer/index.ts b/shims/buffer/index.ts
@@ -0,0 +1,5 @@
+// eslint-disable-next-line unicorn/prefer-node-protocol
+import { Buffer } from 'buffer'
+
+export { Buffer }
+export default Buffer
diff --git a/shims/buffer/package.json b/shims/buffer/package.json
@@ -0,0 +1,12 @@
+{
+  "type": "module",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.js"
+    }
+  },
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js"
+}
diff --git a/shims/global/index.ts b/shims/global/index.ts
@@ -0,0 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/no-invalid-this
+const global = globalThis || this || self
+
+export { global }
+export default global
diff --git a/shims/global/package.json b/shims/global/package.json
@@ -0,0 +1,12 @@
+{
+  "type": "module",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.js"
+    }
+  },
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js"
+}
diff --git a/shims/package.json b/shims/package.json
@@ -5,6 +5,18 @@
     ".": {
       "require": "./dist/index.cjs",
       "import": "./dist/index.js"
+    },
+    "./buffer": {
+      "require": "./buffer/dist/index.cjs",
+      "import": "./buffer/dist/index.js"
+    },
+    "./global": {
+      "require": "./global/dist/index.cjs",
+      "import": "./global/dist/index.js"
+    },
+    "./process": {
+      "require": "./process/dist/index.cjs",
+      "import": "./process/dist/index.js"
     }
   },
   "main": "./dist/index.cjs",
diff --git a/shims/process/index.ts b/shims/process/index.ts
@@ -1,10 +1,8 @@
-// eslint-disable-next-line @typescript-eslint/no-invalid-this
-const global = globalThis || this || self
-
-export { Buffer } from 'buffer-polyfill'
 // We cannot use `process-polyfill` as the package name due to a bug in Yarn v1. The errors results in a dependency
 // conflict with `node-stdlib-browser` which fails to import `process/browser.js`.
 // https://github.com/yarnpkg/yarn/issues/6907
 // eslint-disable-next-line unicorn/prefer-node-protocol
-export { default as process } from 'process'
-export { global }
+import process from 'process'
+
+export { process }
+export default process
diff --git a/shims/process/package.json b/shims/process/package.json
@@ -0,0 +1,12 @@
+{
+  "type": "module",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.js"
+    }
+  },
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js"
+}
diff --git a/shims/vite.config.ts b/shims/vite.config.ts
@@ -1,13 +1,14 @@
 import { defineConfig } from 'vite'
-import { externalizeDeps } from 'vite-plugin-externalize-deps'
 
 // https://vitejs.dev/config/
 export default defineConfig({
   build: {
     lib: {
-      entry: './index.ts',
-      fileName: 'index',
+      entry: {
+        index: './index.ts',
+      },
     },
+    minify: false,
     rollupOptions: {
       external: [/^node:.*$/],
       output: [
@@ -19,15 +20,11 @@ export default defineConfig({
         {
           exports: 'named',
           format: 'cjs',
-          inlineDynamicImports: true,
           interop: 'auto',
         },
       ],
     },
     sourcemap: true,
     target: 'esnext',
   },
-  plugins: [
-    externalizeDeps(),
-  ],
 })
diff --git a/src/index.ts b/src/index.ts
