Skip to content

Commit 4366ad8

Browse files
kutyelkutyel
authored
Merge branch 'master' into master
2 parents af3422c + 0cbd8fd commit 4366ad8

File tree

1,140 files changed

+38852
-18499
lines changed

Some content is hidden

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

1,140 files changed

+38852
-18499
lines changed

‎.editorconfig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ max_line_length = 233
1212
indent_style = space
1313
indent_size = 2
1414

15+
[*.yml]
16+
indent_style = space
17+
indent_size = 2
18+
19+
[*.yaml]
20+
indent_style = space
21+
indent_size = 2
22+
1523
[test/cases/parsing/bom/bomfile.{css,js}]
1624
charset = utf-8-bom
1725

‎.eslintrc‎

Lines changed: 46 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,53 @@
11
{
2+
"root": true,
3+
"plugins": ["node"],
4+
"extends": ["eslint:recommended", "plugin:node/recommended"],
25
"env": {
36
"node": true
47
},
58
"rules": {
6-
"strict": 0,
7-
"camelcase": 0,
8-
"curly": 0,
9-
"indent": [2, "tab", { "SwitchCase": 1 }],
10-
"eol-last": 1,
11-
"no-shadow": 0,
12-
"no-redeclare": 2,
13-
"no-extra-bind": 1,
14-
"no-empty": 0,
15-
"no-process-exit": 1,
16-
"no-underscore-dangle": 0,
17-
"no-use-before-define": 0,
18-
"no-undef": 2,
19-
"no-unused-vars": 0,
20-
"consistent-return": 0,
21-
"no-inner-declarations": 1,
22-
"no-loop-func": 1,
23-
"space-before-function-paren": [2, "never"]
9+
"quotes": ["error", "double"],
10+
"no-undef": "error",
11+
"no-extra-semi": "error",
12+
"semi": "error",
13+
"no-template-curly-in-string": "error",
14+
"no-caller": "error",
15+
"yoda": "error",
16+
"eqeqeq": "error",
17+
"global-require": "off",
18+
"brace-style": "error",
19+
"eol-last": "error",
20+
"indent": ["error", "tab", { "SwitchCase": 1 }],
21+
"no-extra-bind": "warn",
22+
"no-empty": "off",
23+
"no-multiple-empty-lines": "error",
24+
"no-multi-spaces": "error",
25+
"no-process-exit": "warn",
26+
"space-in-parens": "error",
27+
"no-trailing-spaces": "error",
28+
"no-use-before-define": "off",
29+
"no-unused-vars": ["error", {"args": "none"}],
30+
"key-spacing": "error",
31+
"space-infix-ops": "error",
32+
"no-unsafe-negation": "error",
33+
"no-loop-func": "warn",
34+
"space-before-function-paren": ["error", "never"],
35+
"space-before-blocks": "error",
36+
"object-curly-spacing": ["error", "always"],
37+
"keyword-spacing": ["error", {
38+
"after": false,
39+
"overrides": {
40+
"try": {"after": true},
41+
"else": {"after": true},
42+
"throw": {"after": true},
43+
"case": {"after": true},
44+
"return": {"after": true},
45+
"finally": {"after": true},
46+
"do": {"after": true}
47+
}
48+
}],
49+
"no-console": "off",
50+
"valid-jsdoc": "error"
2451
}
2552
}
53+

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,22 @@
1-
## **BEFORE YOU SUBMIT** please read the following:
2-
If you have a support request or question please
3-
submit them to [StackOverflow](http://stackoverflow.com/questions/tagged/webpack) using the tag `[webpack]` or the [webpack Gitter](https://gitter.im/webpack/webpack). Future support requests will be closed.
4-
(remove this from issue)
1+
<!-- Please don't delete this template or we'll close your issue -->
2+
<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
3+
<!-- Also consider trying the webpack@beta version, maybe it's already fixed. -->
54

5+
**Do you want to request a *feature* or report a *bug*?**
66

7+
<!-- Please ask questions on StackOverflow or the webpack Gitter (https://gitter.im/webpack/webpack). -->
8+
<!-- Issues which contain questions or support requests will be closed. -->
79

8-
**I'm submitting a bug report**
9-
**I'm submitting a feature request**
10-
**I'm submitting a support request** => Please do not submit support request here, see note at the top of this template.
11-
(remove inappropriate sentences)
10+
**What is the current behavior?**
1211

12+
**If the current behavior is a bug, please provide the steps to reproduce.**
1313

14-
**Webpack version:**
15-
1.10.x/2.x
14+
<!-- A great way to do this is to provide your configuration via a GitHub gist. -->
15+
<!-- Best provide a minimal reproduceable repo -->
16+
<!-- If your issue is caused by a plugin or loader file the issue on the plugin/loader repo -->
1617

18+
**What is the expected behavior?**
1719

18-
**Please tell us about your environment:**
19-
OSX 10.x / Linux / Windows 10
20+
**If this is a feature request, what is motivation or use case for changing the behavior?**
2021

21-
22-
**Current behavior:**
23-
24-
25-
**Expected/desired behavior:**
26-
27-
28-
* **If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem along with a gist/jsbin of your webpack configuration.**
29-
30-
31-
* **What is the expected behavior?**
32-
33-
34-
* **What is the motivation / use case for changing the behavior?**
35-
36-
37-
* **Browser:** [all | Chrome XX | Firefox XX | IE XX | Safari XX | Mobile Chrome XX | Android X.X Web Browser | iOS XX Safari | iOS XX UIWebView | iOS XX WKWebView ]
38-
39-
* **Language:** [all | TypeScript X.X | ES6/7 | ES5 | Dart | ...]
22+
**Please mention other relevant information such as the browser version, Node.js version, webpack version and Operating System.**

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,24 @@
1-
**Please check if the PR fulfills these requirements**
2-
- [ ] Tests for the changes have been added (for bug fixes / features)
3-
- [ ] Docs have been added / updated (for bug fixes / features)
1+
<!-- Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. -->
42

3+
**What kind of change does this PR introduce?**
54

6-
**What kind of change does this PR introduce?** (Bug fix, feature, docs update, ...)
7-
- [ ] Bugfix
8-
- [ ] Feature
9-
- [ ] Code style update (formatting, local variables)
10-
- [ ] Refactoring (no functional changes, no api changes)
11-
- [ ] Build related changes
12-
- [ ] CI related changes
13-
- [ ] Other... Please describe:
5+
<!-- E.g. a bugfix, feature, refactoring, build related change, etc… -->
146

15-
**What is the current behavior?** (You can also link to an open issue here)
7+
**Did you add tests for your changes?**
168

9+
<!-- Note that we won't merge your changes if you don't add tests -->
1710

11+
**If relevant, link to documentation update:**
1812

19-
**What is the new behavior?**
13+
<!-- Link PR from webpack/webpack.js.org here, or N/A -->
2014

15+
**Summary**
2116

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. -->
2219

2320
**Does this PR introduce a breaking change?**
24-
- [ ] Yes
25-
- [ ] No
2621

27-
If this PR contains a breaking change, please describe the following...
28-
29-
* Impact:
30-
* Migration path for existing applications:
31-
* Github Issue(s) this is regarding:
32-
33-
34-
**Other information**:
22+
<!-- If this PR introduces a breaking change, please describe the impact and a migration path for existing applications. -->
3523

24+
**Other information**

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
/node_modules
22
/test/js
33
/test/browsertest/js
4+
/test/fixtures/temp-cache-fixture
45
/benchmark/js
56
/benchmark/fixtures
67
/examples/*/js
78
/coverage
89
.DS_Store
910
*.log
10-
.idea
11+
.idea
12+
.vscode

‎.travis.yml‎

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,46 @@
11
sudo: false
22
language: node_js
3-
os:
4-
- linux
5-
- osx
6-
node_js:
7-
- node
8-
- "6"
9-
- "5"
10-
- "4"
3+
4+
branches:
5+
only:
6+
- master
7+
8+
cache:
9+
directories:
10+
- $HOME/.npm
11+
- $HOME/.yarn-cache
1112

1213
matrix:
14+
include:
15+
- os: linux
16+
node_js: "7"
17+
env: NO_WATCH_TESTS=1 JOB_PART=lint
18+
- os: linux
19+
node_js: "7"
20+
env: NO_WATCH_TESTS=1 JOB_PART=test
21+
- os: linux
22+
node_js: "6"
23+
env: NO_WATCH_TESTS=1 JOB_PART=test
24+
- os: linux
25+
node_js: "4.3"
26+
env: NO_WATCH_TESTS=1 JOB_PART=test
27+
- os: osx
28+
node_js: "7"
29+
env: NO_WATCH_TESTS=1 JOB_PART=test
1330
allow_failures:
14-
- node_js: "4"
31+
- os: osx
32+
fast_finish: true
1533

16-
script: npm run travis
17-
env:
18-
- NO_WATCH_TESTS=1
34+
before_script:
35+
- bash ./ci/travis-install.sh
1936

20-
install:
21-
- npm link ../webpack --force
22-
- npm install
37+
script: npm run travis:$JOB_PART
2338

2439
after_success:
2540
- cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose
2641
- cat ./coverage/coverage.json | node_modules/codecov.io/bin/codecov.io.js
2742
- rm -rf ./coverage
43+
44+
notifications:
45+
slack:
46+
secure: JduSdKWwbnLCwo7Z4E59SGE+Uw832UwnXzQiKEpg1BV45MYDPRiGltly1tRHmPh9OGjvGx3XSkC2tNGOBLtL4UL2SCkf012x0t7jDutKRfcv/njynl8jk8l+UhPmaWiHXDQAgGiiKdL4RfzPLW3HeVHCOWm0LKMzcarTa8tw+rE=

‎CONTRIBUTING.md‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,24 @@ that include your webpack.config.js and relevant files are more likely to receiv
2020
If you have created your own loader/plugin please include it on the relevant
2121
documentation pages:
2222

23-
[List of loaders](https://webpack.github.io/docs/list-of-loaders.html)
24-
[List of plugins](https://webpack.github.io/docs/list-of-plugins.html)
23+
[List of loaders](https://webpack.js.org/loaders/) or [awesome-webpack](https://github.com/webpack-contrib/awesome-webpack#loaders)
24+
[List of plugins](https://webpack.js.org/plugins) or [awesome-webpack](https://github.com/webpack-contrib/awesome-webpack#webpack-plugins)
2525

2626
## Setup
2727

2828
```bash
2929
git clone https://github.com/webpack/webpack.git
3030
cd webpack
31-
npm install
32-
npm link
33-
npm link webpack
31+
npm install -g yarn
32+
yarn install
33+
yarn link
34+
yarn link webpack
3435
```
3536

3637
To run the entire test suite use:
3738

3839
```bash
39-
npm test
40+
yarn test
4041
```
4142

4243
## Submitting Changes
@@ -47,7 +48,7 @@ your pull request should be accepted quickly.
4748

4849
Some things that will increase the chance that your pull request is accepted:
4950

50-
* Write tests
51+
* [Write tests](./test/README.md)
5152
* Follow the existing coding style
5253
* Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
5354

‎LICENSE‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
(The MIT License)
2-
3-
Copyright (c) 2012-2016 Tobias Koppers
1+
Copyright JS Foundation and other contributors
42

53
Permission is hereby granted, free of charge, to any person obtaining
64
a copy of this software and associated documentation files (the

0 commit comments

Comments
 (0)