Merge branch 'vercel:canary' into update-typescript-eslint-parser

vercel · Apr 15, 2022 · 0ce93d7 · 0ce93d7
2 parents af3e58b + 1582e11
commit 0ce93d7
Show file tree

Hide file tree

Showing 42 changed files with 265 additions and 59 deletions.
diff --git a/.alexrc b/.alexrc
@@ -16,6 +16,7 @@
     "hook",
     "hooks",
     "host-hostess",
-    "invalid"
+    "invalid",
+    "remains"
   ]
 }
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -2,9 +2,9 @@
 # https://help.github.com/en/articles/about-code-owners
 
 *          @timneutkens @ijjk @shuding @huozhi
-/.github/  @timneutkens @ijjk @shuding @styfle @huozhi @padmaia
-/docs/     @timneutkens @ijjk @shuding @styfle @huozhi @padmaia @leerob @lfades @molebox
-/examples/ @timneutkens @ijjk @shuding @leerob @lfades @steven-tey
+/.github/  @timneutkens @ijjk @shuding @styfle @huozhi @padmaia @balazsorban44
+/docs/     @timneutkens @ijjk @shuding @styfle @huozhi @padmaia @leerob @balazsorban44
+/examples/ @timneutkens @ijjk @shuding @leerob @steven-tey @balazsorban44
 
 # SWC Build (@padmaia)
 

diff --git a/docs/basic-features/data-fetching/get-static-props.md b/docs/basic-features/data-fetching/get-static-props.md
@@ -20,8 +20,8 @@ You should use `getStaticProps` if:
 
 - The data required to render the page is available at build time ahead of a user’s request
 - The data comes from a headless CMS
-- The data can be publicly cached (not user-specific)
 - The page must be pre-rendered (for SEO) and be very fast — `getStaticProps` generates `HTML` and `JSON` files, both of which can be cached by a CDN for performance
+- The data can be publicly cached (not user-specific). This condition can be bypassed in certain specific situation by using a Middleware to rewrite the path.
 
 ## When does getStaticProps run
 

diff --git a/docs/migrating/from-create-react-app.md b/docs/migrating/from-create-react-app.md
@@ -39,7 +39,7 @@ Here's an example `package.json`:
 
 ## Static Assets and Compiled Output
 
