Merge branch 'master' into define-functions

# Conflicts:
#	lib/DefinePlugin.js
#	test/WatchTestCases.test.js
#	test/statsCases/define-plugin/expected.txt

.editorconfig

@@ -2,11 +2,11 @@ root = true
 
 [*]
 indent_style = tab
-indent_size = 4
+indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-max_line_length = 233
+max_line_length = 80
 
 [.prettierrc]
 indent_style = space

.eslintrc.js

@@ -1,6 +1,6 @@
 module.exports = {
 	root: true,
-	plugins: ["prettier", "node"],
+	plugins: ["prettier", "node", "jest"],
 	extends: ["eslint:recommended", "plugin:node/recommended", "plugin:prettier/recommended"],
 	env: {
 		node: true,
@@ -13,7 +13,6 @@ module.exports = {
 		"prettier/prettier": "error",
 		"no-undef": "error",
 		"no-extra-semi": "error",
-		"semi": "error",
 		"no-template-curly-in-string": "error",
 		"no-caller": "error",
 		"no-control-regex": "off",
@@ -30,7 +29,20 @@ module.exports = {
 		"no-loop-func": "warn",
 		"indent": "off",
 		"no-console": "off",
-		"valid-jsdoc": "error",
+		"valid-jsdoc": ["error", {
+			"prefer": {
+				"return": "returns",
+				"memberof": "DONTUSE",
+				"class": "DONTUSE",
+				"inheritdoc": "DONTUSE",
+				"description": "DONTUSE",
+				"readonly": "DONTUSE"
+			},
+			"preferType": {
+				"*": "any"
+			},
+			"requireReturnType": true
+		}],
 		"node/no-unsupported-features": "error",
 		"node/no-deprecated-api": "error",
 		"node/no-missing-import": "error",
@@ -56,7 +68,7 @@ module.exports = {
 		{
 			files: ["test/**/*.js"],
 			env: {
-				mocha: true,
+				"jest/globals": true
 			}
 		}
 	]

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Create a report to help us improve
+---
+
+<!-- Please don't delete this template because we'll close your issue -->
+<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
+
+# Bug report
+
+<!-- Please ask questions on StackOverflow or the webpack Gitter. -->
+<!-- https://stackoverflow.com/questions/ask?tags=webpack -->
+<!-- https://gitter.im/webpack/webpack -->
+<!-- Issues which contain questions or support requests will be closed. -->
+
+**What is the current behavior?**
+
+
+**If the current behavior is a bug, please provide the steps to reproduce.**
+
+
+<!-- A great way to do this is to provide your configuration via a GitHub repository -->
+<!-- The most helpful is a minimal reproduction with instructions on how to reproduce -->
+<!-- Repositories with too many files or large `webpack.config.js` files are not suitable -->
+<!-- Please only add small code snippets directly into this issue -->
+<!-- https://gist.github.com is a good place for longer code snippets -->
+<!-- If your issue is caused by a plugin or loader, please create an issue on the loader/plugin repository instead -->
+
+**What is the expected behavior?**
+
+
+<!-- "It should work" is not a helpful explanation -->
+<!-- Explain exactly how it should behave -->
+
+**Other relevant information:**
+webpack version:  
+Node.js version: 
+Operating System: 
+Additional tools:

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -0,0 +1,27 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+<!-- Please don't delete this template or we'll close your issue -->
+
+## Feature request
+
+<!-- Issues which contain questions or support requests will be closed. -->
+<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
+<!-- Check if this feature need to be implemented in a plugin or loader instead -->
+<!-- If yes: file the issue on the plugin/loader repo -->
+<!-- Features related to the development server should be filed on this repo instead -->
+
+**What is the expected behavior?**
+
+
+**What is motivation or use case for adding/changing the behavior?**
+
+
+**How should this be implemented in your opinion?**
+
+
+**Are you willing to work on this yourself?**
+yes

.github/ISSUE_TEMPLATE/Other.md

@@ -0,0 +1,9 @@
+---
+name: Other
+about: Something else
+
+---
+
+<!-- Bug reports and Feature requests must use other templates, or will be closed -->
+<!-- Please ask questions on StackOverflow or the webpack Gitter (https://gitter.im/webpack/webpack). -->
+<!-- Issues which contain questions or support requests will be closed. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,9 @@
 <!-- Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. -->
+<!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->
+<!-- Try to link to an open issue for more information. -->
+
+
+<!-- In addition to that please answer these questions: -->
 
 **What kind of change does this PR introduce?**
 
@@ -8,17 +13,11 @@
 
 <!-- Note that we won't merge your changes if you don't add tests -->
 
-**If relevant, link to documentation update:**
-
-<!-- Link PR from webpack/webpack.js.org here, or N/A -->
-
-**Summary**
-
-<!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->
-<!-- Try to link to an open issue for more information. -->
-
 **Does this PR introduce a breaking change?**
 
 <!-- If this PR introduces a breaking change, please describe the impact and a migration path for existing applications. -->
 
-**Other information**
+**What needs to be documented once your changes are merged?**
+
+<!-- List all the information that needs to be added to the documentation after merge -->
+<!-- When your changes are merged you will be asked to contribute this to the documentation -->

.gitignore

@@ -10,4 +10,5 @@
 *.log
 .idea
 .vscode
+.eslintcache
 package-lock.json

.prettierignore

@@ -0,0 +1,15 @@
+# Ignore all paths.
+**/*.*
+
+# Enable prettier for the following paths.
+!setup/**/*.js
+!lib/**/*.js
+!bin/*.js
+!hot/*.js
+!buildin/*.js
+!benchmark/**/*.js
+!test/*.js
+!test/**/webpack.config.js
+!examples/**/webpack.config.js
+!schemas/**/*.js
+!declarations.d.ts

.travis.yml

@@ -9,39 +9,56 @@ branches:
 
 cache:
   yarn: true
+  directories:
+    - ".jest-cache"
+    - ".eslintcache"
+
+stages:
+ - basic
+ - advanced
+ - versions
 
 matrix:
   include:
     - os: linux
-      node_js: "8"
-      env: NO_WATCH_TESTS=1 JOB_PART=lint
+      node_js: "10"
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=basic
+      stage: basic
     - os: linux
-      node_js: "8"
-      env: NO_WATCH_TESTS=1 JOB_PART=integration
+      node_js: "10"
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=lint-unit
+      stage: advanced
+    - os: linux
+      node_js: "10"
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
+      stage: advanced
+    - os: osx
+      node_js: "10"
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
+      stage: versions
     - os: linux
       node_js: "8"
-      env: NO_WATCH_TESTS=1 JOB_PART=unit
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
+      stage: versions
     - os: linux
       node_js: "6"
-      env: NO_WATCH_TESTS=1 JOB_PART=integration
-    - os: osx
-      node_js: "8"
-      env: NO_WATCH_TESTS=1 JOB_PART=integration
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
+      stage: versions
+  fast_finish: true
   allow_failures:
     - os: osx
-  fast_finish: true
 
 install:
   - yarn --frozen-lockfile
   - yarn link --frozen-lockfile || true
   - yarn link webpack --frozen-lockfile
 
-script: npm run travis:$JOB_PART
+script: yarn travis:$JOB_PART
 
 after_success:
   - cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose
-  - bash <(curl -s https://codecov.io/bash) -F $JOB_PART
-  - rm -rf ./coverage
+  - bash <(curl -s https://codecov.io/bash) -F $JOB_PART -X gcov
+  - rm -f .jest-cache/haste-map* .jest-cache/perf-cache*
 
 notifications:
   slack: