Merge branch 'canary' into refactor/types

vercel · Sep 21, 2021 · f4683bb · f4683bb
2 parents 93303bd + 0976a04
commit f4683bb
Show file tree

Hide file tree

Showing 65 changed files with 3,378 additions and 2,420 deletions.
diff --git a/package.json b/package.json
@@ -151,8 +151,6 @@
     "seedrandom": "3.0.5",
     "selenium-webdriver": "4.0.0-beta.4",
     "shell-quote": "1.7.2",
-    "sqlite": "4.0.22",
-    "sqlite3": "5.0.2",
     "styled-jsx-plugin-postcss": "3.0.2",
     "tailwindcss": "1.1.3",
     "taskr": "1.1.0",

diff --git a/packages/next/build/swc/src/styled_jsx/utils.rs b/packages/next/build/swc/src/styled_jsx/utils.rs
@@ -29,12 +29,12 @@ pub fn compute_class_names(
   let mut dynamic_styles = vec![];
   let mut external_styles = vec![];
   for style_info in styles {
-    match &style_info {
+    match style_info {
       JSXStyle::Local(style_info) => {
         if !style_info.is_dynamic {
           static_hashes.push(style_info.hash.clone());
         } else {
-          dynamic_styles.push(style_info.clone());
+          dynamic_styles.push(style_info);
         }
       }
       JSXStyle::External(external) => {
@@ -82,43 +82,49 @@ pub fn compute_class_names(
         span: DUMMY_SP,
         computed: false,
       }))),
-      args: dynamic_styles
-        .iter()
-        .map(|style_info| {
-          let hash_input = match &static_class_name {
-            Some(class_name) => format!("{}{}", style_info.hash, class_name),
-            None => style_info.hash.clone(),
-          };
-          ExprOrSpread {
-            expr: Box::new(Expr::Array(ArrayLit {
-              elems: vec![
-                Some(ExprOrSpread {
-                  expr: Box::new(string_literal_expr(&hash_string(&hash_input))),
-                  spread: None,
-                }),
-                Some(ExprOrSpread {
-                  expr: Box::new(Expr::Array(ArrayLit {
-                    elems: style_info
-                      .expressions
-                      .iter()
-                      .map(|expression| {
-                        Some(ExprOrSpread {
-                          expr: expression.clone(),
-                          spread: None,
-                        })
-                      })
-                      .collect(),
-                    span: DUMMY_SP,
-                  })),
-                  spread: None,
-                }),
-              ],
-              span: DUMMY_SP,
-            })),
-            spread: None,
-          }
-        })
-        .collect(),
+      args: vec![ExprOrSpread {
+        expr: Box::new(Expr::Array(ArrayLit {
+          elems: dynamic_styles
+            .iter()
+            .map(|style_info| {
+              let hash_input = match &static_class_name {
+                Some(class_name) => format!("{}{}", style_info.hash, class_name),
+                None => style_info.hash.clone(),
+              };
+              Some(ExprOrSpread {
+                expr: Box::new(Expr::Array(ArrayLit {
+                  elems: vec![
+                    Some(ExprOrSpread {
+                      expr: Box::new(string_literal_expr(&hash_string(&hash_input))),
+                      spread: None,
+                    }),
+                    Some(ExprOrSpread {
+                      expr: Box::new(Expr::Array(ArrayLit {
+                        elems: style_info
+                          .expressions
+                          .iter()
+                          .map(|expression| {
+                            Some(ExprOrSpread {
+                              expr: expression.clone(),
+                              spread: None,
+                            })
+                          })
+                          .collect(),
+                        span: DUMMY_SP,
+                      })),
+                      spread: None,
+                    }),
+                  ],
+                  span: DUMMY_SP,
+                })),
+                spread: None,
+              })
+            })
+            .collect(),
+          span: DUMMY_SP,
+        })),
+        spread: None,
+      }],
       span: DUMMY_SP,
       type_args: None,
     })),

