Merge branch 'canary' into feat/wasm-images

vercel · Feb 17, 2021 · 3d1cc65 · 3d1cc65
2 parents 0e16d8c + 62803a9
commit 3d1cc65
Show file tree

Hide file tree

Showing 18 changed files with 54 additions and 32 deletions.
diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "10.0.8-canary.0"
+  "version": "10.0.8-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": "10.0.8-canary.0",
+  "version": "10.0.8-canary.1",
   "keywords": [
     "react",
     "next",

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": "10.0.8-canary.0",
+  "version": "10.0.8-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": "10.0.8-canary.0",
+  "version": "10.0.8-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": "10.0.8-canary.0",
+  "version": "10.0.8-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": "10.0.8-canary.0",
+  "version": "10.0.8-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": "10.0.8-canary.0",
+  "version": "10.0.8-canary.1",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-google-analytics/package.json b/packages/next-plugin-google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-google-analytics",
-  "version": "10.0.8-canary.0",
+  "version": "10.0.8-canary.1",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-google-analytics"

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

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": "10.0.8-canary.0",
+  "version": "10.0.8-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": "10.0.8-canary.0",
+  "version": "10.0.8-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": "10.0.8-canary.0",
+  "version": "10.0.8-canary.1",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
@@ -80,6 +80,7 @@ import {
   PageInfo,
   printCustomRoutes,
   printTreeView,
+  getCssFilePaths,
 } from './utils'
 import getBaseWebpackConfig from './webpack-config'
 import { PagesManifest } from './webpack/plugins/pages-manifest-plugin'
@@ -868,6 +869,14 @@ export default async function build(
 
     await writeBuildId(distDir, buildId)
 
+    if (config.experimental.optimizeCss) {
+      const cssFilePaths = getCssFilePaths(buildManifest)
+
+      requiredServerFiles.files.push(
+        ...cssFilePaths.map((filePath) => path.join(config.distDir, filePath))
+      )
+    }
+
     await promises.writeFile(
       path.join(distDir, SERVER_FILES_MANIFEST),
       JSON.stringify(requiredServerFiles),

diff --git a/packages/next/build/utils.ts b/packages/next/build/utils.ts
@@ -956,3 +956,16 @@ export function detectConflictingPaths(
     process.exit(1)
   }
 }
+
+export function getCssFilePaths(buildManifest: BuildManifest): string[] {
+  const cssFiles = new Set<string>()
+  Object.values(buildManifest.pages).forEach((files) => {
+    files.forEach((file) => {
+      if (file.endsWith('.css')) {
+        cssFiles.add(file)
+      }
+    })
+  })
+
+  return [...cssFiles]
+}
diff --git a/packages/next/build/webpack/loaders/next-serverless-loader/index.ts b/packages/next/build/webpack/loaders/next-serverless-loader/index.ts
@@ -103,9 +103,9 @@ const nextServerlessLoader: webpack.loader.Loader = function () {
         import onError from 'next-plugin-loader?middleware=on-error-server!'
         import 'next/dist/next-server/server/node-polyfill-fetch'
         import routesManifest from '${routesManifest}'
-  
+
         import { getApiHandler } from 'next/dist/build/webpack/loaders/next-serverless-loader/api-handler'
-  
+
         const apiHandler = getApiHandler({
           pageModule: require("${absolutePagePath}"),
           rewrites: routesManifest.rewrites,
@@ -129,35 +129,35 @@ const nextServerlessLoader: webpack.loader.Loader = function () {
       import routesManifest from '${routesManifest}'
       import buildManifest from '${buildManifest}'
       import reactLoadableManifest from '${reactLoadableManifest}'
-  
+
       ${envLoading}
       ${runtimeConfigImports}
       ${
         // this needs to be called first so its available for any other imports
         runtimeConfigSetter
       }
       import { getPageHandler } from 'next/dist/build/webpack/loaders/next-serverless-loader/page-handler'
-  
+
       const appMod = require('${absoluteAppPath}')
       let App = appMod.default || appMod.then && appMod.then(mod => mod.default);
-  
+
       const compMod = require('${absolutePagePath}')
-  
+
       const Component = compMod.default || compMod.then && compMod.then(mod => mod.default)
       export default Component
       export const getStaticProps = compMod['getStaticProp' + 's'] || compMod.then && compMod.then(mod => mod['getStaticProp' + 's'])
       export const getStaticPaths = compMod['getStaticPath' + 's'] || compMod.then && compMod.then(mod => mod['getStaticPath' + 's'])
       export const getServerSideProps = compMod['getServerSideProp' + 's'] || compMod.then && compMod.then(mod => mod['getServerSideProp' + 's'])
-  
+
       // kept for detecting legacy exports
       export const unstable_getStaticParams = compMod['unstable_getStaticParam' + 's'] || compMod.then && compMod.then(mod => mod['unstable_getStaticParam' + 's'])
       export const unstable_getStaticProps = compMod['unstable_getStaticProp' + 's'] || compMod.then && compMod.then(mod => mod['unstable_getStaticProp' + 's'])
       export const unstable_getStaticPaths = compMod['unstable_getStaticPath' + 's'] || compMod.then && compMod.then(mod => mod['unstable_getStaticPath' + 's'])
       export const unstable_getServerProps = compMod['unstable_getServerProp' + 's'] || compMod.then && compMod.then(mod => mod['unstable_getServerProp' + 's'])
-  
+
       export let config = compMod['confi' + 'g'] || (compMod.then && compMod.then(mod => mod['confi' + 'g'])) || {}
       export const _app = App
-  
+
       const { renderReqToHTML, render } = getPageHandler({
         pageModule: compMod,
         pageComponent: Component,
@@ -171,16 +171,16 @@ const nextServerlessLoader: webpack.loader.Loader = function () {
         pageGetStaticProps: getStaticProps,
         pageGetStaticPaths: getStaticPaths,
         pageGetServerSideProps: getServerSideProps,
-  
+
         assetPrefix: "${assetPrefix}",
         canonicalBase: "${canonicalBase}",
         generateEtags: ${generateEtags || 'false'},
         poweredByHeader: ${poweredByHeader || 'false'},
-  
+
         runtimeConfig,
         buildManifest,
         reactLoadableManifest,
-  
+
         rewrites: routesManifest.rewrites,
         i18n: ${i18n || 'undefined'},
         page: "${page}",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "10.0.8-canary.0",
+  "version": "10.0.8-canary.1",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -62,10 +62,10 @@
   "dependencies": {
     "@babel/runtime": "7.12.5",
     "@hapi/accept": "5.0.1",
-    "@next/env": "10.0.8-canary.0",
-    "@next/polyfill-module": "10.0.8-canary.0",
-    "@next/react-dev-overlay": "10.0.8-canary.0",
-    "@next/react-refresh-utils": "10.0.8-canary.0",
+    "@next/env": "10.0.8-canary.1",
+    "@next/polyfill-module": "10.0.8-canary.1",
+    "@next/react-dev-overlay": "10.0.8-canary.1",
+    "@next/react-refresh-utils": "10.0.8-canary.1",
     "@opentelemetry/api": "0.14.0",
     "ast-types": "0.13.2",
     "browserslist": "4.16.1",
@@ -133,7 +133,7 @@
     "@babel/preset-react": "7.12.10",
     "@babel/preset-typescript": "7.12.7",
     "@babel/types": "7.12.12",
-    "@next/polyfill-nomodule": "10.0.8-canary.0",
+    "@next/polyfill-nomodule": "10.0.8-canary.1",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
     "@taskr/watch": "1.1.0",

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": "10.0.8-canary.0",
+  "version": "10.0.8-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": "10.0.8-canary.0",
+  "version": "10.0.8-canary.1",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",