Merge branch 'canary' into basepath-trailing-slash

vercel · Jul 15, 2020 · a664f73 · a664f73
2 parents b1f9137 + 1fe612e
commit a664f73
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/examples/with-expo-typescript/README.md b/examples/with-expo-typescript/README.md
@@ -33,9 +33,9 @@ Deploy the native app to the App store and Play store using [Expo deployment](ht
 Execute [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app) with [npm](https://docs.npmjs.com/cli/init) or [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) to bootstrap the example:
 
 ```bash
-npx create-next-app --example with-expo with-expo-typescript-app
+npx create-next-app --example with-expo-typescript with-expo-typescript-app
 # or
-yarn create next-app --example with-expo with-expo-typescript-app
+yarn create next-app --example with-expo-typescript with-expo-typescript-app
 ```
 
 ### Running web

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -383,7 +383,7 @@ export default async function getBaseWebpackConfig(
         defaultVendors: false,
         framework: {
           chunks: 'all',
-          name: isWebpack5 ? 'static/chunks/framework' : 'framework',
+          name: 'framework',
           // This regex ignores nested copies of framework libraries so they're
           // bundled with their issuer.
           // https://github.com/vercel/next.js/pull/9012
@@ -418,25 +418,22 @@ export default async function getBaseWebpackConfig(
               hash.update(module.libIdent({ context: dir }))
             }
 
-            return (
-              (isWebpack5 ? 'static/chunks/' : '') +
-              hash.digest('hex').substring(0, 8)
-            )
+            return hash.digest('hex').substring(0, 8)
           },
           priority: 30,
           minChunks: 1,
           reuseExistingChunk: true,
         },
         commons: {
-          name: (isWebpack5 ? 'static/chunks/' : '') + 'commons',
+          name: 'commons',
           minChunks: totalPages,
           priority: 20,
         },
         shared: {
           name(module, chunks) {
             return (
               (isWebpack5 ? 'static/chunks/' : '') +
-              (crypto
+              crypto
                 .createHash('sha1')
                 .update(
                   chunks.reduce(
@@ -447,7 +444,7 @@ export default async function getBaseWebpackConfig(
                   )
                 )
                 .digest('hex') +
-                (isModuleCSS(module) ? '_CSS' : ''))
+              (isModuleCSS(module) ? '_CSS' : '')
             )
           },
           priority: 10,
@@ -972,6 +969,7 @@ export default async function getBaseWebpackConfig(
           })
         })(),
       config.experimental.conformance &&
+        !isWebpack5 &&
         !dev &&
         new WebpackConformancePlugin({
           tests: [

diff --git a/test/integration/conformance/test/index.test.js b/test/integration/conformance/test/index.test.js
@@ -7,7 +7,8 @@ import { join } from 'path'
 const appDir = join(__dirname, '../')
 jest.setTimeout(1000 * 60 * 2)
 
-describe('Conformance system', () => {
+// Disabled given that @prateekbh is still reviewing this plugin
+describe.skip('Conformance system', () => {
   let build
   beforeAll(async () => {
     build = await nextBuild(appDir, [], {