Skip to content

Commit 15bec9b

Browse files
sokrasokra
committed
Merge branch 'master' into precommit_lint
# Conflicts: # yarn.lock
2 parents a1b9b6e + a1e79ab commit 15bec9b

File tree

325 files changed

+5331
-3068
lines changed

Some content is hidden

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

325 files changed

+5331
-3068
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

‎.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4-
54
---
65

7-
<!-- Please don't delete this template or we'll close your issue -->
6+
<!-- Please don't delete this template because we'll close your issue -->
87
<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
98

109
# Bug report
@@ -20,18 +19,18 @@ about: Create a report to help us improve
2019
**If the current behavior is a bug, please provide the steps to reproduce.**
2120

2221

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 -->
22+
<!-- A great way to do this is to provide your configuration via a GitHub repository -->
23+
<!-- The most helpful is a minimal reproduction with instructions on how to reproduce -->
24+
<!-- Repositories with too many files or large `webpack.config.js` files are not suitable -->
25+
<!-- Please only add small code snippets directly into this issue -->
2726
<!-- 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. -->
27+
<!-- If your issue is caused by a plugin or loader, please create an issue on the loader/plugin repository instead -->
2928

3029
**What is the expected behavior?**
3130

3231

33-
<!-- "It should work" is not a good explaination -->
34-
<!-- Explain how exactly you expecting it to behave -->
32+
<!-- "It should work" is not a helpful explanation -->
33+
<!-- Explain exactly how it should behave -->
3534

3635
**Other relevant information:**
3736
webpack version:

‎.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
!bin/*.js
88
!hot/*.js
99
!buildin/*.js
10+
!benchmark/**/*.js
1011
!test/*.js
1112
!test/**/webpack.config.js
1213
!examples/**/webpack.config.js

‎benchmark/benchmark.js

Lines changed: 99 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -14,117 +14,118 @@ const benchmarkOptions = {
1414
};
1515

1616
function runTimes(compiler, times, deferred) {
17-
fs.writeFileSync(path.join(fixtures, "0.js"), "module.exports = " + Math.random(), "utf-8");
17+
fs.writeFileSync(
18+
path.join(fixtures, "0.js"),
19+
"module.exports = " + Math.random(),
20+
"utf-8"
21+
);
1822
compiler.run(err => {
19-
if(err) throw err;
20-
if(times === 1)
21-
deferred.resolve();
22-
else
23-
runTimes(compiler, times - 1, deferred);
23+
if (err) throw err;
24+
if (times === 1) deferred.resolve();
25+
else runTimes(compiler, times - 1, deferred);
2426
});
2527
}
2628

