rollup 2.52.0 → 2.52.4

package/dist/rollup.d.ts

@@ -277,7 +277,8 @@ export type RenderChunkHook = (
 	| Promise<{ code: string; map?: SourceMapInput } | null>
 	| { code: string; map?: SourceMapInput }
 	| string
-	| null;
+	| null
+	| undefined;
 
 export type ResolveDynamicImportHook = (
 	this: PluginContext,
@@ -539,7 +540,7 @@ export interface InputOptions {
 	moduleContext?: ((id: string) => string | null | undefined) | { [id: string]: string };
 	onwarn?: WarningHandlerWithDefault;
 	perf?: boolean;
-	plugins?: Plugin[];
+	plugins?: (Plugin | null | false | undefined)[];
 	preserveEntrySignatures?: PreserveEntrySignaturesOption;
 	/** @deprecated Use the "preserveModules" output option instead. */
 	preserveModules?: boolean;
@@ -650,7 +651,7 @@ export interface OutputOptions {
 	noConflict?: boolean;
 	outro?: string | (() => string | Promise<string>);
 	paths?: OptionsPaths;
-	plugins?: OutputPlugin[];
+	plugins?: (OutputPlugin | null | false | undefined)[];
 	preferConst?: boolean;
 	preserveModules?: boolean;
 	preserveModulesRoot?: string;

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.0
-	Wed, 16 Jun 2021 05:23:55 GMT - commit c4f9d13bd284a6b483b1a087917ed3f0bc93cd18
+	Rollup.js v2.52.4
+	Wed, 30 Jun 2021 04:06:36 GMT - commit c3ad218caeeafa8a1b6ff8d4dde0db2556a3309a
 
 
 	https://github.com/rollup/rollup

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.0
-	Wed, 16 Jun 2021 05:23:55 GMT - commit c4f9d13bd284a6b483b1a087917ed3f0bc93cd18
+	Rollup.js v2.52.4
+	Wed, 30 Jun 2021 04:06:36 GMT - commit c3ad218caeeafa8a1b6ff8d4dde0db2556a3309a
 
 
 	https://github.com/rollup/rollup

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.0
-	Wed, 16 Jun 2021 05:23:55 GMT - commit c4f9d13bd284a6b483b1a087917ed3f0bc93cd18
+	Rollup.js v2.52.4
+	Wed, 30 Jun 2021 04:06:36 GMT - commit c3ad218caeeafa8a1b6ff8d4dde0db2556a3309a
 
 
 	https://github.com/rollup/rollup

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.0
-	Wed, 16 Jun 2021 05:23:55 GMT - commit c4f9d13bd284a6b483b1a087917ed3f0bc93cd18
+	Rollup.js v2.52.4
+	Wed, 30 Jun 2021 04:06:36 GMT - commit c3ad218caeeafa8a1b6ff8d4dde0db2556a3309a
 
 
 	https://github.com/rollup/rollup

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.0
-	Wed, 16 Jun 2021 05:23:55 GMT - commit c4f9d13bd284a6b483b1a087917ed3f0bc93cd18
+	Rollup.js v2.52.4
+	Wed, 30 Jun 2021 04:06:36 GMT - commit c3ad218caeeafa8a1b6ff8d4dde0db2556a3309a
 
 
 	https://github.com/rollup/rollup
@@ -32,7 +32,7 @@ function _interopNamespaceDefault(e) {
 
 var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
 
-var version$1 = "2.52.0";
+var version$1 = "2.52.4";
 
 function ensureArray(items) {
     if (Array.isArray(items)) {
@@ -4578,7 +4578,11 @@ class Identifier extends NodeBase {
         const { treeshake } = this.context.options;
         switch (kind) {
             case 'var':
-                variable = this.scope.addDeclaration(this, this.context, treeshake && treeshake.correctVarValueBeforeDeclaration ? UNKNOWN_EXPRESSION : init, true);
+                variable = this.scope.addDeclaration(this, this.context, init, true);
+                if (treeshake && treeshake.correctVarValueBeforeDeclaration) {
+                    // Necessary to make sure the init is deoptimized. We cannot call deoptimizePath here.
+                    this.scope.addDeclaration(this, this.context, UNDEFINED_EXPRESSION, true);
+                }
                 break;
             case 'function':
                 // in strict mode, functions are only hoisted within a scope but not across block scopes
@@ -4752,9 +4756,10 @@ const INTEGER_REG_EXP = /^\d+$/;
 class ObjectEntity extends ExpressionEntity {
     // If a PropertyMap is used, this will be taken as propertiesAndGettersByKey
     // and we assume there are no setters or getters
-    constructor(properties, prototypeExpression) {
+    constructor(properties, prototypeExpression, immutable = false) {
         super();
         this.prototypeExpression = prototypeExpression;
+        this.immutable = immutable;
         this.allProperties = [];
         this.deoptimizedPaths = Object.create(null);
         this.expressionsToBeDeoptimizedByKey = Object.create(null);
@@ -4810,7 +4815,7 @@ class ObjectEntity extends ExpressionEntity {
     }
     deoptimizePath(path) {
         var _a;
-        if (this.hasUnknownDeoptimizedProperty)
+        if (this.hasUnknownDeoptimizedProperty || this.immutable)
             return;
         const key = path[0];
         if (path.length === 1) {
@@ -4842,9 +4847,6 @@ class ObjectEntity extends ExpressionEntity {
     }
     deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker) {
         var _a;
-        if (path.length === 0) {
-            return;
-        }
         const [key, ...subPath] = path;
         if (this.hasUnknownDeoptimizedProperty ||
             // single paths that are deoptimized will not become getters or setters
@@ -4871,7 +4873,9 @@ class ObjectEntity extends ExpressionEntity {
                         property.deoptimizeThisOnEventAtPath(event, subPath, thisParameter, recursionTracker);
                     }
                 }
-                this.thisParametersToBeDeoptimized.add(thisParameter);
+                if (!this.immutable) {
+                    this.thisParametersToBeDeoptimized.add(thisParameter);
+                }
                 return;
             }
             for (const property of relevantUnmatchableProperties) {
@@ -4895,7 +4899,9 @@ class ObjectEntity extends ExpressionEntity {
                 property.deoptimizeThisOnEventAtPath(event, subPath, thisParameter, recursionTracker);
             }
         }
-        this.thisParametersToBeDeoptimized.add(thisParameter);
+        if (!this.immutable) {
+            this.thisParametersToBeDeoptimized.add(thisParameter);
+        }
         (_a = this.prototypeExpression) === null || _a === void 0 ? void 0 : _a.deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker);
     }
     getLiteralValueAtPath(path, recursionTracker, origin) {
@@ -4958,8 +4964,9 @@ class ObjectEntity extends ExpressionEntity {
                 return false;
             }
             for (const getter of this.unmatchableGetters) {
-                if (getter.hasEffectsWhenAccessedAtPath(subPath, context))
+                if (getter.hasEffectsWhenAccessedAtPath(subPath, context)) {
                     return true;
+                }
             }
         }
         else {
@@ -4992,6 +4999,7 @@ class ObjectEntity extends ExpressionEntity {
         }
         if (this.hasUnknownDeoptimizedProperty)
             return true;
+        // We do not need to test for unknown properties as in that case, hasUnknownDeoptimizedProperty is true
         if (typeof key === 'string') {
             if (this.propertiesAndSettersByKey[key]) {
                 const setters = this.settersByKey[key];
@@ -5004,15 +5012,8 @@ class ObjectEntity extends ExpressionEntity {
                 return false;
             }
             for (const property of this.unmatchableSetters) {
-                if (property.hasEffectsWhenAssignedAtPath(subPath, context))
+                if (property.hasEffectsWhenAssignedAtPath(subPath, context)) {
                     return true;
-            }
-        }
-        else {
-            for (const setters of Object.values(this.settersByKey).concat([this.unmatchableSetters])) {
-                for (const setter of setters) {
-                    if (setter.hasEffectsWhenAssignedAtPath(subPath, context))
-                        return true;
                 }
             }
         }
@@ -5071,11 +5072,6 @@ class ObjectEntity extends ExpressionEntity {
                     }
                     if (!propertiesAndGettersByKey[key]) {
                         propertiesAndGettersByKey[key] = [property, ...unmatchablePropertiesAndGetters];
-                        if (INTEGER_REG_EXP.test(key)) {
-                            for (const integerProperty of unknownIntegerProps) {
-                                propertiesAndGettersByKey[key].push(integerProperty);
-                            }
-                        }
                     }
                 }
             }
@@ -5126,7 +5122,7 @@ class ObjectEntity extends ExpressionEntity {
             return UNKNOWN_EXPRESSION;
         }
         const expression = this.getMemberExpression(key);
-        if (expression !== UNKNOWN_EXPRESSION) {
+        if (!(expression === UNKNOWN_EXPRESSION || this.immutable)) {
             const expressionsToBeDeoptimized = (this.expressionsToBeDeoptimizedByKey[key] =
                 this.expressionsToBeDeoptimizedByKey[key] || []);
             expressionsToBeDeoptimized.push(origin);
@@ -5259,7 +5255,7 @@ const OBJECT_PROTOTYPE = new ObjectEntity({
     toLocaleString: METHOD_RETURNS_STRING,
     toString: METHOD_RETURNS_STRING,
     valueOf: METHOD_RETURNS_UNKNOWN
-}, null);
+}, null, true);
 
 class ClassNode extends NodeBase {
     constructor() {
@@ -6238,7 +6234,7 @@ const ARRAY_PROTOTYPE = new ObjectEntity({
     splice: METHOD_MUTATES_SELF_RETURNS_NEW_ARRAY,
     unshift: METHOD_MUTATES_SELF_RETURNS_NUMBER,
     values: METHOD_DEOPTS_SELF_RETURNS_UNKNOWN
-}, OBJECT_PROTOTYPE);
+}, OBJECT_PROTOTYPE, true);
 
 class ArrayExpression extends NodeBase {
     constructor() {
@@ -6273,10 +6269,14 @@ class ArrayExpression extends NodeBase {
         const properties = [
             { key: 'length', kind: 'init', property: UNKNOWN_LITERAL_NUMBER }
         ];
+        let hasSpread = false;
         for (let index = 0; index < this.elements.length; index++) {
             const element = this.elements[index];
-            if (element instanceof SpreadElement) {
-                properties.unshift({ key: UnknownInteger, kind: 'init', property: element });
+            if (element instanceof SpreadElement || hasSpread) {
+                if (element) {
+                    hasSpread = true;
+                    properties.unshift({ key: UnknownInteger, kind: 'init', property: element });
+                }
             }
             else if (!element) {
                 properties.push({ key: String(index), kind: 'init', property: UNDEFINED_EXPRESSION });
@@ -6329,7 +6329,9 @@ class ArrayPattern extends NodeBase {
 class BlockScope extends ChildScope {
     addDeclaration(identifier, context, init, isHoisted) {
         if (isHoisted) {
-            return this.parent.addDeclaration(identifier, context, UNKNOWN_EXPRESSION, isHoisted);
+            this.parent.addDeclaration(identifier, context, init, isHoisted);
+            // Necessary to make sure the init is deoptimized. We cannot call deoptimizePath here.
+            return this.parent.addDeclaration(identifier, context, UNDEFINED_EXPRESSION, isHoisted);
         }
         else {
             return super.addDeclaration(identifier, context, init, false);
@@ -7171,8 +7173,7 @@ class CatchScope extends ParameterScope {
             existingParameter.addDeclaration(identifier, init);
             return existingParameter;
         }
-        // as parameters are handled differently, all remaining declarations are
-        // hoisted
+        // as parameters are handled differently, all remaining declarations are hoisted
         return this.parent.addDeclaration(identifier, context, init, isHoisted);
     }
 }
@@ -10070,7 +10071,10 @@ class Module {
         if (name !== 'default') {
             const foundNamespaceReexport = name in this.namespaceReexportsByName
                 ? this.namespaceReexportsByName[name]
-                : (this.namespaceReexportsByName[name] = this.getVariableFromNamespaceReexports(name, importerForSideEffects, searchedNamesAndModules, skipExternalNamespaceReexports));
+                : this.getVariableFromNamespaceReexports(name, importerForSideEffects, searchedNamesAndModules, skipExternalNamespaceReexports);
+            if (!skipExternalNamespaceReexports) {
+                this.namespaceReexportsByName[name] = foundNamespaceReexport;
+            }
             if (foundNamespaceReexport) {
                 return foundNamespaceReexport;
             }
@@ -10462,8 +10466,18 @@ class Module {
     }
     getVariableFromNamespaceReexports(name, importerForSideEffects, searchedNamesAndModules, skipExternalNamespaceReexports = false) {
         let foundSyntheticDeclaration = null;
-        const skipExternalNamespaceValues = new Set([true, skipExternalNamespaceReexports]);
-        for (const skipExternalNamespaces of skipExternalNamespaceValues) {
+        const skipExternalNamespaceValues = [{ searchedNamesAndModules, skipExternalNamespaces: true }];
+        if (!skipExternalNamespaceReexports) {
+            const clonedSearchedNamesAndModules = new Map();
+            for (const [name, modules] of searchedNamesAndModules || []) {
+                clonedSearchedNamesAndModules.set(name, new Set(modules));
+            }
+            skipExternalNamespaceValues.push({
+                searchedNamesAndModules: clonedSearchedNamesAndModules,
+                skipExternalNamespaces: false
+            });
+        }
+        for (const { skipExternalNamespaces, searchedNamesAndModules } of skipExternalNamespaceValues) {
             const foundDeclarations = new Set();
             for (const module of this.exportAllModules) {
                 if (module instanceof Module || !skipExternalNamespaces) {

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.0
-	Wed, 16 Jun 2021 05:23:55 GMT - commit c4f9d13bd284a6b483b1a087917ed3f0bc93cd18
+	Rollup.js v2.52.4
+	Wed, 30 Jun 2021 04:06:36 GMT - commit c3ad218caeeafa8a1b6ff8d4dde0db2556a3309a
 
 
 	https://github.com/rollup/rollup

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.0
-	Wed, 16 Jun 2021 05:23:55 GMT - commit c4f9d13bd284a6b483b1a087917ed3f0bc93cd18
+	Rollup.js v2.52.4
+	Wed, 30 Jun 2021 04:06:36 GMT - commit c3ad218caeeafa8a1b6ff8d4dde0db2556a3309a
 
 
 	https://github.com/rollup/rollup

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "2.52.0",
+  "version": "2.52.4",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -9,9 +9,9 @@
     "rollup": "dist/bin/rollup"
   },
   "scripts": {
-    "build": "shx rm -rf dist && git rev-parse HEAD > .commithash && rollup -c && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup",
-    "build:cjs": "shx rm -rf dist && rollup -c --configTest && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup",
-    "build:bootstrap": "dist/bin/rollup -c && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup",
+    "build": "shx rm -rf dist && git rev-parse HEAD > .commithash && rollup --config rollup.config.ts --configPlugin typescript && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup",
+    "build:cjs": "shx rm -rf dist && rollup --config rollup.config.ts --configPlugin typescript --configTest && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup",
+    "build:bootstrap": "node dist/bin/rollup --config rollup.config.ts --configPlugin typescript && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup",
     "ci:lint": "npm run lint:nofix",
     "ci:test": "npm run build:cjs && npm run build:bootstrap && npm run test:all",
     "ci:test:only": "npm run build:cjs && npm run build:bootstrap && npm run test:only",
@@ -38,7 +38,7 @@
     "test:only": "mocha test/test.js",
     "test:typescript": "shx rm -rf test/typescript/dist && shx cp -r dist test/typescript/ && tsc --noEmit -p test/typescript && tsc --noEmit",
     "test:browser": "mocha test/browser/index.js",
-    "watch": "rollup -cw"
+    "watch": "rollup --config rollup.config.ts --configPlugin typescript --watch"
   },
   "repository": "rollup/rollup",
   "keywords": [
@@ -64,7 +64,6 @@
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.0.0",
     "@rollup/plugin-replace": "^2.4.2",
-    "@rollup/plugin-typescript": "^8.2.1",
     "@types/micromatch": "^4.0.1",
     "@types/node": "^10.17.60",
     "@types/require-relative": "^0.8.0",
@@ -104,7 +103,7 @@
     "pretty-ms": "^7.0.1",
     "require-relative": "^0.8.7",
     "requirejs": "^2.3.6",
-    "rollup": "^2.51.2",
+    "rollup": "^2.52.0",
     "rollup-plugin-license": "^2.5.0",
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-terser": "^7.0.2",