From 6a216d06d2b02b41b2e8e5620d3c2fda3f0069b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Smyrek?= Date: Tue, 4 Feb 2020 11:37:31 +0100 Subject: [PATCH 1/2] Webpack config for development build --- core/build/dev-server.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/build/dev-server.js b/core/build/dev-server.js index 958c1b6dbf..b40d7554ff 100644 --- a/core/build/dev-server.js +++ b/core/build/dev-server.js @@ -2,14 +2,14 @@ const path = require('path') const webpack = require('webpack') const MFS = require('memory-fs') -let baseClientConfig = require('./webpack.client.config') -let baseServerConfig = require('./webpack.server.config') +let baseClientConfig = require('./webpack.client.config').default +let baseServerConfig = require('./webpack.server.config').default const themeRoot = require('./theme-path') const extendedConfig = require(path.join(themeRoot, '/webpack.config.js')) -let clientConfig = extendedConfig(baseClientConfig, { isClient: true, isDev: true }).default; -let serverConfig = extendedConfig(baseServerConfig, { isClient: false, isDev: true }).default; +let clientConfig = extendedConfig(baseClientConfig, { isClient: true, isDev: true }) +let serverConfig = extendedConfig(baseServerConfig, { isClient: false, isDev: true }) module.exports = function setupDevServer (app, cb) { let bundle From 18ae70a7a3f573eccac585d0188a85edf4900903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Smyrek?= Date: Tue, 4 Feb 2020 11:47:19 +0100 Subject: [PATCH 2/2] Changelog update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef383b71bf..6c8a7cf7a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed / Improved - Set cache tag when loading a category - @haelbichalex (#3940) +- In development build `webpack.config.js` in theme folder is now called without the `default` key ### Fixed - Added Finnish translations - @mattiteraslahti and @alphpkeemik