wip: Package consolidation

.circleci/comment.js

@@ -10,7 +10,7 @@ async function run() {
   let pr;
   // If we aren't running on a PR commit, double check if this is a branch created for a fork. If so, we'll need to
   // comment the build link on the fork.
-  if (!process.env.CIRCLE_PULL_REQUEST) {
+  if (true) {
     try {
       const commit = await octokit.git.getCommit({
         owner: 'adobe',
@@ -41,7 +41,7 @@ async function run() {
             break;
           }
         }
-      } else if (!process.env.CIRCLE_PULL_REQUEST) {
+      } else if (true) {
         // If it isn't a PR commit, then we are on main. Create a comment for the test app and docs build
         await octokit.repos.createCommitComment({
           owner: 'adobe',

.circleci/config.yml

@@ -390,7 +390,7 @@ jobs:
       - store_artifacts:
           path: ~/junit
 
-  test-esm:
+  test-build:
     executor: rsp-2xlarge
     steps:
       - restore_cache:
@@ -401,6 +401,7 @@ jobs:
           command: |
             make build
             node --loader ./scripts/esm-support/loader.mjs ./scripts/esm-support/testESM.mjs
+            node scripts/testCJS.cjs
 
   lint:
     executor: rsp-xlarge
@@ -921,7 +922,7 @@ workflows:
       - test-ssr-18:
           requires:
             - install-18
-      - test-esm:
+      - test-build:
           requires:
             - install
       - lint:
@@ -965,9 +966,9 @@ workflows:
             branches:
               only: main
       - verdaccio:
-          filters:
-            branches:
-              only: main
+          # filters:
+          #   branches:
+          #     only: main
           requires:
             - install
       - v-rsp-cra-18:
@@ -1014,7 +1015,7 @@ workflows:
             - test-17
             - test-ssr-18
             - test-18
-            - test-esm
+            - test-build
             - storybook
             - storybook-s2
       - deploy-s3-stage:

.storybook/.parcelrc

@@ -2,7 +2,7 @@
   "extends": "@parcel/config-storybook",
   "resolvers": ["@parcel/resolver-glob", "..."],
   "transformers": {
-    "packages/*/*/intl/*.json": ["parcel-transformer-intl"],
+    "packages/**/intl/**/*.json": ["parcel-transformer-intl"],
     "raw:*": ["@parcel/transformer-raw"]
   }
 }

.storybook/main.js

@@ -3,6 +3,9 @@ module.exports = {
   stories: [
     '../packages/@{react-aria,react-stately,spectrum-icons}/*/stories/*.stories.{js,jsx,ts,tsx}',
     '../packages/@react-spectrum/!(s2)/stories/*.stories.{js,jsx,ts,tsx}',
+    '../packages/@adobe/react-spectrum/stories/*/*.stories.{js,jsx,ts,tsx}',
+    '../packages/react-aria/stories/*/*.stories.{js,jsx,ts,tsx}',
+    '../packages/react-stately/stories/*/*.stories.{js,jsx,ts,tsx}',
     '../packages/react-aria-components/stories/*.stories.{js,jsx,ts,tsx}'
   ],
 

Makefile

@@ -39,6 +39,7 @@ clean_dist:
 	rm -rf packages/@adobe/react-spectrum/i18n
 	rm -rf packages/@react-aria/i18n/server
 	rm -rf packages/@react-spectrum/s2/style/dist packages/@react-spectrum/s2/page.css packages/@react-spectrum/s2/icons packages/@react-spectrum/s2/illustrations
+	rm -rf packages/{@adobe/react-spectrum,@react-spectrum/s2,react-aria,react-stately,react-aria-components}/*.js
 
 clean_parcel:
 	rm -rf .parcel-cache
@@ -98,14 +99,16 @@ publish-nightly: build
 	yarn publish:nightly
 
 build:
-	parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/react-aria-components --no-optimize --config .parcelrc-build
+	mkdir -p dist
+	yarn tsgo --project tsconfig.build.json --declaration --emitDeclarationOnly --outDir dist/types --rootDir packages
+	parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/{react-aria,react-stately,react-aria-components,@adobe/react-spectrum} --no-optimize --config .parcelrc-build
 	yarn workspaces foreach --all -pt run prepublishOnly
-	for pkg in packages/@react-{spectrum,aria,stately}/*/  packages/@internationalized/{message,string,date,number}/ packages/@adobe/react-spectrum/ packages/react-aria/ packages/react-stately/ packages/react-aria-components/; \
-		do node scripts/buildEsm.js $$pkg; \
-	done
+	node scripts/buildEsm.js
 	node scripts/buildI18n.js
 	node scripts/generateIconDts.js
 	node scripts/fixUseClient.js
+	node scripts/moveTypes.mjs
+	rm -rf types
 
 website:
 	yarn build:docs --public-url /reactspectrum/$$(git rev-parse HEAD)/docs --dist-dir dist/$$(git rev-parse HEAD)/docs

bin/useLayoutEffectRule.js

@@ -15,7 +15,7 @@ module.exports = {
     return {
       ImportDeclaration(node) {
         const source = node.source.value;
-        if (source === '@react-aria/utils' || source === './useLayoutEffect' || source === './') {
+        if (source !== 'react') {
           return;
         }
         const importSpecifiers = node.specifiers.filter(specifier => specifier.type === 'ImportSpecifier');

eslint.config.mjs

@@ -189,7 +189,7 @@ export default [{
         "no-nested-ternary": ERROR,
         "no-multiple-empty-lines": ERROR,
         "no-unneeded-ternary": ERROR,
-        "no-duplicate-imports": ERROR,
+        // "no-duplicate-imports": ERROR,
         "react/display-name": OFF,
         "react/jsx-curly-spacing": [ERROR, "never"],
         "react/jsx-indent-props": [ERROR, ERROR],
@@ -337,16 +337,6 @@ export default [{
         "jsx-a11y/scope": ERROR,
         "jsx-a11y/tabindex-no-positive": ERROR,
 
-        "monorepo/no-internal-import": [ERROR, {
-            ignore: [
-                "@adobe/spectrum-css-temp",
-                "@spectrum-icons/ui",
-                "@spectrum-icons/workflow",
-                "@spectrum-icons/illustrations",
-                "@react-spectrum/s2/icons"
-            ],
-        }],
-
         "monorepo/no-relative-import": ERROR,
     },
 }, {

examples/rac-spectrum-tailwind/tsconfig.json

@@ -13,7 +13,7 @@
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,

examples/rsp-cra-18/src/App.tsx

@@ -3,7 +3,7 @@ import {Provider, defaultTheme, Item, TagGroup, Cell, Column, Row, TableBody, Ta
 import Lighting from './Lighting';
 import {useState} from 'react'
 import BodyContent from './BodyContent';
-import {enableTableNestedRows} from '@react-stately/flags';
+import {enableTableNestedRows} from 'react-stately/private/flags/flags';
 import ButtonExamples from './sections/ButtonExamples';
 import CollectionExamples from './sections/CollectionExamples';
 import DateTimeExamples from './sections/DateTimeExamples';

examples/rsp-cra-18/src/AutocompleteExample.tsx

@@ -1,5 +1,5 @@
 import {Autocomplete, Input, Label, Menu, MenuItem, SearchField, Text, useFilter} from 'react-aria-components'
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
 import styles from './autocomplete.css';
 
 interface AutocompleteItem {

examples/rsp-cra-18/src/sections/StatusExamples.tsx

@@ -1,5 +1,4 @@
-import {Flex, Divider, Badge, InlineAlert, Heading, Content, LabeledValue, Meter, ProgressBar, ProgressCircle, StatusLight, Button} from '@adobe/react-spectrum';
-import {ToastContainer, ToastQueue} from '@react-spectrum/toast'
+import {Flex, Divider, Badge, InlineAlert, Heading, Content, LabeledValue, Meter, ProgressBar, ProgressCircle, StatusLight, Button, ToastContainer, ToastQueue} from '@adobe/react-spectrum';
 
 export default function StatusExamples() {
   return (

examples/rsp-cra-18/tsconfig.json

@@ -14,7 +14,7 @@
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,

examples/rsp-next-ts-17/components/ReorderableListView.tsx

@@ -1,5 +1,4 @@
-import { Item, ListView, Text, useListData } from "@adobe/react-spectrum";
-import { useDragAndDrop } from "@react-spectrum/dnd";
+import { Item, ListView, Text, useListData, useDragAndDrop } from "@adobe/react-spectrum";
 import Folder from "@spectrum-icons/illustrations/Folder";
 
 export default function ReorderableListView() {

examples/rsp-next-ts-17/pages/_app.tsx

@@ -8,13 +8,13 @@ import {
   Flex,
   Grid,
   View,
+  ToastContainer,
 } from "@adobe/react-spectrum";
 import { ColorScheme } from "@react-types/provider";
 import { useState } from "react";
 import Moon from "@spectrum-icons/workflow/Moon";
 import Light from "@spectrum-icons/workflow/Light";
-import { ToastContainer } from "@react-spectrum/toast";
-import {enableTableNestedRows} from '@react-stately/flags';
+import {enableTableNestedRows} from 'react-stately/private/flags/flags';
 
 function MyApp({ Component, pageProps }: AppProps) {
   const [theme, setTheme] = useState<ColorScheme>("light");

examples/rsp-next-ts-17/pages/index.tsx

@@ -84,14 +84,14 @@ import {
   DisclosurePanel,
   TreeView,
   TreeViewItem,
-  TreeViewItemContent
+  TreeViewItemContent,
+  ToastQueue,
+  SubmenuTrigger
 } from "@adobe/react-spectrum";
 import Edit from "@spectrum-icons/workflow/Edit";
 import NotFound from "@spectrum-icons/illustrations/NotFound";
 import Section from "../components/Section";
 import ReorderableListView from "../components/ReorderableListView";
-import {ToastQueue} from '@react-spectrum/toast';
-import {SubmenuTrigger} from "@react-spectrum/menu";
 
 import FileTxt from '@spectrum-icons/workflow/FileTxt';
 import Folder from '@spectrum-icons/workflow/Folder';

examples/rsp-next-ts-17/tsconfig.json

@@ -9,7 +9,7 @@
     "noEmit": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",

examples/rsp-next-ts/components/AutocompleteExample.tsx

@@ -1,5 +1,5 @@
 import {Autocomplete, Input, Label, Menu, MenuItem, SearchField, Text, useFilter} from 'react-aria-components'
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
 import React from 'react';
 import styles from './autocomplete.module.css';
 

examples/rsp-next-ts/components/ReorderableListView.tsx

@@ -1,5 +1,4 @@
-import { Item, ListView, Text, useListData } from "@adobe/react-spectrum";
-import { useDragAndDrop } from "@react-spectrum/dnd";
+import { Item, ListView, Text, useListData, useDragAndDrop } from "@adobe/react-spectrum";
 import Folder from "@spectrum-icons/illustrations/Folder";
 
 export default function ReorderableListView() {

examples/rsp-next-ts/pages/_app.tsx

@@ -7,13 +7,13 @@ import {
   Flex,
   Grid,
   View,
+  ToastContainer,
 } from "@adobe/react-spectrum";
 import { ColorScheme } from "@react-types/provider";
 import { useState } from "react";
 import Moon from "@spectrum-icons/workflow/Moon";
 import Light from "@spectrum-icons/workflow/Light";
-import { ToastContainer } from "@react-spectrum/toast";
-import {enableTableNestedRows} from '@react-stately/flags';
+import {enableTableNestedRows} from 'react-stately/private/flags/flags';
 import {useRouter, type NextRouter} from 'next/router';
 import Script from 'next/script';
 

examples/rsp-next-ts/pages/index.tsx

@@ -84,15 +84,15 @@ import {
   DisclosurePanel,
   TreeView,
   TreeViewItem,
-  TreeViewItemContent
+  TreeViewItemContent,
+  ToastQueue,
+  SubmenuTrigger
 } from "@adobe/react-spectrum";
 import {AutocompleteExample} from "../components/AutocompleteExample";
 import Edit from "@spectrum-icons/workflow/Edit";
 import NotFound from "@spectrum-icons/illustrations/NotFound";
 import Section from "../components/Section";
 import ReorderableListView from "../components/ReorderableListView";
-import {ToastQueue} from '@react-spectrum/toast';
-import {SubmenuTrigger} from "@react-spectrum/menu";
 
 import FileTxt from '@spectrum-icons/workflow/FileTxt';
 import Folder from '@spectrum-icons/workflow/Folder';

examples/rsp-next-ts/tsconfig.json

@@ -9,7 +9,7 @@
     "noEmit": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",

examples/rsp-webpack-4/src/App.js

@@ -3,7 +3,7 @@ import {Provider, defaultTheme, Item, TagGroup, Cell, Column, InlineAlert, Row,
 import Lighting from './Lighting';
 import {useState} from 'react'
 import BodyContent from './BodyContent';
-import {enableTableNestedRows} from '@react-stately/flags';
+import {enableTableNestedRows} from 'react-stately/private/flags/flags';
 
 let columns = [
   {name: 'Foo', key: 'foo'},

examples/s2-esbuild-starter-app/tsconfig.json

@@ -12,7 +12,7 @@
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,

examples/s2-webpack-5-typescript-example/tsconfig.json

@@ -10,7 +10,7 @@
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "react-jsx",

jest.config.js

@@ -156,7 +156,9 @@ module.exports = {
   testEnvironment: 'jsdom',
 
   // Options that will be passed to the testEnvironment
-  // testEnvironmentOptions: {},
+  testEnvironmentOptions: {
+    customExportConditions: ['source']
+  },
 
   // Adds a location field to test results
   // testLocationInResults: false,