Skip to content

Commit 83f4fe1

Browse files
BUPTlhuanyuBUPTlhuanyu
authored
Merge branch 'master' into master
2 parents e6a3b94 + ee1dc79 commit 83f4fe1

Some content is hidden

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

58 files changed

+14616
-16698
lines changed

‎.cspell.json‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"version": "0.2",
3+
"language": "en,en-gb",
4+
"words": [
5+
"hoge",
6+
"pathinfo",
7+
"iife",
8+
"fullhash",
9+
"cacheable",
10+
"elsewise",
11+
"Respawn",
12+
"respawning",
13+
"cpus",
14+
"vspace",
15+
"hspace",
16+
"memfs",
17+
"commitlint",
18+
"opencollective",
19+
"Koppers",
20+
"sokra",
21+
"lifecycles",
22+
"absolutify",
23+
"filebase",
24+
"chunkhash",
25+
"moduleid",
26+
"modulehash"
27+
],
28+
"ignorePaths": [
29+
"CHANGELOG.md",
30+
"package.json",
31+
"dist/**",
32+
"**/__snapshots__/**",
33+
"package-lock.json",
34+
"**/*.css",
35+
"**/fonts/**",
36+
"node_modules",
37+
"coverage",
38+
"*.log"
39+
]
40+
}

‎.eslintignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
/coverage
22
/dist
33
/node_modules
4-
/test/fixtures
4+
/test/fixtures
5+
/test/basic-loader-test/mod.js
6+
/test/basic-loader-test/mod1.js
7+
/test/basic-loader-test/mod2.js
8+

‎.eslintrc.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
module.exports = {
22
root: true,
33
extends: ['@webpack-contrib/eslint-config-webpack', 'prettier'],
4+
parserOptions: {
5+
ecmaVersion: 2020,
6+
},
47
};

‎.github/CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ module. Thankfully, Github provides a means to do this. Add a dependency to the
140140
```json
141141
{
142142
"devDependencies": {
143-
"thread-loader": "webpack-contrib/thread-loader#{id}/head"
143+
"sass-loader": "webpack-contrib/sass-loader#{id}/head"
144144
}
145145
}
146146
```
@@ -149,7 +149,7 @@ Where `{id}` is the # ID of your Pull Request.
149149

150150
## Contributor License Agreement
151151

