[*] [babel] add babel-plugin-add-module-exports and fully use ESM syntax

ljharb · ljharb · commit 18527e8ac190 · 2022-11-03T10:54:44.000-07:00
diff --git a/.babelrc b/.babelrc
@@ -2,9 +2,10 @@
   "presets": ["airbnb"],
   "plugins": [
     ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+    ["add-module-exports"],
   ],
-  ignore: [
+  "ignore": [
     "packages/enzyme-test-suite/test/_helpers/untranspiled*",
   ],
-  sourceMaps: "both",
+  "sourceMaps": "both",
 }
diff --git a/package.json b/package.json
@@ -66,6 +66,7 @@
     "@babel/register": "^7.18.9",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.2.2",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-replace-object-assign": "^2.0.0",
     "babel-preset-airbnb": "^4.5.0",
     "chai": "^4.3.4",
diff --git a/packages/enzyme-adapter-react-13/.babelrc b/packages/enzyme-adapter-react-13/.babelrc
@@ -4,6 +4,7 @@
   ],
   "plugins": [
     ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+    ["add-module-exports"],
   ],
   "sourceMaps": "both",
 }
diff --git a/packages/enzyme-adapter-react-13/package.json b/packages/enzyme-adapter-react-13/package.json
@@ -52,6 +52,7 @@
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-replace-object-assign": "^2.0.0",
     "babel-preset-airbnb": "^4.5.0",
     "enzyme": "^3.0.0",
diff --git a/packages/enzyme-adapter-react-13/src/ReactThirteenAdapter.js b/packages/enzyme-adapter-react-13/src/ReactThirteenAdapter.js
@@ -284,4 +284,4 @@ class ReactThirteenAdapter extends EnzymeAdapter {
   }
 }
 
-module.exports = ReactThirteenAdapter;
+export default ReactThirteenAdapter;
diff --git a/packages/enzyme-adapter-react-14/.babelrc b/packages/enzyme-adapter-react-14/.babelrc
@@ -4,6 +4,7 @@
   ],
   "plugins": [
     ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+    ["add-module-exports"],
   ],
   "sourceMaps": "both",
 }
diff --git a/packages/enzyme-adapter-react-14/package.json b/packages/enzyme-adapter-react-14/package.json
@@ -56,6 +56,7 @@
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-replace-object-assign": "^2.0.0",
     "babel-preset-airbnb": "^4.5.0",
     "enzyme": "^3.0.0",
diff --git a/packages/enzyme-adapter-react-14/src/ReactFourteenAdapter.js b/packages/enzyme-adapter-react-14/src/ReactFourteenAdapter.js
@@ -336,4 +336,4 @@ class ReactFourteenAdapter extends EnzymeAdapter {
   }
 }
 
-module.exports = ReactFourteenAdapter;
+export default ReactFourteenAdapter;
diff --git a/packages/enzyme-adapter-react-15.4/.babelrc b/packages/enzyme-adapter-react-15.4/.babelrc
@@ -4,6 +4,7 @@
   ],
   "plugins": [
     ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+    ["add-module-exports"],
   ],
   "sourceMaps": "both",
 }
diff --git a/packages/enzyme-adapter-react-15.4/package.json b/packages/enzyme-adapter-react-15.4/package.json
@@ -56,6 +56,7 @@
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-replace-object-assign": "^2.0.0",
     "babel-preset-airbnb": "^4.5.0",
     "enzyme": "^3.0.0",
diff --git a/packages/enzyme-adapter-react-15.4/src/ReactFifteenFourAdapter.js b/packages/enzyme-adapter-react-15.4/src/ReactFifteenFourAdapter.js
@@ -372,4 +372,4 @@ class ReactFifteenFourAdapter extends EnzymeAdapter {
   }
 }
 
-module.exports = ReactFifteenFourAdapter;
+export default ReactFifteenFourAdapter;
diff --git a/packages/enzyme-adapter-react-15/.babelrc b/packages/enzyme-adapter-react-15/.babelrc
@@ -4,6 +4,7 @@
   ],
   "plugins": [
     ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+    ["add-module-exports"],
   ],
   "sourceMaps": "both",
 }
