Update turbopack
and swc_core
to v0.78.24
(#51943)
Reverts #51940 ### What? Update SWC crates and turbopack ### Turbopack Updates * https://github.com/vercel/turbo/pull/5366 <!-- Justin Ridgewell - Fix bug with `imports` field from a nested directory --> * https://github.com/vercel/turbo/pull/5361 <!-- Tobias Koppers - update for next.js changes to env vars --> * https://github.com/vercel/turbo/pull/5311 <!-- OJ Kwon - test(filetrace): skip failing tests --> * https://github.com/vercel/turbo/pull/5402 <!-- Leah - reduce indent in `analyze_ecmascript_module` by splitting the function up --> * https://github.com/vercel/turbo/pull/5412 <!-- Leah - Update `swc_core` to `v0.78.24` --> Closes WEB-1174 Turbopack counterpart: https://github.com/vercel/turbo/pull/5412 --------- Co-authored-by: Tobias Koppers <tobias.koppers@googlemail.com> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
parent
3773c5be8c
commit
484bdebc24
12 changed files with 468 additions and 338 deletions
700
Cargo.lock
generated
700
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
10
Cargo.toml
10
Cargo.toml
|
@ -38,15 +38,15 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran
|
|||
|
||||
# SWC crates
|
||||
# Keep consistent with preset_env_base through swc_core
|
||||
swc_core = { version = "0.76.46" }
|
||||
testing = { version = "0.33.13" }
|
||||
swc_core = { version = "0.78.24" }
|
||||
testing = { version = "0.33.19" }
|
||||
|
||||
# Turbo crates
|
||||
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230622.2" }
|
||||
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230628.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-230622.2" }
|
||||
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230628.2" }
|
||||
# [TODO]: need to refactor embed_directory! macro usage in next-core
|
||||
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230622.2" }
|
||||
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230628.2" }
|
||||
|
||||
# General Deps
|
||||
|
||||
|
|
|
@ -1511,7 +1511,14 @@ impl VisitMut for ClosureReplacer<'_> {
|
|||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
struct Name(Id, Vec<(JsWord, bool)>);
|
||||
struct NamePart {
|
||||
prop: JsWord,
|
||||
is_member: bool,
|
||||
optional: bool,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
struct Name(Id, Vec<NamePart>);
|
||||
|
||||
impl From<&'_ Ident> for Name {
|
||||
fn from(value: &Ident) -> Self {
|
||||
|
@ -1539,7 +1546,11 @@ impl TryFrom<&'_ MemberExpr> for Name {
|
|||
match &value.prop {
|
||||
MemberProp::Ident(prop) => {
|
||||
let mut obj: Name = value.obj.as_ref().try_into()?;
|
||||
obj.1.push((prop.sym.clone(), true));
|
||||
obj.1.push(NamePart {
|
||||
prop: prop.sym.clone(),
|
||||
is_member: true,
|
||||
optional: false,
|
||||
});
|
||||
Ok(obj)
|
||||
}
|
||||
_ => Err(()),
|
||||
|
@ -1552,10 +1563,14 @@ impl TryFrom<&'_ OptChainExpr> for Name {
|
|||
|
||||
fn try_from(value: &OptChainExpr) -> Result<Self, Self::Error> {
|
||||
match &*value.base {
|
||||
OptChainBase::Member(value) => match &value.prop {
|
||||
OptChainBase::Member(m) => match &m.prop {
|
||||
MemberProp::Ident(prop) => {
|
||||
let mut obj: Name = value.obj.as_ref().try_into()?;
|
||||
obj.1.push((prop.sym.clone(), false));
|
||||
let mut obj: Name = m.obj.as_ref().try_into()?;
|
||||
obj.1.push(NamePart {
|
||||
prop: prop.sym.clone(),
|
||||
is_member: false,
|
||||
optional: value.optional,
|
||||
});
|
||||
Ok(obj)
|
||||
}
|
||||
_ => Err(()),
|
||||
|
@ -1569,7 +1584,12 @@ impl From<Name> for Expr {
|
|||
fn from(value: Name) -> Self {
|
||||
let mut expr = Expr::Ident(value.0.into());
|
||||
|
||||
for (prop, is_member) in value.1.into_iter() {
|
||||
for NamePart {
|
||||
prop,
|
||||
is_member,
|
||||
optional,
|
||||
} in value.1.into_iter()
|
||||
{
|
||||
if is_member {
|
||||
expr = Expr::Member(MemberExpr {
|
||||
span: DUMMY_SP,
|
||||
|
@ -1579,12 +1599,12 @@ impl From<Name> for Expr {
|
|||
} else {
|
||||
expr = Expr::OptChain(OptChainExpr {
|
||||
span: DUMMY_SP,
|
||||
question_dot_token: DUMMY_SP,
|
||||
base: Box::new(OptChainBase::Member(MemberExpr {
|
||||
span: DUMMY_SP,
|
||||
obj: expr.into(),
|
||||
prop: MemberProp::Ident(Ident::new(prop, DUMMY_SP)),
|
||||
})),
|
||||
optional,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,2 +1,3 @@
|
|||
var _my_array;
|
||||
var _my_array_;
|
||||
var test = (_my_array_ = my_array === null || my_array === void 0 ? void 0 : my_array[0]) !== null && _my_array_ !== void 0 ? _my_array_ : [];
|
||||
var test = (_my_array_ = (_my_array = my_array) === null || _my_array === void 0 ? void 0 : _my_array[0]) !== null && _my_array_ !== void 0 ? _my_array_ : [];
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
"check": "tsc --noEmit"
|
||||
},
|
||||
"dependencies": {
|
||||
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230622.2",
|
||||
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230622.2",
|
||||
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230628.2",
|
||||
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230628.2",
|
||||
"anser": "^2.1.1",
|
||||
"css.escape": "^1.5.1",
|
||||
"next": "*",
|
||||
|
|
|
@ -316,13 +316,11 @@ fn parse_config_value(
|
|||
JsValue::Constant(ConstantValue::Str(str)) if str.as_str() == "force-cache" => {
|
||||
config.revalidate = Some(NextRevalidate::ForceCache);
|
||||
}
|
||||
_ => {
|
||||
return invalid_config(
|
||||
"`revalidate` needs to be static false, static 'force-cache' or a static \
|
||||
positive integer",
|
||||
&value,
|
||||
)
|
||||
}
|
||||
_ => invalid_config(
|
||||
"`revalidate` needs to be static false, static 'force-cache' or a static \
|
||||
positive integer",
|
||||
&value,
|
||||
),
|
||||
}
|
||||
}
|
||||
"fetchCache" => {
|
||||
|
|
|
@ -3,7 +3,7 @@ PlainIssue {
|
|||
context: "[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/hello.emit",
|
||||
category: "loaders",
|
||||
title: "Issue while running loader",
|
||||
description: "Error: Warning!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:161:11)\n at (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:112:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:104:10)\n at (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:67)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
|
||||
description: "Error: Warning!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:161:11)\n at (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:112:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:104:10)\n at (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:74)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
|
||||
detail: "",
|
||||
documentation_link: "",
|
||||
source: None,
|
|
@ -3,7 +3,7 @@ PlainIssue {
|
|||
context: "[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/hello.emit",
|
||||
category: "loaders",
|
||||
title: "Issue while running loader",
|
||||
description: "Error: Error!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:161:11)\n at (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:112:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:104:10)\n at (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:67)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
|
||||
description: "Error: Error!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:161:11)\n at (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:112:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:104:10)\n at (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:74)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
|
||||
detail: "",
|
||||
documentation_link: "",
|
||||
source: None,
|
|
@ -3,7 +3,7 @@ PlainIssue {
|
|||
context: "[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/hello.emit",
|
||||
category: "loaders",
|
||||
title: "Issue while running loader",
|
||||
description: "Error: Error!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:161:11)\n at (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:112:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:104:10)\n at (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:67)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
|
||||
description: "Error: Error!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:161:11)\n at (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:112:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:104:10)\n at (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:74)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
|
||||
detail: "",
|
||||
documentation_link: "",
|
||||
source: None,
|
|
@ -3,7 +3,7 @@ PlainIssue {
|
|||
context: "[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/hello.emit",
|
||||
category: "loaders",
|
||||
title: "Issue while running loader",
|
||||
description: "Error: Warning!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:161:11)\n at (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:112:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:104:10)\n at (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:67)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
|
||||
description: "Error: Warning!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:161:11)\n at (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:112:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:104:10)\n at (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:74)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
|
||||
detail: "",
|
||||
documentation_link: "",
|
||||
source: None,
|
|
@ -25,7 +25,7 @@ serde_json = "1"
|
|||
tracing = { version = "0.1.37" }
|
||||
wasm-bindgen = { version = "0.2", features = ["enable-interning"] }
|
||||
wasm-bindgen-futures = "0.4.8"
|
||||
getrandom = { version = "0.2.5", optional = true, default-features = false }
|
||||
getrandom = { version = "0.2.9", default-features = false, features = ["js"] }
|
||||
js-sys = "0.3.59"
|
||||
serde-wasm-bindgen = "0.4.3"
|
||||
turbopack-binding = { workspace = true, features = [
|
||||
|
|
|
@ -992,8 +992,8 @@ importers:
|
|||
'@types/react': 18.2.7
|
||||
'@types/react-dom': 18.2.4
|
||||
'@vercel/ncc': ^0.36.0
|
||||
'@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230622.2
|
||||
'@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230622.2
|
||||
'@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230628.2
|
||||
'@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230628.2
|
||||
anser: ^2.1.1
|
||||
css.escape: ^1.5.1
|
||||
find-up: ^6.3.0
|
||||
|
@ -1005,8 +1005,8 @@ importers:
|
|||
stacktrace-parser: ^0.1.10
|
||||
strip-ansi: ^7.0.1
|
||||
dependencies:
|
||||
'@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230622.2_react-refresh@0.12.0'
|
||||
'@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230622.2'
|
||||
'@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230628.2_react-refresh@0.12.0'
|
||||
'@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230628.2'
|
||||
anser: 2.1.1
|
||||
css.escape: 1.5.1
|
||||
next: link:../../../../next
|
||||
|
@ -6124,7 +6124,7 @@ packages:
|
|||
dependencies:
|
||||
'@mdx-js/mdx': 2.2.1
|
||||
source-map: 0.7.3
|
||||
webpack: 5.86.0
|
||||
webpack: 5.86.0_@swc+core@1.3.55
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
|
@ -6798,7 +6798,6 @@ packages:
|
|||
cpu: [arm64]
|
||||
os: [darwin]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@swc/core-darwin-x64/1.3.55:
|
||||
|
@ -6807,7 +6806,6 @@ packages:
|
|||
cpu: [x64]
|
||||
os: [darwin]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@swc/core-linux-arm-gnueabihf/1.3.55:
|
||||
|
@ -6816,7 +6814,6 @@ packages:
|
|||
cpu: [arm]
|
||||
os: [linux]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@swc/core-linux-arm64-gnu/1.3.55:
|
||||
|
@ -6825,7 +6822,6 @@ packages:
|
|||
cpu: [arm64]
|
||||
os: [linux]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@swc/core-linux-arm64-musl/1.3.55:
|
||||
|
@ -6834,7 +6830,6 @@ packages:
|
|||
cpu: [arm64]
|
||||
os: [linux]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@swc/core-linux-x64-gnu/1.3.55:
|
||||
|
@ -6843,7 +6838,6 @@ packages:
|
|||
cpu: [x64]
|
||||
os: [linux]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@swc/core-linux-x64-musl/1.3.55:
|
||||
|
@ -6852,7 +6846,6 @@ packages:
|
|||
cpu: [x64]
|
||||
os: [linux]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@swc/core-win32-arm64-msvc/1.3.55:
|
||||
|
@ -6861,7 +6854,6 @@ packages:
|
|||
cpu: [arm64]
|
||||
os: [win32]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@swc/core-win32-ia32-msvc/1.3.55:
|
||||
|
@ -6870,7 +6862,6 @@ packages:
|
|||
cpu: [ia32]
|
||||
os: [win32]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@swc/core-win32-x64-msvc/1.3.55:
|
||||
|
@ -6879,7 +6870,6 @@ packages:
|
|||
cpu: [x64]
|
||||
os: [win32]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@swc/core/1.3.55_@swc+helpers@0.5.1:
|
||||
|
@ -6904,7 +6894,6 @@ packages:
|
|||
'@swc/core-win32-arm64-msvc': 1.3.55
|
||||
'@swc/core-win32-ia32-msvc': 1.3.55
|
||||
'@swc/core-win32-x64-msvc': 1.3.55
|
||||
dev: true
|
||||
|
||||
/@swc/helpers/0.4.14:
|
||||
resolution: {integrity: sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==}
|
||||
|
@ -23807,7 +23796,6 @@ packages:
|
|||
serialize-javascript: 6.0.1
|
||||
terser: 5.17.7
|
||||
webpack: 5.86.0_@swc+core@1.3.55
|
||||
dev: true
|
||||
|
||||
/terser/5.10.0:
|
||||
resolution: {integrity: sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==}
|
||||
|
@ -25165,7 +25153,6 @@ packages:
|
|||
- '@swc/core'
|
||||
- esbuild
|
||||
- uglify-js
|
||||
dev: true
|
||||
|
||||
/websocket-driver/0.7.3:
|
||||
resolution: {integrity: sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==}
|
||||
|
@ -25574,9 +25561,9 @@ packages:
|
|||
/zwitch/2.0.4:
|
||||
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
|
||||
|
||||
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230622.2_react-refresh@0.12.0':
|
||||
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230622.2}
|
||||
id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230622.2'
|
||||
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230628.2_react-refresh@0.12.0':
|
||||
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230628.2}
|
||||
id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230628.2'
|
||||
name: '@vercel/turbopack-ecmascript-runtime'
|
||||
version: 0.0.0
|
||||
dependencies:
|
||||
|
@ -25587,8 +25574,8 @@ packages:
|
|||
- webpack
|
||||
dev: false
|
||||
|
||||
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230622.2':
|
||||
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230622.2}
|
||||
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230628.2':
|
||||
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230628.2}
|
||||
name: '@vercel/turbopack-node'
|
||||
version: 0.0.0
|
||||
dependencies:
|
||||
|
|
Loading…
Reference in a new issue