-Create React App uses the `public` directory for the [entry HTML file](https://create-react-app.dev/docs/using-the-public-folder), whereas Next.js uses it for static assets. It's possible to add static assets here, but Create React App recommends importing them directly from JavaScript files.
+Create React App uses the `public` directory for the [entry HTML file](https://create-react-app.dev/docs/using-the-public-folder) as well as static assets, but Next.js only uses it for static assets. When migrating from Create React App, the location of the `public` directory remains the same.
 
 - Move any images, fonts, or other static assets to `public`.
 - Convert `index.html` (the entry point of your application) to Next.js. Any `<head>` code should be moved to a [custom `_document.js`](/docs/advanced-features/custom-document.md). Any shared layout between all pages should be moved to a [custom `_app.js`](/docs/advanced-features/custom-app.md).
@@ -50,7 +50,9 @@ Create React App uses the `public` directory for the [entry HTML file](https://c
 
 With Create React App, you're likely using React Router. Instead of using a third-party library, Next.js includes its own [file-system based routing](/docs/routing/introduction.md).
 
-- Convert all `Route` components to new files in the `pages` directory.
+- Create a [`pages`](/docs/basic-features/pages.md) directory at the root of your project.
+- Then, move the `src/App.js` file to `pages/index.js`. This file is the [index page](https://nextjs.org/docs/routing/introduction#index-routes) of your Next.js application. Populate this file with code that is used to display the index route in your Create React App.
+- Convert all other `Route` components to new files in the `pages` directory.
 - For routes that require dynamic content (e.g. `/blog/:slug`), you can use [Dynamic Routes](/docs/routing/dynamic-routes.md) with Next.js (e.g. `pages/blog/[slug].js`). The value of `slug` is accessible through a [query parameter](/docs/routing/dynamic-routes.md). For example, the route `/blog/first-post` would forward the query object `{ 'slug': 'first-post' }` to `pages/blog/[slug].js` ([learn more here](/docs/basic-features/data-fetching/get-static-paths.md)).
 
 For more information, see [Migrating from React Router](/docs/migrating/from-react-router.md).

diff --git a/docs/upgrading.md b/docs/upgrading.md
@@ -12,7 +12,7 @@ The minimum Node.js version has been bumped from 12.0.0 to 12.22.0 which is the
 
 ### Upgrade React version to latest
 
-To upgrade you can run the following command:
+The minimum required React version is `17.0.2`. To upgrade you can run the following command in the terminal:
 
 ```
 npm install react@latest react-dom@latest

diff --git a/errors/manifest.json b/errors/manifest.json
@@ -649,6 +649,10 @@
         {
           "title": "invalid-getserversideprops-return-value",
           "path": "/errors/invalid-getserversideprops-return-value.md"
+        },
+        {
+          "title": "no-assign-module-variable",
+          "path": "/errors/no-assign-module-variable.md"
         }
       ]
     }

diff --git a/errors/no-assign-module-variable.md b/errors/no-assign-module-variable.md
@@ -0,0 +1,13 @@
+# No assign module variable
+
+#### Why This Error Occurred
+
+A value is being assigned to the `module` variable. The `module` variable is already used and it is highly likely that assigning to this variable will cause errors.
+
+#### Possible Ways to Fix It
+
+Use a different variable name:
+
+```js
+let myModule = {...}
+```
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.1.6-canary.0"
+  "version": "12.1.6-canary.1"
 }
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.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "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.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "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.1.6-canary.0",
+    "@next/eslint-plugin-next": "12.1.6-canary.1",
     "@rushstack/eslint-patch": "1.0.8",
     "@typescript-eslint/parser": "5.19.0",
     "eslint-import-resolver-node": "0.3.4",

diff --git a/packages/eslint-plugin-next/lib/index.js b/packages/eslint-plugin-next/lib/index.js
@@ -20,6 +20,7 @@ module.exports = {
     'no-duplicate-head': require('./rules/no-duplicate-head'),
     'inline-script-id': require('./rules/inline-script-id'),
     'next-script-for-ga': require('./rules/next-script-for-ga'),
+    'no-assign-module-variable': require('./rules/no-assign-module-variable'),
   },
   configs: {
     recommended: {
@@ -45,6 +46,7 @@ module.exports = {
         '@next/next/no-typos': 1,
         '@next/next/no-duplicate-head': 2,
         '@next/next/inline-script-id': 2,
+        '@next/next/no-assign-module-variable': 2,
       },
     },
     'core-web-vitals': {

diff --git a/packages/eslint-plugin-next/lib/rules/no-assign-module-variable.js b/packages/eslint-plugin-next/lib/rules/no-assign-module-variable.js
@@ -0,0 +1,30 @@
+module.exports = {
+  meta: {
+    docs: {
+      description: `Prohibit assignment to the 'module' variable`,
+      recommended: true,
+      url: 'https://nextjs.org/docs/messages/no-assign-module-variable',
+    },
+  },
+
+  create: function (context) {
+    return {
+      VariableDeclaration(node) {
+        // Checks node.declarations array for variable with id.name of 'module'
+        const moduleVariableFound = node.declarations.some(
+          (declaration) => declaration.id.name === 'module'
+        )
+
+        // Return early if no 'module' variable is found
+        if (!moduleVariableFound) {
+          return
+        }
+
+        context.report({
+          node,
+          message: `Do not assign to the variable 'module'. See: https://nextjs.org/docs/messages/no-assign-module-variable`,
+        })
+      },
+    }
+  },
+}
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.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "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.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "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.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "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.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "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.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "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.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "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.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "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.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "12.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform --cargo-name next_swc_napi native",

