From 5110feffc3c082b7bd2652929fc7872dc0948fdf Mon Sep 17 00:00:00 2001 From: Dmitry Molotkov Date: Wed, 24 Jun 2020 22:23:25 +0300 Subject: [PATCH 1/4] fix: catch all route chunk not found --- packages/utils/src/resolve.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/utils/src/resolve.js b/packages/utils/src/resolve.js index 09972caa837b..1de22fd6e28e 100644 --- a/packages/utils/src/resolve.js +++ b/packages/utils/src/resolve.js @@ -18,10 +18,9 @@ export const wp = function wp (p = '') { } export const wChunk = function wChunk (p = '') { - if (isWindows) { - return p.replace(/\//g, '_') - } - return p + // workaround for SplitChunksPlugin that generate names starting from . for catchAll pages _.vue + // consider using https://webpack.js.org/configuration/output/#outputfilename for more robust control over filename generation + return p.replace('_', '[_]') } const reqSep = /\//g From d98d624890d2f6227c91399e4c21e52264a732f7 Mon Sep 17 00:00:00 2001 From: Dmitry Molotkov Date: Wed, 24 Jun 2020 22:28:17 +0300 Subject: [PATCH 2/4] remove trailing space --- packages/utils/src/resolve.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/utils/src/resolve.js b/packages/utils/src/resolve.js index 1de22fd6e28e..79d43f516af0 100644 --- a/packages/utils/src/resolve.js +++ b/packages/utils/src/resolve.js @@ -18,7 +18,7 @@ export const wp = function wp (p = '') { } export const wChunk = function wChunk (p = '') { - // workaround for SplitChunksPlugin that generate names starting from . for catchAll pages _.vue + // workaround for SplitChunksPlugin that generate names starting from . for catchAll pages _.vue // consider using https://webpack.js.org/configuration/output/#outputfilename for more robust control over filename generation return p.replace('_', '[_]') } From aedea6557b6acf5361f498cc97ba752e1963ac4f Mon Sep 17 00:00:00 2001 From: Aldarund Date: Wed, 24 Jun 2020 22:57:18 +0300 Subject: [PATCH 3/4] fix win test --- test/dev/extract-css.test.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/dev/extract-css.test.js b/test/dev/extract-css.test.js index a507c69a3714..bb6086f3c980 100644 --- a/test/dev/extract-css.test.js +++ b/test/dev/extract-css.test.js @@ -5,7 +5,6 @@ import { loadFixture, getPort, Nuxt } from '../utils' let nuxt = null const readFile = promisify(fs.readFile) -const isWindows = process.platform.startsWith('win') describe('extract css', () => { beforeAll(async () => { @@ -17,7 +16,7 @@ describe('extract css', () => { }) test('Verify global.css has been extracted and minified', async () => { - const fileName = isWindows ? 'pages_index.css' : 'pages/index.css' + const fileName = 'pages/index.css' const extractedIndexCss = resolve(__dirname, '..', 'fixtures/extract-css/.nuxt/dist/client', fileName) const content = await readFile(extractedIndexCss, 'utf-8') From 83e7808ced08bf567bffa9bf5050b21250107b67 Mon Sep 17 00:00:00 2001 From: Aldarund Date: Wed, 24 Jun 2020 23:13:10 +0300 Subject: [PATCH 4/4] fix win test --- packages/utils/test/resolve.win.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/utils/test/resolve.win.test.js b/packages/utils/test/resolve.win.test.js index 3feb80b84dc1..768e26a5aa36 100644 --- a/packages/utils/test/resolve.win.test.js +++ b/packages/utils/test/resolve.win.test.js @@ -12,7 +12,7 @@ describe.win('util: resolve windows', () => { }) test('should format windows path', () => { - expect(wChunk('nuxt/layout/test')).toEqual('nuxt_layout_test') + expect(wChunk('nuxt/layout/test')).toEqual('nuxt/layout/test') }) test('should resolve alias path', () => {