Merge branch 'canary' into canary

kodiakhq[bot] · web-flow · commit e73db9bc502d · 2020-08-11T02:59:57.000Z
diff --git a/examples/with-firebase-authentication/utils/auth/useUser.js b/examples/with-firebase-authentication/utils/auth/useUser.js
@@ -33,7 +33,7 @@ const useUser = () => {
     // Firebase updates the id token every hour, this
     // makes sure the react state and the cookie are
     // both kept up to date
-    firebase.auth().onIdTokenChanged((user) => {
+    const cancelAuthListener = firebase.auth().onIdTokenChanged((user) => {
       if (user) {
         const userData = mapUserData(user)
         setUserCookie(userData)
@@ -50,6 +50,10 @@ const useUser = () => {
       return
     }
     setUser(userFromCookie)
+
+    return () => {
+      cancelAuthListener()
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
diff --git a/examples/with-i18n-rosetta/lib/i18n.js b/examples/with-i18n-rosetta/lib/i18n.js
@@ -14,28 +14,10 @@ export const I18nContext = createContext()
 i18n.locale(defaultLanguage)
 
 export default function I18n({ children, locale, lngDict }) {
-  const [activeDict, setActiveDict] = useState(() => lngDict)
   const activeLocaleRef = useRef(locale || defaultLanguage)
   const [, setTick] = useState(0)
   const firstRender = useRef(true)
 
-  // for initial SSR render
-  if (locale && firstRender.current === true) {
-    firstRender.current = false
-    i18n.locale(locale)
-    i18n.set(locale, activeDict)
-  }
-
-  useEffect(() => {
-    if (locale) {
-      i18n.locale(locale)
-      i18n.set(locale, activeDict)
-      activeLocaleRef.current = locale
-      // force rerender
-      setTick((tick) => tick + 1)
-    }
-  }, [locale, activeDict])
-
   const i18nWrapper = {
     activeLocale: activeLocaleRef.current,
     t: (...args) => i18n.t(...args),
@@ -44,13 +26,26 @@ export default function I18n({ children, locale, lngDict }) {
       activeLocaleRef.current = l
       if (dict) {
         i18n.set(l, dict)
-        setActiveDict(dict)
-      } else {
-        setTick((tick) => tick + 1)
       }
+      // force rerender to update view
+      setTick((tick) => tick + 1)
     },
   }
 
+  // for initial SSR render
+  if (locale && firstRender.current === true) {
+    firstRender.current = false
+    i18nWrapper.locale(locale, lngDict)
+  }
+
+  // when locale is updated
+  useEffect(() => {
+    if (locale) {
+      i18nWrapper.locale(locale, lngDict)
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [lngDict, locale])
+
   return (
     <I18nContext.Provider value={i18nWrapper}>{children}</I18nContext.Provider>
   )
diff --git a/examples/with-i18n-rosetta/pages/[lng]/index.js b/examples/with-i18n-rosetta/pages/[lng]/index.js
@@ -19,7 +19,7 @@ const HomePage = () => {
       <h2>{i18n.t('intro.text')}</h2>
       <h3>{i18n.t('intro.description')}</h3>
       <div>Current locale: {i18n.activeLocale}</div>
-      <Link href="/de">
+      <Link href="/[lng]" as="/de">
         <a>Use client-side routing to change language to 'de'</a>
       </Link>
     </div>
diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.5.2-canary.14"
+  "version": "9.5.2"
 }
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": "9.5.2-canary.14",
+  "version": "9.5.2",
   "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": "9.5.2-canary.14",
+  "version": "9.5.2",
   "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": "9.5.2-canary.14",
+  "version": "9.5.2",
   "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": "9.5.2-canary.14",
+  "version": "9.5.2",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "9.5.2-canary.14",
+  "version": "9.5.2",
   "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": "9.5.2-canary.14",
+  "version": "9.5.2",
   "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": "9.5.2-canary.14",
+  "version": "9.5.2",
   "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": "9.5.2-canary.14",
+  "version": "9.5.2",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"
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": "9.5.2-canary.14",
+  "version": "9.5.2",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -929,7 +929,7 @@ export default async function getBaseWebpackConfig(
           config.experimental.reactMode
         ),
         'process.env.__NEXT_OPTIMIZE_FONTS': JSON.stringify(
-          config.experimental.optimizeFonts
+          config.experimental.optimizeFonts && !dev
         ),
         'process.env.__NEXT_OPTIMIZE_IMAGES': JSON.stringify(
           config.experimental.optimizeImages
diff --git a/packages/next/build/webpack/plugins/font-stylesheet-gathering-plugin.ts b/packages/next/build/webpack/plugins/font-stylesheet-gathering-plugin.ts
@@ -1,6 +1,4 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { NodePath } from 'ast-types/lib/node-path'
-import { compilation as CompilationType, Compiler } from 'webpack'
+import webpack, { compilation as CompilationType, Compiler } from 'webpack'
 import { namedTypes } from 'ast-types'
 import { RawSource } from 'webpack-sources'
 import {
@@ -9,10 +7,17 @@ import {
 } from '../../../next-server/server/font-utils'
 // @ts-ignore
 import BasicEvaluatedExpression from 'webpack/lib/BasicEvaluatedExpression'
+import { process as minify } from 'cssnano-simple'
 import { OPTIMIZED_FONT_PROVIDERS } from '../../../next-server/lib/constants'
 
-interface VisitorMap {
-  [key: string]: (path: NodePath) => void
+const isWebpack5 = parseInt(webpack.version!) === 5
+
+async function minifyCss(css: string): Promise<string> {
+  return new Promise((resolve) => {
+    minify(css, { map: false }).then((res) => {
+      resolve(res.css)
+    })
+  })
 }
 
 export class FontStylesheetGatheringPlugin {
@@ -132,19 +137,41 @@ export class FontStylesheetGatheringPlugin {
 
           this.manifestContent = []
           for (let promiseIndex in fontDefinitionPromises) {
+            const css = await fontDefinitionPromises[promiseIndex]
+            const content = await minifyCss(css)
             this.manifestContent.push({
               url: this.gatheredStylesheets[promiseIndex],
-              content: await fontDefinitionPromises[promiseIndex],
+              content,
             })
           }
-          compilation.assets['font-manifest.json'] = new RawSource(
-            JSON.stringify(this.manifestContent, null, '  ')
-          )
+          if (!isWebpack5) {
+            compilation.assets['font-manifest.json'] = new RawSource(
+              JSON.stringify(this.manifestContent, null, '  ')
+            )
+          }
           modulesFinished()
         }
       )
       cb()
     })
+
+    if (isWebpack5) {
+      compiler.hooks.make.tap(this.constructor.name, (compilation) => {
+        // @ts-ignore TODO: Remove ignore when webpack 5 is stable
+        compilation.hooks.processAssets.tap(
+          {
+            name: this.constructor.name,
+            // @ts-ignore TODO: Remove ignore when webpack 5 is stable
+            stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
+          },
+          (assets: any) => {
+            assets['font-manifest.json'] = new RawSource(
+              JSON.stringify(this.manifestContent, null, '  ')
+            )
+          }
+        )
+      })
+    }
   }
 }
 
diff --git a/packages/next/client/link.tsx b/packages/next/client/link.tsx
@@ -97,13 +97,14 @@ function prefetch(
   prefetched[href + '%' + as] = true
 }
 
-function isNewTabRequest(event: React.MouseEvent) {
+function isModifiedEvent(event: React.MouseEvent) {
   const { target } = event.currentTarget as HTMLAnchorElement
   return (
     (target && target !== '_self') ||
     event.metaKey ||
     event.ctrlKey ||
     event.shiftKey ||
+    event.altKey || // triggers resource download
     (event.nativeEvent && event.nativeEvent.which === 2)
   )
 }
@@ -119,8 +120,8 @@ function linkClicked(
 ): void {
   const { nodeName } = e.currentTarget
 
-  if (nodeName === 'A' && (isNewTabRequest(e) || !isLocalURL(href))) {
-    // ignore click for new tab / new window behavior
+  if (nodeName === 'A' && (isModifiedEvent(e) || !isLocalURL(href))) {
+    // ignore click for browser’s default behavior
     return
   }
 
diff --git a/packages/next/next-server/lib/post-process.ts b/packages/next/next-server/lib/post-process.ts
@@ -145,10 +145,7 @@ class FontOptimizerMiddleware implements PostProcessMiddleware {
       const fontContent = options.getFontDefinition(url)
       result = result.replace(
         '</head>',
-        `<style data-href="${url}">${fontContent.replace(
-          /(\n)/g,
-          ''
-        )}</style></head>`
+        `<style data-href="${url}">${fontContent}</style></head>`
       )
     }
     return result
diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
@@ -169,10 +169,11 @@ export default class Server {
       customServer: customServer === true ? true : undefined,
       ampOptimizerConfig: this.nextConfig.experimental.amp?.optimizer,
       basePath: this.nextConfig.basePath,
-      optimizeFonts: this.nextConfig.experimental.optimizeFonts,
-      fontManifest: this.nextConfig.experimental.optimizeFonts
-        ? requireFontManifest(this.distDir, this._isLikeServerless)
-        : null,
+      optimizeFonts: this.nextConfig.experimental.optimizeFonts && !dev,
+      fontManifest:
+        this.nextConfig.experimental.optimizeFonts && !dev
+          ? requireFontManifest(this.distDir, this._isLikeServerless)
+          : null,
       optimizeImages: this.nextConfig.experimental.optimizeImages,
     }
 
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "9.5.2-canary.14",
+  "version": "9.5.2",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -77,8 +77,8 @@
     "@babel/preset-typescript": "7.9.0",
     "@babel/runtime": "7.9.6",
     "@babel/types": "7.9.6",
-    "@next/react-dev-overlay": "9.5.2-canary.14",
-    "@next/react-refresh-utils": "9.5.2-canary.14",
+    "@next/react-dev-overlay": "9.5.2",
+    "@next/react-refresh-utils": "9.5.2",
     "ast-types": "0.13.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",
@@ -124,7 +124,7 @@
     "react-dom": "^16.6.0"
   },
   "devDependencies": {
-    "@next/polyfill-nomodule": "9.5.2-canary.14",
+    "@next/polyfill-nomodule": "9.5.2",
     "@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": "9.5.2-canary.14",
+  "version": "9.5.2",
   "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": "9.5.2-canary.14",
+  "version": "9.5.2",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",
