Merge tag 'v4.20.0' into next

4.20.0
DantrazTrev · Sep 25, 2018 · 17044bf · 17044bf
2 parents 8414d7a + c4d8a3c
commit 17044bf
Show file tree

Hide file tree

Showing 57 changed files with 2,618 additions and 289 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -23,7 +23,7 @@ module.exports = {
 		yoda: "error",
 		eqeqeq: "error",
 		"global-require": "off",
-		"brace-style": "error",
+		"brace-style": "off",
 		"eol-last": "error",
 		"no-extra-bind": "warn",
 		"no-process-exit": "warn",

diff --git a/README.md b/README.md
@@ -11,6 +11,7 @@
 [![deps][deps]][deps-url]
 [![tests][tests]][tests-url]
 [![builds][builds]][builds-url]
+[![builds2][builds2]][builds2-url]
 [![coverage][cover]][cover-url]
 [![licenses][licenses]][licenses-url]
 
@@ -752,6 +753,9 @@ src="https://static.monei.net/monei-logo.svg" height="30" alt="MONEI"></a>
 [builds-url]: https://ci.appveyor.com/project/sokra/webpack/branch/master
 [builds]: https://ci.appveyor.com/api/projects/status/github/webpack/webpack?svg=true
 
+[builds2]: https://dev.azure.com/webpack/webpack/_apis/build/status/webpack.webpack
+[builds2-url]: https://dev.azure.com/webpack/webpack/_build/latest?definitionId=3
+
 [licenses-url]: https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fwebpack%2Fwebpack?ref=badge_shield
 [licenses]: https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fwebpack%2Fwebpack.svg?type=shield
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -13,21 +13,8 @@ cache:
   - "..\\.yarn-cache"
   - ".jest-cache"
 
-# what combinations to test
-environment:
-  matrix:
-    - nodejs_version: 10
-      job_part: unit
-      jest: --maxWorkers=2 --cacheDirectory .jest-cache
-    - nodejs_version: 10
-      job_part: integration
-      jest: --maxWorkers=2 --cacheDirectory .jest-cache
-    - nodejs_version: 8
-      job_part: integration
-      jest: --maxWorkers=2 --cacheDirectory .jest-cache
-
 install:
-  - ps: Install-Product node $env:nodejs_version x64
+  - ps: Install-Product node 10 x64
   - yarn --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache
   - yarn link --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache || yarn link --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache
   - yarn link webpack --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache
@@ -40,8 +27,8 @@ matrix:
 test_script:
   - node --version
   - yarn --version
-  - cmd: set JEST=%jest%
-  - cmd: yarn appveyor:%job_part%
+  - cmd: set JEST=--maxWorkers=2 --cacheDirectory .jest-cache
+  - cmd: yarn appveyor:integration
   - cmd: yarn istanbul report --report lcovonly
   - cmd: yarn unlink webpack
   - cmd: yarn global add codecov && codecov -F %job_part% --disable=gcov

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,17 +11,20 @@ jobs:
           curl -o- -L https://yarnpkg.com/install.sh | bash
         displayName: "Install Yarn"
       - script: |
+          set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
           node -v
           yarn -v
         displayName: "Print versions"
       - script: |
+          set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
           yarn --frozen-lockfile
           yarn link --frozen-lockfile || true
           yarn link webpack --frozen-lockfile
         displayName: "Install dependencies"
       - script: |
+          set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
           yarn test:basic --ci
           yarn test:unit --ci
@@ -38,17 +41,20 @@ jobs:
           curl -o- -L https://yarnpkg.com/install.sh | bash
         displayName: "Install Yarn"
       - script: |
+          set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
           node -v
           yarn -v
         displayName: "Print versions"
       - script: |
+          set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
           yarn --frozen-lockfile
           yarn link --frozen-lockfile || true
           yarn link webpack --frozen-lockfile
         displayName: "Install dependencies"
       - script: |
+          set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
           yarn lint
         displayName: "Run linting"
@@ -74,17 +80,20 @@ jobs:
           curl -o- -L https://yarnpkg.com/install.sh | bash
         displayName: "Install Yarn"
       - script: |
+          set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
           node -v
           yarn -v
         displayName: "Print versions"
       - script: |
+          set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
           yarn --frozen-lockfile
           yarn link --frozen-lockfile || true
           yarn link webpack --frozen-lockfile
         displayName: "Install dependencies"
       - script: |
+          set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
           yarn cover:init
           yarn cover:integration "test/(?!TestCases)" --ci --maxWorkers=2
@@ -116,17 +125,20 @@ jobs:
           curl -o- -L https://yarnpkg.com/install.sh | bash
         displayName: "Install Yarn"
       - script: |
+          set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
           node -v
           yarn -v
         displayName: "Print versions"
       - script: |
+          set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
           yarn --frozen-lockfile
           yarn link --frozen-lockfile || true
           yarn link webpack --frozen-lockfile
         displayName: "Install dependencies"
       - script: |
+          set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
           yarn cover:init
           yarn cover:integration "test/(?!TestCases)" --ci
@@ -158,14 +170,17 @@ jobs:
           npm install --global yarn
         displayName: "Install Yarn"
       - script: |
+          set -e
           node -v
           yarn -v
         displayName: "Print versions"
       - script: |
+          set -e
           yarn --frozen-lockfile
           yarn link --frozen-lockfile || true
           yarn link webpack --frozen-lockfile
         displayName: "Install dependencies"
-      - script:
+      - script: |
+          set -e
           yarn cover:init && yarn cover:integration "test/(?!TestCases)" --ci --maxWorkers=2 && move coverage\\coverage-final.json coverage\\coverage-final-1.json && yarn cover:integration "test/TestCasesD" --ci --maxWorkers=2 && move coverage\\coverage-final.json coverage\\coverage-final-2.json && yarn cover:integration "test/TestCases(?!D)" --ci --maxWorkers=2 && move coverage\\coverage-final.json coverage\\coverage-final-3.json
         displayName: "Run tests with coverage"
diff --git a/declarations.d.ts b/declarations.d.ts
@@ -220,6 +220,15 @@ declare module "@webassemblyjs/ast" {
 	export function isFuncImportDescr(n: Node): boolean;
 }
 
+// This "hack" is needed because typescript doesn't support recursive type definitions
+// It's referenced from "ruleSet-conditions" in schemas/WebpackOptions.json
+interface RuleSetConditionsRecursive
+	extends Array<import("./declarations/WebpackOptions").RuleSetCondition> {}
+interface RuleSetConditionsAbsoluteRecursive
+	extends Array<
+			import("./declarations/WebpackOptions").RuleSetConditionAbsolute
+		> {}
+
 /**
  * Global variable declarations
  * @todo Once this issue is resolved, remove these globals and add JSDoc onsite instead