Merge branch 'canary' into fix/startTime-error

vercel · Jul 2, 2024 · 85f8cf3 · 85f8cf3
2 parents 88bc80f + 669712c
commit 85f8cf3
Show file tree

Hide file tree

Showing 28 changed files with 430 additions and 256 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -1,8 +1,10 @@
+# Update all mentions of this name in vercel-packages when changing.
 name: build-and-deploy
 
 on:
   push:
-    branches: ['canary']
+    # TODO: Run only on canary pushes but PR syncs.
+    # Requires checking if CI is approved
   workflow_dispatch:
 
 env:
@@ -14,15 +16,48 @@ env:
   TURBO_REMOTE_ONLY: 'true'
 
 jobs:
+  deploy-target:
+    runs-on: ubuntu-latest
+    outputs:
+      value: ${{ steps.deploy-target.outputs.value }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_LTS_VERSION }}
+          check-latest: true
+      - run: corepack enable
+      - name: Determine deploy target
+        # 'force-preview' performs a full preview build but only if acknowledged i.e. workflow_dispatch
+        # 'automated-preview' for pushes on branches other than 'canary' for integration testing.
+        # 'staging' for canary branch since that will eventually be published i.e. become the production build.
+        id: deploy-target
+        run: |
+          if [[ $(node ./scripts/check-is-release.js 2> /dev/null || :) = v* ]];
+          then
+            echo "value=production" >> $GITHUB_OUTPUT
+          elif [ '${{ github.ref }}' == 'refs/heads/canary' ]
+          then
+            echo "value=staging" >> $GITHUB_OUTPUT
+          elif [ '${{ github.event_name }}' == 'workflow_dispatch' ]
+          then
+            echo "value=force-preview" >> $GITHUB_OUTPUT
+          else
+            echo "value=automated-preview" >> $GITHUB_OUTPUT
+          fi
+      - name: Print deploy target
+        run: echo "Deploy target is '${{ steps.deploy-target.outputs.value }}'"
+
   build:
     runs-on: ubuntu-latest
     env:
       NEXT_TELEMETRY_DISABLED: 1
       # we build a dev binary for use in CI so skip downloading
       # canary next-swc binaries in the monorepo
       NEXT_SKIP_NATIVE_POSTINSTALL: 1
-    outputs:
-      isRelease: ${{ steps.check-release.outputs.IS_RELEASE }}
     steps:
       - name: Setup node
         uses: actions/setup-node@v4
@@ -52,31 +87,35 @@ jobs:
 
       - run: pnpm run build
 
