Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: support both webpack versions #1065

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
evenstensberg merged 5 commits into from
Sep 5, 2019
Merged

fix: support both webpack versions #1065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d28f9f5
fix: support both webpack versions
evenstensberg Aug 26, 2019
55b770c
chore: vuln patch
evenstensberg Aug 26, 2019
065e87e
chore: abstract validation
evenstensberg Aug 28, 2019
4275fd5
chore: remove lint err
evenstensberg Aug 28, 2019
70bf934
tests: add schema tests
evenstensberg Sep 5, 2019
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
11 changes: 2 additions & 9 deletions bin/utils/convert-argv.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ const fs = require("fs");
fs.existsSync = fs.existsSync || path.existsSync;
const interpret = require("interpret");
const prepareOptions = require("./prepareOptions");
const webpackConfigurationSchema = require("../config/webpackConfigurationSchema.json");
const validateSchema = require("webpack").validateSchema;
const WebpackOptionsValidationError = require("webpack").WebpackOptionsValidationError;
const findup = require("findup-sync");
const validateOptions = require("./validate-options");

module.exports = function(...args) {
const argv = args[1] || args[0];
Expand Down Expand Up @@ -137,12 +135,7 @@ module.exports = function(...args) {

function processConfiguredOptions(options) {
if (options) {
const webpackConfigurationValidationErrors = validateSchema(webpackConfigurationSchema, options);
if (webpackConfigurationValidationErrors.length) {
const error = new WebpackOptionsValidationError(webpackConfigurationValidationErrors);
console.error(error.message, `\nReceived: ${typeof options} : ${JSON.stringify(options, null, 2)}`);
process.exit(-1); // eslint-disable-line
}
validateOptions(options);
} else {
options = {};
}
Expand Down
21 changes: 21 additions & 0 deletions bin/utils/validate-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
const webpackConfigurationSchema = require("../config/webpackConfigurationSchema.json");
const validateSchema = require("webpack").validateSchema;

module.exports = function validateOptions(options) {
let error;
try {
const errors = validateSchema(webpackConfigurationSchema, options);
if (errors && errors.length > 0) {
const { WebpackOptionsValidationError } = require("webpack");
error = new WebpackOptionsValidationError(errors);
}
} catch (err) {
error = err;
}

if (error) {
console.error(error.message);
// eslint-disable-next-line no-process-exit
process.exit(-1);
}
};
17 changes: 14 additions & 3 deletions package-lock.json
View file
Open in desktop

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

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
"babel-preset-jest": "24.6.0",
"codecov": "3.5.0",
"commitizen": "4.0.3",
"commitlint": "^8.1.0",
"commitlint-config-cz": "0.12.0",
"conventional-changelog-cli": "2.0.21",
"cz-customizable": "6.2.0",
Expand Down
Loading