diff --git a/.circleci/config.yml b/.circleci/config.yml index 4b6fe7bed54f5f2e90677daf7b085f80e656d116..8dac24250728cbed2158c9cc135c64e9fbda52e4 100644 --- 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/package.json b/package.json index 41d0e23880a0dcf49d922f614f93a7e792e8cb41..491ca04e32cf14b3061cb8b3627611c50ebc81de 100644 --- 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/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts index fd6ec5cd00d00178b86ef77aab4694b01de5c2a0..fd7f1ce58e11a4abd0a7cca3f490a300a5f6a1d8 100644 --- a/packages/next/build/webpack-config.ts +++ b/packages/next/build/webpack-config.ts @@ -724,6 +724,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 ), diff --git a/packages/next/next-server/server/config.ts b/packages/next/next-server/server/config.ts index 712eca701718ad09ee2e8d5d57faa8399630ab71..3fe9b13f1a7b3faf4f104eed1f6f9a81cb5ccbdb 100644 --- a/packages/next/next-server/server/config.ts +++ b/packages/next/next-server/server/config.ts @@ -47,6 +47,7 @@ const defaultConfig: { [key: string]: any } = { profiling: false, publicDirectory: false, sprFlushToDisk: true, + deferScripts: false, }, future: { excludeDefaultMomentLocales: false, diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx index 5eed3f678cce0aeb49a71b00350583b6045daacb..3de7a9700c13cfe638018662d6ade27a80a1a447 100644 --- a/packages/next/pages/_document.tsx +++ b/packages/next/pages/_document.tsx @@ -521,7 +521,8 @@ export class NextScript extends Component { return (