Update swc_core to v0.83.12 (#55216)

### What? I made `styled-jsx` configurable. It uses `swc_css` by default, and with `useLigntningcss: true`, it uses it. swc-project/plugins#207 ### Why? ### How? Closes NEXT- Fixes # Closes WEB-1532
vercel · Sep 15, 2023 · ad79325 · ad79325
1 parent 6f2a42a
commit ad79325
Show file tree

Hide file tree

Showing 19 changed files with 638 additions and 328 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,15 +38,18 @@ next-transform-dynamic = { path = "packages/next-swc/crates/next-transform-dynam
 next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-transform-strip-page-exports" }
 
 # SWC crates
-swc_core = { version = "=0.79.55", features = ["ecma_loader_lru", "ecma_loader_parking_lot"] }
-testing = { version = "0.33.21" }
+swc_core = { version = "0.83.12", features = [
+  "ecma_loader_lru",
+  "ecma_loader_parking_lot",
+] }
+testing = { version = "0.34.1" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230914.5" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230915.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-230914.5" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230915.2" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230914.5" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230915.2" }
 
 # General Deps
 

diff --git a/package.json b/package.json
@@ -85,8 +85,8 @@
     "@picocss/pico": "1.5.10",
     "@svgr/webpack": "5.5.0",
     "@swc/cli": "0.1.55",
-    "@swc/core": "1.3.55",
-    "@swc/helpers": "0.5.1",
+    "@swc/core": "1.3.85",
+    "@swc/helpers": "0.5.2",
     "@testing-library/jest-dom": "6.1.2",
     "@testing-library/react": "13.0.0",
     "@types/cheerio": "0.22.16",

diff --git a/packages/next-swc/crates/core/src/lib.rs b/packages/next-swc/crates/core/src/lib.rs
@@ -103,7 +103,7 @@ pub struct TransformOptions {
     pub server_components: Option<react_server_components::Config>,
 
     #[serde(default)]
-    pub styled_jsx: bool,
+    pub styled_jsx: Option<turbopack_binding::swc::custom_transform::styled_jsx::visitor::Config>,
 
     #[serde(default)]
     pub styled_components:
@@ -202,11 +202,12 @@ where
                 )),
             _ => Either::Right(noop()),
         },
-        if opts.styled_jsx {
+        if let Some(config) = opts.styled_jsx {
             Either::Left(
                 turbopack_binding::swc::custom_transform::styled_jsx::visitor::styled_jsx(
                     cm.clone(),
                     file.name.clone(),
+                    config,
                 ),
             )
         } else {

diff --git a/packages/next-swc/crates/core/src/optimize_barrel.rs b/packages/next-swc/crates/core/src/optimize_barrel.rs
@@ -255,7 +255,7 @@ impl Fold for OptimizeBarrel {
                             .into(),
                         raw: None,
                     }),
-                    asserts: None,
+                    with: None,
                     type_only: false,
                 })));
             }

diff --git a/packages/next-swc/crates/core/src/server_actions.rs b/packages/next-swc/crates/core/src/server_actions.rs
@@ -915,7 +915,7 @@ impl<C: Comments> VisitMut for ServerActions<C> {
                         raw: None,
                     }),
                     type_only: false,
-                    asserts: None,
+                    with: None,
                 })));
             }
 
@@ -1001,7 +1001,7 @@ impl<C: Comments> VisitMut for ServerActions<C> {
                         raw: None,
                     }),
                     type_only: false,
-                    asserts: None,
+                    with: None,
                 })));
                 new.push(ModuleItem::Stmt(Stmt::Expr(ExprStmt {
                     span: DUMMY_SP,
@@ -1076,7 +1076,7 @@ impl<C: Comments> VisitMut for ServerActions<C> {
                     raw: None,
                 }),
                 type_only: false,
-                asserts: None,
+                with: None,
             })));
             // Make it the first item
             new.rotate_right(1);

diff --git a/packages/next-swc/crates/core/tests/full.rs b/packages/next-swc/crates/core/tests/full.rs
@@ -67,7 +67,7 @@ fn test(input: &Path, minify: bool) {
                 is_server: false,
                 server_components: None,
                 styled_components: Some(assert_json("{}")),
-                styled_jsx: true,
+                styled_jsx: Some(assert_json("{}")),
                 remove_console: None,
                 react_remove_properties: None,
                 relay: None,

diff --git a/packages/next-swc/crates/core/tests/full/example/output.js b/packages/next-swc/crates/core/tests/full/example/output.js
@@ -35,5 +35,5 @@ import t from "other";
 }())[0];
 export var __N_SSG = !0;
 export default function e() {
-    return React.createElement("div", null);
+    return /*#__PURE__*/ React.createElement("div", null);
 }
diff --git a/packages/next-swc/crates/next-core/js/package.json b/packages/next-swc/crates/next-core/js/package.json
@@ -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-230914.5",
-    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230914.5",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230915.2",
+    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230915.2",
     "anser": "^2.1.1",
     "css.escape": "^1.5.1",
     "next": "*",

