Perf: Distribute both ESM and CJS modules

.babelrc.js

@@ -12,13 +12,24 @@ const withTests = {
   ],
 };
 
+const modules = process.env.BABEL_ESM === 'true' ? false : 'auto';
+
 module.exports = {
   ignore: [
     './lib/codemod/src/transforms/__testfixtures__',
     './lib/postinstall/src/__testfixtures__',
   ],
   presets: [
-    ['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage', corejs: '3' }],
+    [
+      '@babel/preset-env',
+      {
+        shippedProposals: true,
+        useBuiltIns: 'usage',
+        corejs: '3',
+        targets: 'defaults',
+        modules,
+      },
+    ],
     '@babel/preset-typescript',
     '@babel/preset-react',
     '@babel/preset-flow',
@@ -52,7 +63,16 @@ module.exports = {
     {
       test: './lib',
       presets: [
-        ['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage', corejs: '3' }],
+        [
+          '@babel/preset-env',
+          {
+            shippedProposals: true,
+            useBuiltIns: 'usage',
+            corejs: '3',
+            modules,
+            targets: 'defaults',
+          },
+        ],
         '@babel/preset-react',
       ],
       plugins: [
@@ -83,8 +103,9 @@ module.exports = {
             shippedProposals: true,
             useBuiltIns: 'usage',
             targets: {
-              node: '8.11',
+              node: '10',
             },
+            modules,
             corejs: '3',
           },
         ],
@@ -104,5 +125,22 @@ module.exports = {
         test: withTests,
       },
     },
+    {
+      test: ['**/virtualModuleEntry.template.js'],
+      presets: [
+        [
+          '@babel/preset-env',
+          {
+            shippedProposals: true,
+            useBuiltIns: 'usage',
+            targets: {
+              node: '10',
+            },
+            corejs: '3',
+            modules: false,
+          },
+        ],
+      ],
+    },
   ],
 };

.gitignore

@@ -5,7 +5,6 @@ node_modules
 *.sw*
 npm-shrinkwrap.json
 dist
-ts3.4
 .tern-port
 *.DS_Store
 .cache

addons/a11y/package.json

@@ -20,21 +20,21 @@
     "directory": "addons/a11y"
   },
   "license": "MIT",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "types": "dist/ts3.9/index.d.ts",
   "typesVersions": {
     "<3.8": {
       "*": [
-        "ts3.4/*"
+        "dist/ts3.4/*"
       ]
     }
   },
   "files": [
     "dist/**/*",
     "README.md",
     "*.js",
-    "*.d.ts",
-    "ts3.4/**/*"
+    "*.d.ts"
   ],
   "scripts": {
     "prepare": "node ../../scripts/prepare.js"

addons/a11y/preset.js

@@ -1 +1,13 @@
-module.exports = require('./dist/preset');
+function managerEntries(entry = []) {
+  return [...entry, require.resolve('./dist/esm/register')];
+}
+
+function config(entry = []) {
+  return [
+    ...entry,
+    require.resolve('./dist/esm/a11yRunner'),
+    require.resolve('./dist/esm/a11yHighlight'),
+  ];
+}
+
+module.exports = { managerEntries, config };

addons/a11y/register.js

@@ -1 +1 @@
-require('./dist/register');
+require('./dist/esm/register');

addons/a11y/src/preset/addDecorator.ts → addons/a11y/src/addDecorator.ts

@@ -1,3 +1,3 @@
-import { withA11y } from '../index';
+import { withA11y } from '.';
 
 export const decorators = [withA11y];

addons/actions/package.json

@@ -15,21 +15,21 @@
     "directory": "addons/actions"
   },
   "license": "MIT",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "types": "dist/ts3.9/index.d.ts",
   "typesVersions": {
     "<3.8": {
       "*": [
-        "ts3.4/*"
+        "dist/ts3.4/*"
       ]
     }
   },
   "files": [
     "dist/**/*",
     "README.md",
     "*.js",
-    "*.d.ts",
-    "ts3.4/**/*"
+    "*.d.ts"
   ],
   "scripts": {
     "prepare": "node ../../scripts/prepare.js"

addons/actions/preset.js

@@ -1 +1,16 @@
-module.exports = require('./dist/preset');
+function managerEntries(entry, options) {
+  return [...entry, require.resolve('./dist/esm/register')];
+}
+
+function config(entry = [], { addDecorator = true } = {}) {
+  const actionConfig = [];
+  if (addDecorator) {
+    actionConfig.push(require.resolve('./dist/esm/preset/addDecorator'));
+  }
+  return [...entry, ...actionConfig, require.resolve('./dist/esm/preset/addArgs')];
+}
+
+module.exports = {
+  managerEntries,
+  config,
+};

addons/actions/register.js

@@ -1 +1 @@
-require('./dist/register');
+require('./dist/esm/register');

addons/backgrounds/package.json

@@ -19,21 +19,21 @@
   },
   "license": "MIT",
   "author": "jbaxleyiii",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "types": "dist/ts3.9/index.d.ts",
   "typesVersions": {
     "<3.8": {
       "*": [
-        "ts3.4/*"
+        "dist/ts3.4/*"
       ]
     }
   },
   "files": [
     "dist/**/*",
     "README.md",
     "*.js",
-    "*.d.ts",
-    "ts3.4/**/*"
+    "*.d.ts"
   ],
   "scripts": {
     "prepare": "node ../../scripts/prepare.js"

addons/backgrounds/preset.js

@@ -1 +1,16 @@
-module.exports = require('./dist/preset');
+function config(entry = []) {
+  return [
+    ...entry,
+    require.resolve('./dist/esm/preset/addDecorator'),
+    require.resolve('./dist/esm/preset/addParameter'),
+  ];
+}
+
+function managerEntries(entry = [], options) {
+  return [...entry, require.resolve('./dist/esm/register')];
+}
+
+module.exports = {
+  managerEntries,
+  config,
+};

addons/backgrounds/register.js

@@ -1 +1 @@
-require('./dist/register');
+require('./dist/esm/register');

addons/controls/package.json

@@ -19,7 +19,16 @@
     "directory": "addons/controls"
   },
   "license": "MIT",