diff --git a/packages/next/build/swc/tests/fixture/styled-jsx/attribute-generation-modes/output.js b/packages/next/build/swc/tests/fixture/styled-jsx/attribute-generation-modes/output.js
@@ -14,15 +14,19 @@ export const Test2 = ()=><div className={"jsx-81a68341e430a972 " + `jsx-${styles
   </div>
 ;
 export const Test3 = ({ color  })=><div className={`jsx-${styles.__hash}` + " " + _JSXStyle.dynamic([
-        "26b457d3bc475235",
         [
-            color
+            "26b457d3bc475235",
+            [
+                color
+            ]
         ]
     ])}>
     <p className={`jsx-${styles.__hash}` + " " + _JSXStyle.dynamic([
-        "26b457d3bc475235",
         [
-            color
+            "26b457d3bc475235",
+            [
+                color
+            ]
         ]
     ])}>external and dynamic</p>
     <_JSXStyle id={"26b457d3bc475235"} dynamic={[
@@ -32,15 +36,19 @@ export const Test3 = ({ color  })=><div className={`jsx-${styles.__hash}` + " "
   </div>
 ;
 export const Test4 = ({ color  })=><div className={`jsx-${styles.__hash}` + " jsx-ceba8c9ce34e3d0c " + _JSXStyle.dynamic([
-        "e6cca97eb9ca1a15",
         [
-            color
+            "e6cca97eb9ca1a15",
+            [
+                color
+            ]
         ]
     ])}>
     <p className={`jsx-${styles.__hash}` + " jsx-ceba8c9ce34e3d0c " + _JSXStyle.dynamic([
-        "e6cca97eb9ca1a15",
         [
-            color
+            "e6cca97eb9ca1a15",
+            [
+                color
+            ]
         ]
     ])}>external, static and dynamic</p>
     <_JSXStyle id={"ceba8c9ce34e3d0c"}>{"p.jsx-ceba8c9ce34e3d0c {display:inline-block}"}</_JSXStyle>
@@ -57,15 +65,19 @@ export const Test5 = ()=><div className={"jsx-df0159ebd3f9fb6f"}>
   </div>
 ;
 export const Test6 = ({ color  })=><div className={"jsx-ceba8c9ce34e3d0c " + _JSXStyle.dynamic([
-        "a55f0611581d64ca",
         [
-            color
+            "a55f0611581d64ca",
+            [
+                color
+            ]
         ]
     ])}>
     <p className={"jsx-ceba8c9ce34e3d0c " + _JSXStyle.dynamic([
-        "a55f0611581d64ca",
         [
-            color
+            "a55f0611581d64ca",
+            [
+                color
+            ]
         ]
     ])}>static and dynamic</p>
     <_JSXStyle id={"ceba8c9ce34e3d0c"}>{"p.jsx-ceba8c9ce34e3d0c {display:inline-block}"}</_JSXStyle>
@@ -75,15 +87,19 @@ export const Test6 = ({ color  })=><div className={"jsx-ceba8c9ce34e3d0c " + _JS
   </div>
 ;
 export const Test7 = ({ color  })=><div className={_JSXStyle.dynamic([
-        "4adc07771eb3723",
         [
-            color
+            "4adc07771eb3723",
+            [
+                color
+            ]
         ]
     ])}>
     <p className={_JSXStyle.dynamic([
-        "4adc07771eb3723",
         [
-            color
+            "4adc07771eb3723",
+            [
+                color
+            ]
         ]
     ])}>dynamic only</p>
     <_JSXStyle id={"4adc07771eb3723"} dynamic={[
@@ -97,15 +113,19 @@ export const Test8 = ({ color  })=>{
             color
         };
         return <div className={_JSXStyle.dynamic([
-            "a552a4a765a9ca4e",
             [
-                innerProps.color
+                "a552a4a765a9ca4e",
+                [
+                    innerProps.color
+                ]
             ]
         ])}>
         <p className={_JSXStyle.dynamic([
-            "a552a4a765a9ca4e",
             [
-                innerProps.color
+                "a552a4a765a9ca4e",
+                [
+                    innerProps.color
+                ]
             ]
         ])}>dynamic with scoped compound variable</p>
         <_JSXStyle id={"a552a4a765a9ca4e"} dynamic={[
@@ -119,15 +139,19 @@ export const Test9 = ({ color  })=>{
         color
     };
     return <div className={_JSXStyle.dynamic([
-        "7ef39e3312c80ead",
         [
-            innerProps.color
+            "7ef39e3312c80ead",
+            [
+                innerProps.color
+            ]
         ]
     ])}>
       <p className={_JSXStyle.dynamic([
-        "7ef39e3312c80ead",
         [
-            innerProps.color
+            "7ef39e3312c80ead",
+            [
+                innerProps.color
+            ]
         ]
     ])}>dynamic with compound variable</p>
       <_JSXStyle id={"7ef39e3312c80ead"} dynamic={[
@@ -145,9 +169,11 @@ export const Test11 = ({ color  })=>{
     const items = Array.from({
         length: 5
     }).map((item, i)=><li key={i} className={_JSXStyle.dynamic([
-            "ebe03db0369a2939",
             [
-                color
+                "ebe03db0369a2939",
+                [
+                    color
+                ]
             ]
         ]) + " " + "item"}>
       <_JSXStyle id={"ebe03db0369a2939"} dynamic={[

diff --git a/packages/next/build/swc/tests/fixture/styled-jsx/expressions/output.js b/packages/next/build/swc/tests/fixture/styled-jsx/expressions/output.js
@@ -10,35 +10,43 @@ const obj = {
     display: "block"
 };
 export default (({ display  })=><div className={"jsx-802e359ee0ab20c4 " + _JSXStyle.dynamic([
-        "76aa3eae4e21e4ca",
         [
-            display ? "block" : "none"
-        ]
-    ], [
-        "5ba905f763f40220",
+            "76aa3eae4e21e4ca",
+            [
+                display ? "block" : "none"
+            ]
+        ],
         [
-            darken(color) + 2
-        ]
-    ], [
-        "c4bb394aae9bd00b",
+            "5ba905f763f40220",
+            [
+                darken(color) + 2
+            ]
+        ],
         [
-            darken(color)
+            "c4bb394aae9bd00b",
+            [
+                darken(color)
+            ]
         ]
     ])}>
     <p className={"jsx-802e359ee0ab20c4 " + _JSXStyle.dynamic([
-        "76aa3eae4e21e4ca",
         [
-            display ? "block" : "none"
-        ]
-    ], [
-        "5ba905f763f40220",
+            "76aa3eae4e21e4ca",
+            [
+                display ? "block" : "none"
+            ]
+        ],
         [
-            darken(color) + 2
-        ]
-    ], [
-        "c4bb394aae9bd00b",
+            "5ba905f763f40220",
+            [
+                darken(color) + 2
+            ]
+        ],
         [
-            darken(color)
+            "c4bb394aae9bd00b",
+            [
+                darken(color)
+            ]
         ]
     ])}>test</p>
     <_JSXStyle id={"f3d3af42197b4734"}>{`p.${color}.jsx-802e359ee0ab20c4 {color:${otherColor};

diff --git a/packages/next/build/swc/tests/fixture/styled-jsx/styles/output.js b/packages/next/build/swc/tests/fixture/styled-jsx/styles/output.js
@@ -16,9 +16,11 @@ foo.__hash = "e46da79e05d23fff";
     ]}>{`div.__jsx-style-dynamic-selector {color:${colors.green.light}}
 a.__jsx-style-dynamic-selector {color:red}`}</_JSXStyle>,
     className: _JSXStyle.dynamic([
-        "12e2c41a8d37fe78",
         [
-            colors.green.light
+            "12e2c41a8d37fe78",
+            [
+                colors.green.light
+            ]
         ]
     ])
 });
