feat(next-swc): Update swc crates (#35395)

* Update crates * fixup * fix type * Update test refs * Update css crates * Update test refs * Update test refs * Update test refs * SourceMap * Fix? * Update crates * Fix * Update test refs * Update test refs * Update error reporter * Update snapshots * Update snapshots * Bug? * Fix * Fix lint * Update swc again * fixup * Update test refs * Fix Co-authored-by: Maia Teegarden <dev@padmaia.rocks>
vercel · Mar 30, 2022 · fdfa3c7 · fdfa3c7
1 parent 9f9214a
commit fdfa3c7
Show file tree

Hide file tree

Showing 117 changed files with 1,119 additions and 997 deletions.
diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock
diff --git a/packages/next-swc/Cargo.toml b/packages/next-swc/Cargo.toml
@@ -6,5 +6,8 @@ members = [
   "crates/wasm"
 ]
 
+[profile.dev.package.swc_css_prefixer]
+opt-level = 2
+
 [profile.release]
 lto = true
diff --git a/packages/next-swc/crates/core/Cargo.toml b/packages/next-swc/crates/core/Cargo.toml
@@ -19,20 +19,20 @@ radix_fmt = "1"
 regex = "1.5"
 serde = "1"
 serde_json = "1"
-styled_components = "0.19.0"
-swc = "0.150.1"
-swc_atoms = "0.2.9"
-swc_common = {version = "0.17.15", features = ["concurrent", "sourcemap"]}
-swc_css = "0.100.0"
-swc_ecma_loader = {version = "0.29.0", features = ["node", "lru"]}
-swc_ecmascript = {version = "0.132.0", features = ["codegen", "minifier", "optimization", "parser", "react", "transforms", "typescript", "utils", "visit"]}
+styled_components = "0.23.0"
+swc = "0.161.1"
+swc_atoms = "0.2.11"
+swc_common = { version = "0.17.18", features = ["concurrent", "sourcemap"] }
+swc_css = "0.103.0"
+swc_ecma_loader = { version = "0.29.0", features = ["node", "lru"] }
+swc_ecmascript = { version = "0.140.0", features = ["codegen", "minifier", "optimization", "parser", "react", "transforms", "typescript", "utils", "visit"] }
 swc_node_base = "0.5.1"
-swc_stylis = "0.96.1"
 swc_cached = "0.1.1"
+swc_css_prefixer = "0.99.3"
 tracing = {version = "0.1.28", features = ["release_max_level_off"]}
 handlebars = "4.2.1"
 
 [dev-dependencies]
-swc_ecma_transforms_testing = "0.69.0"
-testing = "0.18.1"
+swc_ecma_transforms_testing = "0.75.0"
+testing = "0.19.1"
 walkdir = "2.3.2"
diff --git a/packages/next-swc/crates/core/src/emotion/mod.rs b/packages/next-swc/crates/core/src/emotion/mod.rs
@@ -307,8 +307,7 @@ impl<C: Comments> EmotionTransformer<C> {
             if index % 2 == 0 {
                 if let Some(q) = tagged_tpl.quasis.get_mut(i) {
                     let q = q.take();
-                    let minified =
-                        minify_css_string(&q.raw.value, index == 0, index == args_len - 1);
+                    let minified = minify_css_string(&q.raw, index == 0, index == args_len - 1);
                     // Compress one more spaces into one space
                     if minified.replace(' ', "").is_empty() {
                         if index != 0 && index != args_len - 1 {

diff --git a/packages/next-swc/crates/core/src/next_dynamic.rs b/packages/next-swc/crates/core/src/next_dynamic.rs
@@ -6,7 +6,7 @@ use swc_common::{FileName, DUMMY_SP};
 use swc_ecmascript::ast::{
     ArrayLit, ArrowExpr, BinExpr, BinaryOp, BlockStmtOrExpr, Bool, CallExpr, Callee, Expr,
     ExprOrSpread, Ident, ImportDecl, ImportSpecifier, KeyValueProp, Lit, MemberExpr, MemberProp,
-    Null, ObjectLit, Prop, PropName, PropOrSpread, Str, StrKind,
+    Null, ObjectLit, Prop, PropName, PropOrSpread, Str,
 };
 use swc_ecmascript::utils::ExprFactory;
 use swc_ecmascript::utils::{
@@ -148,8 +148,7 @@ impl Fold for NextDynamicPatcher {
                                                 )
                                                 .into(),
                                                 span: DUMMY_SP,
-                                                kind: StrKind::Synthesized {},
-                                                has_escape: false,
+                                                raw: None,
                                             }))),
                                             right: Box::new(Expr::Lit(Lit::Str(Str {
                                                 value: self
@@ -159,10 +158,7 @@ impl Fold for NextDynamicPatcher {
                                                     .clone()
                                                     .into(),
                                                 span: DUMMY_SP,
-                                                kind: StrKind::Normal {
-                                                    contains_quote: false,
-                                                },
-                                                has_escape: false,
+                                                raw: None,
                                             }))),
                                         })),
                                         spread: None,
@@ -202,8 +198,7 @@ impl Fold for NextDynamicPatcher {
                                                             .clone()
                                                             .into(),
                                                         span: DUMMY_SP,
-                                                        kind: StrKind::Synthesized {},
-                                                        has_escape: false,
+                                                        raw: None,
                                                     }))),
                                                     spread: None,
                                                 }],

