Skip to content

Commit

Permalink
dependency updates, fix document root evaluation
Browse files Browse the repository at this point in the history
  • Loading branch information
Oliver Fabel authored and Oliver Fabel committed Jul 17, 2022
1 parent 3647776 commit 99ad480
Show file tree
Hide file tree
Showing 9 changed files with 112 additions and 56 deletions.
10 changes: 10 additions & 0 deletions .idea/runConfigurations/install.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/runConfigurations/update.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [1.9.7] - 17.07.2022

### Fixed

* Document root evaluation for development web server.
* Updated dependencies to the latest versions.

### Changed

* Increased minimal required Node Version to 16.16.0.

## [1.9.6] - 11.07.2022

### Fixed
Expand Down Expand Up @@ -413,7 +424,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
* Custom JS module support
* Basic setup to publish project as NPM package

[Unreleased]: https://github.com/bsi-software/bsi-cx-design-build/compare/1.9.6...HEAD
[Unreleased]: https://github.com/bsi-software/bsi-cx-design-build/compare/1.9.7...HEAD

[1.9.7]: https://github.com/bsi-software/bsi-cx-design-build/compare/1.9.6...1.9.7

[1.9.6]: https://github.com/bsi-software/bsi-cx-design-build/compare/1.9.5...1.9.6

Expand Down
10 changes: 10 additions & 0 deletions dist/main.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/main.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/types.d.ts.map

Large diffs are not rendered by default.

100 changes: 50 additions & 50 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@bsi-cx/design-build",
"version": "1.9.6",
"version": "1.9.7",
"description": "A webpack config builder to create a design for BSI CX.",
"private": false,
"engines": {
"node": ">=14.16.0"
"node": ">=16.16.0"
},
"browser": "dist/browser.js",
"main": "dist/main.js",
Expand All @@ -14,7 +14,10 @@
"watch": "webpack --config webpack.config.js --mode production --watch --progress",
"pretest": "./test/install.js",
"posttest": "./test/uninstall.js",
"test": "cd test && webpack --config webpack.config.js --mode development --progress"
"test": "cd test && webpack --config webpack.config.js --mode development --progress",
"preserve": "./test/install.js",
"serve": "cd test && webpack serve --config webpack.config.js --mode development --progress",
"postserve": "./test/uninstall.js"
},
"repository": "github:bsi-software/bsi-cx-design-build",
"bugs": {
Expand Down
10 changes: 10 additions & 0 deletions src/webpack-config-builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,13 @@ export default class WebpackConfigBuilder {
* @param {...BuildConfig} configs
*/
static fromConfigs(...configs) {
/**
* @type {undefined|number}
*/
let commonDevServerPort = undefined;
/**
* @type {undefined|string[]}
*/
let commonContentBase = undefined;

let buildConfigs = configs
Expand All @@ -805,6 +811,10 @@ export default class WebpackConfigBuilder {
}
});

if (commonContentBase.length > 0) {
commonContentBase.unshift(path.posix.sep);
}

let devServerConfig = buildConfigs[0].devServer;
devServerConfig.port = commonDevServerPort;
devServerConfig.static.directory = path.join(...commonContentBase);
Expand Down

0 comments on commit 99ad480

Please sign in to comment.