Skip to content

Commit 1886b7a

Browse files
sokrasokra
committed
Merge branch 'master' into next
# Conflicts: # bin/webpack.js # lib/Compilation.js # yarn.lock
2 parents 289ba67 + 6a69091 commit 1886b7a

File tree

20 files changed

+225
-201
lines changed

20 files changed

+225
-201
lines changed

‎benchmark/benchmark.js‎

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
var path = require("path");
2-
var fs = require("fs");
3-
var Benchmark = require("benchmark");
4-
var webpack = require("../");
5-
var fixtures = path.join(__dirname, "fixtures");
6-
var outputPath = path.join(__dirname, "js");
1+
const path = require("path");
2+
const fs = require("fs");
3+
const Benchmark = require("benchmark");
4+
const webpack = require("../");
5+
const fixtures = path.join(__dirname, "fixtures");
6+
const outputPath = path.join(__dirname, "js");
77

8-
var benchmarkOptions = {
8+
const benchmarkOptions = {
99
defer: true,
1010
onCycle: function() {
1111
process.stderr.write(".");
@@ -15,7 +15,7 @@ var benchmarkOptions = {
1515

1616
function runTimes(compiler, times, deferred) {
1717
fs.writeFileSync(path.join(fixtures, "0.js"), "module.exports = " + Math.random(), "utf-8");
18-
compiler.run(function(err, stats) {
18+
compiler.run((err, stats) => {
1919
if(err) throw err;
2020
if(times === 1)
2121
deferred.resolve();
@@ -24,26 +24,26 @@ function runTimes(compiler, times, deferred) {
2424
});
2525
}
2626

27-
var tests = {
27+
const tests = {
2828
"normal build": [
2929
[0, 1, 5, 10, 50, 100, 200],
30-
function(size, deferred) {
30+
(size, deferred) => {
3131
webpack({
3232
context: fixtures,
3333
entry: "./" + size + ".js",
3434
output: {
3535
path: outputPath,
3636
filename: "bundle.js"
3737
}
38-
}, function(err, stats) {
38+
}, (err, stats) => {
3939
if(err) throw err;
4040
deferred.resolve();
4141
});
4242
}
4343
],
4444
"eval dev build": [
4545
[0, 1, 2, 5, 10, 15],
46-
function(size, deferred) {
46+
(size, deferred) => {
4747
webpack({
4848
context: fixtures,
4949
entry: "./" + size + ".big.js",
@@ -52,15 +52,15 @@ var tests = {
5252
filename: "bundle.js"
5353
},
5454
devtool: "eval"
55-
}, function(err, stats) {
55+
}, (err, stats) => {
5656
if(err) throw err;
5757
deferred.resolve();
5858
})
5959
}
6060
],
6161
"sourcemap build": [
6262
[0, 1, 2, 5, 10, 15],
63-
function(size, deferred) {
63+
(size, deferred) => {
6464
webpack({
6565
context: fixtures,
6666
entry: "./" + size + ".big.js",
@@ -69,15 +69,15 @@ var tests = {
6969
filename: "bundle.js"
7070
},
7171
devtool: "source-map"
72-
}, function(err, stats) {
72+
}, (err, stats) => {
7373
if(err) throw err;
7474
deferred.resolve();
7575
})
7676
}
7777
],
7878
"cheap sourcemap build": [
7979
[0, 1, 2, 5, 10, 15],
80-
function(size, deferred) {
80+
(size, deferred) => {
8181
webpack({
8282
context: fixtures,
8383
entry: "./" + size + ".big.js",
@@ -94,7 +94,7 @@ var tests = {
9494
],
9595
"build w/ chunks": [
9696
[0, 1, 5, 10, 50, 100, 200],
97-
function(size, deferred) {
97+
(size, deferred) => {
9898
webpack({
9999
context: fixtures,
100100
entry: "./" + size + ".async.js",
@@ -110,7 +110,7 @@ var tests = {
110110
],
111111
"build w/ chunks": [
112112
[0, 1, 5, 10, 50, 100, 200],
113-
function(size, deferred) {
113+
(size, deferred) => {
114114
webpack({
115115
context: fixtures,
116116
entry: "./" + size + ".async.js",
@@ -126,7 +126,7 @@ var tests = {
126126
],
127127
"incremental": [
128128
[0, 1, 5, 10, 50, 100, 200],
129-
function(size, deferred) {
129+
(size, deferred) => {
130130
var compiler = webpack({
131131
cache: true,
132132
context: fixtures,
@@ -141,7 +141,7 @@ var tests = {
141141
],
142142
"incremental cheap sourcemap": [
143143
[1, 2, 3, 4, 5, 6],
144-
function(size, deferred) {
144+
(size, deferred) => {
145145
var compiler = webpack({
146146
cache: true,
147147
context: fixtures,
@@ -157,7 +157,7 @@ var tests = {
157157
],
158158
"incremental2": [
159159
[0, 1, 5, 10, 50, 100, 200],
160-
function(size, deferred) {
160+
(size, deferred) => {
161161
var compiler = webpack({
162162
cache: true,
163163
context: fixtures,
@@ -172,7 +172,7 @@ var tests = {
172172
],
173173
"incremental4": [
174174
[0, 1, 5, 10, 50, 100, 200],
175-
function(size, deferred) {
175+
(size, deferred) => {
176176
var compiler = webpack({
177177
cache: true,
178178
context: fixtures,
@@ -187,7 +187,7 @@ var tests = {
187187
],
188188
"incremental16": [
189189
[0, 1, 5, 10, 50, 100, 200],
190-
function(size, deferred) {
190+
(size, deferred) => {
191191
var compiler = webpack({
192192
cache: true,
193193
context: fixtures,
@@ -202,24 +202,21 @@ var tests = {
202202
],
203203
};
204204

205-
var suite = new Benchmark.Suite;
205+
const suite = new Benchmark.Suite;
206206

207-
Object.keys(tests).filter(function(name) {
208-
if(process.argv.length > 2)
209-
return name.indexOf(process.argv[2]) >= 0;
210-
return true;
211-
}).forEach(function(name) {
212-
var test = tests[name];
213-
test[0].forEach(function(size) {
214-
suite.add(name + " " + size, function(deferred) {
215-
test[1](size, deferred);
216-
}, benchmarkOptions);
207+
Object.keys(tests).filter((name) => (process.argv.length > 2) ? name.indexOf(process.argv[2]) >= 0 : true)
208+
.forEach((name) => {
209+
const test = tests[name];
210+
test[0].forEach((size) => {
211+
suite.add(name + " " + size, (deferred) => {
212+
test[1](size, deferred);
213+
}, benchmarkOptions);
214+
});
217215
});
218-
});
219216

220-
suite.on("cycle", function(event) {
217+
suite.on("cycle", (event) => {
221218
process.stderr.write("\n");
222-
var b = event.target;
219+
const b = event.target;
223220
console.log(b.name + "\t" + Math.floor(1000 * (b.stats.mean - b.stats.moe)) + "\t" + Math.floor(1000 * (b.stats.mean + b.stats.moe)));
224221
});
225222

‎benchmark/createBenchmark.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ webpack({
1717
new webpack.IgnorePlugin(/^(fsevents|uglify-js)$/),
1818
new webpack.NormalModuleReplacementPlugin(/^.\/loadLoader$/, path.resolve(__dirname, "./createBenchmark/loadLoader"))
1919
]
20-
}, function(err, stats) {
20+
}, (err, stats) => {
2121
console.log(stats.toString());
2222
});

‎benchmark/createBenchmark/loadLoader.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
module.exports = (loader, callback) => {
1+
module.exports = (loader, callback) => {
22
callback(new Error("Loaders are not supported"));
33
}

‎benchmark/createFixtures.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
var path = require("path");
2-
var fs = require("fs");
1+
const path = require("path");
2+
const fs = require("fs");
33

4-
var fixtures = path.join(__dirname, "fixtures");
4+
const fixtures = path.join(__dirname, "fixtures");
55

66
try {
77
fs.mkdirSync(fixtures);
88
} catch(e) {}
99

10-
for(var i = 0; i < 10000; i++) {
11-
var source = [];
10+
for(let i = 0; i < 10000; i++) {
11+
const source = [];
1212
if(i > 8)
1313
source.push("require(" + JSON.stringify("./" + (i / 8 | 0) + ".js") + ");");
1414
if(i > 4)
@@ -21,8 +21,8 @@ for(var i = 0; i < 10000; i++) {
2121
fs.writeFileSync(path.join(fixtures, i + ".js"), source.join("\n"), "utf-8");
2222
}
2323

24-
for(var i = 0; i < 10000; i++) {
25-
var source = [];
24+
for(let i = 0; i < 10000; i++) {
25+
const source = [];
2626
source.push("require.ensure([], function(require) {");
2727
if(i > 8)
2828
source.push("require(" + JSON.stringify("./" + (i / 8 | 0) + ".async.js") + ");");
@@ -37,8 +37,8 @@ for(var i = 0; i < 10000; i++) {
3737
fs.writeFileSync(path.join(fixtures, i + ".async.js"), source.join("\n"), "utf-8");
3838
}
3939

40-
for(var i = 0; i < 100; i++) {
41-
var source = [];
40+
for(let i = 0; i < 100; i++) {
41+
const source = [];
4242
if(i > 8)
4343
source.push("require(" + JSON.stringify("./" + (i / 8 | 0) + ".big.js") + ");");
4444
if(i > 4)
@@ -47,7 +47,7 @@ for(var i = 0; i < 100; i++) {
4747
source.push("require(" + JSON.stringify("./" + (i / 2 | 0) + ".big.js") + ");");
4848
if(i > 0)
4949
source.push("require(" + JSON.stringify("./" + (i - 1) + ".big.js") + ");");
50-
for(var j = 0; j < 300; j++)
50+
for(let j = 0; j < 300; j++)
5151
source.push("if(Math.random())hello.world();test.a.b.c.d();x(1,2,3,4);var a,b,c,d,e,f;");
5252
source.push("module.exports = " + i + ";");
5353
fs.writeFileSync(path.join(fixtures, i + ".big.js"), source.join("\n"), "utf-8");

‎benchmark/createFixtures2.js‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
1-
var path = require("path");
2-
var fs = require("fs");
1+
const path = require("path");
2+
const fs = require("fs");
33

4-
var fixtures = path.join(__dirname, "fixtures");
4+
const fixtures = path.join(__dirname, "fixtures");
55

66
try {
77
fs.mkdirSync(fixtures);
88
} catch(e) {}
99

1010
function genModule(prefix, depth, asyncDepth, multiplex, r, circular) {
11-
var source = [];
12-
var isAsync = depth >= asyncDepth;
11+
const source = [];
12+
const isAsync = depth >= asyncDepth;
1313
if(!isAsync)
1414
circular.push(path.resolve(fixtures, prefix + "/index.js"));
1515
source.push("(function() {");
16-
var m = (r % multiplex) + 1;
17-
var sum = 1;
16+
const m = (r % multiplex) + 1;
17+
let sum = 1;
18+
let item;
1819
try {
1920
fs.mkdirSync(path.resolve(fixtures, prefix));
2021
} catch(e) {}
2122
if(depth > 0) {
22-
for(var i = 0; i < m; i++) {
23+
for(let i = 0; i < m; i++) {
2324
sum += genModule(prefix + "/" + i, depth - 1, asyncDepth, multiplex, (r + i + depth) * m + i + depth, circular);
2425
source.push("require(" + JSON.stringify("./" + i) + ");");
2526
if(i === 0) {
2627
if(isAsync)
2728
source.push("}); require.ensure([], function() {");
2829
}
2930
}
30-
var item = circular[r % circular.length];
31+
item = circular[r % circular.length];
3132
}
3233
source.push("}, " + JSON.stringify(prefix) + ");");
3334
if(item)
@@ -37,20 +38,20 @@ function genModule(prefix, depth, asyncDepth, multiplex, r, circular) {
3738
return sum;
3839
}
3940

40-
for(var i = 2; i < 14; i++) {
41-
var count = genModule("tree-" + i, 6, 100, i, 0, []);
41+
for(let i = 2; i < 14; i++) {
42+
const count = genModule("tree-" + i, 6, 100, i, 0, []);
4243
console.log("generated tree", i, count);
4344
}
4445

45-
for(i = 2; i < 14; i++) {
46-
count = genModule("async-tree-" + i, 6, 1, i, 0, []);
46+
for(let i = 2; i < 14; i++) {
47+
const count = genModule("async-tree-" + i, 6, 1, i, 0, []);
4748
console.log("generated async tree", i, count);
4849
}
4950

50-
var a = genModule("module-async", 7, 1, 3, 2, []);
51+
const a = genModule("module-async", 7, 1, 3, 2, []);
5152

52-
var b = genModule("module-big-async", 5, 2, 9, 2, []);
53+
const b = genModule("module-big-async", 5, 2, 9, 2, []);
5354

54-
var c = genModule("module-broad-async", 3, 3, 20, 10, []);
55+
const c = genModule("module-broad-async", 3, 3, 20, 10, []);
5556

5657
console.log("generated modules", a, b, c);

‎benchmark/createTestCases.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function e() {}
3232
function f() {}
3333
`
3434

35-
for(var i = 0; i < 2; i++) {
35+
for(let i = 0; i < 2; i++) {
3636
avgJs += `(function() {${avgJs}}());`;
3737
}
3838

‎bin/webpack.js‎

100755100644
File mode changed.

0 commit comments

Comments
 (0)