Merge branch 'canary' into split-chunks-css

vercel · Feb 4, 2020 · 888a1d7 · 888a1d7
2 parents befc190 + bc81379
commit 888a1d7
Show file tree

Hide file tree

Showing 142 changed files with 1,316 additions and 1,122 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -21,6 +21,7 @@
     }
   },
   "overrides": [
+    { "files": ["**/__tests__/**"], "env": { "jest": true } },
     {
       "files": ["**/*.ts", "**/*.tsx"],
       "parser": "@typescript-eslint/parser",

diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -49,6 +49,10 @@ jobs:
         with:
           path: '.'
           key: ${{ github.sha }}
+
+      # TODO: remove after we fix watchpack watching too much
+      - run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
+
       - run: node run-tests.js --timings -g ${{ matrix.group }}/6 -c 3
 
   testsPass:

diff --git a/.github/workflows/test_react_next.yml b/.github/workflows/test_react_next.yml
@@ -47,4 +47,7 @@ jobs:
 
       - run: yarn upgrade react@next react-dom@next -W --dev
 
+      # TODO: remove after we fix watchpack watching too much
+      - run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
+
       - run: node run-tests.js --timings -g ${{ matrix.group }}/6 -c 3
diff --git a/errors/404-get-initial-props.md b/errors/404-get-initial-props.md
@@ -0,0 +1,15 @@
+# 404.js Cannot Have getInitialProps
+
+#### Why This Error Occurred
+
+In your `404.js` page you added `getInitialProps` or `getServerProps` which is not allowed as this prevents the page from being static and `404.js` is meant to provide more flexibility for a static 404 page. Having a static 404 page is the most ideal as this page can be served very often and if not static puts extra strain on your server and more invocations for serverless functions which increase the cost of hosting your site unnecessarily.
+
+#### Possible Ways to Fix It
+
+Remove `getInitialProps` from `404.js` and make sure no HOC's used in `404.js` attach `getInitialProps`.
+
+If you want to fetch data for your `404.js` page move it to a client side fetch inside of `componentDidMount` or `useEffect(() => {}, [])`.
+
+### Useful Links
+
+- [Automatic Static Optimization](https://nextjs.org/docs/advanced-features/automatic-static-optimization)
diff --git a/errors/serverless-publicRuntimeConfig.md b/errors/serverless-publicRuntimeConfig.md
diff --git a/examples/api-routes-apollo-server-and-client-auth/pages/signin.js b/examples/api-routes-apollo-server-and-client-auth/pages/signin.js
@@ -31,15 +31,15 @@ function SignIn() {
     const passwordElement = event.currentTarget.elements.password
 
     try {
+      await client.resetStore()
       const { data } = await signIn({
         variables: {
           email: emailElement.value,
           password: passwordElement.value,
         },
       })
-      client.resetStore()
       if (data.signIn.user) {
-        router.push('/')
+        await router.push('/')
       }
     } catch (error) {
       setErrorMsg(getErrorMessage(error))

diff --git a/examples/api-routes-apollo-server-and-client-auth/pages/signout.js b/examples/api-routes-apollo-server-and-client-auth/pages/signout.js
@@ -16,12 +16,11 @@ function SignOut() {
   const [signOut] = useMutation(SignOutMutation)
 
   React.useEffect(() => {
-    if (typeof window !== 'undefined') {
-      signOut().then(() => {
-        client.resetStore()
+    signOut().then(() => {
+      client.resetStore().then(() => {
         router.push('/signin')
       })
-    }
+    })
   }, [signOut, router, client])
 
   return <p>Signing out...</p>

diff --git a/examples/blog-starter/now.json b/examples/blog-starter/now.json
@@ -1,8 +1,6 @@
 {
-  "version": 2,
   "name": "nextjs-blog-starter",
   "alias": ["nextjs-blog-starter.now.sh"],
-  "builds": [{ "src": "package.json", "use": "@now/next" }],
   "routes": [
     { "src": "/feed.json", "dest": "/_next/static/feed.json" },
     { "src": "/blog/(?<page>[^/]+)$", "dest": "/blog?page=$page" }

diff --git a/examples/using-preact/README.md b/examples/using-preact/README.md
@@ -1,6 +1,6 @@
 # Preact example
 
-This example uses [Preact](https://github.com/developit/preact) instead of React. It's a React like UI framework which is fast and small. Here we've customized Next.js to use Preact instead of React.
+This example uses [Preact](https://github.com/preactjs/preact) instead of React. It's a React like UI framework which is fast and small. Here we've customized Next.js to use Preact instead of React.
 
 Here's how we did it:
 

diff --git a/examples/using-preact/package.json b/examples/using-preact/package.json
@@ -9,8 +9,8 @@
   "dependencies": {
     "module-alias": "2.2.2",
     "next": "latest",
-    "preact": "10.0.0",
-    "preact-render-to-string": "5.0.7"
+    "preact": "10.2.1",
+    "preact-render-to-string": "5.1.4"
   },
   "license": "ISC",
   "devDependencies": {

diff --git a/examples/with-firebase-hosting/package.json b/examples/with-firebase-hosting/package.json
@@ -10,7 +10,7 @@
     "preserve": "npm run build-public && npm run build-funcs && npm run build-app && npm run copy-deps && npm run install-deps",
     "serve": "cross-env NODE_ENV=production firebase serve",
     "predeploy": "npm run build-public && npm run build-funcs && npm run build-app && npm run copy-deps",
-    "deploy": "firebase deploy",
+    "deploy": "NODE_ENV=production firebase deploy",
     "clean": "rimraf \"dist/functions/**\" && rimraf \"dist/public\"",
     "build-public": "cpx \"src/public/**/*.*\" \"dist/public\" -C",
     "build-funcs": "babel \"src/functions\" --out-dir \"dist/functions\"",

diff --git a/examples/with-jest-flow/.babelrc b/examples/with-jest-flow/.babelrc
diff --git a/examples/with-jest-flow/.eslintrc.json b/examples/with-jest-flow/.eslintrc.json
diff --git a/examples/with-jest-flow/.flowconfig b/examples/with-jest-flow/.flowconfig
diff --git a/examples/with-jest-flow/README.md b/examples/with-jest-flow/README.md
diff --git a/examples/with-jest-flow/__tests__/__snapshots__/index.test.js.snap b/examples/with-jest-flow/__tests__/__snapshots__/index.test.js.snap
diff --git a/examples/with-jest-flow/__tests__/index.test.js b/examples/with-jest-flow/__tests__/index.test.js
diff --git a/examples/with-jest-flow/components/Page.js b/examples/with-jest-flow/components/Page.js
diff --git a/examples/with-jest-flow/flow-typed/next.js.flow b/examples/with-jest-flow/flow-typed/next.js.flow
diff --git a/examples/with-jest-flow/jest.config.js b/examples/with-jest-flow/jest.config.js
diff --git a/examples/with-jest-flow/jest.setup.js b/examples/with-jest-flow/jest.setup.js
diff --git a/examples/with-jest-flow/package.json b/examples/with-jest-flow/package.json
diff --git a/examples/with-jest-flow/pages/index.js b/examples/with-jest-flow/pages/index.js
diff --git a/examples/with-jest-react-testing-library/.babelrc b/examples/with-jest-react-testing-library/.babelrc
diff --git a/examples/with-jest-react-testing-library/README.md b/examples/with-jest-react-testing-library/README.md