Skip to content

Commit c148033

Browse files
ooflorentooflorent
committed
Remove module.webpackPolyfill guard
1 parent 74e6346 commit c148033

File tree

5 files changed

+58
-85
lines changed

5 files changed

+58
-85
lines changed

‎lib/NodeStuffPlugin.js

Lines changed: 29 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,14 @@ class NodeStuffPlugin {
5151
compilation.hooks.runtimeRequirementInModule
5252
.for(RuntimeGlobals.harmonyModuleDecorator)
5353
.tap("NodeStuffPlugin", (module, set) => {
54+
set.add(RuntimeGlobals.module);
5455
set.add(RuntimeGlobals.require);
5556
});
5657

5758
compilation.hooks.runtimeRequirementInModule
5859
.for(RuntimeGlobals.nodeModuleDecorator)
5960
.tap("NodeStuffPlugin", (module, set) => {
61+
set.add(RuntimeGlobals.module);
6062
set.add(RuntimeGlobals.require);
6163
});
6264

@@ -245,28 +247,23 @@ class HarmonyModuleDecoratorRuntimeModule extends RuntimeModule {
245247
return Template.asString([
246248
`${RuntimeGlobals.harmonyModuleDecorator} = function(module) {`,
247249
Template.indent([
248-
"if (!module.webpackPolyfill) {",
250+
"module = Object.create(module);",
251+
"if (!module.children) module.children = [];",
252+
"Object.defineProperty(module, 'loaded', {",
249253
Template.indent([
250-
"module = Object.create(module);",
251-
"if (!module.children) module.children = [];",
252-
"Object.defineProperty(module, 'loaded', {",
253-
Template.indent([
254-
"enumerable: true,",
255-
"get: function () { return module.l; }"
256-
]),
257-
"});",
258-
"Object.defineProperty(module, 'id', {",
259-
Template.indent([
260-
"enumerable: true,",
261-
"get: function () { return module.i; }"
262-
]),
263-
"});",
264-
"Object.defineProperty(module, 'exports', {",
265-
Template.indent("enumerable: true"),
266-
"});",
267-
"module.webpackPolyfill = 1;"
254+
"enumerable: true,",
255+
"get: function () { return module.l; }"
268256
]),
269-
"}",
257+
"});",
258+
"Object.defineProperty(module, 'id', {",
259+
Template.indent([
260+
"enumerable: true,",
261+
"get: function () { return module.i; }"
262+
]),
263+
"});",
264+
"Object.defineProperty(module, 'exports', {",
265+
Template.indent("enumerable: true"),
266+
"});",
270267
"return module;"
271268
]),
272269
"};"
@@ -286,25 +283,20 @@ class NodeModuleDecoratorRuntimeModule extends RuntimeModule {
286283
return Template.asString([
287284
`${RuntimeGlobals.nodeModuleDecorator} = function(module) {`,
288285
Template.indent([
289-
"if (!module.webpackPolyfill) {",
286+
"module.paths = [];",
287+
"if (!module.children) module.children = [];",
288+
"Object.defineProperty(module, 'loaded', {",
289+
Template.indent([
290+
"enumerable: true,",
291+
"get: function() { return module.l; }"
292+
]),
293+
"});",
294+
"Object.defineProperty(module, 'id', {",
290295
Template.indent([
291-
"module.paths = [];",
292-
"if (!module.children) module.children = [];",
293-
"Object.defineProperty(module, 'loaded', {",
294-
Template.indent([
295-
"enumerable: true,",
296-
"get: function() { return module.l; }"
297-
]),
298-
"});",
299-
"Object.defineProperty(module, 'id', {",
300-
Template.indent([
301-
"enumerable: true,",
302-
"get: function() { return module.i; }"
303-
]),
304-
"});",
305-
"module.webpackPolyfill = 1;"
296+
"enumerable: true,",
297+
"get: function() { return module.i; }"
306298
]),
307-
"}",
299+
"});",
308300
"return module;"
309301
]),
310302
"};"

‎test/__snapshots__/StatsTestCases.test.js.snap

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -731,13 +731,13 @@ Entrypoint main = main.js
731731
`;
732732

733733
exports[`StatsTestCases should print correct stats for filter-warnings 1`] = `
734-
"Hash: c833e2d80363a2e3a79dc833e2d80363a2e3a79dc833e2d80363a2e3a79dc833e2d80363a2e3a79dc833e2d80363a2e3a79dc833e2d80363a2e3a79dc833e2d80363a2e3a79dc833e2d80363a2e3a79dc833e2d80363a2e3a79dc833e2d80363a2e3a79dc833e2d80363a2e3a79dc833e2d80363a2e3a79dc833e2d80363a2e3a79d
734+
"Hash: d3d9bf7d7c68dde32298d3d9bf7d7c68dde32298d3d9bf7d7c68dde32298d3d9bf7d7c68dde32298d3d9bf7d7c68dde32298d3d9bf7d7c68dde32298d3d9bf7d7c68dde32298d3d9bf7d7c68dde32298d3d9bf7d7c68dde32298d3d9bf7d7c68dde32298d3d9bf7d7c68dde32298d3d9bf7d7c68dde32298d3d9bf7d7c68dde32298
735735
Child undefined:
736-
Hash: c833e2d80363a2e3a79d
736+
Hash: d3d9bf7d7c68dde32298
737737
Time: Xms
738738
Built at: Thu Jan 01 1970 00:00:00 GMT
739739
Asset Size Chunks Chunk Names
740-
bundle.js 1.35 KiB {0} [emitted] main
740+
bundle.js 1.29 KiB {0} [emitted] main
741741
Entrypoint main = bundle.js
742742
743743
WARNING in Terser Plugin: Dropping side-effect-free statement [./index.js:6,0]
@@ -762,53 +762,53 @@ Child undefined:
762762
763763
WARNING in Terser Plugin: Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0]
764764
Child Terser:
765-
Hash: c833e2d80363a2e3a79d
765+
Hash: d3d9bf7d7c68dde32298
766766
Time: Xms
767767
Built at: Thu Jan 01 1970 00:00:00 GMT
768768
Asset Size Chunks Chunk Names
769-
bundle.js 1.35 KiB {0} [emitted] main
769+
bundle.js 1.29 KiB {0} [emitted] main
770770
Entrypoint main = bundle.js
771771
Child /Terser/:
772-
Hash: c833e2d80363a2e3a79d
772+
Hash: d3d9bf7d7c68dde32298
773773
Time: Xms
774774
Built at: Thu Jan 01 1970 00:00:00 GMT
775775
Asset Size Chunks Chunk Names
776-
bundle.js 1.35 KiB {0} [emitted] main
776+
bundle.js 1.29 KiB {0} [emitted] main
777777
Entrypoint main = bundle.js
778778
Child warnings => true:
779-
Hash: c833e2d80363a2e3a79d
779+
Hash: d3d9bf7d7c68dde32298
780780
Time: Xms
781781
Built at: Thu Jan 01 1970 00:00:00 GMT
782782
Asset Size Chunks Chunk Names
783-
bundle.js 1.35 KiB {0} [emitted] main
783+
bundle.js 1.29 KiB {0} [emitted] main
784784
Entrypoint main = bundle.js
785785
Child [Terser]:
786-
Hash: c833e2d80363a2e3a79d
786+
Hash: d3d9bf7d7c68dde32298
787787
Time: Xms
788788
Built at: Thu Jan 01 1970 00:00:00 GMT
789789
Asset Size Chunks Chunk Names
790-
bundle.js 1.35 KiB {0} [emitted] main
790+
bundle.js 1.29 KiB {0} [emitted] main
791791
Entrypoint main = bundle.js
792792
Child [/Terser/]:
793-
Hash: c833e2d80363a2e3a79d
793+
Hash: d3d9bf7d7c68dde32298
794794
Time: Xms
795795
Built at: Thu Jan 01 1970 00:00:00 GMT
796796
Asset Size Chunks Chunk Names
797-
bundle.js 1.35 KiB {0} [emitted] main
797+
bundle.js 1.29 KiB {0} [emitted] main
798798
Entrypoint main = bundle.js
799799
Child [warnings => true]:
800-
Hash: c833e2d80363a2e3a79d
800+
Hash: d3d9bf7d7c68dde32298
801801
Time: Xms
802802
Built at: Thu Jan 01 1970 00:00:00 GMT
803803
Asset Size Chunks Chunk Names
804-
bundle.js 1.35 KiB {0} [emitted] main
804+
bundle.js 1.29 KiB {0} [emitted] main
805805
Entrypoint main = bundle.js
806806
Child should not filter:
807-
Hash: c833e2d80363a2e3a79d
807+
Hash: d3d9bf7d7c68dde32298
808808
Time: Xms
809809
Built at: Thu Jan 01 1970 00:00:00 GMT
810810
Asset Size Chunks Chunk Names
811-
bundle.js 1.35 KiB {0} [emitted] main
811+
bundle.js 1.29 KiB {0} [emitted] main
812812
Entrypoint main = bundle.js
813813
814814
WARNING in Terser Plugin: Dropping side-effect-free statement [./index.js:6,0]
@@ -833,11 +833,11 @@ Child should not filter:
833833
834834
WARNING in Terser Plugin: Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0]
835835
Child /should not filter/:
836-
Hash: c833e2d80363a2e3a79d
836+
Hash: d3d9bf7d7c68dde32298
837837
Time: Xms
838838
Built at: Thu Jan 01 1970 00:00:00 GMT
839839
Asset Size Chunks Chunk Names
840-
bundle.js 1.35 KiB {0} [emitted] main
840+
bundle.js 1.29 KiB {0} [emitted] main
841841
Entrypoint main = bundle.js
842842
843843
WARNING in Terser Plugin: Dropping side-effect-free statement [./index.js:6,0]
@@ -862,11 +862,11 @@ Child /should not filter/:
862862
863863
WARNING in Terser Plugin: Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0]
864864
Child warnings => false:
865-
Hash: c833e2d80363a2e3a79d
865+
Hash: d3d9bf7d7c68dde32298
866866
Time: Xms
867867
Built at: Thu Jan 01 1970 00:00:00 GMT
868868
Asset Size Chunks Chunk Names
869-
bundle.js 1.35 KiB {0} [emitted] main
869+
bundle.js 1.29 KiB {0} [emitted] main
870870
Entrypoint main = bundle.js
871871
872872
WARNING in Terser Plugin: Dropping side-effect-free statement [./index.js:6,0]
@@ -891,11 +891,11 @@ Child warnings => false:
891891
892892
WARNING in Terser Plugin: Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0]
893893
Child [should not filter]:
894-
Hash: c833e2d80363a2e3a79d
894+
Hash: d3d9bf7d7c68dde32298
895895
Time: Xms
896896
Built at: Thu Jan 01 1970 00:00:00 GMT
897897
Asset Size Chunks Chunk Names
898-
bundle.js 1.35 KiB {0} [emitted] main
898+
bundle.js 1.29 KiB {0} [emitted] main
899899
Entrypoint main = bundle.js
900900
901901
WARNING in Terser Plugin: Dropping side-effect-free statement [./index.js:6,0]
@@ -920,11 +920,11 @@ Child [should not filter]:
920920
921921
WARNING in Terser Plugin: Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0]
922922
Child [/should not filter/]:
923-
Hash: c833e2d80363a2e3a79d
923+
Hash: d3d9bf7d7c68dde32298
924924
Time: Xms
925925
Built at: Thu Jan 01 1970 00:00:00 GMT
926926
Asset Size Chunks Chunk Names
927-
bundle.js 1.35 KiB {0} [emitted] main
927+
bundle.js 1.29 KiB {0} [emitted] main
928928
Entrypoint main = bundle.js
929929
930930
WARNING in Terser Plugin: Dropping side-effect-free statement [./index.js:6,0]
@@ -949,11 +949,11 @@ Child [/should not filter/]:
949949
950950
WARNING in Terser Plugin: Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0]
951951
Child [warnings => false]:
952-
Hash: c833e2d80363a2e3a79d
952+
Hash: d3d9bf7d7c68dde32298
953953
Time: Xms
954954
Built at: Thu Jan 01 1970 00:00:00 GMT
955955
Asset Size Chunks Chunk Names
956-
bundle.js 1.35 KiB {0} [emitted] main
956+
bundle.js 1.29 KiB {0} [emitted] main
957957
Entrypoint main = bundle.js
958958
959959
WARNING in Terser Plugin: Dropping side-effect-free statement [./index.js:6,0]
@@ -3348,11 +3348,11 @@ Entrypoint main = bundle.js
33483348
`;
33493349

33503350
exports[`StatsTestCases should print correct stats for warnings-terser 1`] = `
3351-
"Hash: b47866a9f29c4fc052c6
3351+
"Hash: 34aa884ee4518287c3cf
33523352
Time: Xms
33533353
Built at: Thu Jan 01 1970 00:00:00 GMT
33543354
Asset Size Chunks Chunk Names
3355-
bundle.js 1.35 KiB {0} [emitted] main
3355+
bundle.js 1.29 KiB {0} [emitted] main
33563356
Entrypoint main = bundle.js
33573357
[0] ./index.js 299 bytes {0} [built]
33583358
[1] ./a.js 249 bytes {0} [built]

‎test/cases/parsing/inject-free-vars/fail.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/cases/parsing/inject-free-vars/index.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎test/cases/parsing/inject-free-vars/x1.js

Whitespace-only changes.

0 commit comments

Comments
 (0)