Update swc_core to v0.82.11 (#54653)

### What? Update swc crates to 44de87f481 ### Why? To use `import with` and etc... ### How? Closes WEB-1460 Fixes # --- Turbopack counterpart: https://github.com/vercel/turbo/pull/5820 --------- Co-authored-by: Tobias Koppers <tobias.koppers@googlemail.com>
2023-09-01 22:35:04 +09:00 · 2023-09-01 22:35:04 +09:00 · a5c180388a
commit a5c180388a
parent e2584c6fb3
18 changed files with 402 additions and 213 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -42,15 +42,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.70" }
-testing = { version = "0.33.24" }
+swc_core = { version = "0.82.11" }
+testing = { version = "0.34.1" }

 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230829.2" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230901.1" }
 # [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-230829.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230901.1" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230829.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230901.1" }

 # General Deps

--- 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,
                })));
            }
--- 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);
--- 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);
 }
--- a/packages/next-swc/crates/core/tests/loader/css-hygiene-1/output.js
+++ b/packages/next-swc/crates/core/tests/loader/css-hygiene-1/output.js
@ -1,3 +1,3 @@
-var _defaultExport = new String("@media(max-width:870px){th.expiration-date-cell,td.expiration-date-cell{display:none}}");
+var _defaultExport = new String("@media (width<=870px){th.expiration-date-cell,td.expiration-date-cell{display:none}}");
 _defaultExport.__hash = "fd71bf06ba8860bb";
 export default _defaultExport;
--- 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-230829.2",
-    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230829.2",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230901.1",
+    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230901.1",
    "anser": "^2.1.1",
    "css.escape": "^1.5.1",
    "next": "*",
--- a/packages/next-swc/crates/next-font/src/font_imports_generator.rs
+++ b/packages/next-swc/crates/next-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,
                            }),
                        ));
                    }
--- 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,
                    })));
                }
            }
--- 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,
                            }),
                        ));
                    }
--- a/packages/next/package.json
+++ b/packages/next/package.json
@ -192,7 +192,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-230829.2",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230901.1",
    "acorn": "8.5.0",
    "ajv": "8.11.0",
    "amphtml-validator": "1.0.35",
--- a/packages/next/src/compiled/sass-loader/cjs.js
+++ b/packages/next/src/compiled/sass-loader/cjs.js
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -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-230829.2
-        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230829.2(react-refresh@0.12.0)(webpack@5.86.0)'
+        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230901.1
+        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230901.1(react-refresh@0.12.0)(webpack@5.86.0)'
      acorn:
        specifier: 8.5.0
        version: 8.5.0
@ -1326,7 +1326,7 @@ importers:
        version: 0.13.4
      sass-loader:
        specifier: 12.4.0
-        version: 12.4.0(sass@1.54.0)(webpack@5.86.0)
+        version: 12.4.0(webpack@5.86.0)
      schema-utils2:
        specifier: npm:schema-utils@2.7.1
        version: /schema-utils@2.7.1
@ -1524,11 +1524,11 @@ importers:
  packages/next-swc/crates/next-core/js:
    dependencies:
      '@vercel/turbopack-ecmascript-runtime':
-        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230829.2
-        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230829.2(react-refresh@0.12.0)(webpack@5.86.0)'
+        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230901.1
+        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230901.1(react-refresh@0.12.0)(webpack@5.86.0)'
      '@vercel/turbopack-node':
-        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230829.2
-        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230829.2'
+        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230901.1
+        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230901.1'
      anser:
        specifier: ^2.1.1
        version: 2.1.1
@ -23892,7 +23892,7 @@ packages:
  /safer-buffer@2.1.2:
    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}

-  /sass-loader@12.4.0(sass@1.54.0)(webpack@5.86.0):
+  /sass-loader@12.4.0(webpack@5.86.0):
    resolution: {integrity: sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==}
    engines: {node: '>= 12.13.0'}
    peerDependencies:
@ -23910,7 +23910,6 @@ packages:
    dependencies:
      klona: 2.0.4
      neo-async: 2.6.2
-      sass: 1.54.0
      webpack: 5.86.0(@swc/core@1.3.55)
    dev: true

@ -27187,9 +27186,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-230829.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-230829.2}
-    id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230829.2'
+  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230901.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-230901.1}
+    id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230901.1'
    name: '@vercel/turbopack-ecmascript-runtime'
    version: 0.0.0
    dependencies:
