rollup 2.67.3 → 2.68.0

package/dist/rollup.d.ts

@@ -108,7 +108,6 @@ export interface TransformModuleJSON {
 	customTransformCache: boolean;
 	originalCode: string;
 	originalSourcemap: ExistingDecodedSourceMap | null;
-	resolvedIds?: ResolvedIdMap;
 	sourcemapChain: DecodedSourceMapOrMissing[];
 	transformDependencies: string[];
 }
@@ -117,6 +116,7 @@ export interface ModuleJSON extends TransformModuleJSON, ModuleOptions {
 	ast: AcornNode;
 	dependencies: string[];
 	id: string;
+	resolvedIds: ResolvedIdMap;
 	transformFiles: EmittedFile[] | undefined;
 }
 
@@ -254,6 +254,7 @@ export type ShouldTransformCachedModuleHook = (
 		id: string;
 		meta: CustomPluginOptions;
 		moduleSideEffects: boolean | 'no-treeshake';
+		resolvedSources: ResolvedIdMap;
 		syntheticNamedExports: boolean | string;
 	}
 ) => Promise<boolean> | boolean;

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.67.3
-	Fri, 18 Feb 2022 05:29:45 GMT - commit fa4e1b720f64ffae24fcbf99a44b605842ac7f23
+	Rollup.js v2.68.0
+	Tue, 22 Feb 2022 06:24:42 GMT - commit 51cab92373bcf8c844a8de2a6765869f7eb05a5d
 
 
 	https://github.com/rollup/rollup

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.67.3
-	Fri, 18 Feb 2022 05:29:45 GMT - commit fa4e1b720f64ffae24fcbf99a44b605842ac7f23
+	Rollup.js v2.68.0
+	Tue, 22 Feb 2022 06:24:42 GMT - commit 51cab92373bcf8c844a8de2a6765869f7eb05a5d
 
 
 	https://github.com/rollup/rollup

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.67.3
-	Fri, 18 Feb 2022 05:29:45 GMT - commit fa4e1b720f64ffae24fcbf99a44b605842ac7f23
+	Rollup.js v2.68.0
+	Tue, 22 Feb 2022 06:24:42 GMT - commit 51cab92373bcf8c844a8de2a6765869f7eb05a5d
 
 
 	https://github.com/rollup/rollup

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.67.3
-	Fri, 18 Feb 2022 05:29:45 GMT - commit fa4e1b720f64ffae24fcbf99a44b605842ac7f23
+	Rollup.js v2.68.0
+	Tue, 22 Feb 2022 06:24:42 GMT - commit 51cab92373bcf8c844a8de2a6765869f7eb05a5d
 
 
 	https://github.com/rollup/rollup
