Skip to content

Commit

Permalink
Update swc_core to v0.79.22 (#52945)
Browse files Browse the repository at this point in the history
### 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: vercel/turbo#5575

Co-authored-by: Tobias Koppers <1365881+sokra@users.noreply.github.com>
  • Loading branch information
kdy1 and sokra committed Jul 21, 2023
1 parent e887772 commit 84820c9
Show file tree
Hide file tree
Showing 9 changed files with 211 additions and 211 deletions.
274 changes: 137 additions & 137 deletions Cargo.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,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.79.13" }
testing = { version = "0.33.20" }
swc_core = { version = "0.79.22" }
testing = { version = "0.33.21" }

# 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..
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
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

Expand Down
30 changes: 17 additions & 13 deletions packages/next-swc/crates/core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,17 @@ use either::Either;
use fxhash::FxHashSet;
use next_transform_font::next_font_loaders;
use serde::Deserialize;
use turbopack_binding::swc::core::{
common::{
chain, comments::Comments, pass::Optional, FileName, Mark, SourceFile, SourceMap,
SyntaxContext,
},
ecma::{
ast::EsVersion, parser::parse_file_as_module, transforms::base::pass::noop, visit::Fold,
use turbopack_binding::swc::{
core::{
common::{
chain, comments::Comments, pass::Optional, FileName, Mark, SourceFile, SourceMap,
SyntaxContext,
},
ecma::{
ast::EsVersion, parser::parse_file_as_module, transforms::base::pass::noop, visit::Fold,
},
},
custom_transform::modularize_imports,
};

pub mod amp_attributes;
Expand Down Expand Up @@ -123,8 +126,7 @@ pub struct TransformOptions {
pub emotion: Option<turbopack_binding::swc::custom_transform::emotion::EmotionOptions>,

#[serde(default)]
pub modularize_imports:
Option<turbopack_binding::swc::custom_transform::modularize_imports::Config>,
pub modularize_imports: Option<modularize_imports::Config>,

#[serde(default)]
pub font_loaders: Option<next_transform_font::Config>,
Expand Down Expand Up @@ -167,14 +169,16 @@ where

let mut modularize_imports_config = match &opts.modularize_imports {
Some(config) => config.clone(),
None => turbopack_binding::swc::custom_transform::modularize_imports::Config {
None => modularize_imports::Config {
packages: std::collections::HashMap::new(),
},
};
modularize_imports_config.packages.insert(
"next/server".to_string(),
turbopack_binding::swc::custom_transform::modularize_imports::PackageConfig {
transform: "next/dist/server/web/exports/{{ kebabCase member }}".to_string(),
modularize_imports::PackageConfig {
transform: modularize_imports::Transform::String(
"next/dist/server/web/exports/{{ kebabCase member }}".to_string(),
),
prevent_full_import: false,
skip_default_conversion: false,
},
Expand Down Expand Up @@ -272,7 +276,7 @@ where
}
})
.unwrap_or_else(|| Either::Right(noop())),
turbopack_binding::swc::custom_transform::modularize_imports::modularize_imports(
modularize_imports::modularize_imports(
modularize_imports_config
),
match &opts.font_loaders {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ import f, { f1, f2 } from 'foo';
const f3 = 1;
var f4;
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) {
const g191 = 1;
}
function x() {
const f2 = 1;
const f21 = 1;
const g201 = 1;
}
export function y(p, [p1, { p2 }], ...p3) {
const f2 = 1;
export function y(p, [p1, { p2 }], ...p3) {
const f21 = 1;
const f11 = 1;
const f19 = 1;
if (true) {
Expand All @@ -22,7 +22,7 @@ export function y(p, [p1, { p2 }], ...p3) {
return $$ACTION_0.apply(null, (action.$$bound || []).concat(args));
}
__create_action_proxy__("6d53ce510b2e36499b8f56038817b9bad86cabb4", [
f2,
f21,
f11,
p,
p1,
Expand Down
10 changes: 4 additions & 6 deletions packages/next-swc/crates/core/tests/full/auto-cjs/1/output.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
Object.defineProperty(exports, "__esModule", {
value: !0
});
var e = function(e) {
return e && e.__esModule ? e : {
default: e
};
}(require("esm"));
console.log(e.default.foo), module.exports = e.default;
var e, o = (e = require("esm")) && e.__esModule ? e : {
default: e
};
console.log(o.default.foo), module.exports = o.default;
62 changes: 30 additions & 32 deletions packages/next-swc/crates/core/tests/full/example/output.js
Original file line number Diff line number Diff line change
@@ -1,41 +1,39 @@
function r(r, t) {
(null == t || t > r.length) && (t = r.length);
for(var n = 0, e = Array(t); n < t; n++)e[n] = r[n];
return e;
function r(r, e) {
(null == e || e > r.length) && (e = r.length);
for(var n = 0, o = Array(e); n < e; n++)o[n] = r[n];
return o;
}
import t from "other";
(function(t, n) {
return function(r) {
if (Array.isArray(r)) return r;
}(t) || function(r, t) {
var n, e, o = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
if (null != o) {
var a = [], l = !0, u = !1;
((function(r) {
if (Array.isArray(r)) return r;
})(t) || function(r, e) {
var n, o, a = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
if (null != a) {
var l = [], u = !0, i = !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 {
for(o = o.call(r); !(l = (n = o.next()).done) && (a.push(n.value), !t || a.length !== t); l = !0);
} catch (r) {
u = !0, e = r;
u || null == a.return || a.return();
} finally{
try {
l || null == o.return || o.return();
} finally{
if (u) throw e;
}
if (i) throw o;
}
return a;
}
}(t, n) || function(t, n) {
if (t) {
if ("string" == typeof t) return r(t, n);
var e = Object.prototype.toString.call(t).slice(8, -1);
if ("Object" === e && t.constructor && (e = t.constructor.name), "Map" === e || "Set" === e) return Array.from(e);
if ("Arguments" === e || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e)) return r(t, n);
}
}(t, n) || function() {
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)[0];
return l;
}
}(t, 1) || function(e, n) {
if (e) {
if ("string" == typeof e) return r(e, 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);
if ("Arguments" === o || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(o)) return r(e, n);
}
}(t, 1) || function() {
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 default function n() {
export default function e() {
return React.createElement("div", null);
}
4 changes: 2 additions & 2 deletions packages/next-swc/crates/next-core/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"check": "tsc --noEmit"
},
"dependencies": {
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.1",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/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.3",
"anser": "^2.1.1",
"css.escape": "^1.5.1",
"next": "*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use swc_core::{
};
use turbo_tasks::{trace::TraceRawVcs, Vc};
use turbopack_binding::{
swc::custom_transform::modularize_imports::{modularize_imports, PackageConfig},
swc::custom_transform::modularize_imports::{self, modularize_imports, PackageConfig},
turbopack::{
ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext},
turbopack::module_options::{ModuleRule, ModuleRuleEffect},
Expand Down Expand Up @@ -61,7 +61,7 @@ impl ModularizeImportsTransformer {
(
k.clone(),
PackageConfig {
transform: v.transform.clone(),
transform: modularize_imports::Transform::String(v.transform.clone()),
prevent_full_import: v.prevent_full_import,
skip_default_conversion: v.skip_default_conversion,
},
Expand Down
18 changes: 9 additions & 9 deletions pnpm-lock.yaml

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

0 comments on commit 84820c9

Please sign in to comment.