Skip to content

Unification of webpack config in theme #4051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 4, 2020
Merged

Unification of webpack config in theme #4051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a216d0
Webpack config for development build
Feb 4, 2020
18ae70a
Changelog update
Feb 4, 2020
903506d
Merge branch 'hotfix/v1.11.1' into bugfix/webpack-config-for-developm…
andrzejewsky Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions core/build/dev-server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down