Merge branch 'main' into responsive-calendar

# Conflicts:
#	packages/@react-spectrum/s2/src/Calendar.tsx
#	packages/@react-spectrum/s2/src/DateRangePicker.tsx

Author: snowystinger

.browserslistrc

@@ -1,4 +1 @@
-chrome >= 79
-firefox >= 85
-safari >= 13
-edge >= 88
+baseline widely available

.chromatic-fc/.parcelrc

@@ -4,7 +4,7 @@
   "transformers": {
     "illustration:*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
     "packages/@react-spectrum/s2/s2wf-icons/**/*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
-    "packages/*/*/intl/*.json": ["parcel-transformer-intl"],
+    "packages/**/intl/**/*.json": ["parcel-transformer-intl"],
     // Disable PostCSS from running over style macro output
     "packages/@react-spectrum/s2/**/*.css": ["@parcel/transformer-css"],
     "packages/@react-spectrum/s2/**/*.svg": ["@parcel/transformer-svg-react"]

.chromatic/.parcelrc

@@ -4,7 +4,7 @@
   "transformers": {
     "illustration:*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
     "packages/@react-spectrum/s2/s2wf-icons/**/*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
-    "packages/*/*/intl/*.json": ["parcel-transformer-intl"],
+    "packages/**/intl/**/*.json": ["parcel-transformer-intl"],
     // Disable PostCSS from running over style macro output
     "packages/@react-spectrum/s2/**/*.css": ["@parcel/transformer-css"],
     "packages/@react-spectrum/s2/**/*.svg": ["@parcel/transformer-svg-react"]

.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:
@@ -1014,7 +1015,7 @@ workflows:
             - test-17
             - test-ssr-18
             - test-18
-            - test-esm
+            - test-build
             - storybook
             - storybook-s2
       - deploy-s3-stage:

.parcelrc

@@ -6,7 +6,7 @@
     "docs:*.{js,ts,tsx,json}": ["parcel-transformer-docs", "@parcel/transformer-inline"],
     "docs-json:*.{js,ts,tsx,json}": ["parcel-transformer-docs"],
     "extract:*.mdx": ["parcel-transformer-mdx-extract"],
-    "packages/*/*/intl/*.json": ["parcel-transformer-intl"],
+    "packages/**/intl/**/*.json": ["parcel-transformer-intl"],
     "bundle-text:*.svg": ["@parcel/transformer-svg", "@parcel/transformer-inline-string"],
     "*.{md,mdx}": ["parcel-transformer-mdx-docs"],
     "*.svg": ["@parcel/transformer-svg-react"],

.parcelrc-build

@@ -4,12 +4,13 @@
   "bundler": "@parcel/bundler-library",
   "transformers": {
     "style-types:*.ts": ["@parcel/transformer-typescript-types"],
-    "packages/**/intl/*.json": ["parcel-transformer-intl"],
+    "packages/**/intl/**/*.json": ["parcel-transformer-intl"],
     "bundle-text:*.svg": ["@parcel/transformer-svg", "@parcel/transformer-inline-string"],
     "illustration:*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
     "packages/@react-spectrum/s2/{s2wf-icons,spectrum-illustrations}/**/*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
     // Disable PostCSS from running over style macro output
     "packages/@react-spectrum/s2/**/*.css": ["@parcel/transformer-css"],
+    "*.css": ["parcel-transformer-css-env", "..."],
     "*.svg": ["@parcel/transformer-svg-react"],
     "*.{js,mjs,jsm,jsx,es6,cjs,ts,tsx}": [
       "@parcel/transformer-js",

.parcelrc-storybook

@@ -4,7 +4,7 @@
   "transformers": {
     "illustration:*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
     "packages/@react-spectrum/s2/s2wf-icons/**/*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
-    "packages/*/*/intl/*.json": ["parcel-transformer-intl"],
+    "packages/**/intl/**/*.json": ["parcel-transformer-intl"],
     // Disable PostCSS from running over style macro output
     "*.css": ["@parcel/transformer-css"],
     "*.svg": ["@parcel/transformer-svg-react"],

.storybook-s2/.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/.parcelrc

@@ -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}'
   ],