Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: webpack/webpack-cli
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.3.6
Choose a base ref
...
head repository: webpack/webpack-cli
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.3.7
Choose a head ref
  • 7 commits
  • 4 files changed
  • 2 contributors

Commits on Aug 14, 2019

  1. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    fb31cc4 View commit details
  2. chore: lock deps

    Co-Authored-By: Emanuele <my.burning@gmail.com>
    evenstensberg and ematipico authored Aug 14, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    635bfa3 View commit details
  3. chore: lock deps

    Co-Authored-By: Emanuele <my.burning@gmail.com>
    evenstensberg and ematipico authored Aug 14, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    97d5c75 View commit details
  4. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    43fc033 View commit details

Commits on Aug 16, 2019

  1. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    45b9127 View commit details

Commits on Aug 18, 2019

  1. Merge pull request #1024 from webpack/fix/no-config-mode

    fix: resolve opts when no-config & fix vulns
    evenstensberg authored Aug 18, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b20ecd3 View commit details
  2. chore: v3.3.7

    evenstensberg committed Aug 18, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    9487ee5 View commit details
Showing with 223 additions and 175 deletions.
  1. +17 −0 CHANGELOG.md
  2. +10 −6 bin/utils/convert-argv.js
  3. +193 −166 package-lock.json
  4. +3 −3 package.json
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
<a name="3.3.7"></a>

# 3.3.7 (2019-08-18)

[Full Changelog](https://github.com/webpack/webpack-cli/compare/v3.3.6...v3.3.7)

## Chore

- resolve differently ([45b9127](https://github.com/webpack/webpack-cli/commit/45b9127))
- update lockfile & pass nil ([43fc033](https://github.com/webpack/webpack-cli/commit/43fc033))
- lock deps ([97d5c75](https://github.com/webpack/webpack-cli/commit/97d5c75))
- lock deps ([635bfa3](https://github.com/webpack/webpack-cli/commit/635bfa3))

## Fix

- resolve opts when no-config ([fb31cc4](https://github.com/webpack/webpack-cli/commit/fb31cc4))

<a name="3.3.6"></a>

# 3.3.6 (2019-07-14)
16 changes: 10 additions & 6 deletions bin/utils/convert-argv.js
Original file line number Diff line number Diff line change
@@ -128,19 +128,23 @@ module.exports = function(...args) {
}

if (!configFileLoaded) {
return processConfiguredOptions({});
return processConfiguredOptions();
} else if (options.length === 1) {
return processConfiguredOptions(options[0]);
} else {
return processConfiguredOptions(options);
}

function processConfiguredOptions(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
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
}
} else {
options = {};
}

// process Promise
Loading