diff --git a/packages/next/build/utils.ts b/packages/next/build/utils.ts
@@ -1172,10 +1172,7 @@ export async function copyTracedFiles(
 
           if (symlink) {
             console.log('symlink', path.relative(tracingRoot, symlink))
-            await fs.symlink(
-              path.relative(tracingRoot, symlink),
-              fileOutputPath
-            )
+            await fs.symlink(symlink, fileOutputPath)
           } else {
             await fs.copyFile(tracedFilePath, fileOutputPath)
           }

diff --git a/packages/next/compiled/use-subscription/index.js b/packages/next/compiled/use-subscription/index.js
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -69,7 +69,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "12.1.6-canary.0",
+    "@next/env": "12.1.6-canary.1",
     "caniuse-lite": "^1.0.30001283",
     "postcss": "8.4.5",
     "styled-jsx": "5.0.1"
@@ -117,11 +117,11 @@
     "@hapi/accept": "5.0.2",
     "@napi-rs/cli": "2.4.4",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "12.1.6-canary.0",
-    "@next/polyfill-nomodule": "12.1.6-canary.0",
-    "@next/react-dev-overlay": "12.1.6-canary.0",
-    "@next/react-refresh-utils": "12.1.6-canary.0",
-    "@next/swc": "12.1.6-canary.0",
+    "@next/polyfill-module": "12.1.6-canary.1",
+    "@next/polyfill-nomodule": "12.1.6-canary.1",
+    "@next/react-dev-overlay": "12.1.6-canary.1",
+    "@next/react-refresh-utils": "12.1.6-canary.1",
+    "@next/swc": "12.1.6-canary.1",
     "@peculiar/webcrypto": "1.3.1",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",

diff --git a/packages/next/server/api-utils/node.ts b/packages/next/server/api-utils/node.ts
@@ -442,7 +442,7 @@ function sendJson(res: NextApiResponse, jsonBody: any): void {
   res.setHeader('Content-Type', 'application/json; charset=utf-8')
 
   // Use send to handle request
-  res.send(jsonBody)
+  res.send(JSON.stringify(jsonBody))
 }
 
 function isNotValidData(str: string): boolean {

diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
@@ -431,14 +431,7 @@ function createServerComponentRenderer(
     return root
   }
 
-  // Although it's not allowed to attach some static methods to Component,
-  // we still re-assign all the component APIs to keep the behavior unchanged.
-  for (const methodName of [
-    'getInitialProps',
-    'getStaticProps',
-    'getServerSideProps',
-    'getStaticPaths',
-  ]) {
+  for (const methodName of Object.keys(Component)) {
     const method = (Component as any)[methodName]
     if (method) {
       ;(ServerComponentWrapper as any)[methodName] = method
@@ -1375,7 +1368,7 @@ export async function renderToHTML(
           <AppContainerWithIsomorphicFiberStructure>
             {isServerComponent && !!AppMod.__next_rsc__ ? (
               // _app.server.js is used.
-              <Component {...props.pageProps} router={router} />
+              <Component {...props.pageProps} />
             ) : (
               <App {...props} Component={Component} router={router} />
             )}

diff --git a/packages/next/server/web-server.ts b/packages/next/server/web-server.ts
@@ -169,8 +169,7 @@ export default class NextWebServer extends BaseServer {
     if (options.result.isDynamic()) {
       const writer = res.transformStream.writable.getWriter()
       options.result.pipe({
-        write: (chunk: Uint8Array) =>
-          writer.write(new TextDecoder().decode(chunk)),
+        write: (chunk: Uint8Array) => writer.write(chunk),
         end: () => writer.close(),
         destroy: (err: Error) => writer.abort(err),
         cork: () => {},

diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js
@@ -313,6 +313,7 @@ export async function ncc_use_subscription(task, opts) {
         react: 'react',
         'react-dom': 'react-dom',
       },
+      target: 'es5',
     })
     .target('compiled/use-subscription')
 }

diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "12.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "12.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/test/integration/api-support/pages/api/json-null.js b/test/integration/api-support/pages/api/json-null.js
@@ -0,0 +1,3 @@
+export default (req, res) => {
+  res.json(null)
+}
diff --git a/test/integration/api-support/pages/api/json-string.js b/test/integration/api-support/pages/api/json-string.js
@@ -0,0 +1,3 @@
+export default (req, res) => {
+  res.json('Hello world!')
+}
diff --git a/...ration/api-support/pages/api/undefined.js → ...n/api-support/pages/api/json-undefined.js b/...ration/api-support/pages/api/undefined.js → ...n/api-support/pages/api/json-undefined.js