diff --git a/packages/enzyme-adapter-react-15/package.json b/packages/enzyme-adapter-react-15/package.json
@@ -55,6 +55,7 @@
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-replace-object-assign": "^2.0.0",
     "babel-preset-airbnb": "^4.5.0",
     "enzyme": "^3.0.0",
diff --git a/packages/enzyme-adapter-react-15/src/ReactFifteenAdapter.js b/packages/enzyme-adapter-react-15/src/ReactFifteenAdapter.js
@@ -331,4 +331,4 @@ class ReactFifteenAdapter extends EnzymeAdapter {
   }
 }
 
-module.exports = ReactFifteenAdapter;
+export default ReactFifteenAdapter;
diff --git a/packages/enzyme-adapter-react-16.1/.babelrc b/packages/enzyme-adapter-react-16.1/.babelrc
@@ -4,6 +4,7 @@
   ],
   "plugins": [
     ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+    ["add-module-exports"],
   ],
   "sourceMaps": "both",
 }
diff --git a/packages/enzyme-adapter-react-16.1/package.json b/packages/enzyme-adapter-react-16.1/package.json
@@ -56,6 +56,7 @@
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-replace-object-assign": "^2.0.0",
     "babel-preset-airbnb": "^4.5.0",
     "enzyme": "^3.0.0",
diff --git a/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js b/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js
@@ -567,4 +567,4 @@ class ReactSixteenOneAdapter extends EnzymeAdapter {
   }
 }
 
-module.exports = ReactSixteenOneAdapter;
+export default ReactSixteenOneAdapter;
diff --git a/packages/enzyme-adapter-react-16.2/.babelrc b/packages/enzyme-adapter-react-16.2/.babelrc
@@ -4,6 +4,7 @@
   ],
   "plugins": [
     ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+    ["add-module-exports"],
   ],
   "sourceMaps": "both",
 }
diff --git a/packages/enzyme-adapter-react-16.2/package.json b/packages/enzyme-adapter-react-16.2/package.json
@@ -57,6 +57,7 @@
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-replace-object-assign": "^2.0.0",
     "babel-preset-airbnb": "^4.5.0",
     "enzyme": "^3.0.0",
diff --git a/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js b/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js
@@ -573,4 +573,4 @@ class ReactSixteenTwoAdapter extends EnzymeAdapter {
   }
 }
 
-module.exports = ReactSixteenTwoAdapter;
+export default ReactSixteenTwoAdapter;
diff --git a/packages/enzyme-adapter-react-16.3/.babelrc b/packages/enzyme-adapter-react-16.3/.babelrc
@@ -4,6 +4,7 @@
   ],
   "plugins": [
     ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+    ["add-module-exports"],
   ],
   "sourceMaps": "both",
 }
diff --git a/packages/enzyme-adapter-react-16.3/package.json b/packages/enzyme-adapter-react-16.3/package.json
@@ -57,6 +57,7 @@
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-replace-object-assign": "^2.0.0",
     "babel-preset-airbnb": "^4.5.0",
     "enzyme": "^3.0.0",
diff --git a/packages/enzyme-adapter-react-16.3/src/ReactSixteenThreeAdapter.js b/packages/enzyme-adapter-react-16.3/src/ReactSixteenThreeAdapter.js
@@ -640,4 +640,4 @@ class ReactSixteenThreeAdapter extends EnzymeAdapter {
   }
 }
 
-module.exports = ReactSixteenThreeAdapter;
+export default ReactSixteenThreeAdapter;
diff --git a/packages/enzyme-adapter-react-16/.babelrc b/packages/enzyme-adapter-react-16/.babelrc
@@ -4,6 +4,7 @@
   ],
   "plugins": [
     ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+    ["add-module-exports"],
   ],
   "sourceMaps": "both",
 }
diff --git a/packages/enzyme-adapter-react-16/package.json b/packages/enzyme-adapter-react-16/package.json
@@ -58,6 +58,7 @@
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-replace-object-assign": "^2.0.0",
     "babel-preset-airbnb": "^4.5.0",
     "enzyme": "^3.0.0",
diff --git a/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js b/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js
@@ -991,4 +991,4 @@ class ReactSixteenAdapter extends EnzymeAdapter {
   }
 }
 
-module.exports = ReactSixteenAdapter;
+export default ReactSixteenAdapter;
diff --git a/packages/enzyme-adapter-react-16/src/detectFiberTags.js b/packages/enzyme-adapter-react-16/src/detectFiberTags.js
@@ -39,7 +39,7 @@ function getLazyFiber(LazyComponent) {
   return inst._reactInternalFiber.child;
 }
 
