diff options
author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-03-29 12:55:44 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-29 12:55:44 +0300 |
commit | 56c71a7f33c58ff6b4fa5e3bdc455e3c4027c2ce (patch) | |
tree | 600ebe26eca06bbb6879aef622aa9933df7b6d50 | |
parent | 89c97a6d69e0a327828a507570b9d710f420b46c (diff) | |
parent | fe69fee78c2caa8731e8bc8ff2f95d38b2245a0f (diff) |
Merge pull request #3180 from nextcloud/fix-code-style
fix code style config files
-rw-r--r-- | webpack.common.js | 34 | ||||
-rw-r--r-- | webpack.dev.js | 8 | ||||
-rw-r--r-- | webpack.prod.js | 2 |
3 files changed, 22 insertions, 22 deletions
diff --git a/webpack.common.js b/webpack.common.js index dc0b55df1..2a2e1b3f2 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -11,38 +11,38 @@ module.exports = { 'talk-files-sidebar-loader': path.join(__dirname, 'src', 'mainFilesSidebarLoader.js'), 'talk-public-share-auth-sidebar': path.join(__dirname, 'src', 'mainPublicShareAuthSidebar.js'), 'talk-public-share-sidebar': path.join(__dirname, 'src', 'mainPublicShareSidebar.js'), - 'flow': path.join(__dirname, 'src', 'flow.js') + 'flow': path.join(__dirname, 'src', 'flow.js'), }, output: { path: path.resolve(__dirname, './js'), publicPath: '/js/', - filename: '[name].js' + filename: '[name].js', }, module: { rules: [ { test: /\.css$/, - use: ['vue-style-loader', 'css-loader'] + use: ['vue-style-loader', 'css-loader'], }, { test: /\.scss$/, - use: ['vue-style-loader', 'css-loader', 'sass-loader'] + use: ['vue-style-loader', 'css-loader', 'sass-loader'], }, { test: /\.(js|vue)$/, use: 'eslint-loader', exclude: /node_modules/, - enforce: 'pre' + enforce: 'pre', }, { test: /\.vue$/, loader: 'vue-loader', - exclude: /node_modules/ + exclude: /node_modules/, }, { test: /\.js$/, loader: 'babel-loader', - exclude: /node_modules/ + exclude: /node_modules/, }, { /** @@ -61,24 +61,24 @@ module.exports = { * "webpack doesn't perform commonjs transformation for * codesplitting. Need to set commonjs conversion." */ - ['@babel/env', { modules: 'commonjs' }] - ] - } + ['@babel/env', { modules: 'commonjs' }], + ], + }, }, { test: /\.(png|jpg|gif|svg)$/, loader: 'file-loader', options: { - name: '[name].[ext]?[hash]' - } - } - ] + name: '[name].[ext]?[hash]', + }, + }, + ], }, plugins: [ new VueLoaderPlugin(), - new StyleLintPlugin() + new StyleLintPlugin(), ], resolve: { - extensions: ['*', '.js', '.vue'] - } + extensions: ['*', '.js', '.vue'], + }, } diff --git a/webpack.dev.js b/webpack.dev.js index 9db5011a9..d7884b48e 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -1,7 +1,7 @@ -const merge = require('webpack-merge'); -const common = require('./webpack.common.js'); +const merge = require('webpack-merge') +const common = require('./webpack.common.js') module.exports = merge(common, { - mode: 'development', - devtool: '#cheap-source-map', + mode: 'development', + devtool: '#cheap-source-map', }) diff --git a/webpack.prod.js b/webpack.prod.js index 7e633710b..07cb99412 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -3,5 +3,5 @@ const common = require('./webpack.common.js') module.exports = merge(common, { mode: 'production', - devtool: '#source-map' + devtool: '#source-map', }) |