Merge branch 'canary' into feat/eslint-date-hydration

vercel · Oct 3, 2022 · 2f5298c · 2f5298c
2 parents af5b591 + 3e8af93
commit 2f5298c
Show file tree

Hide file tree

Showing 57 changed files with 236 additions and 178 deletions.
diff --git a/.github/actions/next-stats-action/Dockerfile b/.github/actions/next-stats-action/Dockerfile
@@ -7,7 +7,7 @@ LABEL repository="https://github.com/vercel/next-stats-action"
 COPY . /next-stats
 
 # Install node_modules
-RUN npm i -g pnpm@7.2.1
+RUN npm i -g pnpm@7.3.0
 RUN cd /next-stats && pnpm install --production
 
 RUN git config --global user.email 'stats@localhost'

diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -10,7 +10,7 @@ env:
   NAPI_CLI_VERSION: 2.7.0
   TURBO_VERSION: 1.3.2-canary.1
   RUST_TOOLCHAIN: nightly-2022-09-23
-  PNPM_VERSION: 7.2.1
+  PNPM_VERSION: 7.3.0
 
 jobs:
   check-examples:

diff --git a/.github/workflows/pull_request_stats.yml b/.github/workflows/pull_request_stats.yml
@@ -8,7 +8,7 @@ env:
   NAPI_CLI_VERSION: 2.7.0
   TURBO_VERSION: 1.3.2-canary.1
   RUST_TOOLCHAIN: nightly-2022-09-23
-  PNPM_VERSION: 7.2.1
+  PNPM_VERSION: 7.3.0
 
 jobs:
   build-native-dev:

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -33,7 +33,7 @@ pr:
 
 variables:
   PNPM_CACHE_FOLDER: $(Pipeline.Workspace)/.pnpm-store
-  PNPM_VERSION: 7.2.1
+  PNPM_VERSION: 7.3.0
   NEXT_TELEMETRY_DISABLED: '1'
   node_version: ^14.19.0
 

diff --git a/docs/api-reference/edge-runtime.md b/docs/api-reference/edge-runtime.md
@@ -121,7 +121,7 @@ Running `console.log` on `process.env` **will not** show all your Environment Va
 console.log(process.env)
 // { NEXT_RUNTIME: 'edge' }
 console.log(process.env.TEST_VARIABLE)
