Unverified Commit 84820c90 authored by Donny/강동윤's avatar Donny/강동윤 Committed by GitHub

Update `swc_core` to `v0.79.22` (#52945)

### What?

Update swc_core to `v0.79.22` and other SWC crates to the latest.
### Why?

This is for further next.js work: https://vercel.slack.com/archives/C02HY34AKME/p1689768597095499


### How?

Closes WEB-1299

turbopack counterpart: https://github.com/vercel/turbo/pull/5575Co-authored-by: 's avatarTobias Koppers <1365881+sokra@users.noreply.github.com>
parent e8877726
This diff is collapsed.
...@@ -40,15 +40,15 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran ...@@ -40,15 +40,15 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran
# SWC crates # SWC crates
# Keep consistent with preset_env_base through swc_core # Keep consistent with preset_env_base through swc_core
swc_core = { version = "0.79.13" } swc_core = { version = "0.79.22" }
testing = { version = "0.33.20" } testing = { version = "0.33.21" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.1" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.3" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros.. # [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-230721.1" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.3" }
# [TODO]: need to refactor embed_directory! macro usage in next-core # [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.1" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.3" }
# General Deps # General Deps
......
...@@ -39,14 +39,17 @@ use either::Either; ...@@ -39,14 +39,17 @@ use either::Either;
use fxhash::FxHashSet; use fxhash::FxHashSet;
use next_transform_font::next_font_loaders; use next_transform_font::next_font_loaders;
use serde::Deserialize; use serde::Deserialize;
use turbopack_binding::swc::core::{ use turbopack_binding::swc::{
common::{ core::{
chain, comments::Comments, pass::Optional, FileName, Mark, SourceFile, SourceMap, common::{
SyntaxContext, chain, comments::Comments, pass::Optional, FileName, Mark, SourceFile, SourceMap,
}, SyntaxContext,
ecma::{ },
ast::EsVersion, parser::parse_file_as_module, transforms::base::pass::noop, visit::Fold, ecma::{
ast::EsVersion, parser::parse_file_as_module, transforms::base::pass::noop, visit::Fold,
},
}, },
custom_transform::modularize_imports,
}; };
pub mod amp_attributes; pub mod amp_attributes;
...@@ -123,8 +126,7 @@ pub struct TransformOptions { ...@@ -123,8 +126,7 @@ pub struct TransformOptions {
pub emotion: Option<turbopack_binding::swc::custom_transform::emotion::EmotionOptions>, pub emotion: Option<turbopack_binding::swc::custom_transform::emotion::EmotionOptions>,
#[serde(default)] #[serde(default)]
pub modularize_imports: pub modularize_imports: Option<modularize_imports::Config>,
Option<turbopack_binding::swc::custom_transform::modularize_imports::Config>,
#[serde(default)] #[serde(default)]
pub font_loaders: Option<next_transform_font::Config>, pub font_loaders: Option<next_transform_font::Config>,
...@@ -167,14 +169,16 @@ where ...@@ -167,14 +169,16 @@ where
let mut modularize_imports_config = match &opts.modularize_imports { let mut modularize_imports_config = match &opts.modularize_imports {
Some(config) => config.clone(), Some(config) => config.clone(),
None => turbopack_binding::swc::custom_transform::modularize_imports::Config { None => modularize_imports::Config {
packages: std::collections::HashMap::new(), packages: std::collections::HashMap::new(),
}, },
}; };
modularize_imports_config.packages.insert( modularize_imports_config.packages.insert(
"next/server".to_string(), "next/server".to_string(),
turbopack_binding::swc::custom_transform::modularize_imports::PackageConfig { modularize_imports::PackageConfig {
transform: "next/dist/server/web/exports/{{ kebabCase member }}".to_string(), transform: modularize_imports::Transform::String(
"next/dist/server/web/exports/{{ kebabCase member }}".to_string(),
),
prevent_full_import: false, prevent_full_import: false,
skip_default_conversion: false, skip_default_conversion: false,
}, },
...@@ -272,7 +276,7 @@ where ...@@ -272,7 +276,7 @@ where
} }
}) })
.unwrap_or_else(|| Either::Right(noop())), .unwrap_or_else(|| Either::Right(noop())),
turbopack_binding::swc::custom_transform::modularize_imports::modularize_imports( modularize_imports::modularize_imports(
modularize_imports_config modularize_imports_config
), ),
match &opts.font_loaders { match &opts.font_loaders {
......
...@@ -3,16 +3,16 @@ import f, { f1, f2 } from 'foo'; ...@@ -3,16 +3,16 @@ import f, { f1, f2 } from 'foo';
const f3 = 1; const f3 = 1;
var f4; var f4;
let f5; let f5;
const [f6, [f7, ...f8], { f9 }, { f10 , f11: [f12] , f13: f14 , f15: { f16 } , ...f17 }, ...f18] = []; const [f6, [f7, ...f8], { f9 }, { f10, f11: [f12], f13: f14, f15: { f16 }, ...f17 }, ...f18] = [];
if (true) { if (true) {
const g191 = 1; const g191 = 1;
} }
function x() { function x() {
const f2 = 1; const f21 = 1;
const g201 = 1; const g201 = 1;
} }
export function y(p, [p1, { p2 }], ...p3) { export function y(p, [p1, { p2 }], ...p3) {
const f2 = 1; const f21 = 1;
const f11 = 1; const f11 = 1;
const f19 = 1; const f19 = 1;
if (true) { if (true) {
...@@ -22,7 +22,7 @@ export function y(p, [p1, { p2 }], ...p3) { ...@@ -22,7 +22,7 @@ export function y(p, [p1, { p2 }], ...p3) {
return $$ACTION_0.apply(null, (action.$$bound || []).concat(args)); return $$ACTION_0.apply(null, (action.$$bound || []).concat(args));
} }
__create_action_proxy__("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ __create_action_proxy__("6d53ce510b2e36499b8f56038817b9bad86cabb4", [
f2, f21,
f11, f11,
p, p,
p1, p1,
......
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
value: !0 value: !0
}); });
var e = function(e) { var e, o = (e = require("esm")) && e.__esModule ? e : {
return e && e.__esModule ? e : { default: e
default: e };
}; console.log(o.default.foo), module.exports = o.default;
}(require("esm"));
console.log(e.default.foo), module.exports = e.default;
function r(r, t) { function r(r, e) {
(null == t || t > r.length) && (t = r.length); (null == e || e > r.length) && (e = r.length);
for(var n = 0, e = Array(t); n < t; n++)e[n] = r[n]; for(var n = 0, o = Array(e); n < e; n++)o[n] = r[n];
return e; return o;
} }
import t from "other"; import t from "other";
(function(t, n) { ((function(r) {
return function(r) { if (Array.isArray(r)) return r;
if (Array.isArray(r)) return r; })(t) || function(r, e) {
}(t) || function(r, t) { var n, o, a = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
var n, e, o = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != a) {
if (null != o) { var l = [], u = !0, i = !1;
var a = [], l = !0, u = !1; try {
for(a = a.call(r); !(u = (n = a.next()).done) && (l.push(n.value), !e || l.length !== e); u = !0);
} catch (r) {
i = !0, o = r;
} finally{
try { try {
for(o = o.call(r); !(l = (n = o.next()).done) && (a.push(n.value), !t || a.length !== t); l = !0); u || null == a.return || a.return();
} catch (r) {
u = !0, e = r;
} finally{ } finally{
try { if (i) throw o;
l || null == o.return || o.return();
} finally{
if (u) throw e;
}
} }
return a;
} }
}(t, n) || function(t, n) { return l;
if (t) { }
if ("string" == typeof t) return r(t, n); }(t, 1) || function(e, n) {
var e = Object.prototype.toString.call(t).slice(8, -1); if (e) {
if ("Object" === e && t.constructor && (e = t.constructor.name), "Map" === e || "Set" === e) return Array.from(e); if ("string" == typeof e) return r(e, n);
if ("Arguments" === e || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e)) return r(t, n); var o = Object.prototype.toString.call(e).slice(8, -1);
} if ("Object" === o && e.constructor && (o = e.constructor.name), "Map" === o || "Set" === o) return Array.from(o);
}(t, n) || function() { if ("Arguments" === o || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(o)) return r(e, n);
throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
}(); }(t, 1) || function() {
})(t, 1)[0]; throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}())[0];
export var __N_SSG = !0; export var __N_SSG = !0;
export default function n() { export default function e() {
return React.createElement("div", null); return React.createElement("div", null);
} }
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
"check": "tsc --noEmit" "check": "tsc --noEmit"
}, },
"dependencies": { "dependencies": {
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.1", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.3",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.1", "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.3",
"anser": "^2.1.1", "anser": "^2.1.1",
"css.escape": "^1.5.1", "css.escape": "^1.5.1",
"next": "*", "next": "*",
......
...@@ -13,7 +13,7 @@ use swc_core::{ ...@@ -13,7 +13,7 @@ use swc_core::{
}; };
use turbo_tasks::{trace::TraceRawVcs, Vc}; use turbo_tasks::{trace::TraceRawVcs, Vc};
use turbopack_binding::{ use turbopack_binding::{
swc::custom_transform::modularize_imports::{modularize_imports, PackageConfig}, swc::custom_transform::modularize_imports::{self, modularize_imports, PackageConfig},
turbopack::{ turbopack::{
ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext}, ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext},
turbopack::module_options::{ModuleRule, ModuleRuleEffect}, turbopack::module_options::{ModuleRule, ModuleRuleEffect},
...@@ -61,7 +61,7 @@ impl ModularizeImportsTransformer { ...@@ -61,7 +61,7 @@ impl ModularizeImportsTransformer {
( (
k.clone(), k.clone(),
PackageConfig { PackageConfig {
transform: v.transform.clone(), transform: modularize_imports::Transform::String(v.transform.clone()),
prevent_full_import: v.prevent_full_import, prevent_full_import: v.prevent_full_import,
skip_default_conversion: v.skip_default_conversion, skip_default_conversion: v.skip_default_conversion,
}, },
......
...@@ -994,8 +994,8 @@ importers: ...@@ -994,8 +994,8 @@ importers:
'@types/react': 18.2.7 '@types/react': 18.2.7
'@types/react-dom': 18.2.4 '@types/react-dom': 18.2.4
'@vercel/ncc': ^0.36.0 '@vercel/ncc': ^0.36.0
'@vercel/turbopack-ecmascript-runtime': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.1 '@vercel/turbopack-ecmascript-runtime': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.3
'@vercel/turbopack-node': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.1 '@vercel/turbopack-node': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.3
anser: ^2.1.1 anser: ^2.1.1
css.escape: ^1.5.1 css.escape: ^1.5.1
find-up: ^6.3.0 find-up: ^6.3.0
...@@ -1007,8 +1007,8 @@ importers: ...@@ -1007,8 +1007,8 @@ importers:
stacktrace-parser: ^0.1.10 stacktrace-parser: ^0.1.10
strip-ansi: ^7.0.1 strip-ansi: ^7.0.1
dependencies: dependencies:
'@vercel/turbopack-ecmascript-runtime': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.1_react-refresh@0.12.0' '@vercel/turbopack-ecmascript-runtime': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.3_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.1' '@vercel/turbopack-node': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.3'
anser: 2.1.1 anser: 2.1.1
css.escape: 1.5.1 css.escape: 1.5.1
next: link:../../../../next next: link:../../../../next
...@@ -25518,9 +25518,9 @@ packages: ...@@ -25518,9 +25518,9 @@ packages:
/zwitch/2.0.4: /zwitch/2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.1_react-refresh@0.12.0': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.3_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.1} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.3}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.1' id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.3'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
...@@ -25531,8 +25531,8 @@ packages: ...@@ -25531,8 +25531,8 @@ packages:
- webpack - webpack
dev: false dev: false
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.1': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.3':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.1} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.3}
name: '@vercel/turbopack-node' name: '@vercel/turbopack-node'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment