diff --git a/cli/help.md b/cli/help.md
index 387505d86d5..54bd434fe28 100644
--- a/cli/help.md
+++ b/cli/help.md
@@ -64,7 +64,7 @@ Basic options:
--no-stdin Do not read "-" from stdin
--no-strict Don't emit `"use strict";` in the generated modules
--strictDeprecations Throw errors for deprecated features
---systemNullSetters Replace empty SystemJS setters with `null`
+--no-systemNullSetters Do not replace empty SystemJS setters with `null`
--no-treeshake Disable tree-shaking optimisations
--no-treeshake.annotations Ignore pure call annotations
--no-treeshake.moduleSideEffects Assume modules have no side-effects
diff --git a/docs/01-command-line-reference.md b/docs/01-command-line-reference.md
index 4a3d02eedd4..be1c8a72a00 100755
--- a/docs/01-command-line-reference.md
+++ b/docs/01-command-line-reference.md
@@ -395,7 +395,7 @@ Many options have command line equivalents. In those cases, any arguments passed
--no-stdin Do not read "-" from stdin
--no-strict Don't emit `"use strict";` in the generated modules
--strictDeprecations Throw errors for deprecated features
---systemNullSetters Replace empty SystemJS setters with `null`
+--no-systemNullSetters Do not replace empty SystemJS setters with `null`
--no-treeshake Disable tree-shaking optimisations
--no-treeshake.annotations Ignore pure call annotations
--no-treeshake.moduleSideEffects Assume modules have no side-effects
diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md
index 202ffa95918..838bfcd3ffa 100755
--- a/docs/999-big-list-of-options.md
+++ b/docs/999-big-list-of-options.md
@@ -1558,9 +1558,9 @@ Whether to include the 'use strict' pragma at the top of generated non-ES bundle
#### output.systemNullSetters
-Type: `boolean`
CLI: `--systemNullSetters`/`--no-systemNullSetters`
Default: `false`
+Type: `boolean`
CLI: `--systemNullSetters`/`--no-systemNullSetters`
Default: `true`
-When outputting the `system` module format, this will replace empty setter functions with `null` as an output simplification. This is _only supported in SystemJS 6.3.3 and above_.
+When outputting the `system` module format, by default, empty setter functions are replaced with `null` as an output simplification. This is incompatible with SystemJS before v6.3.3. Deactivate this option to output empty functions instead that older SystemJS versions support.
#### preserveSymlinks
diff --git a/src/utils/options/normalizeOutputOptions.ts b/src/utils/options/normalizeOutputOptions.ts
index 31261080a7b..42e901bdffd 100644
--- a/src/utils/options/normalizeOutputOptions.ts
+++ b/src/utils/options/normalizeOutputOptions.ts
@@ -84,7 +84,7 @@ export function normalizeOutputOptions(
| SourcemapPathTransformOption
| undefined,
strict: config.strict ?? true,
- systemNullSetters: config.systemNullSetters || false,
+ systemNullSetters: config.systemNullSetters ?? true,
validate: config.validate || false
};
diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js
index db46e711a0f..139159c6874 100644
--- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js
@@ -5,7 +5,7 @@ System.register(['./generated-shared2.js', './generated-dep1.js', './generated-d
setters: [function (module) {
x = module.x;
y = module.y;
- }, function () {}, function () {}],
+ }, null, null],
execute: (function () {
console.log(x + y);
diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js
index 62f60a24cd2..675df34673d 100644
--- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js
+++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./generated-shared2.js', './generated-dep1.js', './generated-dep2.js'], (function () {
'use strict';
return {
- setters: [function () {}, function () {}, function () {}],
+ setters: [null, null, null],
execute: (function () {
diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js
index 70e1fd2e983..08bfc8833ba 100644
--- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js
+++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js
@@ -1,7 +1,7 @@
System.register(['./generated-dep1.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js
index f0967d3f2cb..710c9ab7a39 100644
--- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js
+++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js
@@ -1,7 +1,7 @@
System.register(['./generated-dep2.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep11.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep11.js
index 5c4045236b0..561f7d05662 100644
--- a/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep11.js
+++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep11.js
@@ -1,7 +1,7 @@
System.register(['./generated-dep111.js', './generated-dep112.js'], (function () {
'use strict';
return {
- setters: [function () {}, function () {}],
+ setters: [null, null],
execute: (function () {
console.log('11');
diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js
index cd576bfb605..e827089639a 100644
--- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep11.js', './generated-dep112.js', './generated-d
'use strict';
var x;
return {
- setters: [function () {}, function (module) {
+ setters: [null, function (module) {
x = module.x;
- }, function () {}],
+ }, null],
execute: (function () {
console.log('1');
diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js
index 6b0d3129f22..06e9c8d73cd 100644
--- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js
+++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./generated-dep11.js', './generated-dep111.js', './generated-dep112.js'], (function () {
'use strict';
return {
- setters: [function () {}, function () {}, function () {}],
+ setters: [null, null, null],
execute: (function () {
diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js
index 61228b75524..c4037d4d2e8 100644
--- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js
+++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js
@@ -1,7 +1,7 @@
System.register(['./generated-dep111.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js
index d08ce419ac3..7dd00637184 100644
--- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js
+++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js
@@ -1,7 +1,7 @@
System.register(['./generated-dep112.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js
index 7faf680fa7d..6388df3d006 100644
--- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js
+++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./generated-lib.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('dep2');
diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/generated-dep.js b/test/chunking-form/samples/chunking-reexport/_expected/system/generated-dep.js
index d25dda199ce..dc09e7bfb4c 100644
--- a/test/chunking-form/samples/chunking-reexport/_expected/system/generated-dep.js
+++ b/test/chunking-form/samples/chunking-reexport/_expected/system/generated-dep.js
@@ -1,7 +1,7 @@
System.register(['external'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('dep');
diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js
index 3dd1177bb86..0ba68be442a 100644
--- a/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js
@@ -1,7 +1,7 @@
System.register(['./generated-dep.js', 'external'], (function (exports) {
'use strict';
return {
- setters: [function () {}, function (module) {
+ setters: [null, function (module) {
exports('dep', module.asdf);
}],
execute: (function () {
diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js
index 3dd1177bb86..0ba68be442a 100644
--- a/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js
+++ b/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./generated-dep.js', 'external'], (function (exports) {
'use strict';
return {
- setters: [function () {}, function (module) {
+ setters: [null, function (module) {
exports('dep', module.asdf);
}],
execute: (function () {
diff --git a/test/chunking-form/samples/chunking-star-external/_expected/system/generated-dep.js b/test/chunking-form/samples/chunking-star-external/_expected/system/generated-dep.js
index d5a5ecfdbbb..a96979e0807 100644
--- a/test/chunking-form/samples/chunking-star-external/_expected/system/generated-dep.js
+++ b/test/chunking-form/samples/chunking-star-external/_expected/system/generated-dep.js
@@ -1,7 +1,7 @@
System.register(['starexternal2', 'external2'], (function (exports) {
'use strict';
return {
- setters: [function () {}, function () {}],
+ setters: [null, null],
execute: (function () {
var dep = exports('d', 'dep');
diff --git a/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js
index 7b876fe60eb..034bd625ac3 100644
--- a/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js
@@ -17,7 +17,7 @@ System.register(['starexternal1', 'external1', './generated-dep.js', 'starextern
exports('e', module.e);
}, function (module) {
exports('dep', module.d);
- }, function () {}, function () {}],
+ }, null, null],
execute: (function () {
var main = exports('main', '1');
diff --git a/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js b/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js
index 810aa3e2ba9..055d3eb7cd0 100644
--- a/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js
+++ b/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js
@@ -3,7 +3,7 @@ System.register(['./generated-lib1.js', './generated-lib2.js'], (function (expor
return {
setters: [function (module) {
exports('lib1', module.l);
- }, function () {}],
+ }, null],
execute: (function () {
diff --git a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js
index 810aa3e2ba9..055d3eb7cd0 100644
--- a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js
@@ -3,7 +3,7 @@ System.register(['./generated-lib1.js', './generated-lib2.js'], (function (expor
return {
setters: [function (module) {
exports('lib1', module.l);
- }, function () {}],
+ }, null],
execute: (function () {
diff --git a/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main1.js b/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main1.js
index 8e4b0d53d4c..11b0d79c4c8 100644
--- a/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main1.js
+++ b/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main1.js
@@ -1,7 +1,7 @@
System.register(['./generated-emptyTransformed.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main1');
diff --git a/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main2.js b/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main2.js
index 88a05aab011..a2b1c4a1ae8 100644
--- a/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main2.js
+++ b/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./generated-emptyTransformed.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main2');
diff --git a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/system/main2.js b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/system/main2.js
index 13f34084b36..e2a9d26523e 100644
--- a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/system/main2.js
+++ b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./main.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
diff --git a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/system/main2.js b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/system/main2.js
index 13f34084b36..e2a9d26523e 100644
--- a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/system/main2.js
+++ b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./main.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
diff --git a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-middle.js b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-middle.js
index 8b77cba0497..f36fecb955c 100644
--- a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-middle.js
+++ b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-middle.js
@@ -1,7 +1,7 @@
System.register(['./generated-manual-inner.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('middle');
diff --git a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-outer.js b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-outer.js
index 10615e0f8cb..b44b4b9deec 100644
--- a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-outer.js
+++ b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-outer.js
@@ -1,7 +1,7 @@
System.register(['./generated-manual-middle.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('outer');
diff --git a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/main.js b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/main.js
index f1f1c182f3a..875b0a42886 100644
--- a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/main.js
@@ -1,7 +1,7 @@
System.register(['./generated-manual-outer.js', './generated-manual-middle.js', './generated-manual-inner.js'], (function () {
'use strict';
return {
- setters: [function () {}, function () {}, function () {}],
+ setters: [null, null, null],
execute: (function () {
console.log('main');
diff --git a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/generated-chunk-c.js b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/generated-chunk-c.js
index 2db7d11ad75..07a992419da 100644
--- a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/generated-chunk-c.js
+++ b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/generated-chunk-c.js
@@ -1,7 +1,7 @@
System.register(['./generated-chunk-b.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('dep-c');
diff --git a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/main-a.js b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/main-a.js
index dac8db86d06..9b06dfa5513 100644
--- a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/main-a.js
+++ b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/main-a.js
@@ -1,7 +1,7 @@
System.register(['./generated-chunk-c.js', './generated-chunk-b.js'], (function () {
'use strict';
return {
- setters: [function () {}, function () {}],
+ setters: [null, null],
execute: (function () {
console.log('dep1');
diff --git a/test/chunking-form/samples/deprecated/manual-chunks-nested/_expected/system/main.js b/test/chunking-form/samples/deprecated/manual-chunks-nested/_expected/system/main.js
index c13117eb8bb..3e762e61fd8 100644
--- a/test/chunking-form/samples/deprecated/manual-chunks-nested/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/manual-chunks-nested/_expected/system/main.js
@@ -1,7 +1,7 @@
System.register(['./generated-manual.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main');
diff --git a/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/main.js b/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/main.js
index a1339e81333..61a751d32e1 100644
--- a/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/main.js
@@ -5,7 +5,7 @@ System.register(['./generated-deps2and3.js', './generated-lib1.js'], (function (
setters: [function (module) {
fn$1 = module.f;
fn$2 = module.a;
- }, function () {}],
+ }, null],
execute: (function () {
function fn () {
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js
index db2fdb9876a..13ae89f4ef8 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js
@@ -4,7 +4,7 @@ System.register(['external', './other.js', './_virtual/other.js'], (function (ex
return {
setters: [function (module) {
require$$0 = module.default;
- }, function () {}, function (module) {
+ }, null, function (module) {
other = module.__exports;
}],
execute: (function () {
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/system/main.js
index 2f734b5c3b5..6f66e5852b6 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/system/main.js
@@ -3,7 +3,7 @@ System.register(['./inner/more_inner/something.js', './inner/some_effect.js'], (
return {
setters: [function (module) {
exports('Something', module.Something);
- }, function () {}],
+ }, null],
execute: (function () {
diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js
index 5c63e91437f..28a39baeced 100644
--- a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js
+++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js
@@ -1,7 +1,7 @@
System.register(['./generated-main.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js
index 198408e0cb3..14ccab63315 100644
--- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js
+++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js
@@ -1,7 +1,7 @@
System.register(['./generated-separate.js'], (function (exports, module) {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
var inlined$1 = 'inlined';
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js
index c178f99c8f6..a9f766b1dd0 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js
@@ -1,7 +1,7 @@
System.register(['./generated-name.js', './generated-firstName.js', './generated-name2.js', './mainChunk.js'], (function () {
'use strict';
return {
- setters: [function () {}, function () {}, function () {}, function () {}],
+ setters: [null, null, null, null],
execute: (function () {
diff --git a/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main1.js b/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main1.js
index 8e4b0d53d4c..11b0d79c4c8 100644
--- a/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main1.js
+++ b/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main1.js
@@ -1,7 +1,7 @@
System.register(['./generated-emptyTransformed.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main1');
diff --git a/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main2.js b/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main2.js
index 88a05aab011..a2b1c4a1ae8 100644
--- a/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main2.js
+++ b/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./generated-emptyTransformed.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main2');
diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js
index e3373c17206..070c3d723e0 100644
--- a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js
+++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js
@@ -4,7 +4,7 @@ System.register(['./generated-m1.js', './m2.js'], (function () {
return {
setters: [function (module) {
ms = module.m;
- }, function () {}],
+ }, null],
execute: (function () {
console.log(ms);
diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-122e0961.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-c5eecf00.js
similarity index 83%
rename from test/chunking-form/samples/hashing/hash-size/_expected/system/main1-122e0961.js
rename to test/chunking-form/samples/hashing/hash-size/_expected/system/main1-c5eecf00.js
index 3da42becfd9..ce5a10591f3 100644
--- a/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-122e0961.js
+++ b/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-c5eecf00.js
@@ -1,7 +1,7 @@
System.register(['./dep-626bb5df3105f7.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main1');
diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-ed4d8c97a2.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-842e475e5e.js
similarity index 83%
rename from test/chunking-form/samples/hashing/hash-size/_expected/system/main2-ed4d8c97a2.js
rename to test/chunking-form/samples/hashing/hash-size/_expected/system/main2-842e475e5e.js
index 0f4168236e8..6812a37a6ca 100644
--- a/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-ed4d8c97a2.js
+++ b/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-842e475e5e.js
@@ -1,7 +1,7 @@
System.register(['./dep-626bb5df3105f7.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main2');
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js
index 4ff74233e4d..81a14baade8 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js
@@ -1,7 +1,7 @@
System.register(['./generated-shared.js', './generated-dep.js'], (function () {
'use strict';
return {
- setters: [function () {}, function () {}],
+ setters: [null, null],
execute: (function () {
console.log('main1');
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js
index 6a770eba46a..5adf7bbffac 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./generated-shared.js', './generated-dep.js'], (function () {
'use strict';
return {
- setters: [function () {}, function () {}],
+ setters: [null, null],
execute: (function () {
console.log('main2');
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js
index d7a24ba141b..35ddafe0ec4 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js
@@ -5,7 +5,7 @@ System.register(['./main1.js', './generated-dep2.js'], (function (exports) {
setters: [function (module) {
value1 = module.value1;
exports('value1', module.value1);
- }, function () {}],
+ }, null],
execute: (function () {
console.log('dynamic1', value1);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main1.js
index 32daec6f48a..f4992f47347 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main1.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main1.js
@@ -1,7 +1,7 @@
System.register(['./generated-shared.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main1');
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main2.js
index 919b76c5048..a85cddd61c7 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main2.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./generated-shared.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main2');
diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main2.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main2.js
index 13f34084b36..e2a9d26523e 100644
--- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main2.js
+++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./main.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main2.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main2.js
index 13f34084b36..e2a9d26523e 100644
--- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main2.js
+++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./main.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
diff --git a/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-middle.js b/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-middle.js
index 8b77cba0497..f36fecb955c 100644
--- a/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-middle.js
+++ b/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-middle.js
@@ -1,7 +1,7 @@
System.register(['./generated-manual-inner.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('middle');
diff --git a/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-outer.js b/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-outer.js
index 10615e0f8cb..b44b4b9deec 100644
--- a/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-outer.js
+++ b/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-outer.js
@@ -1,7 +1,7 @@
System.register(['./generated-manual-middle.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('outer');
diff --git a/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/main.js b/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/main.js
index f1f1c182f3a..875b0a42886 100644
--- a/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/main.js
+++ b/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/main.js
@@ -1,7 +1,7 @@
System.register(['./generated-manual-outer.js', './generated-manual-middle.js', './generated-manual-inner.js'], (function () {
'use strict';
return {
- setters: [function () {}, function () {}, function () {}],
+ setters: [null, null, null],
execute: (function () {
console.log('main');
diff --git a/test/chunking-form/samples/manual-chunks-function/_expected/system/generated-chunk-c.js b/test/chunking-form/samples/manual-chunks-function/_expected/system/generated-chunk-c.js
index 2db7d11ad75..07a992419da 100644
--- a/test/chunking-form/samples/manual-chunks-function/_expected/system/generated-chunk-c.js
+++ b/test/chunking-form/samples/manual-chunks-function/_expected/system/generated-chunk-c.js
@@ -1,7 +1,7 @@
System.register(['./generated-chunk-b.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('dep-c');
diff --git a/test/chunking-form/samples/manual-chunks-function/_expected/system/main-a.js b/test/chunking-form/samples/manual-chunks-function/_expected/system/main-a.js
index ac6e11d5dbd..3ff03fcbe34 100644
--- a/test/chunking-form/samples/manual-chunks-function/_expected/system/main-a.js
+++ b/test/chunking-form/samples/manual-chunks-function/_expected/system/main-a.js
@@ -1,7 +1,7 @@
System.register(['./generated-chunk-c.js', './generated-chunk-b.js'], (function () {
'use strict';
return {
- setters: [function () {}, function () {}],
+ setters: [null, null],
execute: (function () {
console.log('dep1');
diff --git a/test/chunking-form/samples/manual-chunks-nested/_expected/system/main.js b/test/chunking-form/samples/manual-chunks-nested/_expected/system/main.js
index c13117eb8bb..3e762e61fd8 100644
--- a/test/chunking-form/samples/manual-chunks-nested/_expected/system/main.js
+++ b/test/chunking-form/samples/manual-chunks-nested/_expected/system/main.js
@@ -1,7 +1,7 @@
System.register(['./generated-manual.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main');
diff --git a/test/chunking-form/samples/manual-chunks/_expected/system/main.js b/test/chunking-form/samples/manual-chunks/_expected/system/main.js
index a1339e81333..61a751d32e1 100644
--- a/test/chunking-form/samples/manual-chunks/_expected/system/main.js
+++ b/test/chunking-form/samples/manual-chunks/_expected/system/main.js
@@ -5,7 +5,7 @@ System.register(['./generated-deps2and3.js', './generated-lib1.js'], (function (
setters: [function (module) {
fn$1 = module.f;
fn$2 = module.a;
- }, function () {}],
+ }, null],
execute: (function () {
function fn () {
diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js
index 5552fa131ff..f813ed17452 100644
--- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js
+++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js
@@ -4,7 +4,7 @@ System.register(['./generated-index.js', './generated-dep.js', 'external'], (fun
return {
setters: [function (module) {
lib = module.l;
- }, function () {}, function () {}],
+ }, null, null],
execute: (function () {
console.log(lib);
diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js
index 9692e651fe8..ee341e566cd 100644
--- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js
+++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-index.js', './generated-dep.js', 'external'], (fun
'use strict';
var reexported;
return {
- setters: [function () {}, function (module) {
+ setters: [null, function (module) {
reexported = module.r;
- }, function () {}],
+ }, null],
execute: (function () {
console.log(reexported);
diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/index.js b/test/chunking-form/samples/namespace-reexports/_expected/system/index.js
index 269067121c9..822aca9628f 100644
--- a/test/chunking-form/samples/namespace-reexports/_expected/system/index.js
+++ b/test/chunking-form/samples/namespace-reexports/_expected/system/index.js
@@ -3,7 +3,7 @@ System.register(['./hsl2hsv.js', './generated-index.js'], (function (exports) {
return {
setters: [function (module) {
exports('hsl2hsv', module.default);
- }, function () {}],
+ }, null],
execute: (function () {
diff --git a/test/chunking-form/samples/no-treeshake-imports/_expected/system/main1.js b/test/chunking-form/samples/no-treeshake-imports/_expected/system/main1.js
index 4ba793d0474..e77afbebb4f 100644
--- a/test/chunking-form/samples/no-treeshake-imports/_expected/system/main1.js
+++ b/test/chunking-form/samples/no-treeshake-imports/_expected/system/main1.js
@@ -1,7 +1,7 @@
System.register(['./generated-empty.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main1');
diff --git a/test/chunking-form/samples/no-treeshake-imports/_expected/system/main2.js b/test/chunking-form/samples/no-treeshake-imports/_expected/system/main2.js
index 1ad5d9e2a71..08f489340c7 100644
--- a/test/chunking-form/samples/no-treeshake-imports/_expected/system/main2.js
+++ b/test/chunking-form/samples/no-treeshake-imports/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./generated-empty.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main2');
diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js
index db2fdb9876a..13ae89f4ef8 100644
--- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js
+++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js
@@ -4,7 +4,7 @@ System.register(['external', './other.js', './_virtual/other.js'], (function (ex
return {
setters: [function (module) {
require$$0 = module.default;
- }, function () {}, function (module) {
+ }, null, function (module) {
other = module.__exports;
}],
execute: (function () {
diff --git a/test/chunking-form/samples/preserve-modules-nested-export/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-nested-export/_expected/system/main.js
index 2f734b5c3b5..6f66e5852b6 100644
--- a/test/chunking-form/samples/preserve-modules-nested-export/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-nested-export/_expected/system/main.js
@@ -3,7 +3,7 @@ System.register(['./inner/more_inner/something.js', './inner/some_effect.js'], (
return {
setters: [function (module) {
exports('Something', module.Something);
- }, function () {}],
+ }, null],
execute: (function () {
diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module2.js b/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module2.js
index 03357287d14..296c5c81555 100644
--- a/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module2.js
+++ b/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module2.js
@@ -2,7 +2,7 @@ System.register(['../custom_modules/@my-scope/my-base-pkg/index.js', '../_virtua
'use strict';
var myBasePkg;
return {
- setters: [function () {}, function (module) {
+ setters: [null, function (module) {
myBasePkg = module.__exports;
}],
execute: (function () {
diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build2.js b/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build2.js
index cb3b070d21d..4eea604b7f1 100644
--- a/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build2.js
+++ b/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build2.js
@@ -2,7 +2,7 @@ System.register(['./custom_modules/@my-scope/my-base-pkg/index.js', './_virtual/
'use strict';
var myBasePkg;
return {
- setters: [function () {}, function (module) {
+ setters: [null, function (module) {
myBasePkg = module.__exports;
}],
execute: (function () {
diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/main-entry.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/main-entry.js
index 03c140fd25e..cfcde79b594 100644
--- a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/main-entry.js
+++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/main-entry.js
@@ -1,7 +1,7 @@
System.register(['./a.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main');
diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js
index f0967d3f2cb..710c9ab7a39 100644
--- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js
+++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./generated-dep2.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js
index f0967d3f2cb..710c9ab7a39 100644
--- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js
+++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js
@@ -1,7 +1,7 @@
System.register(['./generated-dep2.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/system/main.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/system/main.js
index 7b44ce05b74..db84850fb05 100644
--- a/test/chunking-form/samples/resolve-dynamic-import/_expected/system/main.js
+++ b/test/chunking-form/samples/resolve-dynamic-import/_expected/system/main.js
@@ -1,7 +1,7 @@
System.register(['./direct-relative-external', 'to-indirect-relative-external', 'direct-absolute-external', 'to-indirect-absolute-external'], (function (exports, module) {
'use strict';
return {
- setters: [function () {}, function () {}, function () {}, function () {}],
+ setters: [null, null, null, null],
execute: (function () {
// nested
diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main1.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main1.js
index 5d6103bfb88..580b3148a28 100644
--- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main1.js
+++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main1.js
@@ -1,7 +1,7 @@
System.register(['external-side-effect'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
function onlyUsedByOne() {
diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main2.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main2.js
index c49984e04f4..1cbf54d6293 100644
--- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main2.js
+++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['external-side-effect'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main2');
diff --git a/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main1.js b/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main1.js
index 19c1b04ce43..6c056ecf0ee 100644
--- a/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main1.js
+++ b/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main1.js
@@ -1,7 +1,7 @@
System.register(['./generated-dep2-effect.js', './generated-dep4-effect.js'], (function () {
'use strict';
return {
- setters: [function () {}, function () {}],
+ setters: [null, null],
execute: (function () {
var value = 42;
diff --git a/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main2.js b/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main2.js
index 3738bc01cfb..beb77057158 100644
--- a/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main2.js
+++ b/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main2.js
@@ -1,7 +1,7 @@
System.register(['./generated-dep2-effect.js', './generated-dep4-effect.js'], (function () {
'use strict';
return {
- setters: [function () {}, function () {}],
+ setters: [null, null],
execute: (function () {
console.log('main2');
diff --git a/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main3.js b/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main3.js
index 1bfc11fd673..130a2f990a8 100644
--- a/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main3.js
+++ b/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main3.js
@@ -1,7 +1,7 @@
System.register(['./generated-dep4-effect.js'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main3');
diff --git a/test/form/samples/compact-empty-external/_expected/system.js b/test/form/samples/compact-empty-external/_expected/system.js
index 51f1de20444..6331e57a2c8 100644
--- a/test/form/samples/compact-empty-external/_expected/system.js
+++ b/test/form/samples/compact-empty-external/_expected/system.js
@@ -1 +1 @@
-System.register(['external'],(function(){'use strict';return{setters:[function(){}],execute:(function(){})}}));
\ No newline at end of file
+System.register(['external'],(function(){'use strict';return{setters:[null],execute:(function(){})}}));
\ No newline at end of file
diff --git a/test/form/samples/compact-multiple-imports/_expected/system.js b/test/form/samples/compact-multiple-imports/_expected/system.js
index af7b2011968..072eb5fb969 100644
--- a/test/form/samples/compact-multiple-imports/_expected/system.js
+++ b/test/form/samples/compact-multiple-imports/_expected/system.js
@@ -1,2 +1,2 @@
-System.register(['external-1','external-2','external-3','external-4','external-5'],(function(){'use strict';var value,value$1;return{setters:[function(){},function(){},function(module){value=module.value;},function(module){value$1=module.value;},function(){}],execute:(function(){assert.equal(value, '3');
+System.register(['external-1','external-2','external-3','external-4','external-5'],(function(){'use strict';var value,value$1;return{setters:[null,null,function(module){value=module.value;},function(module){value$1=module.value;},null],execute:(function(){assert.equal(value, '3');
assert.equal(value$1, '4');})}}));
\ No newline at end of file
diff --git a/test/form/samples/external-empty-import-no-global-b/_expected/system.js b/test/form/samples/external-empty-import-no-global-b/_expected/system.js
index e14f7ee517f..d65ebd0f6ca 100644
--- a/test/form/samples/external-empty-import-no-global-b/_expected/system.js
+++ b/test/form/samples/external-empty-import-no-global-b/_expected/system.js
@@ -2,7 +2,7 @@ System.register('myBundle', ['babel-polyfill', 'other'], (function (exports) {
'use strict';
var x;
return {
- setters: [function () {}, function (module) {
+ setters: [null, function (module) {
x = module.x;
}],
execute: (function () {
diff --git a/test/form/samples/external-empty-import-no-global/_expected/system.js b/test/form/samples/external-empty-import-no-global/_expected/system.js
index 68fa2d4eb5f..30923283bed 100644
--- a/test/form/samples/external-empty-import-no-global/_expected/system.js
+++ b/test/form/samples/external-empty-import-no-global/_expected/system.js
@@ -1,7 +1,7 @@
System.register('myBundle', ['babel-polyfill'], (function (exports) {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
var main = exports('default', new WeakMap());
diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_config.js b/test/form/samples/generated-code-compact/arrow-functions-false/_config.js
index b09e03b16ce..95ab9567fd7 100644
--- a/test/form/samples/generated-code-compact/arrow-functions-false/_config.js
+++ b/test/form/samples/generated-code-compact/arrow-functions-false/_config.js
@@ -25,7 +25,8 @@ module.exports = {
return 'compat';
},
name: 'bundle',
- noConflict: true
+ noConflict: true,
+ systemNullSetters: false
}
},
expectedWarnings: ['DEPRECATED_FEATURE']
diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_config.js b/test/form/samples/generated-code-compact/arrow-functions-true/_config.js
index 345a5cb345e..b7c1613e3de 100644
--- a/test/form/samples/generated-code-compact/arrow-functions-true/_config.js
+++ b/test/form/samples/generated-code-compact/arrow-functions-true/_config.js
@@ -25,7 +25,8 @@ module.exports = {
return 'compat';
},
name: 'bundle',
- noConflict: true
+ noConflict: true,
+ systemNullSetters: false
}
},
expectedWarnings: ['DEPRECATED_FEATURE']
diff --git a/test/form/samples/generated-code/arrow-functions-false/_config.js b/test/form/samples/generated-code/arrow-functions-false/_config.js
index bf7c98bcae7..fb26554fffa 100644
--- a/test/form/samples/generated-code/arrow-functions-false/_config.js
+++ b/test/form/samples/generated-code/arrow-functions-false/_config.js
@@ -24,7 +24,8 @@ module.exports = {
return 'compat';
},
name: 'bundle',
- noConflict: true
+ noConflict: true,
+ systemNullSetters: false
}
},
expectedWarnings: ['DEPRECATED_FEATURE']
diff --git a/test/form/samples/generated-code/arrow-functions-true/_config.js b/test/form/samples/generated-code/arrow-functions-true/_config.js
index a119e583b16..102a4d420b7 100644
--- a/test/form/samples/generated-code/arrow-functions-true/_config.js
+++ b/test/form/samples/generated-code/arrow-functions-true/_config.js
@@ -24,7 +24,8 @@ module.exports = {
return 'compat';
},
name: 'bundle',
- noConflict: true
+ noConflict: true,
+ systemNullSetters: false
}
},
expectedWarnings: ['DEPRECATED_FEATURE']
diff --git a/test/form/samples/prune-pure-unused-import-array/_expected/system.js b/test/form/samples/prune-pure-unused-import-array/_expected/system.js
index b8460796681..c8a51c260b2 100644
--- a/test/form/samples/prune-pure-unused-import-array/_expected/system.js
+++ b/test/form/samples/prune-pure-unused-import-array/_expected/system.js
@@ -1,7 +1,7 @@
System.register(['other'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
diff --git a/test/form/samples/prune-pure-unused-import-function/_expected/system.js b/test/form/samples/prune-pure-unused-import-function/_expected/system.js
index b8460796681..c8a51c260b2 100644
--- a/test/form/samples/prune-pure-unused-import-function/_expected/system.js
+++ b/test/form/samples/prune-pure-unused-import-function/_expected/system.js
@@ -1,7 +1,7 @@
System.register(['other'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
diff --git a/test/form/samples/system-null-setters/_config.js b/test/form/samples/system-null-setters/_config.js
new file mode 100644
index 00000000000..f3948af0079
--- /dev/null
+++ b/test/form/samples/system-null-setters/_config.js
@@ -0,0 +1,10 @@
+module.exports = {
+ description: 'allows to avoid null setters for side effect only imports',
+ options: {
+ external: ['external'],
+ output: {
+ format: 'system',
+ systemNullSetters: false
+ }
+ }
+};
diff --git a/test/form/samples/system-null-setters/_expected.js b/test/form/samples/system-null-setters/_expected.js
new file mode 100644
index 00000000000..664e7499cd3
--- /dev/null
+++ b/test/form/samples/system-null-setters/_expected.js
@@ -0,0 +1,11 @@
+System.register(['external'], (function () {
+ 'use strict';
+ return {
+ setters: [function () {}],
+ execute: (function () {
+
+
+
+ })
+ };
+}));
diff --git a/test/form/samples/system-null-setters/main.js b/test/form/samples/system-null-setters/main.js
new file mode 100644
index 00000000000..007d6fbc2da
--- /dev/null
+++ b/test/form/samples/system-null-setters/main.js
@@ -0,0 +1,2 @@
+import 'external';
+
diff --git a/test/form/samples/treeshake-namespace-access/_expected/system.js b/test/form/samples/treeshake-namespace-access/_expected/system.js
index 53138ccb73a..e0dce5b6f40 100644
--- a/test/form/samples/treeshake-namespace-access/_expected/system.js
+++ b/test/form/samples/treeshake-namespace-access/_expected/system.js
@@ -1,7 +1,7 @@
System.register(['external'], (function () {
'use strict';
return {
- setters: [function () {}],
+ setters: [null],
execute: (function () {
console.log('main');
diff --git a/test/form/samples/unused-import/_config.js b/test/form/samples/unused-import/_config.js
index 905b43be2bf..aa797dca171 100644
--- a/test/form/samples/unused-import/_config.js
+++ b/test/form/samples/unused-import/_config.js
@@ -3,8 +3,7 @@ module.exports = {
options: {
external: ['external'],
output: {
- globals: { external: 'external' },
- systemNullSetters: true
+ globals: { external: 'external' }
}
}
};
diff --git a/test/form/samples/unused-import/main.js b/test/form/samples/unused-import/main.js
index ce3e0cb6298..55c90f2c21a 100644
--- a/test/form/samples/unused-import/main.js
+++ b/test/form/samples/unused-import/main.js
@@ -1,4 +1,4 @@
-import { unused } from 'external';
+import 'external';
function alsoUnused () {
unused();
diff --git a/test/function/samples/output-options-hook/_config.js b/test/function/samples/output-options-hook/_config.js
index 2439d2ab222..b15bd6ce4d4 100644
--- a/test/function/samples/output-options-hook/_config.js
+++ b/test/function/samples/output-options-hook/_config.js
@@ -53,7 +53,7 @@ module.exports = {
sourcemap: false,
sourcemapExcludeSources: false,
strict: true,
- systemNullSetters: false,
+ systemNullSetters: true,
validate: false
});
assert.strictEqual(options.banner(), 'exports.bar = 43;');