@@ -28,9 +30,11 @@ const b = {
     ]}>{`div.__jsx-style-dynamic-selector {color:${colors.green.light}}
 a.__jsx-style-dynamic-selector {color:red}`}</_JSXStyle>,
     className: _JSXStyle.dynamic([
-        "d5617758481f82cd",
         [
-            colors.green.light
+            "d5617758481f82cd",
+            [
+                colors.green.light
+            ]
         ]
     ])
 };
@@ -41,9 +45,11 @@ const dynamic = (colors)=>{
         ]}>{`div.__jsx-style-dynamic-selector {color:${colors.green.light}}
 a.__jsx-style-dynamic-selector {color:red}`}</_JSXStyle>,
         className: _JSXStyle.dynamic([
-            "a7ac579c753e9d90",
             [
-                colors.green.light
+                "a7ac579c753e9d90",
+                [
+                    colors.green.light
+                ]
             ]
         ])
     };

diff --git a/packages/next/build/swc/tests/fixture/styled-jsx/tpl-escape-2/output.js b/packages/next/build/swc/tests/fixture/styled-jsx/tpl-escape-2/output.js
@@ -1,9 +1,11 @@
 import _JSXStyle from "styled-jsx/style";
 export default function Home({ fontFamily  }) {
     return <div className={_JSXStyle.dynamic([
-        "2566fdd7bc25c35",
         [
-            fontFamily
+            "2566fdd7bc25c35",
+            [
+                fontFamily
+            ]
         ]
     ])}>
       <_JSXStyle id={"2566fdd7bc25c35"} dynamic={[

diff --git a/packages/next/compiled/@vercel/nft/index.js b/packages/next/compiled/@vercel/nft/index.js