From fae132a4e08193cb7ce5bdbe96e712f409153018 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Fri, 14 Aug 2020 10:01:15 +0800 Subject: [PATCH 1/3] fix: ensure Dev Tool is enabled in Vue 3 runtime The old alias `@vue/runtime-dom` was introduced because webpack HMR has trouble with pure re-exports. Now that the `vue.runtime.esm-bundler.js` file also includes a call to `initDev`, it's no longer an issue. This also enables Dev Tool in Vue 3 runtime. Fixes #5785 --- packages/@vue/cli-service/__tests__/serve.spec.js | 1 + packages/@vue/cli-service/__tests__/serveVue3.spec.js | 1 + packages/@vue/cli-service/lib/config/base.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/@vue/cli-service/__tests__/serve.spec.js b/packages/@vue/cli-service/__tests__/serve.spec.js index cceeebcbd9..42f9532ca9 100644 --- a/packages/@vue/cli-service/__tests__/serve.spec.js +++ b/packages/@vue/cli-service/__tests__/serve.spec.js @@ -15,6 +15,7 @@ test('serve', async () => { async ({ page, nextUpdate, helpers }) => { const msg = `Welcome to Your Vue.js App` expect(await helpers.getText('h1')).toMatch(msg) + expect(await page.evaluate('window.__VUE__')).toBeDefined() // test hot reload const file = await project.read(`src/App.vue`) diff --git a/packages/@vue/cli-service/__tests__/serveVue3.spec.js b/packages/@vue/cli-service/__tests__/serveVue3.spec.js index c97cb1153c..161f24d0ee 100644 --- a/packages/@vue/cli-service/__tests__/serveVue3.spec.js +++ b/packages/@vue/cli-service/__tests__/serveVue3.spec.js @@ -13,6 +13,7 @@ test('serve with Vue 3', async () => { async ({ page, nextUpdate, helpers }) => { const msg = `Welcome to Your Vue.js App` expect(await helpers.getText('h1')).toMatch(msg) + expect(await page.evaluate('window.__VUE__')).toBeDefined() // test hot reload const file = await project.read(`src/App.vue`) diff --git a/packages/@vue/cli-service/lib/config/base.js b/packages/@vue/cli-service/lib/config/base.js index 343a46cffc..49d23c9f6c 100644 --- a/packages/@vue/cli-service/lib/config/base.js +++ b/packages/@vue/cli-service/lib/config/base.js @@ -121,7 +121,7 @@ module.exports = (api, options) => { 'vue$', options.runtimeCompiler ? 'vue/dist/vue.esm-bundler.js' - : '@vue/runtime-dom' + : 'vue/dist/vue.runtime.esm-bundler.js' ) webpackConfig.module From eec5407e318ded99c4076c88a1ede8cce569e4f0 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Fri, 14 Aug 2020 10:20:33 +0800 Subject: [PATCH 2/3] test: use evaluate function instead of strings --- packages/@vue/cli-service/__tests__/serve.spec.js | 2 +- packages/@vue/cli-service/__tests__/serveVue3.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@vue/cli-service/__tests__/serve.spec.js b/packages/@vue/cli-service/__tests__/serve.spec.js index 42f9532ca9..50ca0aec9d 100644 --- a/packages/@vue/cli-service/__tests__/serve.spec.js +++ b/packages/@vue/cli-service/__tests__/serve.spec.js @@ -15,7 +15,7 @@ test('serve', async () => { async ({ page, nextUpdate, helpers }) => { const msg = `Welcome to Your Vue.js App` expect(await helpers.getText('h1')).toMatch(msg) - expect(await page.evaluate('window.__VUE__')).toBeDefined() + expect(await page.evaluate(() => window.__VUE__)).toBeDefined() // test hot reload const file = await project.read(`src/App.vue`) diff --git a/packages/@vue/cli-service/__tests__/serveVue3.spec.js b/packages/@vue/cli-service/__tests__/serveVue3.spec.js index 161f24d0ee..1021497c22 100644 --- a/packages/@vue/cli-service/__tests__/serveVue3.spec.js +++ b/packages/@vue/cli-service/__tests__/serveVue3.spec.js @@ -13,7 +13,7 @@ test('serve with Vue 3', async () => { async ({ page, nextUpdate, helpers }) => { const msg = `Welcome to Your Vue.js App` expect(await helpers.getText('h1')).toMatch(msg) - expect(await page.evaluate('window.__VUE__')).toBeDefined() + expect(await page.evaluate(() => window.__VUE__)).toBeDefined() // test hot reload const file = await project.read(`src/App.vue`) From f63c9296c1b762d49a2ce261eb72cda9d12820eb Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Fri, 14 Aug 2020 10:22:12 +0800 Subject: [PATCH 3/3] test: only test vue 3 --- packages/@vue/cli-service/__tests__/serve.spec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/@vue/cli-service/__tests__/serve.spec.js b/packages/@vue/cli-service/__tests__/serve.spec.js index 50ca0aec9d..cceeebcbd9 100644 --- a/packages/@vue/cli-service/__tests__/serve.spec.js +++ b/packages/@vue/cli-service/__tests__/serve.spec.js @@ -15,7 +15,6 @@ test('serve', async () => { async ({ page, nextUpdate, helpers }) => { const msg = `Welcome to Your Vue.js App` expect(await helpers.getText('h1')).toMatch(msg) - expect(await page.evaluate(() => window.__VUE__)).toBeDefined() // test hot reload const file = await project.read(`src/App.vue`)