2729
const tests = {
2830
"normal build": [
2931
[0, 1, 5, 10, 50, 100, 200],
3032
(size, deferred) => {
31-
webpack({
32-
context: fixtures,
33-
entry: `./${size}.js`,
34-
output: {
35-
path: outputPath,
36-
filename: "bundle.js"
33+
webpack(
34+
{
35+
context: fixtures,
36+
entry: `./${size}.js`,
37+
output: {
38+
path: outputPath,
39+
filename: "bundle.js"
40+
}
41+
},
42+
err => {
43+
if (err) throw err;
44+
deferred.resolve();
3745
}
38-
}, err => {
39-
if(err) throw err;
40-
deferred.resolve();
41-
});
46+
);
4247
}
4348
],
4449
"eval dev build": [
4550
[0, 1, 2, 5, 10, 15],
4651
(size, deferred) => {
47-
webpack({
48-
context: fixtures,
49-
entry: `./${size}.big.js`,
50-
output: {
51-
path: outputPath,
52-
filename: "bundle.js"
52+
webpack(
53+
{
54+
context: fixtures,
55+
entry: `./${size}.big.js`,
56+
output: {
57+
path: outputPath,
58+
filename: "bundle.js"
59+
},
60+
devtool: "eval"
5361
},
54-
devtool: "eval"
55-
}, err => {
56-
if(err) throw err;
57-
deferred.resolve();
58-
});
62+
err => {
63+
if (err) throw err;
64+
deferred.resolve();
65+
}
66+
);
5967
}
6068
],
6169
"sourcemap build": [
6270
[0, 1, 2, 5, 10, 15],
6371
(size, deferred) => {
64-
webpack({
65-
context: fixtures,
66-
entry: `./${size}.big.js`,
67-
output: {
68-
path: outputPath,
69-
filename: "bundle.js"
72+
webpack(
73+
{
74+
context: fixtures,
75+
entry: `./${size}.big.js`,
76+
output: {
77+
path: outputPath,
78+
filename: "bundle.js"
79+
},
80+
devtool: "source-map"
7081
},
71-
devtool: "source-map"
72-
}, err => {
73-
if(err) throw err;
74-
deferred.resolve();
75-
});
82+
err => {
83+
if (err) throw err;
84+
deferred.resolve();
85+
}
86+
);
7687
}
7788
],
7889
"cheap sourcemap build": [
7990
[0, 1, 2, 5, 10, 15],
8091
(size, deferred) => {
81-
webpack({
82-
context: fixtures,
83-
entry: `./${size}.big.js`,
84-
output: {
85-
path: outputPath,
86-
filename: "bundle.js"
92+
webpack(
93+
{
94+
context: fixtures,
95+
entry: `./${size}.big.js`,
96+
output: {
97+
path: outputPath,
98+
filename: "bundle.js"
99+
},
100+
devtool: "cheap-source-map"
87101
},
88-
devtool: "cheap-source-map"
89-
}, err => {
90-
if(err) throw err;
91-
deferred.resolve();
92-
});
93-
}
94-
],
95-
"build w/ chunks": [
96-
[0, 1, 5, 10, 50, 100, 200],
97-
(size, deferred) => {
98-
webpack({
99-
context: fixtures,
100-
entry: `./${size}.async.js`,
101-
output: {
102-
path: outputPath,
103-
filename: "bundle.js"
102+
err => {
103+
if (err) throw err;
104+
deferred.resolve();
104105
}
105-
}, err => {
106-
if(err) throw err;
107-
deferred.resolve();
108-
});
106+
);
109107
}
110108
],
111109
"build w/ chunks": [
112110
[0, 1, 5, 10, 50, 100, 200],
113111
(size, deferred) => {
114-
webpack({
115-
context: fixtures,
116-
entry: "./" + size + ".async.js",
117-
output: {
118-
path: outputPath,
119-
filename: "bundle.js"
112+
webpack(
113+
{
114+
context: fixtures,
115+
entry: `./${size}.async.js`,
116+
output: {
117+
path: outputPath,
118+
filename: "bundle.js"
119+
}
120+
},
121+
err => {
122+
if (err) throw err;
123+
deferred.resolve();
120124
}
121-
}, err => {
122-
if(err) throw err;
123-
deferred.resolve();
124-
});
125+
);
125126
}
126127
],
127-
"incremental": [
128+
incremental: [
128129
[0, 1, 5, 10, 50, 100, 200],
129130
(size, deferred) => {
130131
var compiler = webpack({
@@ -155,7 +156,7 @@ const tests = {
155156
runTimes(compiler, size, deferred);
156157
}
157158
],
158-
"incremental2": [
159+
incremental2: [
159160
[0, 1, 5, 10, 50, 100, 200],
160161
(size, deferred) => {
161162
var compiler = webpack({
@@ -170,7 +171,7 @@ const tests = {
170171
runTimes(compiler, 3, deferred);
171172
}
172173
],
173-
"incremental4": [
174+
incremental4: [
174175
[0, 1, 5, 10, 50, 100, 200],
175176
(size, deferred) => {
176177
var compiler = webpack({
@@ -185,7 +186,7 @@ const tests = {
185186
runTimes(compiler, 5, deferred);
186187
}
187188
],
188-
"incremental16": [
189+
incremental16: [
189190
[0, 1, 5, 10, 50, 100, 200],
190191
(size, deferred) => {
191192
var compiler = webpack({
@@ -199,25 +200,38 @@ const tests = {
199200
});
200201
runTimes(compiler, 17, deferred);
201202
}
202-
],
203+
]
203204
};
204205

205-
const suite = new Benchmark.Suite;
206+
const suite = new Benchmark.Suite();
206207

207-
Object.keys(tests).filter(name => process.argv.length > 2 ? name.includes(process.argv[2]) : true)
208+
Object.keys(tests)
209+
.filter(
210+
name => (process.argv.length > 2 ? name.includes(process.argv[2]) : true)
211+
)
208212
.forEach(name => {
209213
const test = tests[name];
210214
test[0].forEach(size => {
211-
suite.add(`${name} ${size}`, deferred => {
212-
test[1](size, deferred);
213-
}, benchmarkOptions);
215+
suite.add(
216+
`${name} ${size}`,
217+
deferred => {
218+
test[1](size, deferred);
219+
},
220+
benchmarkOptions
221+
);
214222
});
215223
});
216224

217225
suite.on("cycle", event => {
218226
process.stderr.write("\n");
219227
const b = event.target;
220-
console.log(b.name + "\t" + Math.floor(1000 * (b.stats.mean - b.stats.moe)) + "\t" + Math.floor(1000 * (b.stats.mean + b.stats.moe)));
228+
console.log(
229+
b.name +
230+
"\t" +
231+
Math.floor(1000 * (b.stats.mean - b.stats.moe)) +
232+
"\t" +
233+
Math.floor(1000 * (b.stats.mean + b.stats.moe))
234+
);
221235
});
222236

223237
suite.run({

‎benchmark/createBenchmark.js

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
1-
const webpack = require("webpack");
1+
const webpack = require("../");
22
const path = require("path");
33

4-
webpack({
5-
context: __dirname,
6-
entry: "./createBenchmark/entry.js",
7-
output: {
8-
path: __dirname,
9-
filename: "benchmark-bundle.js"
4+
webpack(
5+
{
6+
context: __dirname,
7+
entry: "./createBenchmark/entry.js",
8+
output: {
9+
path: __dirname,
10+
filename: "benchmark-bundle.js"
11+
},
12+
target: "node",
13+
node: {
14+
__dirname: false
15+
},
16+
plugins: [
17+
new webpack.NamedModulesPlugin(),
18+
new webpack.IgnorePlugin(/^(fsevents|uglify-js)$/),
19+
new webpack.NormalModuleReplacementPlugin(
20+
/^.\/loadLoader$/,
21+
path.resolve(__dirname, "./createBenchmark/loadLoader")
22+
)
23+
]
1024
},
11-
target: "node",
12-
node: {
13-
__dirname: false
14-
},
15-
plugins: [
16-
new webpack.NamedModulesPlugin(),
17-
new webpack.IgnorePlugin(/^(fsevents|uglify-js)$/),
18-
new webpack.NormalModuleReplacementPlugin(/^.\/loadLoader$/, path.resolve(__dirname, "./createBenchmark/loadLoader"))
19-
]
20-
}, (err, stats) => {
21-
console.log(stats.toString());
22-
});
25+
(err, stats) => {
26+
console.log(stats.toString());
27+
}
28+
);

‎benchmark/createBenchmark/entry.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
const webpack = require("webpack");
2-
const MemoryFs = require("memory-fs");
1+
const webpack = require("../../");
32
const path = require("path");
43

54
const testCase = process.argv[2];
@@ -15,11 +14,13 @@ const config = {
1514

1615
const compiler = webpack(config);
1716
compiler.run((err, stats) => {
18-
if(err) {
17+
if (err) {
1918
console.error(err);
2019
} else {
21-
console.log(stats.toString({
22-
errorDetails: true
23-
}));
20+
console.log(
21+
stats.toString({
22+
errorDetails: true
23+
})
24+
);
2425
}
2526
});

0 commit comments

Comments
 (0)