@ -27199,8 +27198,8 @@ packages:
      - react-refresh
      - webpack

-  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230829.2':
-    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230829.2}
+  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230901.1':
+    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230901.1}
    name: '@vercel/turbopack-node'
    version: 0.0.0
    dependencies:
--- a/test/e2e/app-dir/rsc-basic/rsc-basic.test.ts
+++ b/test/e2e/app-dir/rsc-basic/rsc-basic.test.ts
@ -327,7 +327,7 @@ createNextDescribe(

      // from styled-jsx
      expect(head).toMatch(/{color:(\s*)purple;?}/) // styled-jsx/style
-      expect(head).toMatch(/{color:(\s*)hotpink;?}/) // styled-jsx/css
+      expect(head).toMatch(/{color:(\s*)#ff69b4;?}/) // styled-jsx/css

      // from styled-components
      expect(head).toMatch(/{color:(\s*)blue;?}/)
@ -339,7 +339,7 @@ createNextDescribe(

      // from styled-jsx
      expect(head).toMatch(/{color:(\s*)purple;?}/) // styled-jsx/style
-      expect(head).toMatch(/{color:(\s*)hotpink;?}/) // styled-jsx/css
+      expect(head).toMatch(/{color:(\s*)#ff69b4;?}/) // styled-jsx/css

      // from styled-components
      expect(head).toMatch(/{color:(\s*)blue;?}/)
--- a/test/e2e/streaming-ssr/index.test.ts
+++ b/test/e2e/streaming-ssr/index.test.ts
@ -32,7 +32,7 @@ describe('streaming SSR with custom next configs', () => {

  it('should render styled-jsx styles in streaming', async () => {
    const html = await renderViaHTTP(next.url, '/')
-    expect(html).toContain('color:blue')
+    expect(html).toContain('color:#00f')
  })

  it('should redirect paths without trailing-slash and render when slash is appended', async () => {
--- a/test/integration/amphtml/test/index.test.js
+++ b/test/integration/amphtml/test/index.test.js
@ -228,7 +228,7 @@ describe('AMP Usage', () => {
        const html = await renderViaHTTP(appPort, '/styled?amp=1')
        const $ = cheerio.load(html)
        expect($('style[amp-custom]').first().text()).toMatch(
-          /div.jsx-[a-zA-Z0-9]{1,}{color:red}span.jsx-[a-zA-Z0-9]{1,}{color:blue}body{background-color:green}/
+          /div.jsx-[a-zA-Z0-9]{1,}{color:red}span.jsx-[a-zA-Z0-9]{1,}{color:#00f}body{background-color:green}/
        )
      })

--- a/test/integration/client-navigation/test/rendering.js
+++ b/test/integration/client-navigation/test/rendering.js
@ -228,7 +228,7 @@ export default function (render, fetch, ctx) {
      const styleId = $('#blue-box').attr('class')
      const style = $('style')

-      expect(style.text().includes(`p.${styleId}{color:blue`)).toBeTruthy()
+      expect(style.text().includes(`p.${styleId}{color:#00f`)).toBeTruthy()
    })

    test('renders styled jsx external', async () => {
@ -236,7 +236,7 @@ export default function (render, fetch, ctx) {
      const styleId = $('#blue-box').attr('class')
      const style = $('style')

-      expect(style.text().includes(`p.${styleId}{color:blue`)).toBeTruthy()
+      expect(style.text().includes(`p.${styleId}{color:#00f`)).toBeTruthy()
    })

    test('renders properties populated asynchronously', async () => {
--- a/test/integration/react-18/test/concurrent.js
+++ b/test/integration/react-18/test/concurrent.js
@ -21,13 +21,13 @@ export default (context, _render) => {
      context.appPort,
      '/use-flush-effect/styled-jsx'
    )
-    const stylesOccurrence = html.match(/color:(\s)*blue/g) || []
+    const stylesOccurrence = html.match(/color:(\s)*#00f/g) || []
    expect(stylesOccurrence.length).toBe(1)

    await withBrowser('/use-flush-effect/styled-jsx', async (browser) => {
      await check(
        () => browser.waitForElementByCss('#__jsx-900f996af369fc74').text(),
-        /blue/
+        /#00f/
      )
      await check(
        () => browser.waitForElementByCss('#__jsx-8b0811664c4e575e').text(),