Merge branch 'main' into reusable-tests

adobe · Sep 27, 2024 · f5b196b · f5b196b
2 parents 05fe52b + d57bd8d
commit f5b196b
Show file tree

Hide file tree

Showing 254 changed files with 9,244 additions and 478 deletions.
diff --git a/.chromatic-fc/main.js b/.chromatic-fc/main.js
@@ -6,7 +6,7 @@ module.exports = {
   },
   stories: [
     '../packages/**/chromatic-fc/**/*.stories.{js,jsx,ts,tsx}',
-    '../packages/@react-spectrum/s2/stories/*.stories.@(js|jsx|mjs|ts|tsx)'
+    '../packages/@react-spectrum/s2/chromatic/*.stories.@(js|jsx|mjs|ts|tsx)'
   ],
   addons: process.env.NODE_ENV === 'production' ? [] : [
     '@storybook/addon-actions',

diff --git a/.chromatic/main.js b/.chromatic/main.js
@@ -6,7 +6,6 @@ module.exports = {
   },
   stories: [
     '../packages/**/chromatic/**/*.stories.@(js|jsx|ts|tsx)',
-    '../packages/@react-spectrum/s2/stories/*.stories.@(js|jsx|mjs|ts|tsx)',
     '../packages/@react-spectrum/s2/chromatic/*.stories.@(js|jsx|mjs|ts|tsx)'
   ],
   addons: process.env.NODE_ENV === 'production' ? [] : [

diff --git a/.circleci/comment.js b/.circleci/comment.js
@@ -52,6 +52,8 @@ async function run() {
       [NextJS Test App](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/next/index.html)
       [RAC Tailwind Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/rac-tailwind/index.html)
       [RAC Spectrum + Tailwind Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/rac-spectrum-tailwind/index.html)
+      [S2 Parcel Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/s2-parcel-example/index.html)
+      [S2 Webpack Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/s2-webpack-5-example/index.html)
       [CRA Test App Size](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/publish-stats/build-stats.txt)
       [NextJS App Size](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/publish-stats/next-build-stats.txt)
       [Publish stats](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/publish-stats/publish.json)

diff --git a/.storybook-s2/preview.tsx b/.storybook-s2/preview.tsx
@@ -27,7 +27,7 @@ const preview = {
           channel.on(DARK_MODE_EVENT_NAME, setDark);
           return () => channel.removeListener(DARK_MODE_EVENT_NAME, setDark);
         }, []);
-        return <DocsContainer {...props} theme={dark ? themes.dark : themes.light} />;
+        return <DocsContainer {...props} theme={{...(dark ? themes.dark : themes.light), appContentBg: 'var(--s2-container-bg)'}} />;
       },
       source: {
         // code: null, // Will disable code button, and show "No code available"

diff --git a/examples/s2-parcel-example/.gitignore b/examples/s2-parcel-example/.gitignore
@@ -1,4 +1,3 @@
 .DS_Store
 node_modules
 package-lock.json
-yarn.lock
diff --git a/examples/s2-parcel-example/.yarn/releases/yarn-4.2.2.cjs b/examples/s2-parcel-example/.yarn/releases/yarn-4.2.2.cjs
diff --git a/examples/s2-parcel-example/.yarnrc.yml b/examples/s2-parcel-example/.yarnrc.yml
@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.2.2.cjs
diff --git a/examples/s2-parcel-example/package.json b/examples/s2-parcel-example/package.json
@@ -1,14 +1,16 @@
 {
+  "packageManager": "[email protected]",
   "devDependencies": {
     "parcel": "^2.12.0",
     "process": "^0.11.10"
   },
   "dependencies": {
-    "@react-spectrum/s2": "^0.0.0",
+    "@react-spectrum/s2": "latest",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "scripts": {
-    "dev": "parcel src/index.html"
+    "dev": "parcel src/index.html",
+    "build": "parcel build src/index.html"
   }
 }