[v3.0] Change default for systemNullSetters (#4649)

rollup · Oct 7, 2022 · b33513c · b33513c
1 parent 5812006
commit b33513c
Show file tree

Hide file tree

Showing 91 changed files with 118 additions and 92 deletions.
diff --git 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
@@ -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
@@ -1558,9 +1558,9 @@ Whether to include the 'use strict' pragma at the top of generated non-ES bundle
 
 #### output.systemNullSetters
 
-Type: `boolean`<br> CLI: `--systemNullSetters`/`--no-systemNullSetters`<br> Default: `false`
+Type: `boolean`<br> CLI: `--systemNullSetters`/`--no-systemNullSetters`<br> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...ng-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/system/main2.js b/...ng-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/...chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/system/main2.js b/...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/...les/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-middle.js b/...les/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/...ples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-outer.js b/...ples/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/.../chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/main.js b/.../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/...king-form/samples/deprecated/manual-chunks-function/_expected/system/generated-chunk-c.js b/...king-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
@@ -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
@@ -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
@@ -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
@@ -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/.../chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/system/main.js b/.../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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...h-size/_expected/system/main1-122e0961.js → ...h-size/_expected/system/main1-c5eecf00.js b/...h-size/_expected/system/main1-122e0961.js → ...h-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/...size/_expected/system/main2-ed4d8c97a2.js → ...size/_expected/system/main2-842e475e5e.js b/...size/_expected/system/main2-ed4d8c97a2.js → ...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/...king-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js b/...king-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');