Merge branch 'canary' into mannyb/docs

vercel · Jan 11, 2022 · 9f94dfe · 9f94dfe
2 parents 247c64c + 0de8447
commit 9f94dfe
Show file tree

Hide file tree

Showing 55 changed files with 558 additions and 394 deletions.
diff --git a/docs/advanced-features/custom-error-page.md b/docs/advanced-features/custom-error-page.md
@@ -94,3 +94,7 @@ export default function Page({ errorCode, stars }) {
 The `Error` component also takes `title` as a property if you want to pass in a text message along with a `statusCode`.
 
 If you have a custom `Error` component be sure to import that one instead. `next/error` exports the default component used by Next.js.
+
+### Caveats
+
+- `Error` currently does not support Next.js [Data Fetching methods](/docs/basic-features/data-fetching.md) like [`getStaticProps`](/docs/basic-features/data-fetching.md#getstaticprops-static-generation) or [`getServerSideProps`](/docs/basic-features/data-fetching.md#getserversideprops-server-side-rendering).
diff --git a/docs/advanced-features/src-directory.md b/docs/advanced-features/src-directory.md
@@ -11,7 +11,7 @@ The `src` directory is very common in many apps and Next.js supports it by defau
 ## Caveats
 
 - `src/pages` will be ignored if `pages` is present in the root directory
-- Config files like `next.config.js` and `tsconfig.json` should be inside the root directory, moving them to `src` won't work. Same goes for the [`public` directory](/docs/basic-features/static-file-serving.md)
+- Config files like `next.config.js` and `tsconfig.json`, as well as environment variables, should be inside the root directory, moving them to `src` won't work. Same goes for the [`public` directory](/docs/basic-features/static-file-serving.md)
 
 ## Related
 

diff --git a/docs/basic-features/environment-variables.md b/docs/basic-features/environment-variables.md
@@ -76,6 +76,8 @@ export async function getStaticProps() {
 > CORRECT=pre\$A
 > ```
 
+> **Note**: If you are using a `/src` folder, please note that Next.js will load the .env files **only** from the parent folder and **not** from the `/src` folder.
+
 ## Exposing Environment Variables to the Browser
 
 By default environment variables are only available in the Node.js environment, meaning they won't be exposed to the browser.

diff --git a/errors/threw-undefined.md b/errors/threw-undefined.md
@@ -1,9 +1,21 @@
-# Threw undefined in render
+# Threw `undefined`/`null`
 
 #### Why This Error Occurred
 
-Somewhere in your code you `throw` an `undefined` value. Since this isn't a valid error there isn't a stack trace. We show this error instead to let you know what to look for.
+Somewhere in your code you `throw` an `undefined` or `null` value. Since this isn't a valid error there isn't a stack trace. We show this error instead to let you know what to look for.
+
+```js
+function getData() {
+  let error
+  throw error
+}
+
+function Page() {
+  const error = data?.error || null
+  throw error
+}
+```
 
 #### Possible Ways to Fix It
 
-Look in your pages and find where an error could be throwing `undefined`
+Look in your pages and find where an error could be throwing `undefined` or `null` values and ensure `new Error()` is used instead.
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.0.8-canary.19"
+  "version": "12.0.8-canary.21"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "12.0.8-canary.19",
+  "version": "12.0.8-canary.21",
   "keywords": [
     "react",
     "next",

diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "12.0.8-canary.19",
+  "version": "12.0.8-canary.21",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "12.0.8-canary.19",
+    "@next/eslint-plugin-next": "12.0.8-canary.21",
     "@rushstack/eslint-patch": "^1.0.8",
     "@typescript-eslint/parser": "^5.0.0",
     "eslint-import-resolver-node": "^0.3.4",

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "12.0.8-canary.19",
+  "version": "12.0.8-canary.21",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "12.0.8-canary.19",
+  "version": "12.0.8-canary.21",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "12.0.8-canary.19",
+  "version": "12.0.8-canary.21",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "12.0.8-canary.19",
+  "version": "12.0.8-canary.21",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "12.0.8-canary.19",
+  "version": "12.0.8-canary.21",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "12.0.8-canary.19",
+  "version": "12.0.8-canary.21",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "12.0.8-canary.19",
+  "version": "12.0.8-canary.21",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "12.0.8-canary.19",
+  "version": "12.0.8-canary.21",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/crates/core/src/next_dynamic.rs b/packages/next-swc/crates/core/src/next_dynamic.rs
@@ -4,10 +4,11 @@ use pathdiff::diff_paths;
 use swc_atoms::js_word;
 use swc_common::{FileName, DUMMY_SP};
 use swc_ecmascript::ast::{
-    ArrayLit, ArrowExpr, BinExpr, BinaryOp, BlockStmtOrExpr, CallExpr, Expr, ExprOrSpread,
-    ExprOrSuper, Ident, ImportDecl, ImportSpecifier, KeyValueProp, Lit, MemberExpr, ObjectLit,
-    Prop, PropName, PropOrSpread, Str, StrKind,
+    ArrayLit, ArrowExpr, BinExpr, BinaryOp, BlockStmtOrExpr, Bool, CallExpr, Expr, ExprOrSpread,
+    ExprOrSuper, Ident, ImportDecl, ImportSpecifier, KeyValueProp, Lit, MemberExpr, Null,
+    ObjectLit, Prop, PropName, PropOrSpread, Str, StrKind,
 };
+use swc_ecmascript::utils::ExprFactory;
 use swc_ecmascript::utils::{
     ident::{Id, IdentLike},
     HANDLER,
@@ -236,16 +237,52 @@ impl Fold for NextDynamicPatcher {
                             value: generated,
                         })))];
 
+                    let mut has_ssr_false = false;
+
                     if expr.args.len() == 2 {
                         if let Expr::Object(ObjectLit {
                             props: options_props,
                             ..
                         }) = &*expr.args[1].expr
                         {
+                            for prop in options_props.iter() {
+                                if let Some(KeyValueProp { key, value }) = match prop {
+                                    PropOrSpread::Prop(prop) => match &**prop {
+                                        Prop::KeyValue(key_value_prop) => Some(key_value_prop),
+                                        _ => None,
+                                    },
+                                    _ => None,
+                                } {
+                                    if let Some(Ident {
+                                        sym,
+                                        span: _,
+                                        optional: _,
+                                    }) = match key {
+                                        PropName::Ident(ident) => Some(ident),
+                                        _ => None,
+                                    } {
+                                        if sym == "ssr" {
+                                            if let Some(Lit::Bool(Bool {
+                                                value: false,
+                                                span: _,
+                                            })) = match &**value {
+                                                Expr::Lit(lit) => Some(lit),
+                                                _ => None,
+                                            } {
+                                                has_ssr_false = true
+                                            }
+                                        }
+                                    }
+                                }
+                            }
                             props.extend(options_props.iter().cloned());
                         }
                     }
 
+                    if has_ssr_false && self.is_server {
+                        expr.args[0] = Lit::Null(Null { span: DUMMY_SP }).as_arg();
+                    }
+
                     let second_arg = ExprOrSpread {
                         spread: None,
                         expr: Box::new(Expr::Object(ObjectLit {

diff --git a/packages/next-swc/crates/core/src/next_ssg.rs b/packages/next-swc/crates/core/src/next_ssg.rs
@@ -141,6 +141,31 @@ impl Fold for Analyzer<'_> {
         e
     }
 
+    fn fold_jsx_element(&mut self, jsx: JSXElement) -> JSXElement {
+        fn get_leftmost_id_member_expr(e: &JSXMemberExpr) -> Id {
+            match &e.obj {
+                JSXObject::Ident(i) => {
+                    i.to_id()
+                }
+                JSXObject::JSXMemberExpr(e) => {
+                    get_leftmost_id_member_expr(e)
+                }
+            }
+        }
+
+        match &jsx.opening.name {
+            JSXElementName::Ident(i) => {
+                self.add_ref(i.to_id());
+            }
+            JSXElementName::JSXMemberExpr(e) => {
+                self.add_ref(get_leftmost_id_member_expr(e));
+            }
+            _ => {}
+        }
+
+        jsx.fold_children_with(self)
+    }
+
     fn fold_fn_decl(&mut self, f: FnDecl) -> FnDecl {
         let old_in_data = self.in_data_fn;
 

diff --git a/packages/next-swc/crates/core/tests/fixture.rs b/packages/next-swc/crates/core/tests/fixture.rs
@@ -34,6 +34,7 @@ fn amp_attributes_fixture(input: PathBuf) {
 fn next_dynamic_fixture(input: PathBuf) {
     let output_dev = input.parent().unwrap().join("output-dev.js");
     let output_prod = input.parent().unwrap().join("output-prod.js");
+    let output_server = input.parent().unwrap().join("output-server.js");
     test_fixture(
         syntax(),
         &|_tr| {
@@ -60,6 +61,19 @@ fn next_dynamic_fixture(input: PathBuf) {
         &input,
         &output_prod,
     );
+    test_fixture(
+        syntax(),
+        &|_tr| {
+            next_dynamic(
+                false,
+                true,
+                FileName::Real(PathBuf::from("/some-project/src/some-file.js")),
+                Some("/some-project/src".into()),
+            )
+        },
+        &input,
+        &output_server,
+    );
 }
 
 #[fixture("tests/fixture/ssg/**/input.js")]

diff --git a/packages/next-swc/crates/core/tests/fixture/next-dynamic/duplicated-imports/output-server.js b/packages/next-swc/crates/core/tests/fixture/next-dynamic/duplicated-imports/output-server.js
@@ -0,0 +1,12 @@
+import dynamic1 from 'next/dynamic'
+import dynamic2 from 'next/dynamic'
+const DynamicComponent1 = dynamic1(() => import('../components/hello1'), {
+  loadableGenerated: {
+    modules: ['some-file.js -> ' + '../components/hello1'],
+  },
+})
+const DynamicComponent2 = dynamic2(() => import('../components/hello2'), {
+  loadableGenerated: {
+    modules: ['some-file.js -> ' + '../components/hello2'],
+  },
+})
diff --git a/...es/next-swc/crates/core/tests/fixture/next-dynamic/member-with-same-name/output-server.js b/...es/next-swc/crates/core/tests/fixture/next-dynamic/member-with-same-name/output-server.js
@@ -0,0 +1,8 @@
+import dynamic from 'next/dynamic'
+import somethingElse from 'something-else'
+const DynamicComponent = dynamic(() => import('../components/hello'), {
+  loadableGenerated: {
+    modules: ['some-file.js -> ' + '../components/hello'],
+  },
+})
+somethingElse.dynamic('should not be transformed')
diff --git a/packages/next-swc/crates/core/tests/fixture/next-dynamic/no-options/output-server.js b/packages/next-swc/crates/core/tests/fixture/next-dynamic/no-options/output-server.js
@@ -0,0 +1,6 @@
+import dynamic from 'next/dynamic'
+const DynamicComponent = dynamic(() => import('../components/hello'), {
+  loadableGenerated: {
+    modules: ['some-file.js -> ' + '../components/hello'],
+  },
+})
diff --git a/packages/next-swc/crates/core/tests/fixture/next-dynamic/with-options/input.js b/packages/next-swc/crates/core/tests/fixture/next-dynamic/with-options/input.js
@@ -4,3 +4,8 @@ const DynamicComponentWithCustomLoading = dynamic(
   () => import('../components/hello'),
   { loading: () => <p>...</p> }
 )
+
+const DynamicClientOnlyComponent = dynamic(
+  () => import('../components/hello'),
+  { ssr: false }
+)
diff --git a/packages/next-swc/crates/core/tests/fixture/next-dynamic/with-options/output-dev.js b/packages/next-swc/crates/core/tests/fixture/next-dynamic/with-options/output-dev.js
@@ -8,3 +8,12 @@ const DynamicComponentWithCustomLoading = dynamic(()=>import("../components/hell
     },
     loading: ()=><p >...</p>
 });
+const DynamicClientOnlyComponent = dynamic(()=>import("../components/hello")
+, {
+    loadableGenerated: {
+        modules: [
+            "some-file.js -> " + "../components/hello"
+        ]
+    },
+    ssr: false
+});
diff --git a/packages/next-swc/crates/core/tests/fixture/next-dynamic/with-options/output-prod.js b/packages/next-swc/crates/core/tests/fixture/next-dynamic/with-options/output-prod.js
@@ -8,3 +8,12 @@ const DynamicComponentWithCustomLoading = dynamic(()=>import("../components/hell
     },
     loading: ()=><p >...</p>
 });
+const DynamicClientOnlyComponent = dynamic(()=>import("../components/hello")
+, {
+    loadableGenerated: {
+        webpack: ()=>[
+                require.resolveWeak("../components/hello")
+            ]
+    },
+    ssr: false
+});
diff --git a/packages/next-swc/crates/core/tests/fixture/next-dynamic/with-options/output-server.js b/packages/next-swc/crates/core/tests/fixture/next-dynamic/with-options/output-server.js
@@ -0,0 +1,16 @@
+import dynamic from 'next/dynamic'
+const DynamicComponentWithCustomLoading = dynamic(
+  () => import('../components/hello'),
+  {
+    loadableGenerated: {
+      modules: ['some-file.js -> ' + '../components/hello'],
+    },
+    loading: () => <p>...</p>,
+  }
+)
+const DynamicClientOnlyComponent = dynamic(null, {
+  loadableGenerated: {
+    modules: ['some-file.js -> ' + '../components/hello'],
+  },
+  ssr: false,
+})
diff --git a/packages/next-swc/crates/core/tests/fixture/next-dynamic/wrapped-import/output-server.js b/packages/next-swc/crates/core/tests/fixture/next-dynamic/wrapped-import/output-server.js
@@ -0,0 +1,11 @@
+import dynamic from "next/dynamic";
+const DynamicComponent = dynamic(null, {
+    loadableGenerated: {
+        modules: [
+            "some-file.js -> " + "./components/hello"
+        ]
+    },
+    loading: ()=>null
+    ,
+    ssr: false
+});