Merge branch 'canary' into global-css

vercel · Sep 13, 2019 · 9684173 · 9684173
2 parents 58098af + 5c83684
commit 9684173
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -50,6 +50,8 @@ commands:
               circleci tests glob "test/**/*.test.*" | \
               circleci tests split
             )
+          environment:
+            NEXT_TELEMETRY_DISABLED: '1'
   test_browser:
     parameters:
       browser:
@@ -66,6 +68,7 @@ commands:
           environment:
             BROWSERSTACK: 'true'
             BROWSER_NAME: << parameters.browser >>
+            NEXT_TELEMETRY_DISABLED: '1'
   save_npm_token:
     steps:
       - run:

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -8,4 +8,4 @@ jobs:
     - name: PR Stats
       uses: zeit/next-stats-action@master
       env:
-        PR_STATS_COMMENT_TOKEN: ${{ secrets.PR_STATS_COMMENT_TOKEN }}
+        COMMENT_ENDPOINT: https://next-stats.jjsweb.site/api/comment
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,6 +1,9 @@
 pool:
   vmImage: 'vs2017-win2016'
 
+variables:
+  NEXT_TELEMETRY_DISABLED: '1'
+
 strategy:
   maxParallel: 10
   matrix:

diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.0.6-canary.1"
+  "version": "9.0.6-canary.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.0.6-canary.1",
+  "version": "9.0.6-canary.2",
   "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.0.6-canary.1",
+  "version": "9.0.6-canary.2",
   "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.0.6-canary.1",
+  "version": "9.0.6-canary.2",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next/README.md b/packages/next/README.md
@@ -555,6 +555,8 @@ export default Home
 
 ```jsx
 // pages/about.js
+import Link from 'next/link'
+
 function About() {
   return (
     <>

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -330,6 +330,17 @@ export default async function getBaseWebpackConfig(
             try {
               res = resolveRequest(request, context)
             } catch (err) {
+              if (
+                request === 'react-ssr-prepass' &&
+                !config.experimental.ampBindInitData
+              ) {
+                if (
+                  context.replace(/\\/g, '/').includes('next-server/server')
+                ) {
+                  return callback(undefined, `commonjs ${request}`)
+                }
+              }
+
               return callback()
             }
 

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "9.0.6-canary.1",
+  "version": "9.0.6-canary.2",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",