fix(commonjs): prepare for Rollup 3 (#1300)

BREAKING CHANGES: Requires Node 14
rollup · Oct 9, 2022 · f56bf9e · f56bf9e
1 parent 552aa96
commit f56bf9e
Show file tree

Hide file tree

Showing 18 changed files with 291 additions and 288 deletions.
diff --git a/packages/commonjs/README.md b/packages/commonjs/README.md
@@ -13,7 +13,7 @@
 
 ## Requirements
 
-This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v12.0.0+) and Rollup v2.68.0+. If you are using [`@rollup/plugin-node-resolve`](https://github.com/rollup/plugins/tree/master/packages/node-resolve), it should be v13.0.6+.
+This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v14.0.0+) and Rollup v2.68.0+. If you are using [`@rollup/plugin-node-resolve`](https://github.com/rollup/plugins/tree/master/packages/node-resolve), it should be v13.0.6+.
 
 ## Install
 

diff --git a/packages/commonjs/package.json b/packages/commonjs/package.json
@@ -16,11 +16,12 @@
   "main": "./dist/cjs/index.js",
   "module": "./dist/es/index.js",
   "exports": {
-    "require": "./dist/cjs/index.js",
-    "import": "./dist/es/index.js"
+    "import": "./dist/es/index.js",
+    "types": "./types/index.d.ts",
+    "default": "./dist/cjs/index.js"
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">=14.0.0"
   },
   "scripts": {
     "build": "rollup -c",
@@ -39,6 +40,7 @@
   },
   "files": [
     "dist",
+    "!dist/**/*.map",
     "types",
     "README.md",
     "LICENSE"
@@ -52,29 +54,33 @@
     "require"
   ],
   "peerDependencies": {
-    "rollup": "^2.68.0"
+    "rollup": "^2.68.0||^3.0.0"
+  },
+  "peerDependenciesMeta": {
+    "rollup": {
+      "optional": true
+    }
   },
   "dependencies": {
-    "@rollup/pluginutils": "^3.1.0",
+    "@rollup/pluginutils": "^4.2.1",
     "commondir": "^1.0.1",
-    "estree-walker": "^2.0.1",
-    "glob": "^7.1.6",
-    "is-reference": "^1.2.1",
-    "magic-string": "^0.25.7",
-    "resolve": "^1.17.0"
+    "estree-walker": "^2.0.2",
+    "glob": "^8.0.3",
+    "is-reference": "1.2.1",
+    "magic-string": "^0.26.4"
   },
   "devDependencies": {
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.1.0",
+    "@rollup/plugin-node-resolve": "^14.1.0",
     "locate-character": "^2.0.5",
     "require-relative": "^0.8.7",
-    "rollup": "^2.68.0",
-    "shx": "^0.3.2",
-    "source-map": "^0.7.3",
-    "source-map-support": "^0.5.19",
-    "typescript": "^3.9.7"
+    "rollup": "3.0.0-7",
+    "shx": "^0.3.4",
+    "source-map": "^0.7.4",
+    "source-map-support": "^0.5.21",
+    "typescript": "^4.8.3"
   },
-  "types": "types/index.d.ts",
+  "types": "./types/index.d.ts",
   "ava": {
     "workerThreads": false,
     "files": [

diff --git a/packages/commonjs/rollup.config.js b/packages/commonjs/rollup.config.js
diff --git a/packages/commonjs/rollup.config.mjs b/packages/commonjs/rollup.config.mjs
@@ -0,0 +1,13 @@
+import { readFileSync } from 'fs';
+
+import json from '@rollup/plugin-json';
+
+import { createConfig } from '../../shared/rollup.config.mjs';
+
+const pkg = JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8'));
+
+export default {
+  ...createConfig({ pkg }),
+  input: 'src/index.js',
+  plugins: [json()]
+};
diff --git a/packages/commonjs/test/fixtures/function/esm-externals-true/main.js b/packages/commonjs/test/fixtures/function/esm-externals-true/main.js
@@ -2,6 +2,6 @@ const externalNamed = require('external-esm-named');
 const externalMixed = require('external-esm-mixed');
 const externalDefault = require('external-esm-default');
 
-t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');
+t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named');
 t.deepEqual(externalMixed, { default: 'bar', foo: 'foo' }, 'external mixed');
 t.deepEqual(externalDefault, { default: 'bar' }, 'external default');
diff --git a/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-auto/main.js b/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-auto/main.js
@@ -11,6 +11,6 @@ t.deepEqual(namedExports, { foo: 'foo' }, 'named exports');
 t.deepEqual(mixedExports, { foo: 'foo', default: 'bar' }, 'mixed exports');
 t.deepEqual(defaultExport, 'bar', 'default export');
 t.deepEqual(noExports, {}, 'no exports');
-t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');
+t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named');
 t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed');
 t.deepEqual(externalDefault, 'bar', 'external default');
diff --git a/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-false/main.js b/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-false/main.js
@@ -11,7 +11,7 @@ t.deepEqual(namedExports, { foo: 'foo' }, 'named exports');
 t.deepEqual(mixedExports, { foo: 'foo', default: 'bar' }, 'mixed exports');
 t.deepEqual(defaultExport, { default: 'bar' }, 'default export');
 t.deepEqual(noExports, {}, 'no exports');
-t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');
+t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named');
 t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed');
 t.deepEqual(externalDefault, { default: 'bar' }, 'external default');
 

diff --git a/...monjs/test/fixtures/function/import-esm-require-returns-default-function-external/main.js b/...monjs/test/fixtures/function/import-esm-require-returns-default-function-external/main.js
@@ -2,6 +2,6 @@ const externalNamed = require('external-esm-named');
 const externalMixed = require('external-esm-mixed');
 const externalDefault = require('external-esm-default');
 
-t.deepEqual(externalNamed, { foo: 'foo' }, 'named');
+t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'named');
 t.deepEqual(externalMixed, 'bar', 'mixed');
 t.deepEqual(externalDefault, { default: 'bar' }, 'default');
diff --git a/...ages/commonjs/test/fixtures/function/import-esm-require-returns-default-namespace/main.js b/...ages/commonjs/test/fixtures/function/import-esm-require-returns-default-namespace/main.js
@@ -11,6 +11,6 @@ t.deepEqual(namedExports, { foo: 'foo' }, 'named exports');
 t.deepEqual(mixedExports, { foo: 'foo', default: 'bar' }, 'mixed exports');
 t.deepEqual(defaultExport, { default: 'bar' }, 'default export');
 t.deepEqual(noExports, {}, 'no exports');
-t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');
+t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named');
 t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed');
 t.deepEqual(externalDefault, { default: 'bar' }, 'external default');
diff --git a/...ages/commonjs/test/fixtures/function/import-esm-require-returns-default-undefined/main.js b/...ages/commonjs/test/fixtures/function/import-esm-require-returns-default-undefined/main.js
@@ -11,6 +11,6 @@ t.deepEqual(namedExports, { foo: 'foo' }, 'named exports');
 t.deepEqual(mixedExports, { foo: 'foo', default: 'bar' }, 'mixed exports');
 t.deepEqual(defaultExport, { default: 'bar' }, 'default export');
 t.deepEqual(noExports, {}, 'no exports');
-t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');
+t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named');
 t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed');
 t.deepEqual(externalDefault, { default: 'bar' }, 'external default');
diff --git a/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-named/main.js b/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-named/main.js
@@ -10,5 +10,6 @@ t.deepEqual(dep, {
 });
 
 t.deepEqual(external, {
-  foo: 'foo'
+  foo: 'foo',
+  default: { foo: 'foo' }
 });
diff --git a/packages/commonjs/test/fixtures/function/unresolved-dependencies/_config.js b/packages/commonjs/test/fixtures/function/unresolved-dependencies/_config.js
@@ -12,10 +12,10 @@ module.exports = {
       {
         buildEnd() {
           assert.deepStrictEqual(
-            warnings.map(({ code, source }) => {
-              return { code, source };
+            warnings.map(({ code, exporter, ...rest }) => {
+              return { code, exporter };
             }),
-            [{ code: 'UNRESOLVED_IMPORT', source: 'path' }]
+            [{ code: 'UNRESOLVED_IMPORT', exporter: 'path' }]
           );
         }
       }

diff --git a/packages/commonjs/test/helpers/util.js b/packages/commonjs/test/helpers/util.js
@@ -62,7 +62,12 @@ function runCodeSplitTest(codeMap, t, configContext = {}) {
 }
 
 async function getCodeMapFromBundle(bundle, options = {}) {
-  const generated = await bundle.generate({ exports: 'auto', format: 'cjs', ...options });
+  const generated = await bundle.generate({
+    interop: 'compat',
+    exports: 'auto',
+    format: 'cjs',
+    ...options
+  });
   const codeMap = {};
   for (const chunk of generated.output) {
     codeMap[chunk.fileName] = chunk.code;