Skip to content

Commit d4a569d

Browse files
kodiakhq[bot]kodiakhq[bot]
authored
Merge branch 'canary' into speed-up-intergration-test
2 parents 6448770 + 3c326ea commit d4a569d

File tree

108 files changed

+1489
-1097
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1489
-1097
lines changed

‎.github/CODEOWNERS

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828

2929
# Tooling & Telemetry
3030

31-
/packages/next/src/build/ @timneutkens @ijjk @shuding @huozhi @ztanner @feedthejim @vercel/web-tooling
32-
/packages/next/src/server/lib/router-utils/setup-dev.ts @timneutkens @ijjk @shuding @huozhi @feedthejim @ztanner @wyattjoh @vercel/web-tooling
33-
/packages/next/src/telemetry/ @timneutkens @ijjk @shuding @padmaia
34-
/packages/next-swc/ @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
35-
Cargo.toml @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
36-
Cargo.lock @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
37-
/.cargo/config.toml @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
38-
/.config/nextest.toml @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
39-
/test/build-turbopack-tests-manifest.js @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
40-
/test/turbopack-tests-manifest.json @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
31+
/packages/next/src/build/ @timneutkens @ijjk @shuding @huozhi @ztanner @feedthejim @vercel/web-tooling
32+
/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts @timneutkens @ijjk @shuding @huozhi @feedthejim @ztanner @wyattjoh @vercel/web-tooling
33+
/packages/next/src/telemetry/ @timneutkens @ijjk @shuding @padmaia
34+
/packages/next-swc/ @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
35+
Cargo.toml @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
36+
Cargo.lock @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
37+
/.cargo/config.toml @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
38+
/.config/nextest.toml @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
39+
/test/build-turbopack-tests-manifest.js @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
40+
/test/turbopack-tests-manifest.json @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling

‎Cargo.lock

Lines changed: 35 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ swc_core = { version = "0.83.28", features = [
4040
testing = { version = "0.34.1" }
4141

4242
# Turbo crates
43-
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231002.1" }
43+
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.4" }
4444
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
45-
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231002.1" }
45+
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.4" }
4646
# [TODO]: need to refactor embed_directory! macro usage in next-core
47-
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231002.1" }
47+
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.4" }
4848

4949
# General Deps
5050

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
"registry": "https://registry.npmjs.org/"
1717
}
1818
},
19-
"version": "13.5.5-canary.2"
19+
"version": "13.5.5-canary.4"
2020
}

‎packages/create-next-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-next-app",
3-
"version": "13.5.5-canary.2",
3+
"version": "13.5.5-canary.4",
44
"keywords": [
55
"react",
66
"next",

‎packages/eslint-config-next/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-config-next",
3-
"version": "13.5.5-canary.2",
3+
"version": "13.5.5-canary.4",
44
"description": "ESLint configuration used by Next.js.",
55
"main": "index.js",
66
"license": "MIT",
@@ -10,7 +10,7 @@
1010
},
1111
"homepage": "https://nextjs.org/docs/app/building-your-application/configuring/eslint#eslint-config",
1212
"dependencies": {
13-
"@next/eslint-plugin-next": "13.5.5-canary.2",
13+
"@next/eslint-plugin-next": "13.5.5-canary.4",
1414
"@rushstack/eslint-patch": "^1.3.3",
1515
"@typescript-eslint/parser": "^5.4.2 || ^6.0.0",
1616
"eslint-import-resolver-node": "^0.3.6",

‎packages/eslint-plugin-next/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/eslint-plugin-next",
3-
"version": "13.5.5-canary.2",
3+
"version": "13.5.5-canary.4",
44
"description": "ESLint plugin for Next.js.",
55
"main": "dist/index.js",
66
"license": "MIT",

‎packages/font/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/font",
3-
"version": "13.5.5-canary.2",
3+
"version": "13.5.5-canary.4",
44
"repository": {
55
"url": "vercel/next.js",
66
"directory": "packages/font"

0 commit comments

Comments
 (0)