diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index f8c544d7..cfdd4071 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -30,7 +30,7 @@ module.exports = { } }, resolve: { - extensions: ['.js', '.jsx', '.vue'], + extensions: ['.js', '.jsx', '.vue', '.mjs'], modules: [ path.join(__dirname, '../node_modules') ], @@ -68,6 +68,11 @@ module.exports = { path.resolve(__dirname, '../src/i18n') ] }, + { + test: /\.mjs$/, + include: /node_modules/, + type: "javascript/auto" + }, { test: /\.vue$/, loader: 'vue-loader', diff --git a/package.json b/package.json index 727d7602..1445f12c 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@vue/babel-helper-vue-jsx-merge-props": "1.2.1", "@vue/babel-plugin-jsx": "1.1.1", "@vue/compiler-sfc": "^3.1.0", - "@vue/test-utils": "2.0.0-rc.17", + "@vue/test-utils": "^2.0.2", "autoprefixer": "6.7.7", "babel-eslint": "7.2.3", "babel-loader": "8.2.4", diff --git a/yarn.lock b/yarn.lock index 33d5f538..a761ad0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1895,10 +1895,10 @@ resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.37.tgz#8e6adc3f2759af52f0e85863dfb0b711ecc5c702" integrity sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw== -"@vue/test-utils@2.0.0-rc.17": - version "2.0.0-rc.17" - resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.0.0-rc.17.tgz#e6dcf5b5bd3ae23595bdb154b9b578ebcdffd698" - integrity sha512-7LHZKsFRV/HqDoMVY+cJamFzgHgsrmQFalROHC5FMWrzPzd+utG5e11krj1tVsnxYufGA2ABShX4nlcHXED+zQ== +"@vue/test-utils@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.0.2.tgz#0b5edd683366153d5bc5a91edc62f292118710eb" + integrity sha512-E2P4oXSaWDqTZNbmKZFVLrNN/siVN78YkEqs7pHryWerrlZR9bBFLWdJwRoguX45Ru6HxIflzKl4vQvwRMwm5g== "@vuelidate/core@2.0.0-alpha.42": version "2.0.0-alpha.42"