Merge branch 'main' into aggregate-ts-upgrade-updates

# Conflicts:
#	package.json
#	yarn.lock

Author: snowystinger

.circleci/comment.js

@@ -76,7 +76,7 @@ async function run() {
         body: `Build successful! 🎉
 
   * [View the storybook](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook/index.html)
-  * [View the storybook-canary](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-canary/index.html)
+  * [View the storybook-19](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-19/index.html)
   * [View the storybook-17](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-17/index.html)
   * [View the storybook-16](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-16/index.html)
   * [View the documentation](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/docs/index.html)`

.circleci/config.yml

@@ -19,30 +19,30 @@ orbs:
 executors:
   rsp:
     docker:
-      - image: cimg/node:18.17.1
+      - image: cimg/node:18.20.3
     environment:
       CACHE_VERSION: v1
     working_directory: ~/react-spectrum
 
   rsp-large:
     docker:
-      - image: cimg/node:18.17.1
+      - image: cimg/node:18.20.3
     resource_class: large
     environment:
       CACHE_VERSION: v1
     working_directory: ~/react-spectrum
 
   rsp-xlarge:
     docker:
-      - image: cimg/node:18.17.1
+      - image: cimg/node:18.20.3
     resource_class: xlarge
     environment:
       CACHE_VERSION: v1
     working_directory: ~/react-spectrum
 
   rsp-xlarge-nodeupdate:
     docker:
-      - image: cimg/node:18.17.1
+      - image: cimg/node:18.20.3
     resource_class: xlarge
     environment:
       CACHE_VERSION: v1
@@ -121,7 +121,7 @@ jobs:
             - ~/react-spectrum
           key: react-spectrum17-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
 
-  install-canary:
+  install-19:
     executor: rsp-large
     steps:
       - checkout
@@ -134,12 +134,12 @@ jobs:
       - run:
           name: build
           command: |
-            yarn install --pure-lockfile --cache-folder ~/.cache/yarn && yarn install-canary --cache-folder ~/.cache/yarn
+            yarn install --pure-lockfile --cache-folder ~/.cache/yarn && yarn install-19 --cache-folder ~/.cache/yarn
 
       - save_cache:
           paths:
             - ~/react-spectrum
-          key: react-spectrum-canary-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
+          key: react-spectrum-19-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
 
   test-ssr:
     executor: rsp-xlarge
@@ -199,11 +199,11 @@ jobs:
           command: |
             yarn test:ssr
 
-  test-ssr-canary:
+  test-ssr-19:
     executor: rsp-xlarge
     steps:
       - restore_cache:
-          key: react-spectrum-canary-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
+          key: react-spectrum-19-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
 
       - run:
           name: test ssr
@@ -258,12 +258,12 @@ jobs:
       - store_artifacts:
           path: ~/junit
 
-  test-canary:
+  test-19:
     parallelism: 3
     executor: rsp-xlarge
     steps:
       - restore_cache:
-          key: react-spectrum-canary-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
+          key: react-spectrum-19-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
 
       - run: mkdir ~/junit
 
@@ -272,10 +272,10 @@ jobs:
           command: |
             shopt -s globstar
             TESTFILES=$(circleci tests glob "packages/**/*.test.[tj]{s,sx}" | circleci tests split --split-by=timings)
-            JEST_JUNIT_OUTPUT_NAME="junit-canary.xml" yarn test ${TESTFILES}
+            JEST_JUNIT_OUTPUT_NAME="junit-19.xml" yarn test ${TESTFILES}
 
       - run:
-          command: cp junit-canary.xml ~/junit/
+          command: cp junit-19.xml ~/junit/
           when: always
       - store_test_results:
           path: ~/junit
@@ -412,20 +412,20 @@ jobs:
           paths:
             - '*/storybook-17/'
 
-  storybook-canary:
+  storybook-19:
     executor: rsp-large
     steps:
       - restore_cache:
-          key: react-spectrum-canary-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
+          key: react-spectrum-19-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
 
       - run:
-          name: build storybook-canary
-          command: make storybook-canary
+          name: build storybook-19
+          command: make storybook-19
 
       - persist_to_workspace:
           root: dist
           paths:
-            - '*/storybook-canary/'
+            - '*/storybook-19/'
 
   docs:
     executor: rsp-xlarge
@@ -547,7 +547,7 @@ workflows:
       - install
       - install-16
       - install-17
-      - install-canary
+      - install-19
       - test-ssr:
           requires:
             - install
@@ -566,6 +566,12 @@ workflows:
       - test-17:
           requires:
             - install-17
+      - test-19:
+          requires:
+            - install-19
+      - test-ssr-19:
+          requires:
+            - install-19
       - test-esm:
           requires:
             - install
@@ -603,9 +609,9 @@ workflows:
       - storybook-17:
           requires:
             - install-17
-      - storybook-canary:
+      - storybook-19:
           requires:
-            - install-canary
+            - install-19
       - docs:
           requires:
             - install
@@ -628,7 +634,7 @@ workflows:
             - storybook
             - storybook-16
             - storybook-17
-            - storybook-canary
+            - storybook-19
             - docs
       - deploy-verdaccio:
           requires:

.github/actions/branch/action.yml

@@ -1,5 +1,5 @@
 name: 'Branch from fork'
 description: 'creates a branch based off PR from fork'
 runs:
-  using: 'node16'
+  using: 'node18'
   main: 'index.js'

.github/actions/permissions/action.yml

@@ -1,5 +1,5 @@
 name: 'Check permissions'
 description: 'Checks if commentor has write access or above'
 runs:
-  using: 'node16'
+  using: 'node18'
   main: 'index.js'

.github/workflows/pr-comment.yaml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - name: Use Node 16
-        uses: actions/setup-node@v2
+      - name: Use Node 18
+        uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
       - name: install
         run: yarn install
       - name: Check write permissions of commentor

Makefile

@@ -81,8 +81,8 @@ storybook-16:
 storybook-17:
 	yarn build:storybook-17
 
-storybook-canary:
-	yarn build:storybook-canary
+storybook-19:
+	yarn build:storybook-19
 
 # for now doesn't have deploy since v3 doesn't have a place for docs and stuff yet
 ci:

codemods/use-monopackages/use-monopackages.ts

@@ -0,0 +1,181 @@
+const fs = require('fs');
+const path = require('path');
+
+function areSpecifiersAlphabetized(specifiers) {
+  const specifierNames = specifiers.map(
+    (specifier) => specifier.imported.name
+  );
+  const sortedNames = [...specifierNames].sort();
+  return specifierNames.join() === sortedNames.join();
+}
+
+/**
+ * Replaces individual package imports with monopackage imports, where possible.
+ *
+ * Works for:
+ * - `@react-spectrum/*` -> `@adobe/react-spectrum`.
+ * - `@react-aria/*` -> `react-aria`.
+ * - `@react-stately/*` -> `react-stately`.
+ *
+ * By default this will apply to all the above packages, or optionally you can specify which packages to apply this by passing a comma-separated list to the packages option: `--packages=react-aria,react-stately,react-spectrum`.
+ *
+ * Run this from a directory where the relevant packages are installed in node_modules so it knows which monopackage exports are available to use (since exports may vary by version).
+ *
+ * 1. Install jscodeshift: `npm i -g jscodeshift`
+ * 2. Run: `jscodeshift -t /path/to/use-monopackages.ts src/`.
+ */
+module.exports = function transformer(file, api, options) {
+  const j = api.jscodeshift;
+  const root = j(file.source);
+
+  const packages = {
+    'react-spectrum': {
+      monopackage: '@adobe/react-spectrum',
+      individualPrefix: '@react-spectrum/'
+    },
+    'react-aria': {
+      monopackage: 'react-aria',
+      individualPrefix: '@react-aria/'
+    },
+    'react-stately': {
+      monopackage: 'react-stately',
+      individualPrefix: '@react-stately/'
+    }
+  };
+
+  const selectedPackages =
+    options?.packages?.split(',').filter((pkg) => packages[pkg]) ||
+    Object.keys(packages);
+
+  let anyIndexFound = false;
+  const monopackageExports = {};
+
+  selectedPackages.forEach((pkg) => {
+    const indexPath = path.join(
+      process.cwd(),
+      `node_modules/${packages[pkg].monopackage}/dist/types.d.ts`
+    );
+
+    if (fs.existsSync(indexPath)) {
+      anyIndexFound = true;
+      const indexFile = fs.readFileSync(indexPath, 'utf8');
+      const indexRoot = j(indexFile);
+
+      monopackageExports[pkg] = [];
+      // Collect all named exports from the monopackage index file
+      indexRoot.find(j.ExportNamedDeclaration).forEach((path) => {
+        path.node.specifiers.forEach((specifier) => {
+          monopackageExports[pkg].push(specifier.exported.name);
+        });
+      });
+
+      // Collect all exports defined in export statements like "export { Component } from '...' "
+      indexRoot
+        .find(j.ExportNamedDeclaration, {
+          source: {
+            type: 'Literal'
+          }
+        })
+        .forEach((path) => {
+          path.node.specifiers.forEach((specifier) => {
+            monopackageExports[pkg].push(specifier.exported.name);
+          });
+        });
+    } else if (options?.packages?.split(',').includes(pkg)) {
+      console.warn(
+        `The index file for ${packages[pkg].monopackage} at ${indexPath} does not exist. Ensure that ${packages[pkg].monopackage} is installed.`
+      );
+    }
+  });
+
+  if (!anyIndexFound) {
+    console.warn(
+      'None of the index files for the selected packages exist. Ensure that the packages are installed.'
+    );
+    return root.toSource();
+  }
+
+  selectedPackages.forEach((pkg) => {
+    // Find all imports from individual packages
+    const individualPackageImports = root
+      .find(j.ImportDeclaration)
+      .filter((path) => {
+        return path.node.source.value.startsWith(
+          packages[pkg].individualPrefix
+        );
+      });
+
+    if (individualPackageImports.size() === 0) {
+      return;
+    }
+
+    // Collect all imported specifiers from individual packages that are also in the monopackage exports
+    const importedSpecifiers = individualPackageImports
+      .nodes()
+      .reduce((acc, node) => {
+        node.specifiers.forEach((specifier) => {
+          if (monopackageExports[pkg].includes(specifier.imported.name)) {
+            acc.push(specifier);
+          }
+        });
+        return acc;
+      }, []);
+
+    // Remove the old imports if they are present in monopackage exports
+    individualPackageImports.forEach((path) => {
+      path.node.specifiers = path.node.specifiers.filter(
+        (specifier) =>
+          !monopackageExports[pkg].includes(specifier.imported.name)
+      );
+    });
+
+    // Remove import declarations with no specifiers left
+    individualPackageImports
+      .filter((path) => path.node.specifiers.length === 0)
+      .remove();
+
+    // Find existing monopackage import if it exists
+    const monopackageImport = root.find(j.ImportDeclaration).filter((path) => {
+      return path.node.source.value === packages[pkg].monopackage;
+    });
+
+    if (monopackageImport.size() > 0) {
+      const existingImport = monopackageImport.at(0).get().node;
+      const specifiers = existingImport.specifiers;
+      if (areSpecifiersAlphabetized(specifiers)) {
+        // If imports are sorted, add the new import in sorted order
+        importedSpecifiers.forEach((newSpecifier) => {
+          const index = specifiers.findIndex(
+            (specifier) => specifier.imported.name > newSpecifier.imported.name
+          );
+          if (index === -1) {
+            specifiers.push(newSpecifier);
+          } else {
+            specifiers.splice(index, 0, newSpecifier);
+          }
+        });
+      } else {
+        // If imports are not sorted, add the new import to the end
+        specifiers.push(...importedSpecifiers);
+      }
+    } else if (importedSpecifiers.length > 0) {
+      // Create a new monopackage import with the collected specifiers
+      const newImport = j.importDeclaration(
+        importedSpecifiers,
+        j.literal(packages[pkg].monopackage)
+      );
+
+      // Insert the new import below the last existing import
+      const lastImport = root.find(j.ImportDeclaration).at(-1);
+      if (lastImport.size() > 0) {
+        lastImport.insertAfter(newImport);
+      } else {
+        root.get().node.program.body.unshift(newImport);
+      }
+    }
+  });
+
+  return root.toSource();
+};
+
+module.exports.parser = 'tsx';