Merge branch 'canary' into canary

vercel · Oct 28, 2021 · db955bc · db955bc
2 parents 58befa4 + 0d924ca
commit db955bc
Show file tree

Hide file tree

Showing 15 changed files with 77 additions and 76 deletions.
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -413,7 +413,8 @@ jobs:
       - build-native
       - build-windows-i686
       - build-windows-aarch64
-      - build-linux-musl
+      # Temporarily disabled
+      # - build-linux-musl
       - build-linux-arm7
       - build-linux-aarch64
       - build-android-aarch64
@@ -685,60 +686,61 @@ jobs:
         with:
           name: next-swc-binaries
           path: packages/next/native/next-swc.win32-arm64-msvc.node
-
-  build-linux-musl:
-    needs: build
-    if: ${{ needs.build.outputs.isRelease == 'true' }}
-    name: next-swc - linux-musl - node@lts
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - run: echo ::set-output name=DOCS_CHANGE::$(node skip-docs-change.js echo 'not-docs-only-change')
-        id: docs-change
-
-      - name: Login to registry
-        if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
-        run: |
-          docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
-        env:
-          DOCKER_REGISTRY_URL: ghcr.io
-          DOCKER_USERNAME: ${{ github.actor }}
-          DOCKER_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Cache
-        if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
-        uses: actions/cache@v2
-        with:
-          path: |
-            target/
-          key: linux-musl-publish-integration
-
-      - name: Pull docker image
-        if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
-        run: |
-          docker pull ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
-          docker tag ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine builder
-
-      - name: Cache native binary
-        if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
-        id: binary-cache
-        uses: actions/cache@v2
-        with:
-          path: packages/next/native/next-swc.linux-x64-musl.node
-          key: next-swc-nightly-2021-08-12-linux-x64-musl-${{ hashFiles('.github/workflows/build_test_deploy.yml', 'packages/next/build/swc/**') }}
-
-      - name: 'Build'
-        if: ${{ steps.binary-cache.outputs.cache-hit != 'true' && steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
-        run: |
-          docker run --rm -v $(pwd)/packages/next:/swc -w /swc builder sh -c "yarn build-native"
-
-      - name: Upload artifact
-        if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
-        uses: actions/upload-artifact@v2
-        with:
-          name: next-swc-binaries
-          path: packages/next/native/next-swc.linux-x64-musl.node
+
+  # Temporarily disabled
+  # build-linux-musl:
+  #   needs: build
+  #   if: ${{ needs.build.outputs.isRelease == 'true' }}
+  #   name: next-swc - linux-musl - node@lts
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+
+  #     - run: echo ::set-output name=DOCS_CHANGE::$(node skip-docs-change.js echo 'not-docs-only-change')
+  #       id: docs-change
+
+  #     - name: Login to registry
+  #       if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
+  #       run: |
+  #         docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+  #       env:
+  #         DOCKER_REGISTRY_URL: ghcr.io
+  #         DOCKER_USERNAME: ${{ github.actor }}
+  #         DOCKER_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+
+  #     - name: Cache
+  #       if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
+  #       uses: actions/cache@v2
+  #       with:
+  #         path: |
+  #           target/
+  #         key: linux-musl-publish-integration
+
+  #     - name: Pull docker image
+  #       if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
+  #       run: |
+  #         docker pull ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
+  #         docker tag ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine builder
+
+  #     - name: Cache native binary
+  #       if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
+  #       id: binary-cache
+  #       uses: actions/cache@v2
+  #       with:
+  #         path: packages/next/native/next-swc.linux-x64-musl.node
+  #         key: next-swc-nightly-2021-08-12-linux-x64-musl-${{ hashFiles('.github/workflows/build_test_deploy.yml', 'packages/next/build/swc/**') }}
+
+  #     - name: 'Build'
+  #       if: ${{ steps.binary-cache.outputs.cache-hit != 'true' && steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
+  #       run: |
+  #         docker run --rm -v $(pwd)/packages/next:/swc -w /swc builder sh -c "yarn build-native"
+
+  #     - name: Upload artifact
+  #       if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
+  #       uses: actions/upload-artifact@v2
+  #       with:
+  #         name: next-swc-binaries
+  #         path: packages/next/native/next-swc.linux-x64-musl.node
 
   build-linux-aarch64:
     needs: build

diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.0.2-canary.3"
+  "version": "12.0.2-canary.4"
 }
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": "12.0.2-canary.3",
+  "version": "12.0.2-canary.4",
   "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": "12.0.2-canary.3",
+  "version": "12.0.2-canary.4",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "12.0.2-canary.3",
+    "@next/eslint-plugin-next": "12.0.2-canary.4",
     "@rushstack/eslint-patch": "^1.0.6",
     "@typescript-eslint/parser": "^4.20.0",
     "eslint-import-resolver-node": "^0.3.4",

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": "12.0.2-canary.3",
+  "version": "12.0.2-canary.4",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",

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": "12.0.2-canary.3",
+  "version": "12.0.2-canary.4",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "12.0.2-canary.3",
+  "version": "12.0.2-canary.4",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "12.0.2-canary.3",
+  "version": "12.0.2-canary.4",
   "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": "12.0.2-canary.3",
+  "version": "12.0.2-canary.4",
   "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": "12.0.2-canary.3",
+  "version": "12.0.2-canary.4",
   "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": "12.0.2-canary.3",
+  "version": "12.0.2-canary.4",
   "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": "12.0.2-canary.3",
+  "version": "12.0.2-canary.4",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.0.2-canary.3",
+  "version": "12.0.2-canary.4",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -67,10 +67,10 @@
   "dependencies": {
     "@babel/runtime": "7.15.4",
     "@hapi/accept": "5.0.2",
-    "@next/env": "12.0.2-canary.3",
-    "@next/polyfill-module": "12.0.2-canary.3",
-    "@next/react-dev-overlay": "12.0.2-canary.3",
-    "@next/react-refresh-utils": "12.0.2-canary.3",
+    "@next/env": "12.0.2-canary.4",
+    "@next/polyfill-module": "12.0.2-canary.4",
+    "@next/react-dev-overlay": "12.0.2-canary.4",
+    "@next/react-refresh-utils": "12.0.2-canary.4",
     "@node-rs/helper": "1.2.1",
     "acorn": "8.5.0",
     "assert": "2.0.0",
@@ -154,7 +154,7 @@
     "@babel/traverse": "7.15.0",
     "@babel/types": "7.15.0",
     "@napi-rs/cli": "1.1.0",
-    "@next/polyfill-nomodule": "12.0.2-canary.3",
+    "@next/polyfill-nomodule": "12.0.2-canary.4",
     "@peculiar/webcrypto": "1.1.7",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
@@ -278,7 +278,6 @@
     "triples": {
       "defaults": true,
       "additional": [
-        "x86_64-unknown-linux-musl",
         "i686-pc-windows-msvc",
         "aarch64-unknown-linux-gnu",
         "armv7-unknown-linux-gnueabihf",

diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "12.0.2-canary.3",
+  "version": "12.0.2-canary.4",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "12.0.2-canary.3",
+  "version": "12.0.2-canary.4",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",