-  "main": "dist/register.js",
+  "main": "dist/cjs/register.js",
+  "module": "dist/esm/register.js",
+  "types": "dist/ts3.9/index.d.ts",
+  "typesVersions": {
+    "<3.8": {
+      "*": [
+        "dist/ts3.4/*"
+      ]
+    }
+  },
   "files": [
     "dist/**/*",
     "README.md",

addons/controls/preset.js

@@ -1 +1,8 @@
-module.exports = require('./dist/preset');
+const { ensureDocsBeforeControls } = require('./dist/cjs/preset/ensureDocsBeforeControls');
+
+function managerEntries(entry = [], options) {
+  ensureDocsBeforeControls(options.configDir);
+  return [...entry, require.resolve('./dist/esm/register')];
+}
+
+module.exports = { managerEntries };

addons/controls/register.js

@@ -1 +1 @@
-export * from './dist/register';
+import './dist/esm/register';

addons/cssresources/package.json

@@ -19,21 +19,21 @@
   },
   "license": "MIT",
   "author": "nm123github",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "types": "dist/ts3.9/index.d.ts",
   "typesVersions": {
     "<3.8": {
       "*": [
-        "ts3.4/*"
+        "dist/ts3.4/*"
       ]
     }
   },
   "files": [
     "dist/**/*",
     "README.md",
     "*.js",
-    "*.d.ts",
-    "ts3.4/**/*"
+    "*.d.ts"
   ],
   "scripts": {
     "prepare": "node ../../scripts/prepare.js"

addons/cssresources/preset.js

@@ -0,0 +1,5 @@
+function managerEntries(entry = [], options) {
+  return [...entry, require.resolve('./dist/esm/register')];
+}
+
+module.exports = { managerEntries };

addons/cssresources/register.js

@@ -1 +1 @@
-require('./dist/register.js');
+require('./dist/esm/register.js');

addons/design-assets/package.json

@@ -21,21 +21,21 @@
     "directory": "addons/design-assets"
   },
   "license": "MIT",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "types": "dist/ts3.9/index.d.ts",
   "typesVersions": {
     "<3.8": {
       "*": [
-        "ts3.4/*"
+        "dist/ts3.4/*"
       ]
     }
   },
   "files": [
     "dist/**/*",
     "README.md",
     "*.js",
-    "*.d.ts",
-    "ts3.4/**/*"
+    "*.d.ts"
   ],
   "scripts": {
     "prepare": "node ../../scripts/prepare.js"

addons/design-assets/preset.js

@@ -0,0 +1,5 @@
+function managerEntries(entry = [], options) {
+  return [...entry, require.resolve('./dist/esm/register')];
+}
+
+module.exports = { managerEntries };

addons/design-assets/register.js

@@ -1 +1 @@
-require('./dist/register');
+require('./dist/esm/register');

addons/docs/angular/index.js

@@ -1 +1 @@
-module.exports = require('../dist/frameworks/angular/index');
+module.exports = require('../dist/esm/frameworks/angular/index');

addons/docs/blocks.js

@@ -1 +1 @@
-module.exports = require('./dist/blocks');
+export * from './dist/esm/blocks';