Merge branch 'canary' into regexpescape

vercel · Nov 30, 2021 · e19fb11 · e19fb11
2 parents 2c9faa4 + d2cef24
commit e19fb11
Show file tree

Hide file tree

Showing 17 changed files with 188 additions and 162 deletions.
diff --git a/package.json b/package.json
@@ -36,6 +36,7 @@
     "lint-staged": "lint-staged",
     "next-with-deps": "./scripts/next-with-deps.sh",
     "next": "node --trace-deprecation --enable-source-maps packages/next/dist/bin/next",
+    "next-react-18": "node --trace-deprecation --enable-source-maps -r ./test/integration/react-18/test/require-hook.js packages/next/dist/bin/next",
     "next-no-sourcemaps": "node --trace-deprecation packages/next/dist/bin/next",
     "clean-trace-jaeger": "rm -rf test/integration/basic/.next && TRACE_TARGET=JAEGER node --trace-deprecation --enable-source-maps packages/next/dist/bin/next build test/integration/basic",
     "debug": "node --inspect packages/next/dist/bin/next",
@@ -138,9 +139,9 @@
     "pretty-ms": "7.0.0",
     "random-seed": "0.3.0",
     "react": "17.0.2",
-    "react-18": "npm:[email protected]alpha-13455d26d-20211104",
+    "react-18": "npm:[email protected]beta-0cc724c77-20211125",
     "react-dom": "17.0.2",
-    "react-dom-18": "npm:[email protected]alpha-13455d26d-20211104",
+    "react-dom-18": "npm:[email protected]beta-0cc724c77-20211125",
     "react-ssr-prepass": "1.0.8",
     "release": "6.3.0",
     "request-promise-core": "1.1.2",

diff --git a/packages/next/build/webpack/loaders/next-serverless-loader/page-handler.ts b/packages/next/build/webpack/loaders/next-serverless-loader/page-handler.ts
@@ -191,6 +191,10 @@ export function getPageHandler(ctx: ServerlessHandlerCtx) {
           locale: detectedLocale,
           defaultLocale,
           domainLocales: i18n?.domains,
+          optimizeImages: process.env.__NEXT_OPTIMIZE_IMAGES,
+          optimizeCss: process.env.__NEXT_OPTIMIZE_CSS,
+          concurrentFeatures: process.env.__NEXT_CONCURRENT_FEATURES,
+          crossOrigin: process.env.__NEXT_CROSS_ORIGIN,
         },
         options
       )

diff --git a/packages/next/client/image.tsx b/packages/next/client/image.tsx
@@ -642,6 +642,18 @@ export default function Image({
     }
   }
 
+  let imageSrcSetPropName = 'imagesrcset'
+  let imageSizesPropName = 'imagesizes'
+  if (process.env.__NEXT_REACT_ROOT) {
+    imageSrcSetPropName = 'imageSrcSet'
+    imageSizesPropName = 'imageSizes'
+  }
+  const linkProps = {
+    // Note: imagesrcset and imagesizes are not in the link element type with react 17.
+    [imageSrcSetPropName]: imgAttributes.srcSet,
+    [imageSizesPropName]: imgAttributes.sizes,
+  }
+
   return (
     <span style={wrapperStyle}>
       {hasSizer ? (
@@ -716,11 +728,8 @@ export default function Image({
             rel="preload"
             as="image"
             href={imgAttributes.srcSet ? undefined : imgAttributes.src}
-            // @ts-ignore: imagesrcset is not yet in the link element type.
-            imagesrcset={imgAttributes.srcSet}
-            // @ts-ignore: imagesizes is not yet in the link element type.
-            imagesizes={imgAttributes.sizes}
-          ></link>
+            {...linkProps}
+          />
         </Head>
       ) : null}
     </span>

diff --git a/packages/next/export/index.ts b/packages/next/export/index.ts
@@ -381,6 +381,10 @@ export default async function exportApp(
       // Exported pages do not currently support dynamic HTML.
       supportsDynamicHTML: false,
       concurrentFeatures: nextConfig.experimental.concurrentFeatures,
+      crossOrigin: nextConfig.crossOrigin,
+      optimizeCss: nextConfig.experimental.optimizeCss,
+      optimizeFonts: nextConfig.optimizeFonts,
+      optimizeImages: nextConfig.experimental.optimizeImages,
     }
 
     const { serverRuntimeConfig, publicRuntimeConfig } = nextConfig