From 18ed5c66c279f592e41c8769d61331cf290df1f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Tue, 22 Aug 2023 21:13:17 +0200 Subject: [PATCH 1/2] fix: export CJS version for browser --- .changeset/afraid-coats-rescue.md | 9 +++++++ packages/blob/package.json | 5 +++- packages/fetch/package.json | 5 +++- packages/fetch/rollup.config.js | 45 +++++++++++++++++++++---------- packages/file/package.json | 5 +++- packages/form-data/package.json | 5 +++- packages/stream/package.json | 5 +++- 7 files changed, 60 insertions(+), 19 deletions(-) create mode 100644 .changeset/afraid-coats-rescue.md diff --git a/.changeset/afraid-coats-rescue.md b/.changeset/afraid-coats-rescue.md new file mode 100644 index 0000000..fc8814c --- /dev/null +++ b/.changeset/afraid-coats-rescue.md @@ -0,0 +1,9 @@ +--- +"@remix-run/web-blob": patch +"@remix-run/web-fetch": patch +"@remix-run/web-file": patch +"@remix-run/web-form-data": patch +"@remix-run/web-stream": patch +--- + +Export CJS version for browser diff --git a/packages/blob/package.json b/packages/blob/package.json index 795a750..c5e3ba2 100644 --- a/packages/blob/package.json +++ b/packages/blob/package.json @@ -19,7 +19,10 @@ "exports": { ".": { "types": "./dist/src/lib.d.ts", - "browser": "./src/lib.js", + "browser": { + "require": "./dist/src/lib.cjs", + "import": "./src/lib.js" + }, "require": "./dist/src/lib.node.cjs", "import": "./src/lib.node.js" } diff --git a/packages/fetch/package.json b/packages/fetch/package.json index da2cb3d..d8849b6 100644 --- a/packages/fetch/package.json +++ b/packages/fetch/package.json @@ -10,7 +10,10 @@ "exports": { ".": { "types": "./dist/src/lib.node.d.ts", - "browser": "./src/lib.js", + "browser": { + "require": "./dist/lib.cjs", + "import": "./src/lib.js" + }, "require": "./dist/lib.node.cjs", "import": "./src/lib.node.js" }, diff --git a/packages/fetch/rollup.config.js b/packages/fetch/rollup.config.js index e079c7a..5651fad 100644 --- a/packages/fetch/rollup.config.js +++ b/packages/fetch/rollup.config.js @@ -1,18 +1,35 @@ import {builtinModules} from 'module'; import {dependencies} from './package.json'; -export default { - input: 'src/lib.node.js', - output: { - file: 'dist/lib.node.cjs', - format: 'cjs', - esModule: false, - interop: false, - sourcemap: true, - preferConst: true, - exports: 'named', - // https://github.com/rollup/rollup/issues/1961#issuecomment-534977678 - outro: 'exports = module.exports = Object.assign(fetch, exports);' +export default [ + { + input: 'src/lib.js', + output: { + file: 'dist/lib.cjs', + format: 'cjs', + esModule: false, + interop: false, + sourcemap: true, + preferConst: true, + exports: 'named', + // https://github.com/rollup/rollup/issues/1961#issuecomment-534977678 + outro: 'exports = module.exports = Object.assign(fetch, exports);' + }, + external: [...builtinModules, ...Object.keys(dependencies)] }, - external: [...builtinModules, ...Object.keys(dependencies)] -}; + { + input: 'src/lib.node.js', + output: { + file: 'dist/lib.node.cjs', + format: 'cjs', + esModule: false, + interop: false, + sourcemap: true, + preferConst: true, + exports: 'named', + // https://github.com/rollup/rollup/issues/1961#issuecomment-534977678 + outro: 'exports = module.exports = Object.assign(fetch, exports);' + }, + external: [...builtinModules, ...Object.keys(dependencies)] + }, +]; diff --git a/packages/file/package.json b/packages/file/package.json index 7740de9..a53d1c7 100644 --- a/packages/file/package.json +++ b/packages/file/package.json @@ -24,7 +24,10 @@ "exports": { ".": { "types": "./dist/src/lib.d.ts", - "browser": "./src/lib.js", + "browser": { + "require": "./dist/src/lib.cjs", + "import": "./src/lib.js" + }, "require": "./dist/src/lib.node.cjs", "node": "./src/lib.node.js" } diff --git a/packages/form-data/package.json b/packages/form-data/package.json index 8c9d4dc..f11fc1e 100644 --- a/packages/form-data/package.json +++ b/packages/form-data/package.json @@ -22,7 +22,10 @@ "exports": { ".": { "types": "./dist/src/lib.d.ts", - "browser": "./src/lib.js", + "browser": { + "require": "./dist/src/lib.cjs", + "import": "./src/lib.js" + }, "require": "./dist/src/lib.node.cjs", "import": "./src/lib.node.js" } diff --git a/packages/stream/package.json b/packages/stream/package.json index de183a5..a8fa415 100644 --- a/packages/stream/package.json +++ b/packages/stream/package.json @@ -24,7 +24,10 @@ "exports": { ".": { "types": "./src/lib.d.ts", - "browser": "./src/lib.js", + "browser": { + "require": "./src/stream.cjs", + "import": "./src/lib.js" + }, "require": "./src/stream.cjs", "import": "./src/lib.node.js" } From 1d4135da45b1a3de7316a299c3b55c92d5bcb392 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 1 Sep 2023 11:04:31 -0400 Subject: [PATCH 2/2] Update .changeset/afraid-coats-rescue.md --- .changeset/afraid-coats-rescue.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.changeset/afraid-coats-rescue.md b/.changeset/afraid-coats-rescue.md index fc8814c..706474e 100644 --- a/.changeset/afraid-coats-rescue.md +++ b/.changeset/afraid-coats-rescue.md @@ -1,9 +1,9 @@ --- -"@remix-run/web-blob": patch -"@remix-run/web-fetch": patch -"@remix-run/web-file": patch -"@remix-run/web-form-data": patch -"@remix-run/web-stream": patch +"@remix-run/web-blob": minor +"@remix-run/web-fetch": minor +"@remix-run/web-file": minor +"@remix-run/web-form-data": minor +"@remix-run/web-stream": minor --- Export CJS version for browser