Merge commit '4584ea47f66ff1ea89199e80cbc6c437cd15cd89' into typescript-transpile-only

kachkaev · kachkaev · commit 1f502bfea123 · 2019-10-28T11:11:06.000Z
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -36,6 +36,11 @@ commands:
       - run:
           name: Installing Dependencies
           command: yarn install --frozen-lockfile --check-files
+      - run:
+          name: Install correct Chrome Driver version
+          command: yarn add chromedriver@76 -W
+      - run: google-chrome --version
+      - run: chromedriver --version
   yarn_lint:
     steps:
       - run:
diff --git a/examples/with-immutable-redux-wrapper/README.md b/examples/with-immutable-redux-wrapper/README.md
@@ -1,6 +1,6 @@
 # Immutable Redux Example
 
-> This example and documentation is based on the [with-redux](https://github.com/zeit/next.js/tree/master/examples/with-redux) example.
+> This example and documentation is based on the [with-redux-wrapper](https://github.com/zeit/next.js/tree/master/examples/with-redux-wrapper) example.
 
 ## How to use
 
diff --git a/examples/with-immutable-redux-wrapper/package.json b/examples/with-immutable-redux-wrapper/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "immutable": "4.0.0-rc.9",
     "next": "latest",
-    "next-redux-wrapper": "2.0.0-beta.6",
+    "next-redux-wrapper": "4.0.1",
     "react": "^16.7.0",
     "react-dom": "^16.7.0",
     "react-redux": "^5.0.1",
diff --git a/examples/with-react-intl/pages/_app.js b/examples/with-react-intl/pages/_app.js
@@ -1,9 +1,13 @@
 import App from 'next/app'
 import React from 'react'
-import { IntlProvider } from 'react-intl'
+import { createIntl, createIntlCache, RawIntlProvider } from 'react-intl'
+
+// This is optional but highly recommended
+// since it prevents memory leak
+const cache = createIntlCache()
 
 export default class MyApp extends App {
-  static async getInitialProps ({ Component, router, ctx }) {
+  static async getInitialProps ({ Component, ctx }) {
     let pageProps = {}
 
     if (Component.getInitialProps) {
@@ -21,10 +25,18 @@ export default class MyApp extends App {
   render () {
     const { Component, pageProps, locale, messages } = this.props
 
+    const intl = createIntl(
+      {
+        locale,
+        messages
+      },
+      cache
+    )
+
     return (
-      <IntlProvider locale={locale} messages={messages}>
+      <RawIntlProvider value={intl}>
         <Component {...pageProps} />
-      </IntlProvider>
+      </RawIntlProvider>
     )
   }
 }
diff --git a/examples/with-react-native-web/babel.config.js b/examples/with-react-native-web/babel.config.js
@@ -0,0 +1,4 @@
+module.exports = {
+  presets: ['next/babel'],
+  plugins: [['react-native-web', { commonjs: true }]]
+}
diff --git a/examples/with-react-native-web/next.config.js b/examples/with-react-native-web/next.config.js
@@ -1,10 +1,11 @@
 module.exports = {
-  webpack: config => {
+  webpack: (config, { defaultLoaders }) => {
     config.resolve.alias = {
       ...(config.resolve.alias || {}),
       // Transform all direct `react-native` imports to `react-native-web`
       'react-native$': 'react-native-web'
     }
+    config.resolve.extensions.push('.web.js', '.web.ts', '.web.tsx')
     return config
   }
 }
diff --git a/examples/with-react-native-web/package.json b/examples/with-react-native-web/package.json
@@ -10,5 +10,8 @@
     "react": "^16.7.0",
     "react-dom": "^16.7.0",
     "react-native-web": "^0.11.6"
+  },
+  "devDependencies": {
+    "babel-plugin-react-native-web": "^0.11.7"
   }
 }
diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.1.2-canary.8"
+  "version": "9.1.2-canary.9"
 }
diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "babel-jest": "24.8.0",
     "browserstack-local": "1.4.0",
     "cheerio": "0.22.0",
-    "chromedriver": "75.1.0",
+    "chromedriver": "76.0.1",
     "clone": "2.1.2",
     "coveralls": "3.0.3",
     "cross-spawn": "6.0.5",
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.1.2-canary.8",
+  "version": "9.1.2-canary.9",
   "keywords": [
     "react",
     "next",
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.1.2-canary.8",
+  "version": "9.1.2-canary.9",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "9.1.2-canary.8",
+  "version": "9.1.2-canary.9",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -727,6 +727,9 @@ export default async function getBaseWebpackConfig(
         'process.env.__NEXT_EXPORT_TRAILING_SLASH': JSON.stringify(
           config.exportTrailingSlash
         ),
+        'process.env.__NEXT_DEFER_SCRIPTS': JSON.stringify(
+          config.experimental.deferScripts
+        ),
         'process.env.__NEXT_MODERN_BUILD': JSON.stringify(
           config.experimental.modern && !dev
         ),
@@ -739,6 +742,9 @@ export default async function getBaseWebpackConfig(
         'process.env.__NEXT_PRERENDER_INDICATOR': JSON.stringify(
           config.devIndicators.autoPrerender
         ),
+        'process.env.__NEXT_STRICT_MODE': JSON.stringify(
+          config.reactStrictMode
+        ),
         ...(isServer
           ? {
               // Fix bad-actors in the npm ecosystem (e.g. `node-formidable`)
diff --git a/packages/next/client/index.js b/packages/next/client/index.js
@@ -372,11 +372,19 @@ async function doRender ({ App, Component, props, err }) {
     appProps
   })
 
-  // We catch runtime errors using componentDidCatch which will trigger renderError
-  renderReactElement(
+  const elem = (
     <AppContainer>
       <App {...appProps} />
-    </AppContainer>,
+    </AppContainer>
+  )
+
+  // We catch runtime errors using componentDidCatch which will trigger renderError
+  renderReactElement(
+    process.env.__NEXT_STRICT_MODE ? (
+      <React.StrictMode>{elem}</React.StrictMode>
+    ) : (
+      elem
+    ),
     appElement
   )
 
diff --git a/packages/next/next-server/server/api-utils.ts b/packages/next/next-server/server/api-utils.ts
@@ -119,7 +119,15 @@ export function getQueryParser({ url }: IncomingMessage) {
 
     const query: { [key: string]: string | string[] } = {}
     for (const [key, value] of params) {
-      query[key] = value
+      if (query[key]) {
+        if (Array.isArray(query[key])) {
+          ;(query[key] as string[]).push(value)
+        } else {
+          query[key] = [query[key], value]
+        }
+      } else {
+        query[key] = value
+      }
     }
 
     return query
diff --git a/packages/next/next-server/server/config.ts b/packages/next/next-server/server/config.ts
@@ -47,12 +47,14 @@ const defaultConfig: { [key: string]: any } = {
     profiling: false,
     publicDirectory: false,
     sprFlushToDisk: true,
+    deferScripts: false,
   },
   future: {
     excludeDefaultMomentLocales: false,
   },
   serverRuntimeConfig: {},
   publicRuntimeConfig: {},
+  reactStrictMode: false,
 }
 
 const experimentalWarning = execOnce(() => {
diff --git a/packages/next/next-server/server/spr-cache.ts b/packages/next/next-server/server/spr-cache.ts
@@ -5,7 +5,9 @@ import { promisify } from 'util'
 import { PrerenderManifest } from '../../build'
 import { PRERENDER_MANIFEST } from '../lib/constants'
 import { normalizePagePath } from './normalize-page-path'
+import mkdirpOrig from 'mkdirp'
 
+const mkdirp = promisify(mkdirpOrig)
 const readFile = promisify(fs.readFile)
 const writeFile = promisify(fs.writeFile)
 
@@ -166,7 +168,9 @@ export async function setSprCache(
   // `next build` output's manifest.
   if (sprOptions.flushToDisk) {
     try {
-      await writeFile(getSeedPath(pathname, 'html'), data.html, 'utf8')
+      const seedPath = getSeedPath(pathname, 'html')
+      await mkdirp(path.dirname(seedPath))
+      await writeFile(seedPath, data.html, 'utf8')
       await writeFile(
         getSeedPath(pathname, 'json'),
         JSON.stringify(data.pageData),
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "9.1.2-canary.8",
+  "version": "9.1.2-canary.9",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -58,17 +58,17 @@
   },
   "dependencies": {
     "@ampproject/toolbox-optimizer": "1.1.1",
-    "@babel/core": "7.4.5",
-    "@babel/plugin-proposal-class-properties": "7.4.4",
-    "@babel/plugin-proposal-object-rest-spread": "7.4.4",
+    "@babel/core": "7.6.4",
+    "@babel/plugin-proposal-class-properties": "7.5.5",
+    "@babel/plugin-proposal-object-rest-spread": "7.6.2",
     "@babel/plugin-syntax-dynamic-import": "7.2.0",
-    "@babel/plugin-transform-modules-commonjs": "7.4.4",
-    "@babel/plugin-transform-runtime": "7.4.4",
-    "@babel/preset-env": "7.4.5",
-    "@babel/preset-react": "7.0.0",
-    "@babel/preset-typescript": "7.3.3",
-    "@babel/runtime": "7.4.5",
-    "@babel/runtime-corejs2": "7.4.5",
+    "@babel/plugin-transform-modules-commonjs": "7.6.0",
+    "@babel/plugin-transform-runtime": "7.6.2",
+    "@babel/preset-env": "7.6.3",
+    "@babel/preset-react": "7.6.3",
+    "@babel/preset-typescript": "7.6.0",
+    "@babel/runtime": "7.6.3",
+    "@babel/runtime-corejs2": "7.6.3",
     "amphtml-validator": "1.0.23",
     "async-retry": "1.2.3",
     "async-sema": "3.0.0",
@@ -135,7 +135,6 @@
     "react-dom": "^16.6.0"
   },
   "devDependencies": {
-    "@babel/parser": "7.4.5",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
     "@taskr/watch": "1.1.0",
diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
@@ -146,6 +146,7 @@ export class Head extends Component<
     cssFiles.forEach(file => {
       cssLinkElements.push(
         <link
+          key="${file}-preload"
           nonce={this.props.nonce}
           rel="preload"
           href={`${assetPrefix}/_next/${encodeURI(file)}`}
@@ -520,7 +521,8 @@ export class NextScript extends Component<OriginProps> {
 
       return (
         <script
-          async
+          defer={process.env.__NEXT_DEFER_SCRIPTS as any}
+          async={!process.env.__NEXT_DEFER_SCRIPTS as any}
           key={bundle.file}
           src={`${assetPrefix}/_next/${encodeURI(
             bundle.file
@@ -560,7 +562,8 @@ export class NextScript extends Component<OriginProps> {
             file
           )}${_devOnlyInvalidateCacheQueryString}`}
           nonce={this.props.nonce}
-          async
+          defer={process.env.__NEXT_DEFER_SCRIPTS as any}
+          async={!process.env.__NEXT_DEFER_SCRIPTS as any}
           crossOrigin={this.props.crossOrigin || process.crossOrigin}
           {...modernProps}
         />
@@ -593,6 +596,7 @@ export class NextScript extends Component<OriginProps> {
       devFiles,
       __NEXT_DATA__,
     } = this.context._documentProps
+    const deferScripts: any = process.env.__NEXT_DEFER_SCRIPTS
     const { _devOnlyInvalidateCacheQueryString } = this.context
 
     if (inAmpMode) {
@@ -647,7 +651,8 @@ export class NextScript extends Component<OriginProps> {
 
     const pageScript = [
       <script
-        async
+        defer={deferScripts}
+        async={!deferScripts}
         data-next-page={page}
         key={page}
         src={
@@ -661,7 +666,8 @@ export class NextScript extends Component<OriginProps> {
       />,
       process.env.__NEXT_MODERN_BUILD && (
         <script
-          async
+          defer={deferScripts}
+          async={!deferScripts}
           data-next-page={page}
           key={`${page}-modern`}
           src={
@@ -680,7 +686,8 @@ export class NextScript extends Component<OriginProps> {
 
     const appScript = [
       <script
-        async
+        defer={deferScripts}
+        async={!deferScripts}
         data-next-page="/_app"
         src={
           assetPrefix +
@@ -694,7 +701,8 @@ export class NextScript extends Component<OriginProps> {
       />,
       process.env.__NEXT_MODERN_BUILD && (
         <script
-          async
+          defer={deferScripts}
+          async={!deferScripts}
           data-next-page="/_app"
           src={
             assetPrefix +
diff --git a/test/integration/api-support/pages/api/query.js b/test/integration/api-support/pages/api/query.js
@@ -0,0 +1,3 @@
+export default (req, res) => {
+  res.status(200).send(req.query)
+}
diff --git a/test/integration/api-support/test/index.test.js b/test/integration/api-support/test/index.test.js
@@ -180,6 +180,23 @@ function runTests (serverless = false) {
     expect(data).toEqual({ message: 'Parsed body' })
   })
 
+  it('should return empty query object', async () => {
+    const data = await fetchViaHTTP(appPort, '/api/query', null, {}).then(
+      res => res.ok && res.json()
+    )
+    expect(data).toEqual({})
+  })
+
+  it('should parse query correctly', async () => {
+    const data = await fetchViaHTTP(
+      appPort,
+      '/api/query?a=1&b=2&a=3',
+      null,
+      {}
+    ).then(res => res.ok && res.json())
+    expect(data).toEqual({ a: ['1', '3'], b: '2' })
+  })
+
   it('should return empty cookies object', async () => {
     const data = await fetchViaHTTP(appPort, '/api/cookies', null, {}).then(
       res => res.ok && res.json()
diff --git a/test/integration/defer-scripts/next.config.js b/test/integration/defer-scripts/next.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+  onDemandEntries: {
+    // Make sure entries are not getting disposed.
+    maxInactiveAge: 1000 * 60 * 60
+  },
+  experimental: {
+    deferScripts: true
+  }
+}
diff --git a/test/integration/defer-scripts/pages/index.js b/test/integration/defer-scripts/pages/index.js
@@ -0,0 +1 @@
+export default () => <h1>Hello World</h1>
diff --git a/test/integration/defer-scripts/test/index.test.js b/test/integration/defer-scripts/test/index.test.js
diff --git a/test/integration/prerender/pages/user/[user]/profile.js b/test/integration/prerender/pages/user/[user]/profile.js
diff --git a/test/integration/prerender/test/index.test.js b/test/integration/prerender/test/index.test.js
diff --git a/test/integration/production/test/index.test.js b/test/integration/production/test/index.test.js
diff --git a/test/integration/size-limit/test/index.test.js b/test/integration/size-limit/test/index.test.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`	`1`	`module.exports = {`
`2`		`- webpack: config => {`
	`2`	`+ webpack: (config, { defaultLoaders }) => {`
`3`	`3`	`config.resolve.alias = {`
`4`	`4`	`...(config.resolve.alias \|\| {}),`
`5`	`5`	// Transform all direct `react-native` imports to `react-native-web`
`6`	`6`	`'react-native$': 'react-native-web'`
`7`	`7`	`}`
	`8`	`+ config.resolve.extensions.push('.web.js', '.web.ts', '.web.tsx')`
`8`	`9`	`return config`
`9`	`10`	`}`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,8 @@`
`10`	`10`	`"react": "^16.7.0",`
`11`	`11`	`"react-dom": "^16.7.0",`
`12`	`12`	`"react-native-web": "^0.11.6"`
	`13`	`+ },`
	`14`	`+ "devDependencies": {`
	`15`	`+ "babel-plugin-react-native-web": "^0.11.7"`
`13`	`16`	`}`
`14`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@`
`17`	`17`	`"registry": "https://registry.npmjs.org/"`
`18`	`18`	`}`
`19`	`19`	`},`
`20`		`- "version": "9.1.2-canary.8"`
	`20`	`+ "version": "9.1.2-canary.9"`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-next-app",`
`3`		`- "version": "9.1.2-canary.8",`
	`3`	`+ "version": "9.1.2-canary.9",`
`4`	`4`	`"keywords": [`
`5`	`5`	`"react",`
`6`	`6`	`"next",`