@@ -53,7 +53,7 @@ function getCommandOptions(rawCommandOptions) {
             ? rawCommandOptions.globals.split(',').reduce((globals, globalDefinition) => {
                 const [id, variableName] = globalDefinition.split(':');
                 globals[id] = variableName;
-                if (external.indexOf(id) === -1) {
+                if (!external.includes(id)) {
                     external.push(id);
                 }
                 return globals;
@@ -93,7 +93,7 @@ function mergeInputOptions(config, overrides, defaultOnWarnHandler) {
 const getExternal = (config, overrides) => {
     const configExternal = config.external;
     return typeof configExternal === 'function'
-        ? (source, importer, isResolved) => configExternal(source, importer, isResolved) || overrides.external.indexOf(source) !== -1
+        ? (source, importer, isResolved) => configExternal(source, importer, isResolved) || overrides.external.includes(source)
         : rollup.ensureArray(configExternal).concat(overrides.external);
 };
 const getOnWarn = (config, defaultOnWarnHandler) => config.onwarn

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.67.3
-	Fri, 18 Feb 2022 05:29:45 GMT - commit fa4e1b720f64ffae24fcbf99a44b605842ac7f23
+	Rollup.js v2.68.0
+	Tue, 22 Feb 2022 06:24:42 GMT - commit 51cab92373bcf8c844a8de2a6765869f7eb05a5d
 
 
 	https://github.com/rollup/rollup
@@ -28,7 +28,7 @@ function _interopNamespaceDefault(e) {
   return n;
 }
 
-var version$1 = "2.67.3";
+var version$1 = "2.68.0";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -127,18 +127,17 @@ function printQuotedStringList(list, verbs) {
     return output;
 }
 
-const absolutePath = /^(?:\/|(?:[A-Za-z]:)?[\\|/])/;
-const relativePath = /^\.?\.\//;
+const ABSOLUTE_PATH_REGEX = /^(?:\/|(?:[A-Za-z]:)?[\\|/])/;
+const RELATIVE_PATH_REGEX = /^\.?\.\//;
 function isAbsolute(path) {
-    return absolutePath.test(path);
+    return ABSOLUTE_PATH_REGEX.test(path);
 }
 function isRelative(path) {
-    return relativePath.test(path);
+    return RELATIVE_PATH_REGEX.test(path);
 }
+const BACKSLASH_REGEX = /\\/g;
 function normalize(path) {
-    if (path.indexOf('\\') == -1)
-        return path;
-    return path.replace(/\\/g, '/');
+    return path.replace(BACKSLASH_REGEX, '/');
 }
 
 function getAliasName(id) {
@@ -2050,9 +2049,10 @@ Bundle$1.prototype.trimEnd = function trimEnd (charType) {
 
 const MagicString$1 = MagicString;
 
+const ANY_SLASH_REGEX = /[/\\]/;
 function relative(from, to) {
-    const fromParts = from.split(/[/\\]/).filter(Boolean);
-    const toParts = to.split(/[/\\]/).filter(Boolean);
+    const fromParts = from.split(ANY_SLASH_REGEX).filter(Boolean);
+    const toParts = to.split(ANY_SLASH_REGEX).filter(Boolean);
     if (fromParts[0] === '.')
         fromParts.shift();
     if (toParts[0] === '.')
@@ -2326,14 +2326,14 @@ class ExternalModule {
         this.options = options;
         this.id = id;
         this.renormalizeRenderPath = renormalizeRenderPath;
-        this.declarations = Object.create(null);
+        this.declarations = new Map();
         this.defaultVariableName = '';
         this.dynamicImporters = [];
         this.execIndex = Infinity;
         this.exportedVariables = new Map();
         this.importers = [];
         this.mostCommonSuggestion = 0;
-        this.nameSuggestions = Object.create(null);
+        this.nameSuggestions = new Map();
         this.namespaceVariableName = '';
         this.reexported = false;
         this.renderPath = undefined;
@@ -2375,12 +2375,13 @@ class ExternalModule {
         });
     }
     getVariableForExportName(name) {
-        let declaration = this.declarations[name];
+        const declaration = this.declarations.get(name);
         if (declaration)
             return [declaration];
-        this.declarations[name] = declaration = new ExternalVariable(this, name);
-        this.exportedVariables.set(declaration, name);
-        return [declaration];
+        const externalVariable = new ExternalVariable(this, name);
+        this.declarations.set(name, externalVariable);
+        this.exportedVariables.set(externalVariable, name);
+        return [externalVariable];
     }
     setRenderPath(options, inputBase) {
         this.renderPath =
@@ -2393,27 +2394,23 @@ class ExternalModule {
         return this.renderPath;
     }
     suggestName(name) {
-        if (!this.nameSuggestions[name])
-            this.nameSuggestions[name] = 0;
-        this.nameSuggestions[name] += 1;
-        if (this.nameSuggestions[name] > this.mostCommonSuggestion) {
-            this.mostCommonSuggestion = this.nameSuggestions[name];
+        var _a;
+        const value = ((_a = this.nameSuggestions.get(name)) !== null && _a !== void 0 ? _a : 0) + 1;
+        this.nameSuggestions.set(name, value);
+        if (value > this.mostCommonSuggestion) {
+            this.mostCommonSuggestion = value;
             this.suggestedVariableName = name;
         }
     }
     warnUnusedImports() {
-        const unused = Object.keys(this.declarations).filter(name => {
-            if (name === '*')
-                return false;
-            const declaration = this.declarations[name];
-            return !declaration.included && !this.reexported && !declaration.referenced;
-        });
+        const unused = Array.from(this.declarations)
+            .filter(([name, declaration]) => name !== '*' && !declaration.included && !this.reexported && !declaration.referenced)
+            .map(([name]) => name);
         if (unused.length === 0)
             return;
         const importersSet = new Set();
         for (const name of unused) {
-            const { importers } = this.declarations[name].module;
-            for (const importer of importers) {
+            for (const importer of this.declarations.get(name).module.importers) {
                 importersSet.add(importer);
             }
         }
@@ -12346,7 +12343,7 @@ class Module {
         this.exportNamesByVariable = null;
         this.exportShimVariable = new ExportShimVariable(this);
         this.exports = new Map();
-        this.namespaceReexportsByName = Object.create(null);
+        this.namespaceReexportsByName = new Map();
         this.reexportDescriptions = new Map();
         this.relevantDependencies = null;
         this.syntheticExports = new Map();
@@ -12368,6 +12365,8 @@ class Module {
                     .filter(Boolean);
             },
             get dynamicallyImportedIds() {
+                // We cannot use this.dynamicDependencies because this is needed before
+                // dynamicDependencies are populated
                 const dynamicallyImportedIds = [];
                 for (const { id } of dynamicImports) {
                     if (id) {
@@ -12401,6 +12400,8 @@ class Module {
                 return Array.from(sources, source => module.resolvedIds[source]).filter(Boolean);
             },
             get importedIds() {
+                // We cannot use this.dependencies because this is needed before
+                // dependencies are populated
                 return Array.from(sources, source => { var _a; return (_a = module.resolvedIds[source]) === null || _a === void 0 ? void 0 : _a.id; }).filter(Boolean);
             },
             get importers() {
@@ -12460,7 +12461,7 @@ class Module {
     getDependenciesToBeIncluded() {
         if (this.relevantDependencies)
             return this.relevantDependencies;
-        const relevantDependencies = new Set();
+        this.relevantDependencies = new Set();
         const necessaryDependencies = new Set();
         const alwaysCheckedDependencies = new Set();
         const dependencyVariables = new Set(this.imports);
@@ -12492,16 +12493,16 @@ class Module {
         }
         if (!this.options.treeshake || this.info.moduleSideEffects === 'no-treeshake') {
             for (const dependency of this.dependencies) {
-                relevantDependencies.add(dependency);
+                this.relevantDependencies.add(dependency);
             }
         }
         else {
-            this.addRelevantSideEffectDependencies(relevantDependencies, necessaryDependencies, alwaysCheckedDependencies);
+            this.addRelevantSideEffectDependencies(this.relevantDependencies, necessaryDependencies, alwaysCheckedDependencies);
         }
         for (const dependency of necessaryDependencies) {
-            relevantDependencies.add(dependency);
+            this.relevantDependencies.add(dependency);
         }
-        return (this.relevantDependencies = relevantDependencies);
+        return this.relevantDependencies;
     }
     getExportNamesByVariable() {
         if (this.exportNamesByVariable) {
@@ -12573,16 +12574,15 @@ class Module {
         return this.syntheticNamespace;
     }
     getVariableForExportName(name, { importerForSideEffects, isExportAllSearch, onlyExplicit, searchedNamesAndModules } = EMPTY_OBJECT) {
+        var _a;
         if (name[0] === '*') {
             if (name.length === 1) {
                 // export * from './other'
                 return [this.namespace];
             }
-            else {
-                // export * from 'external'
-                const module = this.graph.modulesById.get(name.slice(1));
-                return module.getVariableForExportName('*');
-            }
+            // export * from 'external'
+            const module = this.graph.modulesById.get(name.slice(1));
+            return module.getVariableForExportName('*');
         }
         // export { foo } from './other'
         const reexportDeclaration = this.reexportDescriptions.get(name);
@@ -12613,10 +12613,8 @@ class Module {
             return [null];
         }
         if (name !== 'default') {
-            const foundNamespaceReexport = name in this.namespaceReexportsByName
-                ? this.namespaceReexportsByName[name]
-                : this.getVariableFromNamespaceReexports(name, importerForSideEffects, searchedNamesAndModules);
-            this.namespaceReexportsByName[name] = foundNamespaceReexport;
+            const foundNamespaceReexport = (_a = this.namespaceReexportsByName.get(name)) !== null && _a !== void 0 ? _a : this.getVariableFromNamespaceReexports(name, importerForSideEffects, searchedNamesAndModules);
+            this.namespaceReexportsByName.set(name, foundNamespaceReexport);
             if (foundNamespaceReexport[0]) {
                 return foundNamespaceReexport;
             }
@@ -13593,7 +13591,7 @@ function trimEmptyImports(dependencies) {
 
 function iife(magicString, { accessedGlobals, dependencies, exports, hasExports, indent: t, intro, namedExportsMode, outro, snippets, warn }, { compact, esModule, extend, freeze, externalLiveBindings, globals, interop, name, namespaceToStringTag, strict }) {
     const { _, cnst, getNonArrowFunctionIntro, getPropertyAccess, n } = snippets;
-    const isNamespaced = name && name.indexOf('.') !== -1;
+    const isNamespaced = name && name.includes('.');
     const useVariableAssignment = !extend && !isNamespaced;
     if (name && useVariableAssignment && !isLegal(name)) {
         return error({
@@ -14224,7 +14222,7 @@ function getExportMode(chunk, { exports: exportMode, name, format }, unsetOption
             exportMode = 'default';
         }
         else {
-            if (format !== 'es' && format !== 'system' && exportKeys.indexOf('default') !== -1) {
+            if (format !== 'es' && format !== 'system' && exportKeys.includes('default')) {
                 warn(errMixedExport(facadeModuleId, name));
             }
             exportMode = 'named';
@@ -14742,7 +14740,7 @@ class Chunk {
                 const source = module.render(renderOptions).trim();
                 renderedLength = source.length();
                 if (renderedLength) {
-                    if (options.compact && source.lastLine().indexOf('//') !== -1)
+                    if (options.compact && source.lastLine().includes('//'))
                         source.append('\n');
                     this.renderedModuleSources.set(module, source);
                     magicString.addSource(source);
@@ -22178,6 +22176,7 @@ class ModuleLoader {
                     id: cachedModule.id,
                     meta: cachedModule.meta,
                     moduleSideEffects: cachedModule.moduleSideEffects,
+                    resolvedSources: cachedModule.resolvedIds,
                     syntheticNamedExports: cachedModule.syntheticNamedExports
                 }
             ]))) {

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.67.3
-	Fri, 18 Feb 2022 05:29:45 GMT - commit fa4e1b720f64ffae24fcbf99a44b605842ac7f23
+	Rollup.js v2.68.0
+	Tue, 22 Feb 2022 06:24:42 GMT - commit 51cab92373bcf8c844a8de2a6765869f7eb05a5d
 
 
 	https://github.com/rollup/rollup

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.67.3
-	Fri, 18 Feb 2022 05:29:45 GMT - commit fa4e1b720f64ffae24fcbf99a44b605842ac7f23
+	Rollup.js v2.68.0
+	Tue, 22 Feb 2022 06:24:42 GMT - commit 51cab92373bcf8c844a8de2a6765869f7eb05a5d
 
 
 	https://github.com/rollup/rollup
@@ -201,7 +201,7 @@ class Task {
         this.invalidated = true;
         if (details.isTransformDependency) {
             for (const module of this.cache.modules) {
-                if (module.transformDependencies.indexOf(id) === -1)
+                if (!module.transformDependencies.includes(id))
                     continue;
                 // effective invalidation
                 module.originalCode = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "2.67.3",
+  "version": "2.68.0",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -131,6 +131,7 @@
   },
   "exports": {
     ".": {
+      "types": "./dist/rollup.d.ts",
       "node": {
         "require": "./dist/rollup.js",
         "import": "./dist/es/rollup.js"