Skip to content

Commit

Permalink
Improve global shims (fixes #47)
Browse files Browse the repository at this point in the history
  • Loading branch information
davidmyersdev committed Dec 22, 2023
1 parent f0aecbe commit 5ba8a94
Show file tree
Hide file tree
Showing 11 changed files with 81 additions and 18 deletions.
19 changes: 17 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@
"./shims/banner": {
"require": "./shims/banner/dist/index.cjs",
"import": "./shims/banner/dist/index.cjs"
},
"./shims/buffer": {
"require": "./shims/buffer/dist/index.cjs",
"import": "./shims/buffer/dist/index.cjs"
},
"./shims/global": {
"require": "./shims/global/dist/index.cjs",
"import": "./shims/global/dist/index.cjs"
},
"./shims/process": {
"require": "./shims/process/dist/index.cjs",
"import": "./shims/process/dist/index.cjs"
}
},
"main": "./dist/index.cjs",
Expand All @@ -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:types",
"build:core": "vite build",
"build:shims": "vite build ./shims",
"build:shims": "run-p build:shims:*",
"build:shims:banner": "vite-node ./shims/banner/build.ts",
"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 .",
Expand Down
5 changes: 5 additions & 0 deletions shims/banner/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"type": "module",
"sideEffects": false,
"main": "./dist/index.cjs"
}
1 change: 1 addition & 0 deletions shims/buffer/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { Buffer as default } from 'buffer-polyfill'
12 changes: 12 additions & 0 deletions shims/buffer/package.json
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 2 additions & 0 deletions shims/global/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// eslint-disable-next-line @typescript-eslint/no-invalid-this
export default globalThis || this || self
12 changes: 12 additions & 0 deletions shims/global/package.json
Original file line number Diff line number Diff line change
@@ -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"
}
12 changes: 12 additions & 0 deletions shims/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 1 addition & 6 deletions shims/index.ts → shims/process/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
// 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 }
export { default } from 'process'
12 changes: 12 additions & 0 deletions shims/process/package.json
Original file line number Diff line number Diff line change
@@ -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"
}
11 changes: 4 additions & 7 deletions shims/vite.config.ts
Original file line number Diff line number Diff line change
@@ -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: [
Expand All @@ -19,15 +20,11 @@ export default defineConfig({
{
exports: 'named',
format: 'cjs',
inlineDynamicImports: true,
interop: 'auto',
},
],
},
sourcemap: true,
target: 'esnext',
},
plugins: [
externalizeDeps(),
],
})
6 changes: 3 additions & 3 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,9 @@ export const nodePolyfills = (options: PolyfillOptions = {}): Plugin => {
{
...inject({
// https://github.com/niksy/node-stdlib-browser/blob/3e7cd7f3d115ac5c4593b550e7d8c4a82a0d4ac4/README.md#vite
...(isBuildEnabled(optionsResolved.globals.Buffer) ? { Buffer: [globalShimsPath, 'Buffer'] } : {}),
...(isBuildEnabled(optionsResolved.globals.global) ? { global: [globalShimsPath, 'global'] } : {}),
...(isBuildEnabled(optionsResolved.globals.process) ? { process: [globalShimsPath, 'process'] } : {}),
...(isBuildEnabled(optionsResolved.globals.Buffer) ? { Buffer: 'vite-plugin-node-polyfills/shims/buffer' } : {}),
...(isBuildEnabled(optionsResolved.globals.global) ? { global: 'vite-plugin-node-polyfills/shims/global' } : {}),
...(isBuildEnabled(optionsResolved.globals.process) ? { process: 'vite-plugin-node-polyfills/shims/process' } : {}),
}),
},
],
Expand Down

0 comments on commit 5ba8a94

Please sign in to comment.