diff --git a/config/webpack/environment.js b/config/webpack/environment.js index 468a26c..6f10ad1 100644 --- a/config/webpack/environment.js +++ b/config/webpack/environment.js @@ -1,5 +1,6 @@ const { environment } = require('@rails/webpacker') -const vue = require('./loaders/vue') +const { VueLoaderPlugin } = require('vue-loader') +const vue = require('./loaders/vue') const webpack = require('webpack'); // Get a pre-configured plugin @@ -17,4 +18,6 @@ environment.plugins.prepend( ); environment.loaders.append('vue', vue) +environment.plugins.prepend('VueLoaderPlugin', new VueLoaderPlugin()) +environment.loaders.prepend('vue', vue) module.exports = environment diff --git a/config/webpack/loaders/vue.js b/config/webpack/loaders/vue.js index 4576b03..509c742 100644 --- a/config/webpack/loaders/vue.js +++ b/config/webpack/loaders/vue.js @@ -1,13 +1,6 @@ -const { dev_server: devServer } = require('@rails/webpacker').config - -const isProduction = process.env.NODE_ENV === 'production' -const inDevServer = process.argv.find(v => v.includes('webpack-dev-server')) -const extractCSS = !(inDevServer && (devServer && devServer.hmr)) || isProduction - module.exports = { test: /\.vue(\.erb)?$/, use: [{ - loader: 'vue-loader', - options: { extractCSS } + loader: 'vue-loader' }] } diff --git a/package.json b/package.json index 1a18b46..263e708 100644 --- a/package.json +++ b/package.json @@ -14,9 +14,9 @@ "popper.js": "^1.14.3", "rails-ujs": "^5.2.0", "startbootstrap-sb-admin": "^4.0.0", - "vue": "^2.5.16", + "vue": "^2.6.8", "vue-loader": "^15.7.0", - "vue-template-compiler": "^2.5.16", + "vue-template-compiler": "^2.6.8", "vuex": "^3.0.1" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 77654b1..6194296 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7091,9 +7091,10 @@ vue-style-loader@^4.1.0: hash-sum "^1.0.2" loader-utils "^1.0.2" -vue-template-compiler@^2.5.16: - version "2.5.16" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.16.tgz#93b48570e56c720cdf3f051cc15287c26fbd04cb" +vue-template-compiler@^2.6.8: + version "2.6.8" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.8.tgz#750802604595134775b9c53141b9850b35255e1c" + integrity sha512-SwWKANE5ee+oJg+dEJmsdxsxWYICPsNwk68+1AFjOS8l0O/Yz2845afuJtFqf3UjS/vXG7ECsPeHHEAD65Cjng== dependencies: de-indent "^1.0.2" he "^1.1.0" @@ -7103,9 +7104,10 @@ vue-template-es2015-compiler@^1.9.0: resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== -vue@^2.5.16: - version "2.5.16" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.16.tgz#07edb75e8412aaeed871ebafa99f4672584a0085" +vue@^2.6.8: + version "2.6.8" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.8.tgz#f21cbc536bfc14f7d1d792a137bb12f69e60ea91" + integrity sha512-+vp9lEC2Kt3yom673pzg1J7T1NVGuGzO9j8Wxno+rQN2WYVBX2pyo/RGQ3fXCLh2Pk76Skw/laAPCuBuEQ4diw== vuex@^3.0.1: version "3.0.1"