chore: fix shell:dev-vue3

Akryum · Akryum · commit 6798db2d3445 · 2021-05-04T18:07:51.000+02:00
diff --git a/packages/build-tools/src/createConfig.js b/packages/build-tools/src/createConfig.js
@@ -1,10 +1,11 @@
 const webpack = require('webpack')
-const { merge } = require('webpack-merge')
-const { VueLoaderPlugin } = require('vue-loader')
+const { mergeWithRules } = require('webpack-merge')
 const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
 const path = require('path')
 
 exports.createConfig = (config, target = { chrome: 52, firefox: 48 }) => {
+  const { VueLoaderPlugin } = require('vue-loader')
+
   const bubleOptions = {
     target,
     objectAssign: 'Object.assign',
@@ -157,5 +158,13 @@ exports.createConfig = (config, target = { chrome: 52, firefox: 48 }) => {
     }
   }
 
-  return merge(baseConfig, config)
+  return mergeWithRules({
+    module: {
+      rules: {
+        test: 'match',
+        loader: 'replace',
+        options: 'merge'
+      }
+    }
+  })(baseConfig, config)
 }
diff --git a/packages/shell-dev-vue3/src/main.js b/packages/shell-dev-vue3/src/main.js
@@ -1,11 +1,11 @@
 import { createApp, h } from 'vue'
-import { createRouter, createWebHistory } from 'vue-router'
+import { createRouter, createWebHashHistory } from 'vue-router'
 import App from './App.vue'
 import App3 from './App3.vue'
 import TestPlugin from './devtools-plugin'
 
 const router = createRouter({
-  history: createWebHistory(),
+  history: createWebHashHistory(),
 
   routes: [
     {
diff --git a/packages/shell-dev-vue3/webpack.config.js b/packages/shell-dev-vue3/webpack.config.js
@@ -1,7 +1,8 @@
 const path = require('path')
-const { createConfig } = require('@vue-devtools/build-tools')
 const { VueLoaderPlugin } = require('vue-loader')
+const vueLoaderPath = require.resolve('vue-loader')
 const openInEditor = require('launch-editor-middleware')
+const { createConfig } = require('@vue-devtools/build-tools')
 
 module.exports = createConfig({
   context: __dirname,
@@ -25,7 +26,8 @@ module.exports = createConfig({
     rules: [
       {
         test: /\.vue$/,
-        loader: require.resolve('vue-loader')
+        loader: vueLoaderPath,
+        options: {}
       }
     ]
   },
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`const path = require('path')`
`2`		`-const { createConfig } = require('@vue-devtools/build-tools')`
`3`	`2`	`const { VueLoaderPlugin } = require('vue-loader')`
	`3`	`+const vueLoaderPath = require.resolve('vue-loader')`
`4`	`4`	`const openInEditor = require('launch-editor-middleware')`
	`5`	`+const { createConfig } = require('@vue-devtools/build-tools')`
`5`	`6`
`6`	`7`	`module.exports = createConfig({`
`7`	`8`	`context: __dirname,`
`@@ -25,7 +26,8 @@ module.exports = createConfig({`
`25`	`26`	`rules: [`
`26`	`27`	`{`
`27`	`28`	`test: /\.vue$/,`
`28`		`- loader: require.resolve('vue-loader')`
	`29`	`+ loader: vueLoaderPath,`
	`30`	`+ options: {}`
`29`	`31`	`}`
`30`	`32`	`]`
`31`	`33`	`},`