-module.exports = function detectFiberTags() {
+export default function detectFiberTags() {
   const supportsMode = typeof React.StrictMode !== 'undefined';
   const supportsContext = typeof React.createContext !== 'undefined';
   const supportsForwardRef = typeof React.forwardRef !== 'undefined';
@@ -108,4 +108,4 @@ module.exports = function detectFiberTags() {
       ? getLazyFiber(LazyComponent).tag
       : -1,
   };
-};
+}
diff --git a/packages/enzyme-adapter-utils/.babelrc b/packages/enzyme-adapter-utils/.babelrc
@@ -4,6 +4,7 @@
   ],
   "plugins": [
     ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+    ["add-module-exports"],
   ],
   "sourceMaps": "both",
 }
diff --git a/packages/enzyme-adapter-utils/package.json b/packages/enzyme-adapter-utils/package.json
@@ -54,6 +54,7 @@
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-replace-object-assign": "^2.0.0",
     "babel-preset-airbnb": "^4.5.0",
     "eslint": "^8.24.0",
diff --git a/packages/enzyme-example-mocha/.babelrc b/packages/enzyme-example-mocha/.babelrc
@@ -4,5 +4,6 @@
   ],
   "plugins": [
     ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+    ["add-module-exports"],
   ],
 }
diff --git a/packages/enzyme-example-mocha/package.json b/packages/enzyme-example-mocha/package.json
@@ -20,6 +20,7 @@
     "@babel/cli": "^7.15.4",
     "@babel/core": "^7.15.5",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-replace-object-assign": "^2.0.0",
     "babel-preset-airbnb": "^4.5.0",
     "eslint": "^7.32.0",
diff --git a/packages/enzyme-shallow-equal/.babelrc b/packages/enzyme-shallow-equal/.babelrc
@@ -4,6 +4,7 @@
   ],
   "plugins": [
     ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+    ["add-module-exports"],
   ],
   "sourceMaps": "both",
 }
diff --git a/packages/enzyme-shallow-equal/package.json b/packages/enzyme-shallow-equal/package.json
@@ -46,6 +46,7 @@
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-replace-object-assign": "^2.0.0",
     "babel-preset-airbnb": "^4.5.0",
     "eslint": "^8.24.0",
diff --git a/packages/enzyme-test-suite/.babelrc b/packages/enzyme-test-suite/.babelrc
@@ -4,6 +4,7 @@
   ],
   "plugins": [
     ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+    ["add-module-exports"],
   ],
   "sourceMaps": "both",
 }