-      - id: check-release
-        run: |
-          if [[ $(node ./scripts/check-is-release.js 2> /dev/null || :) = v* ]];
-            then
-              echo "IS_RELEASE=true" >> $GITHUB_OUTPUT
-            else
-              echo "IS_RELEASE=false" >> $GITHUB_OUTPUT
-          fi
-
       - uses: actions/cache@v4
         timeout-minutes: 5
         id: cache-build
         with:
           path: ./*
-          key: ${{ github.sha }}-${{ github.run_number }}
+          key: ${{ github.sha }}-${{ github.run_number }}-${{ github.run_attempt}}
 
   # Build binaries for publishing
   build-native:
+    needs:
+      - deploy-target
     defaults:
       run:
         shell: bash -leo pipefail {0}
 
     strategy:
       fail-fast: false
       matrix:
+        exclude:
+          # Exclude slow builds for automated previews
+          # These are rarely needed for the standard preview usage (e.g. Front sync)
+          - settings:
+              target: ${{ needs.deploy-target.outputs.value == 'automated-preview' && 'i686-pc-windows-msvc' }}
+          - settings:
+              target: ${{ needs.deploy-target.outputs.value == 'automated-preview' && 'x86_64-pc-windows-msvc' }}
+          - settings:
+              target: ${{ needs.deploy-target.outputs.value == 'automated-preview' && 'aarch64-unknown-linux-musl' }}
+          - settings:
+              target: ${{ needs.deploy-target.outputs.value == 'automated-preview' && 'x86_64-unknown-linux-musl' }}
         settings:
           - host:
               - 'self-hosted'
@@ -405,16 +444,14 @@ jobs:
           path: packages/next-swc/crates/wasm/pkg-*
 
   deployTarball:
-    if: ${{ needs.build.outputs.isRelease != 'true' }}
-    name: Deploy tarball
+    if: ${{ needs.deploy-target.outputs.value != 'production' }}
+    name: Deploy preview tarball
     runs-on: ubuntu-latest
     needs:
+      - deploy-target
       - build
       - build-wasm
       - build-native
-    env:
-      VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
-      VERCEL_TEST_TEAM: vtest314-next-e2e-tests
     steps:
       - name: Setup node
         uses: actions/setup-node@v4
@@ -432,7 +469,12 @@ jobs:
         id: restore-build
         with:
           path: ./*
-          key: ${{ github.sha }}-${{ github.run_number }}
+          # Cache includes repo checkout which is required for later scripts
+          fail-on-cache-miss: true
+          key: ${{ github.sha }}-${{ github.run_number }}-${{ github.run_attempt }}
+          restore-keys: |
+            ${{ github.sha }}-${{ github.run_number }}
+            ${{ github.sha }}-${{ github.run_number }}-${{ github.run_attempt}}
 
       - uses: actions/download-artifact@v4
         with:
@@ -446,15 +488,22 @@ jobs:
           merge-multiple: true
           path: packages/next-swc/crates/wasm
 
-      - run: npm i -g vercel@latest
+      - name: Create tarballs
+        run: node scripts/create-preview-tarballs.js "${{ github.sha }}" "${{ runner.temp }}/preview-tarballs"
 
-      - run: node ./scripts/deploy-tarball.js
+      - name: Upload tarballs
+        uses: actions/upload-artifact@v4
+        with:
+          # Update all mentions of this name in vercel-packages when changing.
+          name: preview-tarballs
+          path: ${{ runner.temp }}/preview-tarballs/*
 
   publishRelease:
-    if: ${{ needs.build.outputs.isRelease == 'true' }}
+    if: ${{ needs.deploy-target.outputs.value == 'production' }}
     name: Potentially publish release
     runs-on: ubuntu-latest
     needs:
+      - deploy-target
       - build
       - build-wasm
       - build-native
@@ -480,7 +529,12 @@ jobs:
         id: restore-build
         with:
           path: ./*
-          key: ${{ github.sha }}-${{ github.run_number }}
+          # Cache includes repo checkout which is required for later scripts
+          fail-on-cache-miss: true
+          key: ${{ github.sha }}-${{ github.run_number }}-${{ github.run_attempt }}
+          restore-keys: |
+            ${{ github.sha }}-${{ github.run_number }}
+            ${{ github.sha }}-${{ github.run_number }}-${{ github.run_attempt}}
 
       - uses: actions/download-artifact@v4
         with:
@@ -509,23 +563,25 @@ jobs:
           path: /home/runner/.npm/_logs/*
 
   deployExamples:
+    if: ${{ needs.deploy-target.outputs.value != 'automated-preview' }}
     name: Deploy examples
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [build, deploy-target]
     steps:
+      - run: echo '${{ needs.deploy-target.outputs.value }}'
       - uses: actions/checkout@v4
         with:
           fetch-depth: 25
       - name: Install Vercel CLI
         run: npm i -g vercel@latest
       - name: Deploy preview examples
-        if: ${{ needs.build.outputs.isRelease != 'true' }}
+        if: ${{ needs.deploy-target.outputs.value != 'production' }}
         run: ./scripts/deploy-examples.sh
         env:
           VERCEL_API_TOKEN: ${{ secrets.VERCEL_API_TOKEN }}
           DEPLOY_ENVIRONMENT: preview
       - name: Deploy production examples
-        if: ${{ needs.build.outputs.isRelease == 'true' }}
+        if: ${{ needs.deploy-target.outputs.value == 'production' }}
         run: ./scripts/deploy-examples.sh
         env:
           VERCEL_API_TOKEN: ${{ secrets.VERCEL_API_TOKEN }}
@@ -560,9 +616,10 @@ jobs:
           NEXT_SKIP_NATIVE_POSTINSTALL: 1
 
   upload_turbopack_bytesize:
+    if: ${{ needs.deploy-target.outputs.value != 'automated-preview'}}
     name: Upload Turbopack Bytesize metrics to Datadog
     runs-on: ubuntu-latest
-    needs: [build-native]
+    needs: [build-native, deploy-target]
     env:
       DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
     steps:

diff --git a/contributing/core/testing.md b/contributing/core/testing.md
@@ -125,3 +125,23 @@ To run the test suite using Turbopack, you can use the `TURBOPACK=1` environment
 ```sh
 TURBOPACK=1 pnpm test-dev test/e2e/app-dir/app/
 ```
+
+## Integration testing outside the repository with preview builds
+
+Every branch build will create a tarball for each package in this repository<sup>1</sup> that can be used in external repositories.
+
+You can use this preview build in other packages by using a https://vercel-packages.vercel.app URL instead of a version in the `package.json` e.g.
+
+```json
+{
+  "dependencies": {
+    "next": "https://vercel-packages.vercel.app/next/commits/abcd/next"
+  }
+}
+```
+
+You can refer to builds only by commit SHAs at the moment.
+
+<sup>1</sup> Not all native packages are built automatically.
+`build-and-deploy` excludes slow, rarely used native variants of `next-swc`.
+To force a build of all packages, you can trigger `build-and-deploy` manually (i.e. `workflow_dispatch`).
diff --git a/docs/02-app/02-api-reference/08-next-cli.mdx b/docs/02-app/02-api-reference/08-next-cli.mdx
@@ -426,7 +426,7 @@ Usage: next telemetry [options]
 Allows you to enable or disable Next.js' completely anonymous telemetry collection.
 
 Options:
-  --enable    Eanbles Next.js' telemetry collection.
+  --enable    Enables Next.js' telemetry collection.
   --disable   Disables Next.js' telemetry collection.
   -h, --help  Displays this message.
 

diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "15.0.0-canary.50"
+  "version": "15.0.0-canary.51"
 }
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": "15.0.0-canary.50",
+  "version": "15.0.0-canary.51",
   "keywords": [
     "react",
     "next",

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": "15.0.0-canary.50",
+  "version": "15.0.0-canary.51",
   "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": "15.0.0-canary.50",
+    "@next/eslint-plugin-next": "15.0.0-canary.51",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/eslint-plugin": "^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0",

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": "15.0.0-canary.50",
+  "version": "15.0.0-canary.51",
   "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": "15.0.0-canary.50",
+  "version": "15.0.0-canary.51",
   "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": "15.0.0-canary.50",
+  "version": "15.0.0-canary.51",
   "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": "15.0.0-canary.50",
+  "version": "15.0.0-canary.51",
   "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": "15.0.0-canary.50",
+  "version": "15.0.0-canary.51",
   "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": "15.0.0-canary.50",
+  "version": "15.0.0-canary.51",
   "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": "15.0.0-canary.50",
+  "version": "15.0.0-canary.51",
   "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": "15.0.0-canary.50",
+  "version": "15.0.0-canary.51",
   "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": "15.0.0-canary.50",
+  "version": "15.0.0-canary.51",
   "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": "15.0.0-canary.50",
+  "version": "15.0.0-canary.51",
   "private": true,
   "scripts": {
     "clean": "node ../../scripts/rm.mjs native",