152-
When submitting your contribution, a CLA (Contributor License Agreement) bot will come by to verify that you signed the [CLA](https://cla.js.foundation/webpack-contrib/thread-loader).
152+
When submitting your contribution, a CLA (Contributor License Agreement) bot will come by to verify that you signed the [CLA](https://easycla.lfx.linuxfoundation.org/#/?version=2).
153153
If it is your first time, it will link you to the right place to sign it.
154154
However, if you have committed your contributions using an email that is not the same as your email used on GitHub, the CLA bot can't accept your contribution.
155155

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
77
You arrived at this template because you felt none of the other options
88
matched the kind of issue you'd like to report. Please use this opportunity to
9-
tell us about your particular type of issue so we can try to accomodate
9+
tell us about your particular type of issue so we can try to accommodate
1010
similar issues in the future.
1111
1212
PLEASE do note, if you're using this to report an issue already covered by the

‎.github/ISSUE_TEMPLATE/BUG.md‎

Lines changed: 18 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,32 @@ name: 🐛 Bug Report
33
about: Something went awry and you'd like to tell us about it.
44
---
55

6-
<!--
7-
Issues are so 🔥
6+
<!-- Please don't delete this template otherwise your issue will be closed immediately -->
7+
<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
88

9-
If you remove or skip this template, you'll make the 🐼 sad and the mighty god
10-
of Github will appear and pile-drive the close button from a great height
11-
while making animal noises.
9+
### Bug report
1210

13-
👉🏽 Need support, advice, or help? Don't open an issue!
14-
Head to StackOverflow or https://gitter.im/webpack/webpack.
15-
-->
16-
17-
- Operating System:
18-
- Node Version:
19-
- NPM Version:
20-
- webpack Version:
21-
- thread-loader Version:
22-
23-
### Expected Behavior
24-
25-
<!-- Remove this section if not reporting a bug or modification request. -->
11+
<!-- Please ask questions on discussions or StackOverflow. -->
12+
<!-- https://github.com/webpack/webpack/discussions -->
13+
<!-- https://stackoverflow.com/questions/ask?tags=webpack -->
14+
<!-- Issues which contain questions or support requests will be closed. -->
2615

2716
### Actual Behavior
2817

29-
<!-- Remove this section if not reporting a bug or modification request. -->
30-
31-
### Code
18+
<!-- Explain exactly how it behaves -->
3219

33-
```js
34-
// webpack.config.js
35-
// If your code blocks are over 20 lines, please paste a link to a gist
36-
// (https://gist.github.com).
37-
```
20+
### Expected Behavior
3821

39-
```js
40-
// additional code, HEY YO remove this block if you don't need it
41-
```
22+
<!-- "It should work" is not a helpful explanation -->
23+
<!-- Explain exactly how it should behave -->
4224

4325
### How Do We Reproduce?
4426

45-
<!--
46-
Remove this section if not reporting a bug.
27+
<!-- A great way to do this is to provide your configuration via a GitHub repository -->
28+
<!-- The most helpful is a minimal reproduction with instructions on how to reproduce -->
29+
<!-- Repositories with too many files or large `webpack.config.js` files are not suitable -->
30+
<!-- Please only add small code snippets directly into this issue -->
31+
<!-- https://gist.github.com is a good place for longer code snippets -->
32+
<!-- If your issue is caused by a plugin or loader, please create an issue on the loader/plugin repository instead -->
4733

48-
If your webpack config is over 50 lines long, please provide a URL to a repo
49-
for your beefy 🍖 app that we can use to reproduce.
50-
-->
34+
### Please paste the results of `npx webpack-cli info` here, and mention other relevant information

‎.github/ISSUE_TEMPLATE/DOCS.md‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,8 @@ name: 📚 Documentation
33
about: Are the docs lacking or missing something? Do they need some new 🔥 hotness? Tell us here.
44
---
55

6-
<!--
7-
Issues are so 🔥
8-
9-
If you remove or skip this template, you'll make the 🐼 sad and the mighty god
10-
of Github will appear and pile-drive the close button from a great height
11-
while making animal noises.
12-
13-
👉🏽 Need support, advice, or help? Don't open an issue!
14-
Head to StackOverflow or https://gitter.im/webpack/webpack.
15-
-->
6+
<!-- Please don't delete this template otherwise your issue will be closed immediately -->
7+
<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
168

179
Documentation Is:
1810

@@ -25,4 +17,9 @@ Documentation Is:
2517

2618
### Please Explain in Detail...
2719

20+
<!-- Please don't delete this template otherwise your issue will be closed immediately -->
21+
<!-- https://github.com/webpack/webpack/discussions -->
22+
<!-- https://stackoverflow.com/questions/ask?tags=webpack -->
23+
<!-- Issues which contain questions or support requests will be closed. -->
24+
2825
### Your Proposal for Changes

‎.github/ISSUE_TEMPLATE/FEATURE.md‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,16 @@ name: ✨ Feature Request
33
about: Suggest an idea for this project
44
---
55

6-
<!--
7-
Issues are so 🔥
8-
9-
If you remove or skip this template, you'll make the 🐼 sad and the mighty god
10-
of Github will appear and pile-drive the close button from a great height
11-
while making animal noises.
12-
13-
👉🏽 Need support, advice, or help? Don't open an issue!
14-
Head to StackOverflow or https://gitter.im/webpack/webpack.
15-
-->
16-
17-
- Operating System:
18-
- Node Version:
19-
- NPM Version:
20-
- webpack Version:
21-
- thread-loader Version:
6+
<!-- Please don't delete this template otherwise your issue will be closed immediately -->
7+
<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
228

239
### Feature Proposal
2410

11+
<!-- Please ask questions on discussions or StackOverflow. -->
12+
<!-- https://github.com/webpack/webpack/discussions -->
13+
<!-- https://stackoverflow.com/questions/ask?tags=webpack -->
14+
<!-- Issues which contain questions or support requests will be closed. -->
15+
2516
### Feature Use Case
17+
18+
### Please paste the results of `npx webpack-cli info` here, and mention other relevant information

‎.github/ISSUE_TEMPLATE/MODIFICATION.md‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,18 @@ name: 🔧 Modification Request
33
about: Would you like something work differently? Have an alternative approach? This is the template for you.
44
---
55

6-
<!--
7-
Issues are so 🔥
6+
<!-- Please don't delete this template otherwise your issue will be closed immediately -->
7+
<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
88

9-
If you remove or skip this template, you'll make the 🐼 sad and the mighty god
10-
of Github will appear and pile-drive the close button from a great height
11-
while making animal noises.
12-
13-
👉🏽 Need support, advice, or help? Don't open an issue!
14-
Head to StackOverflow or https://gitter.im/webpack/webpack.
15-
-->
9+
### Modification Proposal
1610

17-
- Operating System:
18-
- Node Version:
19-
- NPM Version:
20-
- webpack Version:
21-
- thread-loader Version:
11+
<!-- Please ask questions on discussions or StackOverflow. -->
12+
<!-- https://github.com/webpack/webpack/discussions -->
13+
<!-- https://stackoverflow.com/questions/ask?tags=webpack -->
14+
<!-- Issues which contain questions or support requests will be closed. -->
2215

2316
### Expected Behavior / Situation
2417

2518
### Actual Behavior / Situation
2619

27-
### Modification Proposal
20+
### Please paste the results of `npx webpack-cli info` here, and mention other relevant information

‎.github/ISSUE_TEMPLATE/SUPPORT.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
---
22
name: 🆘 Support, Help, and Advice
3-
about: 👉🏽 Need support, help, or advice? Don't open an issue! Head to StackOverflow or https://gitter.im/webpack/webpack.
3+
about: 👉🏽 Need support, help, or advice? Don't open an issue! Head to https://github.com/webpack/webpack/discussions, StackOverflow or https://gitter.im/webpack/webpack.
44
---
55

66
Hey there! If you need support, help, or advice then this is not the place to ask.
7-
Please visit [StackOverflow](https://stackoverflow.com/questions/tagged/webpack)
8-
or [the Webpack Gitter](https://gitter.im/webpack/webpack) instead.
7+
Please visit [GitHub Discussions](https://github.com/webpack/webpack/discussions) or [StackOverflow](https://stackoverflow.com/questions/tagged/webpack) instead.

0 commit comments

Comments
 (0)