Merge branch 'canary' into ci-upload-bytes

vercel · Jun 5, 2023 · 625d9cd · 625d9cd
2 parents 8e391f7 + 78ed08d
commit 625d9cd
Show file tree

Hide file tree

Showing 68 changed files with 922 additions and 833 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -16,6 +16,7 @@ linker = "aarch64-linux-musl-gcc"
 rustflags = [
   "--cfg",
   "tokio_unstable",
+  "-Zshare-generics=y",
   "-Csymbol-mangling-version=v0",
   "-Ctarget-feature=-crt-static",
   "-Clink-arg=-lgcc",
@@ -28,6 +29,7 @@ linker = "arm-linux-gnueabihf-gcc"
 rustflags = [
   "--cfg",
   "tokio_unstable",
+  "-Zshare-generics=y",
   "-Csymbol-mangling-version=v0",
   "-Aclippy::too_many_arguments",
 ]
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -3,6 +3,7 @@ name: build-and-deploy
 on:
   push:
     branches: ['canary']
+  workflow_dispatch:
 
 env:
   NAPI_CLI_VERSION: 2.14.7
@@ -24,7 +25,7 @@ jobs:
     outputs:
       docsChange: ${{ steps.docs-change.outputs.DOCS_CHANGE }}
       codemodChange: ${{ steps.codemod-change.outputs.CODEMOD_CHANGE }}
-      isRelease: ${{ steps.check-release.outputs.IS_RELEASE }}
+      isRelease: ${{ github.event_name != 'workflow_dispatch' && steps.check-release.outputs.IS_RELEASE }}
       swcChange: ${{ steps.swc-change.outputs.SWC_CHANGE }}
       turboToken: ${{ steps.turbo-token.outputs.TURBO_TOKEN }}
       weekNum: ${{ steps.get-week.outputs.WEEK }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,11 +42,11 @@ swc_core = { version = "0.76.37" }
 testing = { version = "0.33.13" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230530.1" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230601.3" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230530.1" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230601.3" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230530.1" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230601.3" }
 
 # General Deps
 

diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.4.5-canary.3"
+  "version": "13.4.5-canary.6"
 }
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": "13.4.5-canary.3",
+  "version": "13.4.5-canary.6",
   "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": "13.4.5-canary.3",
+  "version": "13.4.5-canary.6",
   "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": "13.4.5-canary.3",
+    "@next/eslint-plugin-next": "13.4.5-canary.6",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.42.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": "13.4.5-canary.3",
+  "version": "13.4.5-canary.6",
   "description": "ESLint plugin for NextJS.",
   "main": "dist/index.js",
   "license": "MIT",