Merge branch 'canary' into chore/simplify-with-supabase-example

vercel · Oct 31, 2023 · 35dc393 · 35dc393
2 parents 0ff0ef0 + e0cf4e2
commit 35dc393
Show file tree

Hide file tree

Showing 68 changed files with 671 additions and 319 deletions.
diff --git a/.cargo/.vercel.approvers b/.cargo/.vercel.approvers
@@ -1 +1 @@
-@vercel/web-tooling
+@vercel/turbopack
diff --git a/.config/.vercel.approvers b/.config/.vercel.approvers
@@ -1 +1 @@
-nextest.toml @vercel/web-tooling
+nextest.toml @vercel/turbopack
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -14,7 +14,7 @@
 /*.md                                         @vercel/next-js @vercel/devex
 /*.mdx                                        @vercel/next-js @vercel/devex
 /packages/create-next-app/                    @vercel/next-js
-/pnpm-lock.yaml                               @vercel/next-js @vercel/web-tooling
+/pnpm-lock.yaml                               @vercel/next-js @vercel/turbopack
 
 # Image Component (@styfle)
 
@@ -28,13 +28,13 @@
 
 # Tooling & Telemetry
 
-/packages/next/src/build/                                        @timneutkens @ijjk @shuding @huozhi @ztanner @feedthejim @vercel/web-tooling
-/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts  @timneutkens @ijjk @shuding @huozhi @feedthejim @ztanner @wyattjoh @vercel/web-tooling
+/packages/next/src/build/                                        @timneutkens @ijjk @shuding @huozhi @ztanner @feedthejim @vercel/turbopack
+/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts  @timneutkens @ijjk @shuding @huozhi @feedthejim @ztanner @wyattjoh @vercel/turbopack
 /packages/next/src/telemetry/                                    @timneutkens @ijjk @shuding @padmaia
-/packages/next-swc/                                              @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-Cargo.toml                                                       @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-Cargo.lock                                                       @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-/.cargo/config.toml                                              @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-/.config/nextest.toml                                            @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-/test/build-turbopack-tests-manifest.js                          @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-/test/turbopack-tests-manifest.json                              @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+/packages/next-swc/                                              @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
+Cargo.toml                                                       @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
+Cargo.lock                                                       @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
+/.cargo/config.toml                                              @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
+/.config/nextest.toml                                            @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
+/test/build-turbopack-tests-manifest.js                          @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
+/test/turbopack-tests-manifest.json                              @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
diff --git a/.github/labeler.json b/.github/labeler.json
@@ -20,10 +20,8 @@
       { "type": "user", "pattern": "balazsorban44" },
       { "type": "user", "pattern": "feedthejim" },
       { "type": "user", "pattern": "gnoff" },
-      { "type": "user", "pattern": "hanneslund" },
       { "type": "user", "pattern": "huozhi" },
       { "type": "user", "pattern": "ijjk" },
-      { "type": "user", "pattern": "JanKaifer" },
       { "type": "user", "pattern": "javivelasco" },
       { "type": "user", "pattern": "kikobeats" },
       { "type": "user", "pattern": "schniz" },
@@ -41,15 +39,12 @@
       { "type": "user", "pattern": "delbaoliveira" },
       { "type": "user", "pattern": "lydiahallie" },
       { "type": "user", "pattern": "steven-tey" },
-      { "type": "user", "pattern": "nutlope" },
       { "type": "user", "pattern": "stephdietz" },
       { "type": "user", "pattern": "timeyoutakeit" },
       { "type": "user", "pattern": "s3prototype" },
       { "type": "user", "pattern": "manovotny" }
     ],
     "created-by: web-tooling team": [
-      { "type": "user", "pattern": "alexkirsz" },
-      { "type": "user", "pattern": "Brooooooklyn" },
       { "type": "user", "pattern": "ForsakenHarmony" },
       { "type": "user", "pattern": "jridgewell" },
       { "type": "user", "pattern": "kdy1" },

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -380,6 +380,8 @@ jobs:
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
       - run: ./scripts/publish-native.js
       - run: ./scripts/publish-release.js
+        env:
+          RELEASE_BOT_GITHUB_TOKEN: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
 
   deployExamples:
     name: Deploy examples

diff --git a/.github/workflows/update-turbopack-test-manifest.yml b/.github/workflows/update-turbopack-test-manifest.yml
@@ -0,0 +1,36 @@
+# A recurring workflow which updates the passing/failing/skipped integration tests for Turbopack.
+name: Update Turbopack test manifest
+
+on:
+  schedule:
+    # Every hour
+    - cron: '0 * * * *'
+  workflow_dispatch:
+
+jobs:
+  update_manifest:
+    name: Update and upload Turbopack test manifest
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          # Commits made with the default `GITHUB_TOKEN` won't trigger workflows.
+          # See: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow
+          token: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_LTS_VERSION }}
+          check-latest: true
+
+      - name: Create Pull Request
+        shell: bash
+        run: node scripts/automated-update-workflow.js
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_PULL_REQUESTS }}
+          BRANCH_NAME: fonts-data
+          SCRIPT: test/build-turbopack-tests-manifest.js
+          PR_TITLE: Update Turbopack test manifest
+          PR_BODY: This auto-generated PR updates the integration test manifest used when testing Turbopack.
diff --git a/.github/workflows/update_fonts_data.yml b/.github/workflows/update_fonts_data.yml
@@ -36,6 +36,10 @@ jobs:
 
       - name: Create Pull Request
         shell: bash
-        run: node scripts/update-fonts-data-workflow.js
+        run: node scripts/automated-update-workflow.js
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN_PULL_REQUESTS }}
+          BRANCH_NAME: fonts-data
+          SCRIPT: scripts/update-google-fonts.js
+          PR_TITLE: Update font data
+          PR_BODY: This auto-generated PR updates font data with latest available
diff --git a/examples/app-dir-mdx/app/page.tsx b/examples/app-dir-mdx/app/page.tsx
@@ -60,7 +60,7 @@ export default function Home() {
           <h2>
             Templates <span>-&gt;</span>
           </h2>
-          <p>Explore the Next.js 13 playground.</p>
+          <p>Explore starter templates for Next.js.</p>
         </a>
 
         <a

diff --git a/examples/next-forms/next.config.js b/examples/next-forms/next.config.js
@@ -1,8 +1,4 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-  experimental: {
-    serverActions: true,
-  },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/examples/with-fauna/next.config.js b/examples/with-fauna/next.config.js
@@ -1,7 +1,3 @@
-const nextConfig = {
-  experimental: {
-    serverActions: true,
-  },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/examples/with-storybook/app/page.tsx b/examples/with-storybook/app/page.tsx
@@ -80,7 +80,9 @@ export default function Home() {
           <h2 className={inter.className}>
             Templates <span>-&gt;</span>
           </h2>
-          <p className={inter.className}>Explore the Next.js 13 playground.</p>
+          <p className={inter.className}>
+            Explore starter templates for Next.js.
+          </p>
         </a>
 
         <a

diff --git a/examples/with-stripe-typescript/next.config.js b/examples/with-stripe-typescript/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    serverActions: true,
-  },
-}
+module.exports = {}
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "14.0.2-canary.0"
+  "version": "14.0.2-canary.2"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "14.0.2-canary.0",
+  "version": "14.0.2-canary.2",
   "keywords": [
     "react",
     "next",

diff --git a/packages/create-next-app/templates/app-tw/js/app/page.js b/packages/create-next-app/templates/app-tw/js/app/page.js
@@ -87,7 +87,7 @@ export default function Home() {
             </span>
           </h2>
           <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
-            Explore the Next.js 13 playground.
+            Explore starter templates for Next.js.
           </p>
         </a>
 

diff --git a/packages/create-next-app/templates/app-tw/ts/app/page.tsx b/packages/create-next-app/templates/app-tw/ts/app/page.tsx
@@ -87,7 +87,7 @@ export default function Home() {
             </span>
           </h2>
           <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
-            Explore the Next.js 13 playground.
+            Explore starter templates for Next.js.
           </p>
         </a>
 

diff --git a/packages/create-next-app/templates/app/js/app/page.js b/packages/create-next-app/templates/app/js/app/page.js
@@ -73,7 +73,7 @@ export default function Home() {
           <h2>
             Templates <span>-&gt;</span>
           </h2>
-          <p>Explore the Next.js 13 playground.</p>
+          <p>Explore starter templates for Next.js.</p>
         </a>
 
         <a

diff --git a/packages/create-next-app/templates/app/ts/app/page.tsx b/packages/create-next-app/templates/app/ts/app/page.tsx
@@ -73,7 +73,7 @@ export default function Home() {
           <h2>
             Templates <span>-&gt;</span>
           </h2>
-          <p>Explore the Next.js 13 playground.</p>
+          <p>Explore starter templates for Next.js.</p>
         </a>
 
         <a

diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "14.0.2-canary.0",
+  "version": "14.0.2-canary.2",
   "description": "ESLint configuration used by Next.js.",
   "main": "index.js",
   "license": "MIT",
@@ -10,7 +10,7 @@
   },
   "homepage": "https://nextjs.org/docs/app/building-your-application/configuring/eslint#eslint-config",
   "dependencies": {
-    "@next/eslint-plugin-next": "14.0.2-canary.0",
+    "@next/eslint-plugin-next": "14.0.2-canary.2",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0",
     "eslint-import-resolver-node": "^0.3.6",

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "14.0.2-canary.0",
+  "version": "14.0.2-canary.2",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "license": "MIT",

diff --git a/packages/font/package.json b/packages/font/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "14.0.2-canary.0",
+  "version": "14.0.2-canary.2",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "14.0.2-canary.0",
+  "version": "14.0.2-canary.2",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "14.0.2-canary.0",
+  "version": "14.0.2-canary.2",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "14.0.2-canary.0",
+  "version": "14.0.2-canary.2",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "14.0.2-canary.0",
+  "version": "14.0.2-canary.2",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "14.0.2-canary.0",
+  "version": "14.0.2-canary.2",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "14.0.2-canary.0",
+  "version": "14.0.2-canary.2",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "14.0.2-canary.0",
+  "version": "14.0.2-canary.2",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "14.0.2-canary.0",
+  "version": "14.0.2-canary.2",
   "private": true,
   "scripts": {
     "clean": "node ../../scripts/rm.mjs native",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "14.0.2-canary.0",
+  "version": "14.0.2-canary.2",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -92,7 +92,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "14.0.2-canary.0",
+    "@next/env": "14.0.2-canary.2",
     "@swc/helpers": "0.5.2",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001406",
@@ -146,12 +146,12 @@
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/cli": "2.16.2",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "14.0.2-canary.0",
-    "@next/polyfill-nomodule": "14.0.2-canary.0",
-    "@next/react-dev-overlay": "14.0.2-canary.0",
-    "@next/react-refresh-utils": "14.0.2-canary.0",
-    "@next/swc": "14.0.2-canary.0",
-    "@opentelemetry/api": "1.4.1",
+    "@next/polyfill-module": "14.0.2-canary.2",
+    "@next/polyfill-nomodule": "14.0.2-canary.2",
+    "@next/react-dev-overlay": "14.0.2-canary.2",
+    "@next/react-refresh-utils": "14.0.2-canary.2",
+    "@next/swc": "14.0.2-canary.2",
+    "@opentelemetry/api": "1.6.0",
     "@playwright/test": "^1.35.1",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",

diff --git a/packages/next/src/build/index.ts b/packages/next/src/build/index.ts
@@ -1070,6 +1070,11 @@ export default async function build(
       // has a custom webpack config and disable the build worker by default.
       const useBuildWorker =
         config.experimental.webpackBuildWorker || !config.webpack
+      nextBuildSpan.setAttribute(
+        'has-custom-webpack-config',
+        String(!!config.webpack)
+      )
+      nextBuildSpan.setAttribute('use-build-worker', String(useBuildWorker))
 
       if (
         config.webpack &&
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		nextest.toml @vercel/web-tooling
		nextest.toml @vercel/turbopack
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,7 @@ export default function Home() { @@
               <h2>
                 Templates <span>-&gt;</span>
               </h2>
-              <p>Explore the Next.js 13 playground.</p>
+              <p>Explore starter templates for Next.js.</p>
             </a>
             <a
@@ Expand Down @@