Merge branch 'canary' into support_cacheStrategy_eslint_arg

examples/cms-strapi/package.json

@@ -11,8 +11,8 @@
     "next": "latest",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "remark": "12.0.0",
-    "remark-html": "11.0.2"
+    "remark": "^14.0.1",
+    "remark-html": "^15.0.0"
   },
   "devDependencies": {
     "autoprefixer": "10.2.6",

examples/with-supertokens/config/appInfo.js

@@ -0,0 +1,15 @@
+const port = process.env.APP_PORT || 3000
+
+const apiBasePath = '/api/auth/'
+
+export const websiteDomain =
+  process.env.APP_URL ||
+  process.env.NEXT_PUBLIC_APP_URL ||
+  `http://localhost:${port}`
+
+export const appInfo = {
+  appName: 'SuperTokens Demo App',
+  websiteDomain,
+  apiDomain: websiteDomain,
+  apiBasePath,
+}

examples/with-supertokens/config/supertokensConfig.js → examples/with-supertokens/config/backendConfig.js

@@ -1,22 +1,6 @@
 import ThirdPartyEmailPasswordNode from 'supertokens-node/recipe/thirdpartyemailpassword'
 import SessionNode from 'supertokens-node/recipe/session'
-
-import ThirdPartyEmailPasswordReact from 'supertokens-auth-react/recipe/thirdpartyemailpassword'
-import SessionReact from 'supertokens-auth-react/recipe/session'
-
-const port = process.env.APP_PORT || 3000
-const websiteDomain =
-  process.env.APP_URL ||
-  process.env.NEXT_PUBLIC_APP_URL ||
-  `http://localhost:${port}`
-const apiBasePath = '/api/auth/'
-
-let appInfo = {
-  appName: 'SuperTokens Demo App',
-  websiteDomain,
-  apiDomain: websiteDomain,
-  apiBasePath,
-}
+import { appInfo } from './appInfo'
 
 export let backendConfig = () => {
   return {
@@ -50,23 +34,3 @@ export let backendConfig = () => {
     isInServerlessEnv: true,
   }
 }
-
-export let frontendConfig = () => {
-  return {
-    appInfo,
-    recipeList: [
-      ThirdPartyEmailPasswordReact.init({
-        emailVerificationFeature: {
-          mode: 'REQUIRED',
-        },
-        signInAndUpFeature: {
-          providers: [
-            ThirdPartyEmailPasswordReact.Google.init(),
-            ThirdPartyEmailPasswordReact.Github.init(),
-          ],
-        },
-      }),
-      SessionReact.init(),
-    ],
-  }
-}

examples/with-supertokens/config/frontendConfig.js

@@ -0,0 +1,23 @@
+import ThirdPartyEmailPasswordReact from 'supertokens-auth-react/recipe/thirdpartyemailpassword'
+import SessionReact from 'supertokens-auth-react/recipe/session'
+import { appInfo } from './appInfo'
+
+export let frontendConfig = () => {
+  return {
+    appInfo,
+    recipeList: [
+      ThirdPartyEmailPasswordReact.init({
+        emailVerificationFeature: {
+          mode: 'REQUIRED',
+        },
+        signInAndUpFeature: {
+          providers: [
+            ThirdPartyEmailPasswordReact.Google.init(),
+            ThirdPartyEmailPasswordReact.Github.init(),
+          ],
+        },
+      }),
+      SessionReact.init(),
+    ],
+  }
+}

examples/with-supertokens/pages/_app.js

@@ -2,15 +2,20 @@ import '../styles/globals.css'
 import React from 'react'
 import { useEffect } from 'react'
 import SuperTokensReact from 'supertokens-auth-react'
-import * as SuperTokensConfig from '../config/supertokensConfig'
+import * as SuperTokensConfig from '../config/frontendConfig'
 import Session from 'supertokens-auth-react/recipe/session'
-import SuperTokensNode from 'supertokens-node'
 import { redirectToAuth } from 'supertokens-auth-react/recipe/thirdpartyemailpassword'
 
+async function initNode() {
+  const supertokensNode = await import('supertokens-node')
+  const { backendConfig } = await import('../config/backendConfig')
+  supertokensNode.init(backendConfig())
+}
+
 if (typeof window !== 'undefined') {
   SuperTokensReact.init(SuperTokensConfig.frontendConfig())
 } else {
-  SuperTokensNode.init(SuperTokensConfig.backendConfig())
+  initNode().catch(console.error)
 }
 
 function MyApp({ Component, pageProps }) {

examples/with-supertokens/pages/api/auth/[[...path]].js

@@ -2,9 +2,9 @@
 import { superTokensNextWrapper } from 'supertokens-node/nextjs'
 import supertokens from 'supertokens-node'
 import { middleware } from 'supertokens-node/framework/express'
-import * as SuperTokensConfig from '../../../config/supertokensConfig'
+import { backendConfig } from '../../../config/backendConfig'
 
-supertokens.init(SuperTokensConfig.backendConfig())
+supertokens.init(backendConfig())
 
 export default async function superTokens(req, res) {
   await superTokensNextWrapper(

examples/with-supertokens/pages/api/user.js

@@ -1,9 +1,9 @@
 import { superTokensNextWrapper } from 'supertokens-node/nextjs'
 import { verifySession } from 'supertokens-node/recipe/session/framework/express'
 import supertokens from 'supertokens-node'
-import * as SuperTokensConfig from '../../config/supertokensConfig'
+import { backendConfig } from '../../config/backendConfig'
 
-supertokens.init(SuperTokensConfig.backendConfig())
+supertokens.init(backendConfig())
 
 export default async function user(req, res) {
   await superTokensNextWrapper(

package.json

@@ -139,9 +139,9 @@
     "pretty-ms": "7.0.0",
     "random-seed": "0.3.0",
     "react": "17.0.2",
-    "react-18": "npm:[email protected]3c4c1c470-20211021",
+    "react-18": "npm:[email protected]13455d26d-20211104",
     "react-dom": "17.0.2",
-    "react-dom-18": "npm:[email protected]3c4c1c470-20211021",
+    "react-dom-18": "npm:[email protected]13455d26d-20211104",
     "react-ssr-prepass": "1.0.8",
     "release": "6.3.0",
     "request-promise-core": "1.1.2",

packages/next/build/entries.ts

@@ -12,7 +12,7 @@ import { ClientPagesLoaderOptions } from './webpack/loaders/next-client-pages-lo
 import { ServerlessLoaderQuery } from './webpack/loaders/next-serverless-loader'
 import { LoadedEnvFiles } from '@next/env'
 import { NextConfigComplete } from '../server/config-shared'
-import { isFlightPage } from './utils'
+import { isCustomErrorPage, isFlightPage, isReservedPage } from './utils'
 import { ssrEntries } from './webpack/plugins/middleware-plugin'
 import type { webpack5 } from 'next/dist/compiled/webpack/webpack'
 import { MIDDLEWARE_SSR_RUNTIME_WEBPACK } from '../shared/lib/constants'
@@ -136,7 +136,10 @@ export function createEntrypoints(
     const serverBundlePath = posix.join('pages', bundleFile)
 
     const isLikeServerless = isTargetLikeServerless(target)
+    const isReserved = isReservedPage(page)
+    const isCustomError = isCustomErrorPage(page)
     const isFlight = isFlightPage(config, absolutePagePath)
+
     const webServerRuntime = !!config.experimental.concurrentFeatures
 
     if (page.match(MIDDLEWARE_ROUTE)) {
@@ -151,11 +154,7 @@ export function createEntrypoints(
       return
     }
 
-    if (
-      webServerRuntime &&
-      !(page === '/_app' || page === '/_error' || page === '/_document') &&
-      !isApiRoute
-    ) {
+    if (webServerRuntime && !isReserved && !isCustomError && !isApiRoute) {
       ssrEntries.set(clientBundlePath, { requireFlightManifest: isFlight })
       serverWeb[serverBundlePath] = finalizeEntrypoint({
         name: '[name].js',
@@ -184,12 +183,7 @@ export function createEntrypoints(
         serverlessLoaderOptions
       )}!`
     } else if (isApiRoute || target === 'server') {
-      if (
-        !webServerRuntime ||
-        page === '/_document' ||
-        page === '/_app' ||
-        page === '/_error'
-      ) {
+      if (!webServerRuntime || isReserved || isCustomError) {
         server[serverBundlePath] = [absolutePagePath]
       }
     } else if (

packages/next/build/index.ts

@@ -91,6 +91,8 @@ import {
   printTreeView,
   getCssFilePaths,
   getUnresolvedModuleFromError,
+  isReservedPage,
+  isCustomErrorPage,
 } from './utils'
 import getBaseWebpackConfig from './webpack-config'
 import { PagesManifest } from './webpack/plugins/pages-manifest-plugin'
@@ -102,8 +104,6 @@ import { TelemetryPlugin } from './webpack/plugins/telemetry-plugin'
 import { MiddlewareManifest } from './webpack/plugins/middleware-plugin'
 import type { webpack5 as webpack } from 'next/dist/compiled/webpack/webpack'
 
-const RESERVED_PAGE = /^\/(_app|_error|_document|api(\/|$))/
-
 export type SsgRoute = {
   initialRevalidateSeconds: number | false
   srcRoute: string | null
@@ -465,7 +465,7 @@ export default async function build(
           (page) =>
             !isDynamicRoute(page) &&
             !page.match(MIDDLEWARE_ROUTE) &&
-            !page.match(RESERVED_PAGE)
+            !isReservedPage(page)
         )
         .map(pageToRoute),
       dataRoutes: [],
@@ -916,7 +916,7 @@ export default async function build(
 
             if (
               !isMiddlewareRoute &&
-              !page.match(RESERVED_PAGE) &&
+              !isReservedPage(page) &&
               !hasConcurrentFeatures
             ) {
               try {
@@ -1029,7 +1029,8 @@ export default async function build(
               isWebSsr:
                 hasConcurrentFeatures &&
                 !isMiddlewareRoute &&
-                !page.match(RESERVED_PAGE),
+                !isReservedPage(page) &&
+                !isCustomErrorPage(page),
               isHybridAmp,
               ssgPageRoutes,
               initialRevalidateSeconds: false,
@@ -1318,7 +1319,9 @@ export default async function build(
     // Since custom _app.js can wrap the 404 page we have to opt-out of static optimization if it has getInitialProps
     // Only export the static 404 when there is no /_error present
     const useStatic404 =
-      !customAppGetInitialProps && (!hasNonStaticErrorPage || hasPages404)
+      !hasConcurrentFeatures &&
+      !customAppGetInitialProps &&
+      (!hasNonStaticErrorPage || hasPages404)
 
     if (invalidPages.size > 0) {
       const err = new Error(
@@ -1383,7 +1386,10 @@ export default async function build(
 
     const combinedPages = [...staticPages, ...ssgPages]
 
-    if (combinedPages.length > 0 || useStatic404 || useDefaultStatic500) {
+    if (
+      !hasConcurrentFeatures &&
+      (combinedPages.length > 0 || useStatic404 || useDefaultStatic500)
+    ) {
       const staticGenerationSpan = nextBuildSpan.traceChild('static-generation')
       await staticGenerationSpan.traceAsyncFn(async () => {
         detectConflictingPaths(

packages/next/build/utils.ts

@@ -37,6 +37,7 @@ import { NextConfigComplete } from '../server/config-shared'
 import isError from '../lib/is-error'
 
 const { builtinModules } = require('module')
+const RESERVED_PAGE = /^\/(_app|_error|_document|api(\/|$))/
 const fileGzipStats: { [k: string]: Promise<number> | undefined } = {}
 const fsStatGzip = (file: string) => {
   const cached = fileGzipStats[file]
@@ -1144,3 +1145,11 @@ export function getUnresolvedModuleFromError(
   const [, moduleName] = error.match(moduleErrorRegex) || []
   return builtinModules.find((item: string) => item === moduleName)
 }
+
+export function isReservedPage(page: string) {
+  return RESERVED_PAGE.test(page)
+}
+
+export function isCustomErrorPage(page: string) {
+  return page === '/404' || page === '/500'
+}

packages/next/build/webpack-config.ts

@@ -452,7 +452,7 @@ export default async function getBaseWebpackConfig(
   let useSWCLoader = !babelConfigFile
 
   if (!loggedSwcDisabled && !useSWCLoader && babelConfigFile) {
-    Log.warn(
+    Log.info(
       `Disabled SWC as replacement for Babel because of custom Babel configuration "${path.relative(
         dir,
         babelConfigFile

packages/next/build/webpack/loaders/next-middleware-ssr-loader/index.ts

@@ -96,13 +96,13 @@ export default async function middlewareRSCLoader(this: any) {
             createElement(FlightWrapper, props)
           )
         }`
-            : `
-        const Component = Page`
+            : `const Component = Page`
         }
 
         async function render(request) {
           const url = request.nextUrl
-          const query = Object.fromEntries(url.searchParams)
+          const { pathname, searchParams } = url
+          const query = Object.fromEntries(searchParams)
 
           // Preflight request
           if (request.method === 'HEAD') {
@@ -122,9 +122,9 @@ export default async function middlewareRSCLoader(this: any) {
               wrapReadable(
                 renderFlight({
                   router: {
-                    route: url.pathname,
-                    asPath: url.pathname,
-                    pathname: url.pathname,
+                    route: pathname,
+                    asPath: pathname,
+                    pathname: pathname,
                     query,
                   }
                 })
@@ -165,9 +165,9 @@ export default async function middlewareRSCLoader(this: any) {
 
           try {
             const result = await renderToHTML(
-              { url: url.pathname },
+              { url: pathname },
               {},
-              url.pathname,
+              pathname,
               query,
               renderOpts
             )
@@ -177,7 +177,7 @@ export default async function middlewareRSCLoader(this: any) {
             })
           } catch (err) {
             return new Response(
-              (err || 'An error occurred while rendering ' + url.pathname + '.').toString(),
+              (err || 'An error occurred while rendering ' + pathname + '.').toString(),
               {
                 status: 500,
                 headers: { 'x-middleware-ssr': '1' }

packages/next/build/webpack/plugins/middleware-plugin.ts

@@ -100,9 +100,8 @@ export default class MiddlewarePlugin {
     )
     middlewareManifest.clientInfo = middlewareManifest.sortedMiddleware.map(
       (key) => {
-        const ssrEntryInfo = ssrEntries.get(
-          middlewareManifest.middleware[key].name
-        )
+        const middleware = middlewareManifest.middleware[key]
+        const ssrEntryInfo = ssrEntries.get(middleware.name)
         return [key, !!ssrEntryInfo]
       }
     )