archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update turbopack, fix sass peer dependency (#56508)

Browse source 
* https://github.com/vercel/turbo/pull/6076 <!-- Tobias Koppers -
Performance Improvements (5) !-->

Closes WEB-1725
This commit is contained in:
Tobias Koppers 2023-10-06 10:59:43 +02:00 committed by GitHub
parent 2af1e784c2
commit c95e4b7841
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
Cargo.lock generated
View file

@ -321,7 +321,7 @@ dependencies = [
[[package]]
name = "auto-hash-map"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"serde",
"smallvec",
@ -3515,7 +3515,7 @@ dependencies = [
[[package]]
name = "node-file-trace"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"serde",
@ -7368,7 +7368,7 @@ dependencies = [
[[package]]
name = "turbo-tasks"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"async-trait",
@ -7400,7 +7400,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-build"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"cargo-lock",
@ -7412,7 +7412,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-bytes"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"bytes",
@ -7427,7 +7427,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-env"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"dotenvs",
@ -7441,7 +7441,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-fetch"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"indexmap 1.9.3",
@ -7458,7 +7458,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-fs"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"auto-hash-map",
@ -7488,7 +7488,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-hash"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"base16",
"hex",
@ -7500,7 +7500,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-macros"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"convert_case 0.6.0",
@ -7514,7 +7514,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-macros-shared"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"proc-macro2",
"quote",
@ -7524,7 +7524,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-malloc"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"mimalloc",
]
@ -7532,7 +7532,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-memory"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"auto-hash-map",
@ -7557,7 +7557,7 @@ dependencies = [
[[package]]
name = "turbopack"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"async-recursion",
@ -7588,7 +7588,7 @@ dependencies = [
[[package]]
name = "turbopack-binding"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"auto-hash-map",
"mdxjs",
@ -7628,7 +7628,7 @@ dependencies = [
[[package]]
name = "turbopack-build"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"indexmap 1.9.3",
@ -7650,7 +7650,7 @@ dependencies = [
[[package]]
name = "turbopack-cli-utils"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"clap 4.4.2",
@ -7674,7 +7674,7 @@ dependencies = [
[[package]]
name = "turbopack-core"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"async-recursion",
@ -7703,7 +7703,7 @@ dependencies = [
[[package]]
name = "turbopack-css"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"async-trait",
@ -7725,7 +7725,7 @@ dependencies = [
[[package]]
name = "turbopack-dev"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"indexmap 1.9.3",
@ -7749,7 +7749,7 @@ dependencies = [
[[package]]
name = "turbopack-dev-server"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"async-compression",
@ -7786,7 +7786,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"async-trait",
@ -7820,7 +7820,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript-hmr-protocol"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"serde",
"serde_json",
@ -7831,7 +7831,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript-plugins"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"async-trait",
@ -7854,7 +7854,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript-runtime"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"indoc",
@ -7871,7 +7871,7 @@ dependencies = [
[[package]]
name = "turbopack-env"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"indexmap 1.9.3",
@ -7887,7 +7887,7 @@ dependencies = [
[[package]]
name = "turbopack-image"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"base64 0.21.4",
@ -7907,7 +7907,7 @@ dependencies = [
[[package]]
name = "turbopack-json"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"serde",
@ -7922,7 +7922,7 @@ dependencies = [
[[package]]
name = "turbopack-mdx"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"mdxjs",
@ -7937,7 +7937,7 @@ dependencies = [
[[package]]
name = "turbopack-node"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"async-stream",
@ -7972,7 +7972,7 @@ dependencies = [
[[package]]
name = "turbopack-static"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"serde",
@ -7988,7 +7988,7 @@ dependencies = [
[[package]]
name = "turbopack-swc-utils"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"swc_core",
"turbo-tasks",
@ -7999,7 +7999,7 @@ dependencies = [
[[package]]
name = "turbopack-wasm"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.1#59ac1533324bfac62e75d759dd6cdee0f44a0b96"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231006.2#624521ff91ac654c11072581867f558c26d285ab"
dependencies = [
"anyhow",
"indexmap 1.9.3",

6
Cargo.toml
View file

@ -40,11 +40,11 @@ swc_core = { version = "0.83.28", features = [
testing = { version = "0.34.1" }
# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.1" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.2" }
# [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-231006.1" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.1" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.2" }
# General Deps

2
packages/next/package.json
View file

@ -191,7 +191,7 @@
"@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0",
"@vercel/nft": "0.22.6",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.1",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.2",
"acorn": "8.5.0",
"amphtml-validator": "1.0.35",
"anser": "1.4.9",

2
packages/next/src/compiled/sass-loader/cjs.js
View file

File diff suppressed because one or more lines are too long

15
pnpm-lock.yaml
View file

@ -1058,8 +1058,8 @@ importers:
specifier: 0.22.6
version: 0.22.6
'@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.1
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.1(react-refresh@0.12.0)(webpack@5.86.0)'
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.2
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.2(react-refresh@0.12.0)(webpack@5.86.0)'
acorn:
specifier: 8.5.0
version: 8.5.0
@ -1317,7 +1317,7 @@ importers:
version: 0.13.4
sass-loader:
specifier: 12.4.0
version: 12.4.0(webpack@5.86.0)
version: 12.4.0(sass@1.54.0)(webpack@5.86.0)
schema-utils2:
specifier: npm:schema-utils@2.7.1
version: /schema-utils@2.7.1
@ -23483,7 +23483,7 @@ packages:
/safer-buffer@2.1.2:
resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
/sass-loader@12.4.0(webpack@5.86.0):
/sass-loader@12.4.0(sass@1.54.0)(webpack@5.86.0):
resolution: {integrity: sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==}
engines: {node: '>= 12.13.0'}
peerDependencies:
@ -23501,6 +23501,7 @@ packages:
dependencies:
klona: 2.0.4
neo-async: 2.6.2
sass: 1.54.0
webpack: 5.86.0(@swc/core@1.3.85)
dev: true
@ -26756,9 +26757,9 @@ packages:
/zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.1(react-refresh@0.12.0)(webpack@5.86.0)':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.1}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.1'
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.2(react-refresh@0.12.0)(webpack@5.86.0)':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.2}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.2'
name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0
dependencies: