diff options
author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2019-01-26 14:33:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-26 14:33:34 +0100 |
commit | a501193b49b6b1b3345277793f8b326f7c34fcee (patch) | |
tree | ca0e6b26dfe19bf859c44122b1f8ec3f2ca04e36 /settings/webpack.common.js | |
parent | 4611ad5a9c6de08db644958df1141e7877da42d1 (diff) | |
parent | 1a867043381805cbe048e5e8c9b7c88d441fc3ce (diff) | |
download | nextcloud-server-a501193b49b6b1b3345277793f8b326f7c34fcee.tar.gz nextcloud-server-a501193b49b6b1b3345277793f8b326f7c34fcee.zip |
Merge pull request #12282 from nextcloud/settings-naming-fix
Fix vue settings checks and filenames
Diffstat (limited to 'settings/webpack.common.js')
-rw-r--r-- | settings/webpack.common.js | 86 |
1 files changed, 47 insertions, 39 deletions
diff --git a/settings/webpack.common.js b/settings/webpack.common.js index fac11ace6ae..d7c11dcc7cc 100644 --- a/settings/webpack.common.js +++ b/settings/webpack.common.js @@ -2,44 +2,52 @@ const path = require('path') const { VueLoaderPlugin } = require('vue-loader'); module.exports = { - entry: { - 'settings-vue': './src/main.js', - 'settings-admin-security': './src/main-admin-security' - }, - output: { - path: path.resolve(__dirname, './js'), - publicPath: '/', - filename: '[name].js' - }, - module: { - rules: [ - { - test: /\.css$/, - use: [ - 'vue-style-loader', 'css-loader' - ], - }, - { - test: /\.scss$/, - use: [ + entry: { + 'settings-apps-users-management': './src/main-apps-users-management', + 'settings-admin-security': './src/main-admin-security' + }, + output: { + path: path.resolve(__dirname, './js'), + publicPath: '/', + filename: 'vue-[name].js' + }, + optimization: { + splitChunks: { + automaticNameDelimiter: '-', + } + }, + module: { + rules: [ + { + test: /\.css$/, + use: [ + 'vue-style-loader', 'css-loader' + ], + }, + { + test: /\.scss$/, + use: [ 'vue-style-loader', 'css-loader', 'sass-loader' - ], - }, - { - test: /\.vue$/, - loader: 'vue-loader', - }, - { - test: /\.js$/, - loader: 'babel-loader', - exclude: /node_modules/ - }, - ] - }, - plugins: [ - new VueLoaderPlugin() - ], - resolve: { - extensions: ['*', '.js', '.vue', '.json'] - } + ], + }, + { + test: /\.vue$/, + loader: 'vue-loader', + options: { + hotReload: false // disables Hot Reload + } + }, + { + test: /\.js$/, + loader: 'babel-loader', + exclude: /node_modules/ + }, + ] + }, + plugins: [ + new VueLoaderPlugin() + ], + resolve: { + extensions: ['*', '.js', '.vue', '.json'] + } } |