Revert ESM (#3839)

Author: devongovett

.circleci/api-comment.js

@@ -53,13 +53,7 @@ async function run() {
 
   if (pr != null) {
     let commentId = await findDifferComment(pr);
-    let diffs;
-    try {
-      diffs = fs.readFileSync('/tmp/dist/ts-diff.txt');
-    } catch (e) {
-      console.log('No TS Diff output to run on.')
-      return;
-    }
+    let diffs = fs.readFileSync('/tmp/dist/ts-diff.txt');
     if (diffs.length > 0) {
       if (commentId != null) {
         // delete existing comment

.circleci/config.yml

@@ -27,14 +27,6 @@ executors:
       CACHE_VERSION: v1
     working_directory: ~/react-spectrum
 
-  rsp-xlarge-nodeupdate:
-    docker:
-      - image: cimg/node:16.18.0
-    resource_class: xlarge
-    environment:
-      CACHE_VERSION: v1
-    working_directory: ~/react-spectrum
-
 jobs:
   install:
     executor: rsp-large
@@ -214,20 +206,6 @@ jobs:
       - store_artifacts:
           path: ~/junit
 
-
-  test-esm:
-    executor: rsp-xlarge-nodeupdate
-    steps:
-      - restore_cache:
-          key: react-spectrum-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
-
-      - run:
-          name: test
-          command: |
-            make build
-            yarn lerna run prepublishOnly
-            node --loader ./scripts/esm-support/loader.mjs ./scripts/esm-support/testESM.mjs
-
   lint:
     executor: rsp
     steps:
@@ -472,9 +450,6 @@ workflows:
       - test-17:
           requires:
             - install-17
-      - test-esm:
-          requires:
-            - install
       - lint:
           requires:
             - install
@@ -530,7 +505,6 @@ workflows:
             - test-16
             - test-ssr-17
             - test-17
-            - test-esm
             - storybook
             - storybook-16
             - storybook-17

.eslintignore

@@ -7,4 +7,4 @@ node_modules
 packages/*/*/dist
 packages/react-aria/dist
 packages/react-stately/dist
-packages/dev/storybook-builder-parcel/preview.js
+packages/dev/storybook-builder-preview/preview.js

babel-esm.config.json

@@ -16,78 +16,73 @@ const fs = require('fs');
 const Module = require('module');
 const substrings = ['-', '+'];
 
-module.exports = {
-  meta: {
-    fixable: 'code'
-  },
-  create: function (context) {
-    let processNode = (node) => {
-      if (!node.source || node.importKind === 'type') {
-        return;
-      }
-
-      let source = node.source.value.replace(/^[a-z]+:/, '');
-      if (source.startsWith('.') || Module.builtinModules.includes(source)) {
-        return;
-      }
-
-      // Split the import specifier on slashes. If it starts with an @ then it's
-      // a scoped package, otherwise just take the first part.
-      let parts = source.split('/');
-      let pkgName = source.startsWith('@') ? parts.slice(0, 2).join('/') : parts[0];
-
-      // Search for a package.json starting from the current filename
-      let pkgPath = findUp.sync('package.json', {cwd: path.dirname(context.getFilename())});
-      if (!pkgPath) {
-        return;
-      }
-
-      let pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-
-      // The only dev dependency should be spectrum-css.
-      if (exists(pkg.devDependencies, pkgName) && pkgName === '@adobe/spectrum-css-temp') {
-        return;
-      }
-
-      if (!exists(pkg.dependencies, pkgName) && !exists(pkg.peerDependencies, pkgName) && pkgName !== pkg.name) {
-        context.report({
-          node,
-          message: `Missing dependency on ${pkgName}.`,
-          fix(fixer) {
-            // Attempt to find a package in the monorepo. If the dep is for an external library,
-            // then we cannot auto fix it because we don't know the version to add.
-            let depPath = __dirname + '/../packages/' + pkgName + '/package.json';
-            if (!fs.existsSync(depPath)) {
-              return;
-            }
-
-            let depPkg = JSON.parse(fs.readFileSync(depPath, 'utf8'));
-            let pkgVersion = substrings.some(v => depPkg.version.includes(v)) ?  depPkg.version : `^${depPkg.version}`;
-
-            if (pkgName === '@react-spectrum/provider') {
-              pkg.peerDependencies = insertObject(pkg.peerDependencies, pkgName, pkgVersion);
-            } else {
-              pkg.dependencies = insertObject(pkg.dependencies, pkgName, pkgVersion);
-            }
-
-            fs.writeFileSync(pkgPath, JSON.stringify(pkg, false, 2) + '\n');
-
-            // Fake fix so eslint doesn't show the error.
-            return {
-              range: [0, 0],
-              text: ''
-            };
+module.exports = function (context) {
+  let processNode = (node) => {
+    if (!node.source || node.importKind === 'type') {
+      return;
+    }
+
+    let source = node.source.value.replace(/^[a-z]+:/, '');
+    if (source.startsWith('.') || Module.builtinModules.includes(source)) {
+      return;
+    }
+
+    // Split the import specifier on slashes. If it starts with an @ then it's
+    // a scoped package, otherwise just take the first part.
+    let parts = source.split('/');
+    let pkgName = source.startsWith('@') ? parts.slice(0, 2).join('/') : parts[0];
+
+    // Search for a package.json starting from the current filename
+    let pkgPath = findUp.sync('package.json', {cwd: path.dirname(context.getFilename())});
+    if (!pkgPath) {
+      return;
+    }
+
+    let pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+
+    // The only dev dependency should be spectrum-css.
+    if (exists(pkg.devDependencies, pkgName) && pkgName === '@adobe/spectrum-css-temp') {
+      return;
+    }
+
+    if (!exists(pkg.dependencies, pkgName) && !exists(pkg.peerDependencies, pkgName)) {
+      context.report({
+        node,
+        message: `Missing dependency on ${pkgName}.`,
+        fix(fixer) {
+          // Attempt to find a package in the monorepo. If the dep is for an external library,
+          // then we cannot auto fix it because we don't know the version to add.
+          let depPath = __dirname + '/../packages/' + pkgName + '/package.json';
+          if (!fs.existsSync(depPath)) {
+            return;
           }
-        });
-      }
-    };
-
-    return {
-      ImportDeclaration: processNode,
-      ExportNamedDeclaration: processNode,
-      ExportAllDeclaration: processNode
-    };
-  }
+
+          let depPkg = JSON.parse(fs.readFileSync(depPath, 'utf8'));
+          let pkgVersion = substrings.some(v => depPkg.version.includes(v)) ?  depPkg.version : `^${depPkg.version}`;
+
+          if (pkgName === '@react-spectrum/provider') {
+            pkg.peerDependencies = insertObject(pkg.peerDependencies, pkgName, pkgVersion);
+          } else {
+            pkg.dependencies = insertObject(pkg.dependencies, pkgName, pkgVersion);
+          }
+
+          fs.writeFileSync(pkgPath, JSON.stringify(pkg, false, 2) + '\n');
+
+          // Fake fix so eslint doesn't show the error.
+          return {
+            range: [0, 0],
+            text: ''
+          };
+        }
+      });
+    }
+  };
+
+  return {
+    ImportDeclaration: processNode,
+    ExportNamedDeclaration: processNode,
+    ExportAllDeclaration: processNode
+  };
 };
 
 function exists(deps, name) {

bin/imports.js

@@ -1,5 +1,4 @@
-import ntm from 'next-transpile-modules';
-const withTM = ntm([
+const withTM = require("next-transpile-modules")([
   "@adobe/react-spectrum",
   "@react-spectrum/actiongroup",
   "@react-spectrum/badge",
@@ -52,10 +51,9 @@ const withTM = ntm([
   "@spectrum-icons/workflow",
 ]);
 
-let result = withTM({
+module.exports = withTM({
   basePath:
     process.env.VERDACCIO && process.env.CIRCLE_SHA1
       ? `/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/next`
       : "",
 });
-export default result;

examples/rsp-next-ts/next.config.mjs renamed to examples/rsp-next-ts/next.config.js

@@ -10,7 +10,6 @@
     "start": "next start",
     "lint": "next lint"
   },
-  "type": "module",
   "dependencies": {
     "@adobe/react-spectrum": "^3.22.0",
     "@react-spectrum/color": "^3.0.0-beta.16",