diff options
author | Jorik Schellekens <joriks@matrix.org> | 2019-08-15 17:06:22 +0100 |
---|---|---|
committer | Jorik Schellekens <joriks@matrix.org> | 2019-08-28 15:59:54 +0100 |
commit | d6c296d184530fd2c677e70cc2545ec16b211df9 (patch) | |
tree | 5d9011fa63f3125ed62b9afaf1019f8efa19b88b | |
parent | Linted and loaded. (diff) | |
download | synapse-d6c296d184530fd2c677e70cc2545ec16b211df9.tar.xz |
Love a little less lint
-rw-r--r-- | synapse_topology/webui/src/js/containers/ServerName.js | 2 | ||||
-rw-r--r-- | synapse_topology/webui/webpack.config.babel.js | 138 |
2 files changed, 71 insertions, 69 deletions
diff --git a/synapse_topology/webui/src/js/containers/ServerName.js b/synapse_topology/webui/src/js/containers/ServerName.js index 6fdf863b17..e26e97093c 100644 --- a/synapse_topology/webui/src/js/containers/ServerName.js +++ b/synapse_topology/webui/src/js/containers/ServerName.js @@ -10,8 +10,10 @@ const mapStateToProps = (state, ownProps) => ({ const mapDispathToProps = (dispatch) => ({ onClick: servername => { + dispatch(advanceUI()); dispatch(setServername(servername)); + }, }); diff --git a/synapse_topology/webui/webpack.config.babel.js b/synapse_topology/webui/webpack.config.babel.js index 14668baa4f..a18a8da35e 100644 --- a/synapse_topology/webui/webpack.config.babel.js +++ b/synapse_topology/webui/webpack.config.babel.js @@ -4,75 +4,75 @@ import HtmlWebpackPlugin from 'html-webpack-plugin'; import HtmlWebpackTagsPlugin from 'html-webpack-tags-plugin'; export default { - entry: [ './src/js/index.jsx', './src/scss/main.scss', './src/scss/bootstrap.min.css'], - output: { - path: path.resolve(__dirname, 'dist'), - filename: 'bundle.js', - }, - resolve: { - extensions: ['.js', '.jsx', '.css'] - }, - module: { - rules: [ - { - test: /\.jsx$/, - exclude: /node_modules/, - use: ['babel-loader'], - }, - { - test: /\.scss$/, - use: [ - { - loader: 'file-loader', - options: { - name: 'css/[name].css' - } - }, - { - loader: 'style-loader', - }, - { - loader: 'css-loader', - }, - { - loader: 'sass-loader', - }, + entry: ['./src/js/index.jsx', './src/scss/main.scss', './src/scss/bootstrap.min.css'], + output: { + path: path.resolve(__dirname, 'dist'), + filename: 'bundle.js', + }, + resolve: { + extensions: ['.js', '.jsx', '.css'], + }, + module: { + rules: [ + { + test: /\.jsx$/, + exclude: /node_modules/, + use: ['babel-loader'], + }, + { + test: /\.scss$/, + use: [ + { + loader: 'file-loader', + options: { + name: 'css/[name].css', + }, + }, + { + loader: 'style-loader', + }, + { + loader: 'css-loader', + }, + { + loader: 'sass-loader', + }, + ], + }, + { + test: /\.css$/, + use: [ + { + loader: 'file-loader', + options: { + name: 'css/[name].css', + }, + }, + ], + }, + { + test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, + use: [ + { + loader: 'file-loader', + options: { + name: '[name].[ext]', + outputPath: 'fonts/', + }, + }, + ], + }, ], - }, - { - test: /\.css$/, - use: [ - { - loader: 'file-loader', - options: { - name: 'css/[name].css' - } - }, - ], - }, - { - test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, - use: [ - { - loader: 'file-loader', - options: { - name: '[name].[ext]', - outputPath: 'fonts/' - } - } - ] - } - ] - }, - plugins: [ - new HtmlWebpackPlugin({ - hash: true, - filename: __dirname + '/dist/index.html', - title: 'Topology - The synapse configuration tool', - }), - new HtmlWebpackTagsPlugin({ - tags: ['css/bootstrap.min.css', 'css/main.css'] - }), - ], + }, + plugins: [ + new HtmlWebpackPlugin({ + hash: true, + filename: __dirname + '/dist/index.html', + title: 'Topology - The synapse configuration tool', + }), + new HtmlWebpackTagsPlugin({ + tags: ['css/bootstrap.min.css', 'css/main.css'], + }), + ], }; |