rollup · lukastaegert · May 20, 2018 · Mar 2, 2018 · Mar 5, 2018 · Mar 6, 2018
diff --git a/src/finalisers/system.ts b/src/finalisers/system.ts
@@ -1,5 +1,6 @@
 import Chunk, { ModuleDeclarations } from '../Chunk';
 import { Bundle as MagicStringBundle } from 'magic-string';
+import { OutputOptions } from '../rollup/index';
 
 function getStarExcludes ({ dependencies, exports } : ModuleDeclarations) {
 	const starExcludes = new Set(exports.map(expt => expt.exported));
@@ -24,7 +25,8 @@ export default function system (
 		getPath: (name: string) => string;
 		intro: string;
 		outro: string
-	}
+	},
+	outputOptions: OutputOptions
 ) {
 	const { dependencies, exports } = chunk.getModuleDeclarations();
 
@@ -109,8 +111,9 @@ export default function system (
 			`\n${t}${varOrConst} _starExcludes = { ${Array.from(starExcludes).join(': 1, ')}${starExcludes.size ? ': 1' : ''} };`;
 
 	const importBindingsSection = importBindings.length ? `\n${t}var ${importBindings.join(', ')};` : '';
+	const registeredName = outputOptions.name ? `'${outputOptions.name}', ` : '';
 
-	const wrapperStart = `System.register([${dependencyIds.join(', ')}], function (exports, module) {
+	const wrapperStart = `System.register(${registeredName}[${dependencyIds.join(', ')}], function (exports, module) {
 ${t}'use strict';${starExcludesSection}${importBindingsSection}
 ${t}return {${setters.length ? `\n${t}${t}setters: [${setters.map(s => `function (module) {
 ${t}${t}${t}${s}

diff --git a/test/form/index.js b/test/form/index.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const fs = require('fs');
 const assert = require('assert');
 const sander = require('sander');
 const rollup = require('../../dist/rollup');

diff --git a/test/form/samples/assignment-to-array-buffer-view/_expected/system.js b/test/form/samples/assignment-to-array-buffer-view/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('bundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/assignment-to-exports-class-declaration/_expected/system.js b/test/form/samples/assignment-to-exports-class-declaration/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('myModule', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/assignment-to-exports/_expected/system.js b/test/form/samples/assignment-to-exports/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('bundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/catch-parameter-shadowing/_expected/system.js b/test/form/samples/catch-parameter-shadowing/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('bundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/computed-properties/_expected/system.js b/test/form/samples/computed-properties/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('computedProperties', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/dedupes-external-imports/_expected/system.js b/test/form/samples/dedupes-external-imports/_expected/system.js
@@ -1,4 +1,4 @@
-System.register(['external'], function (exports, module) {
+System.register('myBundle', ['external'], function (exports, module) {
 	'use strict';
 	var Component;
 	return {

diff --git a/test/form/samples/export-all-from-internal/_expected/system.js b/test/form/samples/export-all-from-internal/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('exposedInternals', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/export-all-multiple/_expected/system.js b/test/form/samples/export-all-multiple/_expected/system.js
@@ -1,4 +1,4 @@
-System.register(['foo', 'bar', 'baz'], function (exports, module) {
+System.register('myBundle', ['foo', 'bar', 'baz'], function (exports, module) {
 	'use strict';
 	var _starExcludes = { default: 1 };
 	return {

diff --git a/test/form/samples/export-default-2/_expected/system.js b/test/form/samples/export-default-2/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('myBundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/export-default-3/_expected/system.js b/test/form/samples/export-default-3/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('myBundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/export-default-import/_expected/system.js b/test/form/samples/export-default-import/_expected/system.js
@@ -1,4 +1,4 @@
-System.register(['x'], function (exports, module) {
+System.register('myBundle', ['x'], function (exports, module) {
 	'use strict';
 	var x;
 	return {

diff --git a/test/form/samples/export-default/_expected/system.js b/test/form/samples/export-default/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('myBundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/export-globals/_expected/system.js b/test/form/samples/export-globals/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('myBundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/export-live-bindings/_expected/system.js b/test/form/samples/export-live-bindings/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('iife', [], function (exports, module) {
   'use strict';
   return {
     execute: function () {

diff --git a/test/form/samples/exports-at-end-if-possible/_expected/system.js b/test/form/samples/exports-at-end-if-possible/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('myBundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/extend-exports/_expected/system.js b/test/form/samples/extend-exports/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('foo', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/extend-namespaced-exports/_expected/system.js b/test/form/samples/extend-namespaced-exports/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('foo.bar.baz', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/external-deshadowing/_expected/system.js b/test/form/samples/external-deshadowing/_expected/system.js
@@ -1,4 +1,4 @@
-System.register(['a', 'b'], function (exports, module) {
+System.register('myBundle', ['a', 'b'], function (exports, module) {
   'use strict';
   var Test, Test$1;
   return {

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
@@ -1,4 +1,4 @@
-System.register(['babel-polyfill', 'other'], function (exports, module) {
+System.register('myBundle', ['babel-polyfill', 'other'], function (exports, module) {
 	'use strict';
 	var x;
 	return {

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
@@ -1,4 +1,4 @@
-System.register(['babel-polyfill'], function (exports, module) {
+System.register('myBundle', ['babel-polyfill'], function (exports, module) {
 	'use strict';
 	return {
 		setters: [function (module) {

diff --git a/test/form/samples/external-export-tracing/_expected/system.js b/test/form/samples/external-export-tracing/_expected/system.js
@@ -1,4 +1,4 @@
-System.register(['external'], function (exports, module) {
+System.register('myBundle', ['external'], function (exports, module) {
 	'use strict';
 	return {
 		setters: [function (module) {

diff --git a/test/form/samples/external-namespace-reexport/_expected/system.js b/test/form/samples/external-namespace-reexport/_expected/system.js
@@ -1,4 +1,4 @@
-System.register(['highcharts'], function (exports, module) {
+System.register('myBundle', ['highcharts'], function (exports, module) {
 	'use strict';
 	return {
 		setters: [function (module) {

diff --git a/test/form/samples/freeze/_expected/system.js b/test/form/samples/freeze/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('myBundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/function-mutation/_expected/system.js b/test/form/samples/function-mutation/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('bundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/import-named-exported-global-with-alias/_expected/system.js b/test/form/samples/import-named-exported-global-with-alias/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('doc', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/import-specifier-deshadowing/_expected/system.js b/test/form/samples/import-specifier-deshadowing/_expected/system.js
@@ -1,4 +1,4 @@
-System.register(['react-sticky'], function (exports, module) {
+System.register('Sticky', ['react-sticky'], function (exports, module) {
 	'use strict';
 	var Sticky;
 	return {

diff --git a/test/form/samples/indent-false/_expected/system.js b/test/form/samples/indent-false/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('foo', [], function (exports, module) {
 'use strict';
 return {
 execute: function () {

diff --git a/test/form/samples/indent-spaces/_expected/system.js b/test/form/samples/indent-spaces/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('foo', [], function (exports, module) {
   'use strict';
   return {
     execute: function () {

diff --git a/test/form/samples/indent-true-spaces/_expected/system.js b/test/form/samples/indent-true-spaces/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('foo', [], function (exports, module) {
   'use strict';
   return {
     execute: function () {

diff --git a/test/form/samples/indent-true/_expected/system.js b/test/form/samples/indent-true/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('foo', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/interop-false/_expected/system.js b/test/form/samples/interop-false/_expected/system.js
@@ -1,4 +1,4 @@
-System.register(['core/view'], function (exports, module) {
+System.register('foo', ['core/view'], function (exports, module) {
 	'use strict';
 	var View;
 	return {

diff --git a/test/form/samples/intro-and-outro/_expected/system.js b/test/form/samples/intro-and-outro/_expected/system.js
@@ -1,4 +1,4 @@
-System.register(['external'], function (exports, module) {
+System.register('foo', ['external'], function (exports, module) {
 	'use strict';
 	var a, b;
 	return {

diff --git a/test/form/samples/json-parse-is-not-pure/_expected/system.js b/test/form/samples/json-parse-is-not-pure/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('myBundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/json-stringify-is-not-pure/_expected/system.js b/test/form/samples/json-stringify-is-not-pure/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('myBundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/legacy-getter/_expected/system.js b/test/form/samples/legacy-getter/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('foo', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/legacy-reified-namespace/_expected/system.js b/test/form/samples/legacy-reified-namespace/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('myBundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/legacy/_expected/system.js b/test/form/samples/legacy/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('myBundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/module-name-scoped-package/_expected/system.js b/test/form/samples/module-name-scoped-package/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('@scoped/npm-package', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/module-name-wat/_expected/system.js b/test/form/samples/module-name-wat/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('foo.@scoped/npm-package.bar.why-would-you-do-this', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/module-name-with-dashes/_expected/system.js b/test/form/samples/module-name-with-dashes/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('module-name-with-dashes', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/multiple-exports/_expected/system.js b/test/form/samples/multiple-exports/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('myBundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/mutate-logical-expression/_expected/system.js b/test/form/samples/mutate-logical-expression/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('bundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/namespaced-default-exports/_expected/system.js b/test/form/samples/namespaced-default-exports/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('foo.bar.baz', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/namespaced-named-exports/_expected/system.js b/test/form/samples/namespaced-named-exports/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('foo.bar.baz', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/no-treeshake-conflict/_expected/system.js b/test/form/samples/no-treeshake-conflict/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('stirred', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/no-treeshake/_expected/system.js b/test/form/samples/no-treeshake/_expected/system.js
@@ -1,4 +1,4 @@
-System.register(['external'], function (exports, module) {
+System.register('stirred', ['external'], function (exports, module) {
 	'use strict';
 	var value, more;
 	return {

diff --git a/test/form/samples/output-named-library/_config.js b/test/form/samples/output-named-library/_config.js
@@ -0,0 +1,8 @@
+module.exports = {
+  description: 'names bundles correctly',
+  options: {
+    output: {
+      name: 'libraryName',
+    },
+  }
+};
diff --git a/test/form/samples/output-named-library/_expected/amd.js b/test/form/samples/output-named-library/_expected/amd.js
@@ -0,0 +1,9 @@
+define(['exports'], function (exports) { 'use strict';
+
+	const valueOnLib = 42;
+
+	exports.valueOnLib = valueOnLib;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+});
diff --git a/test/form/samples/output-named-library/_expected/cjs.js b/test/form/samples/output-named-library/_expected/cjs.js
@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const valueOnLib = 42;
+
+exports.valueOnLib = valueOnLib;
diff --git a/test/form/samples/output-named-library/_expected/es.js b/test/form/samples/output-named-library/_expected/es.js
@@ -0,0 +1,3 @@
+const valueOnLib = 42;
+
+export { valueOnLib };
diff --git a/test/form/samples/output-named-library/_expected/iife.js b/test/form/samples/output-named-library/_expected/iife.js
@@ -0,0 +1,10 @@
+var libraryName = (function (exports) {
+	'use strict';
+
+	const valueOnLib = 42;
+
+	exports.valueOnLib = valueOnLib;
+
+	return exports;
+
+}({}));
diff --git a/test/form/samples/output-named-library/_expected/system.js b/test/form/samples/output-named-library/_expected/system.js
@@ -0,0 +1,10 @@
+System.register('libraryName', [], function (exports, module) {
+	'use strict';
+	return {
+		execute: function () {
+
+			const valueOnLib = exports('valueOnLib', 42);
+
+		}
+	};
+});
diff --git a/test/form/samples/output-named-library/_expected/umd.js b/test/form/samples/output-named-library/_expected/umd.js
@@ -0,0 +1,13 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+	typeof define === 'function' && define.amd ? define(['exports'], factory) :
+	(factory((global.libraryName = {})));
+}(this, (function (exports) { 'use strict';
+
+	const valueOnLib = 42;
+
+	exports.valueOnLib = valueOnLib;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+})));
diff --git a/test/form/samples/output-named-library/main.js b/test/form/samples/output-named-library/main.js
@@ -0,0 +1 @@
+export const valueOnLib = 42
diff --git a/test/form/samples/pattern-assignments/_expected/system.js b/test/form/samples/pattern-assignments/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('bundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {

diff --git a/test/form/samples/prefer-const/_expected/system.js b/test/form/samples/prefer-const/_expected/system.js
@@ -1,4 +1,4 @@
-System.register(['other'], function (exports, module) {
+System.register('myBundle', ['other'], function (exports, module) {
 	'use strict';
 	var name;
 	return {

diff --git a/test/form/samples/preserves-comments-after-imports/_expected/system.js b/test/form/samples/preserves-comments-after-imports/_expected/system.js
@@ -1,4 +1,4 @@
-System.register([], function (exports, module) {
+System.register('myBundle', [], function (exports, module) {
 	'use strict';
 	return {
 		execute: function () {