diff --git a/packages/enzyme-test-suite/package.json b/packages/enzyme-test-suite/package.json
@@ -61,7 +61,8 @@
   "devDependencies": {
     "@babel/cli": "^7.15.4",
     "@babel/core": "^7.15.5",
-    "babel-eslint": "^10.1.0",
+    "@babel/eslint-parser": "^7.19.1",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "eslint": "^7.32.0",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-plugin-import": "^2.24.2",
diff --git a/packages/enzyme-test-suite/test/_helpers/describeHooks.js b/packages/enzyme-test-suite/test/_helpers/describeHooks.js
@@ -12,7 +12,7 @@ export default function describeHooks({
 
   hooks.forEach((hook) => {
     // eslint-disable-next-line global-require, import/no-dynamic-require
-    require(`../shared/hooks/${hook}`).default({
+    require(`../shared/hooks/${hook}`)({
       hasHooks: is('>= 16.8'),
       Wrap,
       WrapRendered: isShallow ? Wrap : (...args) => Wrap(...args).children(),
diff --git a/packages/enzyme-test-suite/test/_helpers/describeLifecycles.js b/packages/enzyme-test-suite/test/_helpers/describeLifecycles.js
@@ -10,7 +10,7 @@ export default function describeLifecycles({
 
   lifecycles.forEach((lifecycle) => {
     // eslint-disable-next-line global-require, import/no-dynamic-require
-    require(`../shared/lifecycles/${lifecycle}`).default({
+    require(`../shared/lifecycles/${lifecycle}`)({
       Wrap,
       WrapRendered: isShallow ? Wrap : (...args) => Wrap(...args).children(),
       Wrapper,
diff --git a/packages/enzyme-test-suite/test/_helpers/describeMethods.js b/packages/enzyme-test-suite/test/_helpers/describeMethods.js
@@ -10,7 +10,7 @@ export default function describeMethods({
 
   methods.forEach((method) => {
     // eslint-disable-next-line global-require, import/no-dynamic-require
-    require(`../shared/methods/${method}`).default({
+    require(`../shared/methods/${method}`)({
       Wrap,
       WrapRendered: isShallow ? Wrap : (...args) => Wrap(...args).children(),
       Wrapper,
diff --git a/packages/enzyme/.babelrc b/packages/enzyme/.babelrc
@@ -4,6 +4,7 @@
   ],
   "plugins": [
     ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+    ["add-module-exports"],
   ],
   "sourceMaps": "both",
 }
diff --git a/packages/enzyme/ReactWrapper.js b/packages/enzyme/ReactWrapper.js
@@ -1 +1 @@
-module.exports = require('./build/ReactWrapper').default;
+module.exports = require('./build/ReactWrapper');
diff --git a/packages/enzyme/ShallowWrapper.js b/packages/enzyme/ShallowWrapper.js
@@ -1 +1 @@
-module.exports = require('./build/ShallowWrapper').default;
+module.exports = require('./build/ShallowWrapper');
diff --git a/packages/enzyme/mount.js b/packages/enzyme/mount.js
@@ -1 +1 @@
-module.exports = require('./build/mount').default;
+module.exports = require('./build/mount');
diff --git a/packages/enzyme/package.json b/packages/enzyme/package.json
@@ -67,6 +67,7 @@
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-replace-object-assign": "^2.0.0",
     "babel-preset-airbnb": "^4.5.0",
     "eslint": "^8.24.0",
diff --git a/packages/enzyme/render.js b/packages/enzyme/render.js
@@ -1 +1 @@
-module.exports = require('./build/render').default;
+module.exports = require('./build/render');
diff --git a/packages/enzyme/shallow.js b/packages/enzyme/shallow.js
@@ -1 +1 @@
-module.exports = require('./build/shallow').default;
+module.exports = require('./build/shallow');
diff --git a/packages/enzyme/src/EnzymeAdapter.js b/packages/enzyme/src/EnzymeAdapter.js
@@ -53,4 +53,4 @@ EnzymeAdapter.MODES = {
   SHALLOW: 'shallow',
 };
 
-module.exports = EnzymeAdapter;
+export default EnzymeAdapter;
diff --git a/packages/enzyme/src/index.js b/packages/enzyme/src/index.js
@@ -1,18 +1,8 @@
-import ReactWrapper from './ReactWrapper';
-import ShallowWrapper from './ShallowWrapper';
-import EnzymeAdapter from './EnzymeAdapter';
+export { default as ReactWrapper } from './ReactWrapper';
+export { default as ShallowWrapper } from './ShallowWrapper';
+export { default as EnzymeAdapter } from './EnzymeAdapter';
 
-import mount from './mount';
-import shallow from './shallow';
-import render from './render';
-import { merge as configure } from './configuration';
-
-module.exports = {
-  render,
-  shallow,
-  mount,
-  ShallowWrapper,
-  ReactWrapper,
-  configure,
-  EnzymeAdapter,
-};
+export { default as mount } from './mount';
+export { default as shallow } from './shallow';
+export { default as render } from './render';
+export { merge as configure } from './configuration';

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`],`
`5`	`5`	`"plugins": [`
`6`	`6`	`["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],`
	`7`	`+ ["add-module-exports"],`
`7`	`8`	`],`
`8`	`9`	`"sourceMaps": "both",`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,4 +284,4 @@ class ReactThirteenAdapter extends EnzymeAdapter {`
`284`	`284`	`}`
`285`	`285`	`}`
`286`	`286`
`287`		`-module.exports = ReactThirteenAdapter;`
	`287`	`+export default ReactThirteenAdapter;`
Original file line number	Diff line number	Diff line change
`@@ -336,4 +336,4 @@ class ReactFourteenAdapter extends EnzymeAdapter {`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`
`339`		`-module.exports = ReactFourteenAdapter;`
	`339`	`+export default ReactFourteenAdapter;`