Skip to content

Commit 957ee2a

Browse files
mc-zonemc-zone
authored
Merge branch 'master' into feature/module-build-error-with-loader-name
2 parents 1159935 + 11fa1d5 commit 957ee2a

File tree

530 files changed

+11751
-7261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

530 files changed

+11751
-7261
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ root = true
22

33
[*]
44
indent_style = tab
5-
indent_size = 4
5+
indent_size = 2
66
charset = utf-8
77
trim_trailing_whitespace = true
88
insert_final_newline = true
9-
max_line_length = 233
9+
max_line_length = 80
1010

1111
[.prettierrc]
1212
indent_style = space

‎.eslintrc.js‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,20 @@ module.exports = {
2929
"no-loop-func": "warn",
3030
"indent": "off",
3131
"no-console": "off",
32-
"valid-jsdoc": "error",
32+
"valid-jsdoc": ["error", {
33+
"prefer": {
34+
"return": "returns",
35+
"memberof": "DONTUSE",
36+
"class": "DONTUSE",
37+
"inheritdoc": "DONTUSE",
38+
"description": "DONTUSE",
39+
"readonly": "DONTUSE"
40+
},
41+
"preferType": {
42+
"*": "any"
43+
},
44+
"requireReturnType": true
45+
}],
3346
"node/no-unsupported-features": "error",
3447
"node/no-deprecated-api": "error",
3548
"node/no-missing-import": "error",

‎.github/ISSUE_TEMPLATE/Bug_report.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
6+
7+
<!-- Please don't delete this template or we'll close your issue -->
8+
<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
9+
10+
# Bug report
11+
12+
<!-- Please ask questions on StackOverflow or the webpack Gitter. -->
13+
<!-- https://stackoverflow.com/questions/ask?tags=webpack -->
14+
<!-- https://gitter.im/webpack/webpack -->
15+
<!-- Issues which contain questions or support requests will be closed. -->
16+
17+
**What is the current behavior?**
18+
19+
20+
**If the current behavior is a bug, please provide the steps to reproduce.**
21+
22+
23+
<!-- A great way to do this is to provide your configuration via a GitHub repo. -->
24+
<!-- Best provide a minimal reproduceable repo with instructions -->
25+
<!-- Repos with too many files or long configs are not suitable -->
26+
<!-- Please only add small snippets of code directly into the issue -->
27+
<!-- https://gist.github.com is a good place for longer code snippets -->
28+
<!-- If your issue is caused by a plugin or loader file the issue on the plugin/loader repo instead. -->
29+
30+
**What is the expected behavior?**
31+
32+
33+
<!-- "It should work" is not a good explaination -->
34+
<!-- Explain how exactly you expecting it to behave -->
35+
36+
**Other relevant information:**
37+
webpack version:
38+
Node.js version:
39+
Operating System:
40+
Additional tools:

‎.github/ISSUE_TEMPLATE/Feature_request.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
5+
---
6+
7+
<!-- Please don't delete this template or we'll close your issue -->
8+
9+
## Feature request
10+
11+
<!-- Issues which contain questions or support requests will be closed. -->
12+
<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
13+
<!-- Check if this feature need to be implemented in a plugin or loader instead -->
14+
<!-- If yes: file the issue on the plugin/loader repo -->
15+
<!-- Features related to the development server should be filed on this repo instead -->
16+
17+
**What is the expected behavior?**
18+
19+
20+
**What is motivation or use case for adding/changing the behavior?**
21+
22+
23+
**How should this be implemented in your opinion?**
24+
25+
26+
**Are you willing to work on this yourself?**
27+
yes

‎.github/ISSUE_TEMPLATE/Other.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
name: Other
3+
about: Something else
4+
5+
---
6+
7+
<!-- Bug reports and Feature requests must use other templates, or will be closed -->
8+
<!-- Please ask questions on StackOverflow or the webpack Gitter (https://gitter.im/webpack/webpack). -->
9+
<!-- Issues which contain questions or support requests will be closed. -->

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<!-- Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. -->
2+
<!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->
3+
<!-- Try to link to an open issue for more information. -->
4+
5+
6+
<!-- In addition to that please answer these questions: -->
27

38
**What kind of change does this PR introduce?**
49

@@ -8,17 +13,11 @@
813

914
<!-- Note that we won't merge your changes if you don't add tests -->
1015

11-
**If relevant, link to documentation update:**
12-
13-
<!-- Link PR from webpack/webpack.js.org here, or N/A -->
14-
15-
**Summary**
16-
17-
<!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->
18-
<!-- Try to link to an open issue for more information. -->
19-
2016
**Does this PR introduce a breaking change?**
2117

2218
<!-- If this PR introduces a breaking change, please describe the impact and a migration path for existing applications. -->
2319

24-
**Other information**
20+
**What needs to be documented once your changes are merged?**
21+
22+
<!-- List all the information that needs to be added to the documentation after merge -->
23+
<!-- When your changes are merged you will be asked to contribute this to the documentation -->

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
*.log
1111
.idea
1212
.vscode
13+
.eslintcache
1314
package-lock.json

‎.prettierignore‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Ignore all paths.
2+
**/*.*
3+
4+
# Enable prettier for the following paths.
5+
!setup/**/*.js
6+
!lib/**/*.js
7+
!bin/*.js
8+
!hot/*.js
9+
!buildin/*.js
10+
!test/*.js
11+
!test/**/webpack.config.js
12+
!examples/**/webpack.config.js
13+
!schemas/**/*.js
14+
!declarations.d.ts

‎.travis.yml‎

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,42 +9,56 @@ branches:
99

1010
cache:
1111
yarn: true
12+
directories:
13+
- ".jest-cache"
14+
- ".eslintcache"
15+
16+
stages:
17+
- basic
18+
- advanced
19+
- versions
1220

1321
matrix:
1422
include:
1523
- os: linux
1624
node_js: "10"
17-
env: NO_WATCH_TESTS=1 JOB_PART=lint
25+
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=basic
26+
stage: basic
1827
- os: linux
1928
node_js: "10"
20-
env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
21-
- os: linux
22-
node_js: "8"
23-
env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
29+
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=lint-unit
30+
stage: advanced
2431
- os: linux
2532
node_js: "10"
26-
env: NO_WATCH_TESTS=1 JOB_PART=unit
27-
- os: linux
28-
node_js: "6"
29-
env: NO_WATCH_TESTS=1 JEST=--runInBand JOB_PART=integration
33+
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
34+
stage: advanced
3035
- os: osx
3136
node_js: "10"
32-
env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
37+
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
38+
stage: versions
39+
- os: linux
40+
node_js: "8"
41+
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
42+
stage: versions
43+
- os: linux
44+
node_js: "6"
45+
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
46+
stage: versions
47+
fast_finish: true
3348
allow_failures:
3449
- os: osx
35-
fast_finish: true
3650

3751
install:
3852
- yarn --frozen-lockfile
3953
- yarn link --frozen-lockfile || true
4054
- yarn link webpack --frozen-lockfile
4155

42-
script: npm run travis:$JOB_PART
56+
script: yarn travis:$JOB_PART
4357

4458
after_success:
4559
- cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose
46-
- bash <(curl -s https://codecov.io/bash) -F $JOB_PART --disable=gcov
47-
- rm -rf ./coverage
60+
- bash <(curl -s https://codecov.io/bash) -F $JOB_PART -X gcov
61+
- rm -f .jest-cache/haste-map* .jest-cache/perf-cache*
4862

4963
notifications:
5064
slack:

0 commit comments

Comments
 (0)