-// { NEXT_RUNTIME: 'edge', TEST_VARIABLE: 'value' }
+// value
 ```
 
 ## Unsupported APIs

diff --git a/examples/cms-dotcms/.env.local.example → examples/cms-dotcms/.env.local.example b/examples/cms-dotcms/.env.local.example → examples/cms-dotcms/.env.local.example
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.3.2-canary.16"
+  "version": "12.3.2-canary.17"
 }
diff --git a/package.json b/package.json
@@ -219,8 +219,7 @@
     "@babel/traverse": "7.18.0"
   },
   "engines": {
-    "node": ">=12.22.0",
-    "pnpm": ">= 7.2.1"
+    "node": ">=12.22.0"
   },
   "packageManager": "[email protected]"
 }
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.3.2-canary.16",
+  "version": "12.3.2-canary.17",
   "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.3.2-canary.16",
+  "version": "12.3.2-canary.17",
   "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.3.2-canary.16",
+    "@next/eslint-plugin-next": "12.3.2-canary.17",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.21.0",
     "eslint-import-resolver-node": "^0.3.6",

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.3.2-canary.16",
+  "version": "12.3.2-canary.17",
   "description": "ESLint plugin for NextJS.",
   "main": "dist/index.js",
   "license": "MIT",

diff --git a/packages/font/package.json b/packages/font/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "12.3.2-canary.16",
+  "version": "12.3.2-canary.17",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

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.3.2-canary.16",
+  "version": "12.3.2-canary.17",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "12.3.2-canary.16",
+  "version": "12.3.2-canary.17",
   "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.3.2-canary.16",
+  "version": "12.3.2-canary.17",
   "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.3.2-canary.16",
+  "version": "12.3.2-canary.17",
   "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.3.2-canary.16",
+  "version": "12.3.2-canary.17",
   "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.3.2-canary.16",
+  "version": "12.3.2-canary.17",
   "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.3.2-canary.16",
+  "version": "12.3.2-canary.17",
   "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.3.2-canary.16",
+  "version": "12.3.2-canary.17",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform -p next-swc-napi --cargo-name next_swc_napi native --features plugin",

diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
@@ -551,6 +551,28 @@ export default async function build(
           : undefined,
       }
 
+      if (pageKeys.app) {
+        const conflictingAppPagePaths = []
+
+        for (const appPath of pageKeys.app) {
+          if (pageKeys.pages.includes(appPath)) {
+            conflictingAppPagePaths.push(`pages${appPath} - app${appPath}`)
+          }
+        }
+        const numConflicting = conflictingAppPagePaths.length
+
+        if (numConflicting > 0) {
+          Log.error(
+            `Conflicting app and page file${
+              numConflicting === 1 ? ' was' : 's were'
+            } found, please remove the conflicting files to continue. \n${conflictingAppPagePaths.join(
+              '\n'
+            )}\n`
+          )
+          process.exit(1)
+        }
+      }
+
       const conflictingPublicFiles: string[] = []
       const hasPages404 = mappedPages['/404']?.startsWith(PAGES_DIR_ALIAS)
       const hasCustomErrorPage =

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -87,7 +87,7 @@ const BABEL_CONFIG_FILES = [
 ]
 
 const rscSharedRegex =
-  /(node_modules[\\/]react\/|[\\/]shared[\\/]lib[\\/](head-manager-context|router-context|flush-effects)\.js|node_modules[\\/]styled-jsx[\\/])/
+  /(node_modules[\\/]react\/|[\\/]shared[\\/]lib[\\/](head-manager-context|router-context|server-inserted-html)\.js|node_modules[\\/]styled-jsx[\\/])/
 
 // Support for NODE_PATH
 const nodePathList = (process.env.NODE_PATH || '')

diff --git a/packages/next/client/components/app-router.client.tsx b/packages/next/client/components/app-router.client.tsx
@@ -15,7 +15,7 @@ import type {
 import type { FlightRouterState, FlightData } from '../../server/app-render'
 import {
   ACTION_NAVIGATE,
-  ACTION_PREFETCH,
+  // ACTION_PREFETCH,
   ACTION_RELOAD,
   ACTION_RESTORE,
   ACTION_SERVER_PATCH,
@@ -97,7 +97,7 @@ function ErrorOverlay({ children }: PropsWithChildren<{}>): ReactElement {
 let initialParallelRoutes: CacheNode['parallelRoutes'] =
   typeof window === 'undefined' ? null! : new Map()
 
-const prefetched = new Set<string>()
+// const prefetched = new Set<string>()
 
 /**
  * The global router that wraps the application components.
@@ -208,34 +208,32 @@ export default function AppRouter({
 
     const routerInstance: AppRouterInstance = {
       // TODO-APP: implement prefetching of flight
-      prefetch: async (href) => {
+      prefetch: async (_href) => {
         // If prefetch has already been triggered, don't trigger it again.
-        if (prefetched.has(href)) {
-          return
-        }
-
-        prefetched.add(href)
-        const url = new URL(href, location.origin)
-
-        try {
-          // TODO-APP: handle case where history.state is not the new router history entry
-          const serverResponse = await fetchServerResponse(
-            url,
-            // initialTree is used when history.state.tree is missing because the history state is set in `useEffect` below, it being missing means this is the hydration case.
-            window.history.state?.tree || initialTree,
-            true
-          )
-          // @ts-ignore startTransition exists
-          React.startTransition(() => {
-            dispatch({
-              type: ACTION_PREFETCH,
-              url,
-              serverResponse,
-            })
-          })
-        } catch (err) {
-          console.error('PREFETCH ERROR', err)
-        }
+        // if (prefetched.has(href)) {
+        //   return
+        // }
+        // prefetched.add(href)
+        // const url = new URL(href, location.origin)
+        // try {
+        //   // TODO-APP: handle case where history.state is not the new router history entry
+        //   const serverResponse = await fetchServerResponse(
+        //     url,
+        //     // initialTree is used when history.state.tree is missing because the history state is set in `useEffect` below, it being missing means this is the hydration case.
+        //     window.history.state?.tree || initialTree,
+        //     true
+        //   )
+        //   // @ts-ignore startTransition exists
+        //   React.startTransition(() => {
+        //     dispatch({
+        //       type: ACTION_PREFETCH,
+        //       url,
+        //       serverResponse,
+        //     })
+        //   })
+        // } catch (err) {
+        //   console.error('PREFETCH ERROR', err)
+        // }
       },
       replace: (href, options = {}) => {
         // @ts-ignore startTransition exists
@@ -268,7 +266,7 @@ export default function AppRouter({
     }
 
     return routerInstance
-  }, [dispatch, initialTree])
+  }, [dispatch /*, initialTree*/])
 
   useEffect(() => {
     // When mpaNavigation flag is set do a hard navigation to the new url.

diff --git a/packages/next/client/components/hooks-client.ts b/packages/next/client/components/hooks-client.ts
@@ -13,9 +13,9 @@ import {
 } from '../../shared/lib/app-router-context'
 
 export {
-  FlushEffectsContext,
-  useFlushEffects,
-} from '../../shared/lib/flush-effects'
+  ServerInsertedHTMLContext,
+  useServerInsertedHTML,
+} from '../../shared/lib/server-inserted-html'
 
 /**
  * Get the current search params. For example useSearchParams() would return {"foo": "bar"} when ?foo=bar

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.3.2-canary.16",
+  "version": "12.3.2-canary.17",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -69,7 +69,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "12.3.2-canary.16",
+    "@next/env": "12.3.2-canary.17",
     "@swc/helpers": "0.4.11",
     "caniuse-lite": "^1.0.30001406",
     "postcss": "8.4.14",
@@ -120,11 +120,11 @@
     "@hapi/accept": "5.0.2",
     "@napi-rs/cli": "2.7.0",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "12.3.2-canary.16",
-    "@next/polyfill-nomodule": "12.3.2-canary.16",
-    "@next/react-dev-overlay": "12.3.2-canary.16",
-    "@next/react-refresh-utils": "12.3.2-canary.16",
-    "@next/swc": "12.3.2-canary.16",
+    "@next/polyfill-module": "12.3.2-canary.17",
+    "@next/polyfill-nomodule": "12.3.2-canary.17",
+    "@next/react-dev-overlay": "12.3.2-canary.17",
+    "@next/react-refresh-utils": "12.3.2-canary.17",
+    "@next/swc": "12.3.2-canary.17",
     "@segment/ajv-human-errors": "2.1.2",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",