Merge remote-tracking branch 'upstream/canary' into azure/test-timings

vercel · Jan 22, 2020 · fd11f57 · fd11f57
2 parents 12f4658 + 999b8ce
commit fd11f57
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git a/examples/gh-pages/next.config.js b/examples/gh-pages/next.config.js
@@ -5,11 +5,5 @@
 const debug = process.env.NODE_ENV !== 'production'
 
 module.exports = {
-  exportPathMap: function() {
-    return {
-      '/': { page: '/' },
-      '/about': { page: '/about' },
-    }
-  },
   assetPrefix: !debug ? '/Next-gh-page-example/' : '',
 }
diff --git a/examples/with-dynamic-import/next.config.js b/examples/with-dynamic-import/next.config.js
diff --git a/test/integration/production/test/index.test.js b/test/integration/production/test/index.test.js
@@ -718,5 +718,5 @@ describe('Production Usage', () => {
   dynamicImportTests(context, (p, q) => renderViaHTTP(context.appPort, p, q))
 
   processEnv(context)
-  security(context)
+  if (browserName !== 'safari') security(context)
 })