diff --git a/packages/next-swc/crates/core/src/page_config.rs b/packages/next-swc/crates/core/src/page_config.rs
@@ -54,8 +54,7 @@ impl Fold for PageConfig {
                         init: Some(Box::new(Expr::Lit(Lit::Str(Str {
                             value: format!("{} {}", STRING_LITERAL_DROP_BUNDLE, timestamp).into(),
                             span: DUMMY_SP,
-                            kind: StrKind::Synthesized {},
-                            has_escape: false,
+                            raw: None,
                         })))),
                         span: DUMMY_SP,
                         definite: false,

diff --git a/packages/next-swc/crates/core/src/relay.rs b/packages/next-swc/crates/core/src/relay.rs
@@ -43,7 +43,7 @@ fn pull_first_operation_name_from_tpl(tpl: &TaggedTpl) -> Option<String> {
         static OPERATION_REGEX: Lazy<Regex> =
             Lazy::new(|| Regex::new(r"(fragment|mutation|query|subscription) (\w+)").unwrap());
 
-        let capture_group = OPERATION_REGEX.captures_iter(&quasis.raw.value).next();
+        let capture_group = OPERATION_REGEX.captures_iter(&quasis.raw).next();
 
         capture_group.map(|capture_group| capture_group[2].to_string())
     })
