fixup Object.create assignment, __PURE__ tweaks

rollup · Apr 3, 2020 · 5f4310d · 5f4310d
1 parent 35a88be
commit 5f4310d
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 30 deletions.
diff --git a/src/ast/variables/NamespaceVariable.ts b/src/ast/variables/NamespaceVariable.ts
@@ -92,7 +92,8 @@ export default class NamespaceVariable extends Variable {
 			return `${t}${safeName}: ${original.getName()}`;
 		});
 
-		members.unshift(`${t}__proto__:${_}null`);
+		const objectCreate = this.reexportedNamespaceVariables.length;
+		if (!objectCreate) members.unshift(`${t}__proto__:${_}null`);
 
 		if (options.namespaceToStringTag) {
 			members.unshift(`${t}[Symbol.toStringTag]:${_}'Module'`);
@@ -101,12 +102,15 @@ export default class NamespaceVariable extends Variable {
 		const name = this.getName();
 		let output = `{${n}${members.join(`,${n}`)}${n}}`;
 		if (this.reexportedNamespaceVariables.length) {
-			output = `/*#__PURE__*/Object.assign(${this.reexportedNamespaceVariables
+			output = `Object.assign(Object.create(null), ${this.reexportedNamespaceVariables
 				.map((v) => v.getName())
-				.join(', ')}, ${output})`;
-		}
-		if (this.syntheticNamedExports) {
-			output = `/*#__PURE__*/Object.assign(${output}, ${this.module.getDefaultExport().getName()})`;
+				.join(', ')}, ${output}${
+				this.syntheticNamedExports ? ', ' + this.module.getDefaultExport().getName() : ''
+			})`;
+			if (!options.freeze) output = '*#__PURE__*/' + output;
+		} else if (this.syntheticNamedExports) {
+			output = `Object.assign(${output}, ${this.module.getDefaultExport().getName()})`;
+			if (!options.freeze) output = '*#__PURE__*/' + output;
 		}
 		if (options.freeze) {
 			output = `/*#__PURE__*/Object.freeze(${output})`;

diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports/_expected/amd/main.js b/test/chunking-form/samples/mixed-synthetic-named-exports/_expected/amd/main.js
@@ -6,7 +6,7 @@ define(function () { 'use strict';
   };
   const foo = 100;
 
-  var ns = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign({
+  var ns = /*#__PURE__*/Object.freeze(Object.assign({
     __proto__: null,
     foo: foo,
     'default': d

diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports/_expected/cjs/main.js b/test/chunking-form/samples/mixed-synthetic-named-exports/_expected/cjs/main.js
@@ -6,7 +6,7 @@ const d = {
 };
 const foo = 100;
 
-var ns = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign({
+var ns = /*#__PURE__*/Object.freeze(Object.assign({
   __proto__: null,
   foo: foo,
   'default': d

diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports/_expected/es/main.js b/test/chunking-form/samples/mixed-synthetic-named-exports/_expected/es/main.js
@@ -4,7 +4,7 @@ const d = {
 };
 const foo = 100;
 
-var ns = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign({
+var ns = /*#__PURE__*/Object.freeze(Object.assign({
   __proto__: null,
   foo: foo,
   'default': d

diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports/_expected/system/main.js b/test/chunking-form/samples/mixed-synthetic-named-exports/_expected/system/main.js
@@ -9,7 +9,7 @@ System.register([], function () {
       };
       const foo = 100;
 
-      var ns = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign({
+      var ns = /*#__PURE__*/Object.freeze(Object.assign({
         __proto__: null,
         foo: foo,
         'default': d

diff --git a/test/cli/node_modules/bar/lib/config.js b/test/cli/node_modules/bar/lib/config.js
diff --git a/test/cli/node_modules/bar/package.json b/test/cli/node_modules/bar/package.json
diff --git a/test/cli/node_modules/rollup-config-foo/lib/config.js b/test/cli/node_modules/rollup-config-foo/lib/config.js
diff --git a/test/cli/node_modules/rollup-config-foo/package.json b/test/cli/node_modules/rollup-config-foo/package.json
diff --git a/test/cli/samples/watch/bundle-error/main.js b/test/cli/samples/watch/bundle-error/main.js
@@ -1 +1 @@
-export default 42;
+<=>
diff --git a/test/cli/samples/watch/watch-config-early-update/rollup.config.js b/test/cli/samples/watch/watch-config-early-update/rollup.config.js
@@ -1,9 +1,24 @@
 
-		          export default {
-		            input: {output2: "main.js"},
+			import path from 'path';
+		  import fs from 'fs';
+		  const messageFile = path.resolve(__dirname, '_actual', 'message.txt');
+		  export default new Promise(resolve => {
+		    fs.writeFileSync(messageFile, 'loading');
+		    const watcher = fs.watch(messageFile, event => {
+		      if (event === 'change') {
+		        const content = fs.readFileSync(messageFile, 'utf8');
+		        if (content === 'loaded') {
+		          watcher.close();
+		          fs.writeFileSync(messageFile, 'resolved');
+		          resolve({
+		            input: {output1: "main.js"},
 		            output: {
 		              dir: "_actual",
 		              format: "es"
 		            }
-		          };
-
+		          });
+		        }
+		      }
+		    });
+		  });
+
diff --git a/test/cli/samples/watch/watch-config/rollup.config.js b/test/cli/samples/watch/watch-config/rollup.config.js
@@ -1,7 +1 @@
-export default {
-	input: {output: "main4.js"},
-	output: {
-		dir: "_actual",
-		format: "es"
-	}
-};
+throw new Error("Config contains initial errors");
diff --git a/test/form/samples/ns-external-star-reexport/_expected/amd.js b/test/form/samples/ns-external-star-reexport/_expected/amd.js
@@ -2,8 +2,7 @@ define(['external-ns-1', 'external-ns-2'], function (externalNs1, externalNs2) {
 
 	const val = 5;
 
-	var ns = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(externalNs1, externalNs2, {
-		__proto__: null,
+	var ns = /*#__PURE__*/Object.freeze(Object.assign(Object.create(null), externalNs1, externalNs2, {
 		val: val
 	}));
 

diff --git a/test/form/samples/ns-external-star-reexport/_expected/cjs.js b/test/form/samples/ns-external-star-reexport/_expected/cjs.js
@@ -5,8 +5,7 @@ var externalNs2 = require('external-ns-2');
 
 const val = 5;
 
-var ns = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(externalNs1, externalNs2, {
-	__proto__: null,
+var ns = /*#__PURE__*/Object.freeze(Object.assign(Object.create(null), externalNs1, externalNs2, {
 	val: val
 }));
 

diff --git a/test/form/samples/ns-external-star-reexport/_expected/es.js b/test/form/samples/ns-external-star-reexport/_expected/es.js
@@ -3,8 +3,7 @@ import * as externalNs2 from 'external-ns-2';
 
 const val = 5;
 
-var ns = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(externalNs1, externalNs2, {
-	__proto__: null,
+var ns = /*#__PURE__*/Object.freeze(Object.assign(Object.create(null), externalNs1, externalNs2, {
 	val: val
 }));
 

diff --git a/test/form/samples/ns-external-star-reexport/_expected/system.js b/test/form/samples/ns-external-star-reexport/_expected/system.js
@@ -11,8 +11,7 @@ System.register(['external-ns-1', 'external-ns-2'], function (exports) {
 
 			const val = 5;
 
-			var ns = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(externalNs1, externalNs2, {
-				__proto__: null,
+			var ns = /*#__PURE__*/Object.freeze(Object.assign(Object.create(null), externalNs1, externalNs2, {
 				val: val
 			}));