[pull] main from adobe:main

.circleci/comment.js

@@ -58,18 +58,13 @@ async function run() {
           repo: 'react-spectrum',
           commit_sha: process.env.CIRCLE_SHA1,
           body: `Verdaccio builds:
-      [CRA Test App](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/rsp-cra-18/index.html)
       [NextJS Test App](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/next/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 Vite Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/s2-vite-project/index.html)
       [S2 Custom Icons](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/icon-builder-fixture/index.html)
       [S2 Webpack Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/s2-webpack-5-example/index.html)
       [S2 Next.js Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/s2-next-macros/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)
-      [Size diff since last release](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/publish-stats/size-diff.txt)
       [Storybook](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook/index.html?path=/story/accordion--default)
       [S2 Storybook](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-s2/index.html)
       [S2 docs](https://d1pzu54gtk2aed.cloudfront.net/main/${process.env.CIRCLE_SHA1}/)

.circleci/config.yml

@@ -623,28 +623,6 @@ jobs:
           paths:
             - storage
 
-  v-rsp-cra-18:
-    executor: rsp-xlarge
-    steps:
-      - restore_cache:
-          key: react-spectrum-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
-
-      - attach_workspace:
-          at: /tmp/verdaccio-workspace
-
-      - run:
-          name: build react-spectrum-cra-18 off verdaccio
-          command: |
-            ./scripts/verdaccio-ci.sh
-            ./scripts/verdaccio-build-rsp-cra-18.sh
-          environment:
-            VERDACCIO_STORAGE_PATH: /tmp/verdaccio-workspace/storage
-
-      - persist_to_workspace:
-          root: verdaccio_dist
-          paths:
-            - '*/verdaccio/rsp-cra-18'
-
   v-webpack-4:
     executor: rsp-xlarge
     steps:
@@ -1055,9 +1033,6 @@ workflows:
               only: main
           requires:
             - install
-      - v-rsp-cra-18:
-          requires:
-            - verdaccio
       - v-webpack-4:
           requires:
             - verdaccio
@@ -1082,12 +1057,6 @@ workflows:
       - v-icon-builder:
           requires:
             - verdaccio
-      - v-publish-stats:
-          requires:
-            - verdaccio
-            - v-webpack-4
-            - v-nextjs
-            - v-rsp-cra-18
       - v-starters:
           requires:
             - verdaccio
@@ -1123,7 +1092,6 @@ workflows:
               only: main
       - deploy-verdaccio:
           requires:
-            - v-rsp-cra-18
             - v-webpack-4
             - v-nextjs
             - v-rac-rsp-tailwind
@@ -1132,7 +1100,6 @@ workflows:
             - v-s2-webpack
             - v-s2-next
             - v-icon-builder
-            - v-publish-stats
       - comment:
           name: comment-pr
           filters:

examples/next-app-csp/app/layout.tsx

@@ -9,8 +9,8 @@ export const metadata: Metadata = {
   description: 'Generated by create next app'
 };
 
-export default function RootLayout({children}: {children: React.ReactNode}) {
-  const nonce = headers().get('x-nonce');
+export default async function RootLayout({children}: {children: React.ReactNode}) {
+  const nonce = (await headers()).get('x-nonce');
   console.log('nonce', nonce);
   return (
     <html lang="en">

examples/next-app-csp/package.json

@@ -9,20 +9,20 @@
     "../../packages/*/*"
   ],
   "scripts": {
-    "dev": "next dev",
-    "build": "next build",
+    "dev": "next dev --webpack",
+    "build": "next build --webpack",
     "start": "next start",
     "lint": "next lint"
   },
   "dependencies": {
-    "next": "14.2.32",
-    "react": "^18",
-    "react-dom": "^18"
+    "next": "16.2.9",
+    "react": "^19",
+    "react-dom": "^19"
   },
   "devDependencies": {
     "@types/node": "^20",
-    "@types/react": "^18",
-    "@types/react-dom": "^18",
+    "@types/react": "^19",
+    "@types/react-dom": "^19",
     "glob": "^11.0.3",
     "typescript": "^5"
   },