diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 13:52:55 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 14:14:20 +0100 |
commit | 4df3b7cb067797982199c3e613ba32a9c7474348 (patch) | |
tree | bf237d385411f73e670af4c744d8239ab4799434 /config/webpack/development.js | |
parent | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff) | |
parent | 1a0d3c9c65d663210494ec9b55912debad6331f5 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.
Diffstat (limited to 'config/webpack/development.js')
-rw-r--r-- | config/webpack/development.js | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/config/webpack/development.js b/config/webpack/development.js index d54d919ec..1e50a4f46 100644 --- a/config/webpack/development.js +++ b/config/webpack/development.js @@ -1,12 +1,10 @@ // Note: You must restart bin/webpack-dev-server for changes to take effect const merge = require('webpack-merge'); -const sharedConfig = require('./shared.js'); -const { settings, output } = require('./configuration.js'); +const sharedConfig = require('./shared'); +const { settings, output } = require('./configuration'); -const watchOptions = { - ignored: /node_modules/, -}; +const watchOptions = {}; if (process.env.VAGRANT) { // If we are in Vagrant, we can't rely on inotify to update us with changed @@ -17,7 +15,7 @@ if (process.env.VAGRANT) { module.exports = merge(sharedConfig, { mode: 'development', - + cache: true, devtool: 'cheap-module-eval-source-map', stats: { @@ -30,15 +28,33 @@ module.exports = merge(sharedConfig, { devServer: { clientLogLevel: 'none', - https: settings.dev_server.https, + compress: settings.dev_server.compress, + quiet: settings.dev_server.quiet, + disableHostCheck: settings.dev_server.disable_host_check, host: settings.dev_server.host, port: settings.dev_server.port, + https: settings.dev_server.https, + hot: settings.dev_server.hmr, contentBase: output.path, + inline: settings.dev_server.inline, + useLocalIp: settings.dev_server.use_local_ip, + public: settings.dev_server.public, publicPath: output.publicPath, - compress: true, - headers: { 'Access-Control-Allow-Origin': '*' }, - historyApiFallback: true, - disableHostCheck: true, - watchOptions: watchOptions, + historyApiFallback: { + disableDotRule: true, + }, + headers: settings.dev_server.headers, + overlay: settings.dev_server.overlay, + stats: { + entrypoints: false, + errorDetails: false, + modules: false, + moduleTrace: false, + }, + watchOptions: Object.assign( + {}, + settings.dev_server.watch_options, + watchOptions + ), }, }); |