Skip to content

Commit

Permalink
Merge branch 'canary' into fix/optimistic-bailout
Browse files Browse the repository at this point in the history
  • Loading branch information
ztanner authored Nov 15, 2023
2 parents 1dd3f8b + 4e5702c commit a8ba27c
Show file tree
Hide file tree
Showing 149 changed files with 821 additions and 447 deletions.
66 changes: 33 additions & 33 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran
testing = { version = "0.35.7" }

# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231109.2" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231113.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-231109.2" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231113.3" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231109.2" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231113.3" }

# General Deps

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ export function middleware(request: NextRequest) {
)

const response = NextResponse.next({
headers: requestHeaders,
request: {
headers: requestHeaders,
},
Expand Down Expand Up @@ -113,7 +112,6 @@ export function middleware(request) {
)

const response = NextResponse.next({
headers: requestHeaders,
request: {
headers: requestHeaders,
},
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
"registry": "https://registry.npmjs.org/"
}
},
"version": "14.0.3-canary.8"
"version": "14.0.3-canary.9"
}
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -193,16 +193,16 @@
"random-seed": "0.3.0",
"react": "18.2.0",
"react-17": "npm:react@17.0.2",
"react-builtin": "npm:react@18.3.0-canary-0e352ea01-20231109",
"react-builtin": "npm:react@18.3.0-canary-593ecee66-20231114",
"react-dom": "18.2.0",
"react-dom-17": "npm:react-dom@17.0.2",
"react-dom-builtin": "npm:react-dom@18.3.0-canary-0e352ea01-20231109",
"react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-0e352ea01-20231109",
"react-experimental-builtin": "npm:react@0.0.0-experimental-0e352ea01-20231109",
"react-server-dom-turbopack": "18.3.0-canary-0e352ea01-20231109",
"react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-0e352ea01-20231109",
"react-server-dom-webpack": "18.3.0-canary-0e352ea01-20231109",
"react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-0e352ea01-20231109",
"react-dom-builtin": "npm:react-dom@18.3.0-canary-593ecee66-20231114",
"react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-593ecee66-20231114",
"react-experimental-builtin": "npm:react@0.0.0-experimental-593ecee66-20231114",
"react-server-dom-turbopack": "18.3.0-canary-593ecee66-20231114",
"react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-593ecee66-20231114",
"react-server-dom-webpack": "18.3.0-canary-593ecee66-20231114",
"react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-593ecee66-20231114",
"react-ssr-prepass": "1.0.8",
"react-virtualized": "9.22.3",
"relay-compiler": "13.0.2",
Expand All @@ -212,8 +212,8 @@
"resolve-from": "5.0.0",
"sass": "1.54.0",
"satori": "0.10.6",
"scheduler-builtin": "npm:scheduler@0.24.0-canary-0e352ea01-20231109",
"scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-0e352ea01-20231109",
"scheduler-builtin": "npm:scheduler@0.24.0-canary-593ecee66-20231114",
"scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-593ecee66-20231114",
"seedrandom": "3.0.5",
"selenium-webdriver": "4.0.0-beta.4",
"semver": "7.3.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-next-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-next-app",
"version": "14.0.3-canary.8",
"version": "14.0.3-canary.9",
"keywords": [
"react",
"next",
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-config-next/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-config-next",
"version": "14.0.3-canary.8",
"version": "14.0.3-canary.9",
"description": "ESLint configuration used by Next.js.",
"main": "index.js",
"license": "MIT",
Expand All @@ -10,7 +10,7 @@
},
"homepage": "https://nextjs.org/docs/app/building-your-application/configuring/eslint#eslint-config",
"dependencies": {
"@next/eslint-plugin-next": "14.0.3-canary.8",
"@next/eslint-plugin-next": "14.0.3-canary.9",
"@rushstack/eslint-patch": "^1.3.3",
"@typescript-eslint/parser": "^5.4.2 || ^6.0.0",
"eslint-import-resolver-node": "^0.3.6",
Expand Down
Loading

0 comments on commit a8ba27c

Please sign in to comment.