diff --git a/...ues/Error during SSR Rendering-8ad1c9.txt → ...ues/Error during SSR Rendering-42d969.txt b/...ues/Error during SSR Rendering-8ad1c9.txt → ...ues/Error during SSR Rendering-42d969.txt
@@ -7,7 +7,7 @@ error - [rendering] [root of the server]/invalid  Error during SSR Rendering
    at defaultLoader (packages/next/dist/shared/lib/image-loader.js:41:27)
         37 |             process.env.NEXT_RUNTIME !== "edge") {
         38 |                 // We use dynamic require because this should only error in development
-        39 |                 const { hasMatch  } = require("./match-remote-pattern");
+        39 |                 const { hasMatch } = require("./match-remote-pattern");
         40 |                 if (!hasMatch(config.domains, config.remotePatterns, parsedSrc)) {
            |                           v
         41 +                     throw new Error("Invalid src prop (" + src + ') on `next/image`, hostname "' + parsedSrc.hostname + '" i...xt.config.js`\n' + "See more info: https://nextjs.org/docs/messages/next-image-unconfigured-host");
@@ -18,7 +18,7 @@ error - [rendering] [root of the server]/invalid  Error during SSR Rendering
         45 |     }
 
    at <unknown> (packages/next/dist/shared/lib/get-img-props.js:101:36)
-        97 |     const { widths , kind  } = getWidths(config, width, sizes);
+        97 |     const { widths, kind } = getWidths(config, width, sizes);
         98 |     const last = widths.length - 1;
         99 |     return {
        100 |         sizes: !sizes && kind === "w" ? "100vw" : sizes,
@@ -31,7 +31,7 @@ error - [rendering] [root of the server]/invalid  Error during SSR Rendering
        105 |                 width: w
 
    at generateImgAttrs (packages/next/dist/shared/lib/get-img-props.js:101:24)
-        97 |     const { widths , kind  } = getWidths(config, width, sizes);
+        97 |     const { widths, kind } = getWidths(config, width, sizes);
         98 |     const last = widths.length - 1;
         99 |     return {
        100 |         sizes: !sizes && kind === "w" ? "100vw" : sizes,
@@ -44,4 +44,4 @@ error - [rendering] [root of the server]/invalid  Error during SSR Rendering
        105 |                 width: w
 
    at getImgProps (packages/next/dist/shared/lib/get-img-props.js:392:27)
-   at <unknown> (packages/next/dist/client/image-component.js:275:82)
+   at <unknown> (packages/next/dist/client/image-component.js:275:80)
diff --git a/packages/next-swc/crates/next-transform-dynamic/src/lib.rs b/packages/next-swc/crates/next-transform-dynamic/src/lib.rs
@@ -480,7 +480,7 @@ impl NextDynamicPatcher {
                         ],
                         src: Box::new(specifier.into()),
                         type_only: false,
-                        asserts: None,
+                        with: None,
                     })));
                 }
                 TurbopackImport::DevelopmentId {
@@ -506,7 +506,7 @@ impl NextDynamicPatcher {
                         })],
                         src: Box::new(specifier.into()),
                         type_only: false,
-                        asserts: None,
+                        with: None,
                     })));
                 }
                 TurbopackImport::BuildTransition {
@@ -535,7 +535,7 @@ impl NextDynamicPatcher {
                         })],
                         src: Box::new(specifier.into()),
                         type_only: false,
-                        asserts: None,
+                        with: None,
                     })));
                 }
                 TurbopackImport::BuildId {
@@ -561,7 +561,7 @@ impl NextDynamicPatcher {
                         })],
                         src: Box::new(specifier.into()),
                         type_only: false,
-                        asserts: None,
+                        with: None,
                     })));
                 }
             }

diff --git a/packages/next-swc/crates/next-transform-font/src/font_imports_generator.rs b/packages/next-swc/crates/next-transform-font/src/font_imports_generator.rs
@@ -75,7 +75,7 @@ impl<'a> FontImportsGenerator<'a> {
                             }),
                             specifiers: vec![],
                             type_only: false,
-                            asserts: None,
+                            with: None,
                             span: DUMMY_SP,
                         });
                     }
@@ -172,7 +172,7 @@ impl<'a> Visit for FontImportsGenerator<'a> {
                                 })],
                                 src: None,
                                 type_only: false,
-                                asserts: None,
+                                with: None,
                             }),
                         ));
                     }

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -91,7 +91,7 @@
   },
   "dependencies": {
     "@next/env": "13.4.20-canary.31",
-    "@swc/helpers": "0.5.1",
+    "@swc/helpers": "0.5.2",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001406",
     "postcss": "8.4.14",
@@ -193,7 +193,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-230914.5",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230915.2",
     "acorn": "8.5.0",
     "ajv": "8.11.0",
     "amphtml-validator": "1.0.35",

diff --git a/packages/next/src/build/swc/options.ts b/packages/next/src/build/swc/options.ts
@@ -86,7 +86,8 @@ function getBaseSWCOptions({
       externalHelpers: !process.versions.pnp && !jest,
       parser: parserConfig,
       experimental: {
-        keepImportAssertions: true,
+        keepImportAttributes: true,
+        emitAssertForImportAttributes: true,
         plugins,
         cacheRoot: swcCacheDir,
       },
@@ -162,7 +163,7 @@ function getBaseSWCOptions({
       : undefined,
     relay: compilerOptions?.relay,
     // Always transform styled-jsx and error when `client-only` condition is triggered
-    styledJsx: true,
+    styledJsx: {},
     // Disable css-in-js libs (without client-only integration) transform on server layer for server components
     ...(!isServerLayer && {
       // eslint-disable-next-line @typescript-eslint/no-use-before-define