Merge remote-tracking branch 'upstream/canary' into fix/runtime-confi…

…g-serverless
vercel · Feb 1, 2020 · 64aa4a6 · 64aa4a6
2 parents 29ae178 + e63d822
commit 64aa4a6
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 4 deletions.
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/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/packages/next/client/index.js b/packages/next/client/index.js
@@ -99,9 +99,10 @@ class Container extends React.Component {
     // If page was exported and has a querystring
     // If it's a dynamic route or has a querystring
     if (
-      (data.nextExport &&
+      router.isSsr &&
+      ((data.nextExport &&
         (isDynamicRoute(router.pathname) || location.search)) ||
-      (Component && Component.__N_SSG && location.search)
+        (Component && Component.__N_SSG && location.search))
     ) {
       // update query on mount for exported pages
       router.replace(

diff --git a/test/integration/dynamic-routing/pages/[name]/on-mount-redir.js b/test/integration/dynamic-routing/pages/[name]/on-mount-redir.js
@@ -0,0 +1,14 @@
+import React from 'react'
+import Router from 'next/router'
+
+class Page extends React.Component {
+  componentDidMount() {
+    Router.push('/')
+  }
+
+  render() {
+    return <p>redirecting..</p>
+  }
+}
+
+export default Page
diff --git a/test/integration/dynamic-routing/test/index.test.js b/test/integration/dynamic-routing/test/index.test.js
@@ -83,6 +83,12 @@ function runTests(dev) {
     }
   })
 
+  it('should allow calling Router.push on mount successfully', async () => {
+    const browser = await webdriver(appPort, '/post-1/on-mount-redir')
+    waitFor(2000)
+    expect(await browser.elementByCss('h3').text()).toBe('My blog')
+  })
+
   // it('should navigate optional dynamic page', async () => {
   //   let browser
   //   try {
@@ -456,6 +462,12 @@ function runTests(dev) {
             page: '/[name]/comments',
             regex: normalizeRegEx('^\\/([^\\/]+?)\\/comments(?:\\/)?$'),
           },
+          {
+            page: '/[name]/on-mount-redir',
+            regex: normalizeRegEx(
+              '^\\/([^\\/]+?)\\/on\\-mount\\-redir(?:\\/)?$'
+            ),
+          },
           {
             page: '/[name]/[comment]',
             regex: normalizeRegEx('^\\/([^\\/]+?)\\/([^\\/]+?)(?:\\/)?$'),
@@ -507,7 +519,10 @@ describe('Dynamic Routing', () => {
   })
 
   describe('serverless mode', () => {
+    let origNextConfig
+
     beforeAll(async () => {
+      origNextConfig = await fs.readFile(nextConfig, 'utf8')
       await fs.writeFile(
         nextConfig,
         `
@@ -526,7 +541,10 @@ describe('Dynamic Routing', () => {
       appPort = await findPort()
       app = await nextStart(appDir, appPort)
     })
-    afterAll(() => killApp(app))
+    afterAll(async () => {
+      await fs.writeFile(nextConfig, origNextConfig)
+      await killApp(app)
+    })
     runTests()
   })
 })