@@ -56,8 +56,7 @@ fn build_require_expr_from_path(path: &str) -> Expr {
         args: vec![Lit::Str(Str {
             span: Default::default(),
             value: JsWord::from(path),
-            has_escape: false,
-            kind: Default::default(),
+            raw: None,
         })
         .as_arg()],
         type_args: None,

diff --git a/packages/next-swc/crates/core/src/styled_jsx/mod.rs b/packages/next-swc/crates/core/src/styled_jsx/mod.rs
@@ -475,8 +475,8 @@ impl StyledJSXTransformer {
                 expr,
             ) => {
                 if exprs.is_empty() {
-                    hasher.write(quasis[0].raw.value.as_bytes());
-                    css = quasis[0].raw.value.to_string();
+                    hasher.write(quasis[0].raw.as_bytes());
+                    css = quasis[0].raw.to_string();
                     css_span = *span;
                     is_dynamic = false;
                 } else {
@@ -488,7 +488,7 @@ impl StyledJSXTransformer {
                         } else {
                             format!("__styled-jsx-placeholder-{}__", i)
                         };
-                        s = format!("{}{}{}", s, quasis[i].raw.value, placeholder)
+                        s = format!("{}{}{}", s, quasis[i].raw, placeholder)
                     }
                     css = s;
                     css_span = *span;

diff --git a/packages/next-swc/crates/core/src/styled_jsx/transform_css.rs b/packages/next-swc/crates/core/src/styled_jsx/transform_css.rs
@@ -12,10 +12,10 @@ use swc_css::codegen::{
 use swc_css::parser::parser::input::ParserInput;
 use swc_css::parser::{parse_str, parse_tokens, parser::ParserConfig};
 use swc_css::visit::{VisitMut, VisitMutWith};
-use swc_ecmascript::ast::{Expr, Str, StrKind, Tpl, TplElement};
+use swc_css_prefixer::prefixer;
+use swc_ecmascript::ast::{Expr, Tpl, TplElement};
 use swc_ecmascript::parser::StringInput;
 use swc_ecmascript::utils::HANDLER;
-use swc_stylis::prefixer::prefixer;
 use tracing::{debug, trace};
 
 use super::{hash_string, string_literal_expr, LocalStyle};
@@ -97,12 +97,7 @@ pub fn transform_css(
             .map(|quasi| {
                 TplElement {
                     cooked: None, // ? Do we need cooked as well
-                    raw: Str {
-                        value: (*quasi).into(),
-                        span: DUMMY_SP,
-                        has_escape: false,
-                        kind: StrKind::Synthesized {},
-                    },
+                    raw: quasi.replace('`', "\\`").into(),
                     span: DUMMY_SP,
                     tail: false,
                 }

diff --git a/packages/next-swc/crates/core/src/styled_jsx/utils.rs b/packages/next-swc/crates/core/src/styled_jsx/utils.rs
@@ -7,12 +7,7 @@ use super::{ExternalStyle, JSXStyle, LocalStyle};
 
 fn tpl_element(value: &str) -> TplElement {
     TplElement {
-        raw: Str {
-            value: value.into(),
-            span: DUMMY_SP,
-            kind: StrKind::Synthesized,
-            has_escape: false,
-        },
+        raw: value.into(),
         cooked: None,
         span: DUMMY_SP,
         tail: false,
@@ -314,10 +309,9 @@ pub fn styled_jsx_import_decl(style_import_name: &str) -> ModuleItem {
             span: DUMMY_SP,
         })],
         src: Str {
-            has_escape: false,
-            kind: StrKind::Synthesized {},
             span: DUMMY_SP,
             value: "styled-jsx/style".into(),
+            raw: None,
         },
     }))
 }
@@ -335,8 +329,7 @@ pub fn string_literal_expr(str: &str) -> Expr {
     Expr::Lit(Lit::Str(Str {
         value: str.into(),
         span: DUMMY_SP,
-        has_escape: false,
-        kind: StrKind::Synthesized {},
+        raw: None,
     }))
 }
 

diff --git a/packages/next-swc/crates/core/tests/errors/next-dynamic/no-arguments/output.stderr b/packages/next-swc/crates/core/tests/errors/next-dynamic/no-arguments/output.stderr
@@ -1,6 +1,6 @@
-error: next/dynamic requires at least one argument
- --> input.js:3:26
-  |
-3 | const DynamicComponent = dynamic()
-  |                          ^^^^^^^
 
+  x next/dynamic requires at least one argument
+   ,-[input.js:3:1]
+ 3 | const DynamicComponent = dynamic()
+   :                          ^^^^^^^
+   `----
diff --git a/packages/next-swc/crates/core/tests/errors/next-dynamic/options-as-variable/output.stderr b/packages/next-swc/crates/core/tests/errors/next-dynamic/options-as-variable/output.stderr
@@ -1,7 +1,7 @@
-error: next/dynamic options must be an object literal.
-Read more: https://nextjs.org/docs/messages/invalid-dynamic-options-type
- --> input.js:4:43
-  |
-4 | const DynamicComponentWithCustomLoading = dynamic(
-  |                                           ^^^^^^^
 
+  x next/dynamic options must be an object literal.
+  | Read more: https://nextjs.org/docs/messages/invalid-dynamic-options-type
+   ,-[input.js:4:1]
+ 4 | const DynamicComponentWithCustomLoading = dynamic(
+   :                                           ^^^^^^^
+   `----
diff --git a/packages/next-swc/crates/core/tests/errors/next-dynamic/too-many-arguments/output.stderr b/packages/next-swc/crates/core/tests/errors/next-dynamic/too-many-arguments/output.stderr
@@ -1,6 +1,6 @@
-error: next/dynamic only accepts 2 arguments
- --> input.js:3:43
-  |
-3 | const DynamicComponentWithCustomLoading = dynamic(
-  |                                           ^^^^^^^
 
+  x next/dynamic only accepts 2 arguments
+   ,-[input.js:3:1]
+ 3 | const DynamicComponentWithCustomLoading = dynamic(
+   :                                           ^^^^^^^
+   `----
diff --git a/...s/next-swc/crates/core/tests/errors/next-ssg/server-side-after-static-paths/output.stderr b/...s/next-swc/crates/core/tests/errors/next-ssg/server-side-after-static-paths/output.stderr
@@ -1,6 +1,6 @@
-error: You can not use getStaticProps or getStaticPaths with getServerSideProps. To use SSG, please remove getServerSideProps
- --> input.js:2:14
-  |
-2 | export const getServerSideProps = function getServerSideProps() {}
-  |              ^^^^^^^^^^^^^^^^^^
 
+  x You can not use getStaticProps or getStaticPaths with getServerSideProps. To use SSG, please remove getServerSideProps
+   ,-[input.js:2:1]
+ 2 | export const getServerSideProps = function getServerSideProps() {}
+   :              ^^^^^^^^^^^^^^^^^^
+   `----
diff --git a/...s/next-swc/crates/core/tests/errors/next-ssg/server-side-after-static-props/output.stderr b/...s/next-swc/crates/core/tests/errors/next-ssg/server-side-after-static-props/output.stderr
@@ -1,6 +1,6 @@
-error: You can not use getStaticProps or getStaticPaths with getServerSideProps. To use SSG, please remove getServerSideProps
- --> input.js:2:15
-  |
-2 | export { a as getServerSideProps } 
-  |               ^^^^^^^^^^^^^^^^^^
 
+  x You can not use getStaticProps or getStaticPaths with getServerSideProps. To use SSG, please remove getServerSideProps
+   ,-[input.js:2:1]
+ 2 | export { a as getServerSideProps }
+   :               ^^^^^^^^^^^^^^^^^^
+   `----
diff --git a/...s/next-swc/crates/core/tests/errors/next-ssg/static-paths-after-server-side/output.stderr b/...s/next-swc/crates/core/tests/errors/next-ssg/static-paths-after-server-side/output.stderr
@@ -1,6 +1,6 @@
-error: You can not use getStaticProps or getStaticPaths with getServerSideProps. To use SSG, please remove getServerSideProps
- --> input.js:2:10
-  |
-2 | export { getStaticPaths } from 'a'
-  |          ^^^^^^^^^^^^^^
 
+  x You can not use getStaticProps or getStaticPaths with getServerSideProps. To use SSG, please remove getServerSideProps
+   ,-[input.js:2:1]
+ 2 | export { getStaticPaths } from 'a'
+   :          ^^^^^^^^^^^^^^
+   `----
diff --git a/...s/next-swc/crates/core/tests/errors/next-ssg/static-props-after-server-side/output.stderr b/...s/next-swc/crates/core/tests/errors/next-ssg/static-props-after-server-side/output.stderr
@@ -1,6 +1,6 @@
-error: You can not use getStaticProps or getStaticPaths with getServerSideProps. To use SSG, please remove getServerSideProps
- --> input.js:1:26
-  |
-1 | export { getStaticProps, getServerSideProps }
-  |                          ^^^^^^^^^^^^^^^^^^
 
+  x You can not use getStaticProps or getStaticPaths with getServerSideProps. To use SSG, please remove getServerSideProps
+   ,-[input.js:1:1]
+ 1 | export { getStaticProps, getServerSideProps }
+   :                          ^^^^^^^^^^^^^^^^^^
+   `----
diff --git a/packages/next-swc/crates/core/tests/errors/re-export-all-in-page/re-export-all/output.stderr b/packages/next-swc/crates/core/tests/errors/re-export-all-in-page/re-export-all/output.stderr
@@ -1,7 +1,7 @@
-error: Using `export * from '...'` in a page is disallowed. Please use `export { default } from '...'` instead.
-Read more: https://nextjs.org/docs/messages/export-all-in-page
- --> input.js:1:1
-  |
-1 | export * from './other-page'
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+  x Using `export * from '...'` in a page is disallowed. Please use `export { default } from '...'` instead.
+  | Read more: https://nextjs.org/docs/messages/export-all-in-page
+   ,-[input.js:1:1]
+ 1 | export * from './other-page'
+   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   `----
diff --git a/packages/next-swc/crates/core/tests/errors/re-export-all-in-page/re-export-default/output.js b/packages/next-swc/crates/core/tests/errors/re-export-all-in-page/re-export-default/output.js
@@ -1 +1 @@
-export { default, getStaticProps, getStaticPaths } from "./other-page";
+export { default, getStaticProps, getStaticPaths } from './other-page';
diff --git a/packages/next-swc/crates/core/tests/errors/styled-jsx/no-child/output.stderr b/packages/next-swc/crates/core/tests/errors/styled-jsx/no-child/output.stderr
@@ -1,8 +1,7 @@
-error: Expected one child under JSX style tag, but got 0.
-Read more: https://nextjs.org/docs/messages/invalid-styled-jsx-children
- --> input.js:3:5
-  |
-3 | /     <style jsx>
-4 | |     </style>
-  | |____________^
 
+  x Expected one child under JSX style tag, but got 0.
+  | Read more: https://nextjs.org/docs/messages/invalid-styled-jsx-children
+   ,-[input.js:3:5]
+ 3 | ,-> <style jsx>
+ 4 | `->     </style>
+   `----
diff --git a/packages/next-swc/crates/core/tests/errors/styled-jsx/ts-with-css-resolve/output.stderr b/packages/next-swc/crates/core/tests/errors/styled-jsx/ts-with-css-resolve/output.stderr
@@ -1,2 +1,2 @@
-error: /some-project/src/some-file.ts uses `css.resolve`, but ends with `.ts`. The file extension needs to be `.tsx` so that the jsx injected by `css.resolve` will be transformed.
 
+  x /some-project/src/some-file.ts uses `css.resolve`, but ends with `.ts`. The file extension needs to be `.tsx` so that the jsx injected by `css.resolve` will be transformed.
diff --git a/packages/next-swc/crates/core/tests/errors/styled-jsx/two-children/output.stderr b/packages/next-swc/crates/core/tests/errors/styled-jsx/two-children/output.stderr
@@ -1,10 +1,9 @@
-error: Expected one child under JSX style tag, but got 2.
-Read more: https://nextjs.org/docs/messages/invalid-styled-jsx-children
- --> input.js:3:5
-  |
-3 | /     <style jsx>
-4 | |       {`.p {}`}
-5 | |       {`.p {}`}
-6 | |     </style>
-  | |____________^
 
+  x Expected one child under JSX style tag, but got 2.
+  | Read more: https://nextjs.org/docs/messages/invalid-styled-jsx-children
+   ,-[input.js:3:5]
+ 3 | ,-> <style jsx>
+ 4 | |         {`.p {}`}
+ 5 | |         {`.p {}`}
+ 6 | `->     </style>
+   `----
diff --git a/packages/next-swc/crates/core/tests/errors/styled-jsx/wrong-child-type/output.stderr b/packages/next-swc/crates/core/tests/errors/styled-jsx/wrong-child-type/output.stderr
@@ -1,9 +1,8 @@
-error: Expected a single child of type JSXExpressionContainer under JSX Style tag.
-Read more: https://nextjs.org/docs/messages/invalid-styled-jsx-children
- --> input.js:3:5
-  |
-3 | /     <style jsx>
-4 | |       10
-5 | |     </style>
-  | |____________^
 
+  x Expected a single child of type JSXExpressionContainer under JSX Style tag.
+  | Read more: https://nextjs.org/docs/messages/invalid-styled-jsx-children
+   ,-[input.js:3:5]
+ 3 | ,-> <style jsx>
+ 4 | |         10
+ 5 | `->     </style>
+   `----
diff --git a/...ages/next-swc/crates/core/tests/errors/styled-jsx/wrong-jsx-expression-type/output.stderr b/...ages/next-swc/crates/core/tests/errors/styled-jsx/wrong-jsx-expression-type/output.stderr
@@ -1,9 +1,8 @@
-error: Expected a template literal, string or identifier inside the JSXExpressionContainer.
-Read more: https://nextjs.org/docs/messages/invalid-styled-jsx-children
- --> input.js:3:5
-  |
-3 | /     <style jsx>
-4 | |       {[]}
-5 | |     </style>
-  | |____________^
 
+  x Expected a template literal, string or identifier inside the JSXExpressionContainer.
+  | Read more: https://nextjs.org/docs/messages/invalid-styled-jsx-children
+   ,-[input.js:3:5]
+ 3 | ,-> <style jsx>
+ 4 | |         {[]}
+ 5 | `->     </style>
+   `----