rollup 3.26.0 → 3.26.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bin/rollup +2 -2
- package/dist/es/getLogFilter.js +2 -2
- package/dist/es/rollup.js +2 -2
- package/dist/es/shared/node-entry.js +35 -15
- package/dist/es/shared/watch.js +2 -2
- package/dist/getLogFilter.js +2 -2
- package/dist/loadConfigFile.js +2 -2
- package/dist/rollup.js +2 -2
- package/dist/shared/fsevents-importer.js +2 -2
- package/dist/shared/index.js +2 -2
- package/dist/shared/loadConfigFile.js +2 -2
- package/dist/shared/rollup.js +35 -15
- package/dist/shared/watch-cli.js +2 -2
- package/dist/shared/watch-proxy.js +2 -2
- package/dist/shared/watch.js +2 -2
- package/package.json +1 -1
package/dist/bin/rollup
CHANGED
package/dist/es/getLogFilter.js
CHANGED
package/dist/es/rollup.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/*
|
|
2
2
|
@license
|
|
3
|
-
Rollup.js v3.26.
|
|
4
|
-
|
|
3
|
+
Rollup.js v3.26.2
|
|
4
|
+
Thu, 06 Jul 2023 11:18:49 GMT - commit 5d8e2e3032ca9ed120d67b977fb4ce86fc00e6cf
|
|
5
5
|
|
|
6
6
|
https://github.com/rollup/rollup
|
|
7
7
|
|
|
@@ -15,7 +15,7 @@ import { createHash as createHash$1 } from 'node:crypto';
|
|
|
15
15
|
import { lstat, realpath, readdir, readFile, mkdir, writeFile } from 'node:fs/promises';
|
|
16
16
|
import * as tty from 'tty';
|
|
17
17
|
|
|
18
|
-
var version$1 = "3.26.
|
|
18
|
+
var version$1 = "3.26.2";
|
|
19
19
|
|
|
20
20
|
const comma = ','.charCodeAt(0);
|
|
21
21
|
const semicolon = ';'.charCodeAt(0);
|
|
@@ -2264,7 +2264,7 @@ function augmentCodeLocation(properties, pos, source, id) {
|
|
|
2264
2264
|
}
|
|
2265
2265
|
// Error codes should be sorted alphabetically while errors should be sorted by
|
|
2266
2266
|
// error code below
|
|
2267
|
-
const ADDON_ERROR = 'ADDON_ERROR', ALREADY_CLOSED = 'ALREADY_CLOSED', AMBIGUOUS_EXTERNAL_NAMESPACES = 'AMBIGUOUS_EXTERNAL_NAMESPACES', ANONYMOUS_PLUGIN_CACHE = 'ANONYMOUS_PLUGIN_CACHE', ASSET_NOT_FINALISED = 'ASSET_NOT_FINALISED', ASSET_NOT_FOUND = 'ASSET_NOT_FOUND', ASSET_SOURCE_ALREADY_SET = 'ASSET_SOURCE_ALREADY_SET', ASSET_SOURCE_MISSING = 'ASSET_SOURCE_MISSING', BAD_LOADER = 'BAD_LOADER', CANNOT_CALL_NAMESPACE = 'CANNOT_CALL_NAMESPACE', CANNOT_EMIT_FROM_OPTIONS_HOOK = 'CANNOT_EMIT_FROM_OPTIONS_HOOK', CHUNK_NOT_GENERATED = 'CHUNK_NOT_GENERATED', CHUNK_INVALID = 'CHUNK_INVALID', CIRCULAR_DEPENDENCY = 'CIRCULAR_DEPENDENCY', CIRCULAR_REEXPORT = 'CIRCULAR_REEXPORT', CYCLIC_CROSS_CHUNK_REEXPORT = 'CYCLIC_CROSS_CHUNK_REEXPORT', DEPRECATED_FEATURE = 'DEPRECATED_FEATURE', DUPLICATE_PLUGIN_NAME = 'DUPLICATE_PLUGIN_NAME', EMPTY_BUNDLE = 'EMPTY_BUNDLE', EVAL = 'EVAL', EXTERNAL_SYNTHETIC_EXPORTS = 'EXTERNAL_SYNTHETIC_EXPORTS', FILE_NAME_CONFLICT = 'FILE_NAME_CONFLICT', FILE_NOT_FOUND = 'FILE_NOT_FOUND', FIRST_SIDE_EFFECT = 'FIRST_SIDE_EFFECT', ILLEGAL_IDENTIFIER_AS_NAME = 'ILLEGAL_IDENTIFIER_AS_NAME', ILLEGAL_REASSIGNMENT = 'ILLEGAL_REASSIGNMENT', INCONSISTENT_IMPORT_ASSERTIONS = 'INCONSISTENT_IMPORT_ASSERTIONS', INPUT_HOOK_IN_OUTPUT_PLUGIN = 'INPUT_HOOK_IN_OUTPUT_PLUGIN', INVALID_CHUNK = 'INVALID_CHUNK', INVALID_EXPORT_OPTION = 'INVALID_EXPORT_OPTION', INVALID_EXTERNAL_ID = 'INVALID_EXTERNAL_ID', INVALID_LOG_POSITION = 'INVALID_LOG_POSITION', INVALID_OPTION = 'INVALID_OPTION', INVALID_PLUGIN_HOOK = 'INVALID_PLUGIN_HOOK', INVALID_ROLLUP_PHASE = 'INVALID_ROLLUP_PHASE', INVALID_SETASSETSOURCE = 'INVALID_SETASSETSOURCE', INVALID_TLA_FORMAT = 'INVALID_TLA_FORMAT', MISSING_EXPORT = 'MISSING_EXPORT', MISSING_GLOBAL_NAME = 'MISSING_GLOBAL_NAME', MISSING_IMPLICIT_DEPENDANT = 'MISSING_IMPLICIT_DEPENDANT', MISSING_NAME_OPTION_FOR_IIFE_EXPORT = 'MISSING_NAME_OPTION_FOR_IIFE_EXPORT', MISSING_NODE_BUILTINS = 'MISSING_NODE_BUILTINS', MISSING_OPTION = 'MISSING_OPTION', MIXED_EXPORTS = 'MIXED_EXPORTS', MODULE_LEVEL_DIRECTIVE = 'MODULE_LEVEL_DIRECTIVE', NAMESPACE_CONFLICT = 'NAMESPACE_CONFLICT', NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE = 'NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE', OPTIMIZE_CHUNK_STATUS = 'OPTIMIZE_CHUNK_STATUS', PARSE_ERROR = 'PARSE_ERROR', PLUGIN_ERROR = 'PLUGIN_ERROR', SHIMMED_EXPORT = 'SHIMMED_EXPORT', SOURCEMAP_BROKEN = 'SOURCEMAP_BROKEN', SOURCEMAP_ERROR = 'SOURCEMAP_ERROR', SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT = 'SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT', THIS_IS_UNDEFINED = 'THIS_IS_UNDEFINED', UNEXPECTED_NAMED_IMPORT = 'UNEXPECTED_NAMED_IMPORT', UNKNOWN_OPTION = 'UNKNOWN_OPTION', UNRESOLVED_ENTRY = 'UNRESOLVED_ENTRY', UNRESOLVED_IMPORT = 'UNRESOLVED_IMPORT', UNUSED_EXTERNAL_IMPORT = 'UNUSED_EXTERNAL_IMPORT', VALIDATION_ERROR = 'VALIDATION_ERROR';
|
|
2267
|
+
const ADDON_ERROR = 'ADDON_ERROR', ALREADY_CLOSED = 'ALREADY_CLOSED', AMBIGUOUS_EXTERNAL_NAMESPACES = 'AMBIGUOUS_EXTERNAL_NAMESPACES', ANONYMOUS_PLUGIN_CACHE = 'ANONYMOUS_PLUGIN_CACHE', ASSET_NOT_FINALISED = 'ASSET_NOT_FINALISED', ASSET_NOT_FOUND = 'ASSET_NOT_FOUND', ASSET_SOURCE_ALREADY_SET = 'ASSET_SOURCE_ALREADY_SET', ASSET_SOURCE_MISSING = 'ASSET_SOURCE_MISSING', BAD_LOADER = 'BAD_LOADER', CANNOT_CALL_NAMESPACE = 'CANNOT_CALL_NAMESPACE', CANNOT_EMIT_FROM_OPTIONS_HOOK = 'CANNOT_EMIT_FROM_OPTIONS_HOOK', CHUNK_NOT_GENERATED = 'CHUNK_NOT_GENERATED', CHUNK_INVALID = 'CHUNK_INVALID', CIRCULAR_DEPENDENCY = 'CIRCULAR_DEPENDENCY', CIRCULAR_REEXPORT = 'CIRCULAR_REEXPORT', CYCLIC_CROSS_CHUNK_REEXPORT = 'CYCLIC_CROSS_CHUNK_REEXPORT', DEPRECATED_FEATURE = 'DEPRECATED_FEATURE', DUPLICATE_PLUGIN_NAME = 'DUPLICATE_PLUGIN_NAME', EMPTY_BUNDLE = 'EMPTY_BUNDLE', EVAL = 'EVAL', EXTERNAL_MODULES_CANNOT_BE_INCLUDED_IN_MANUAL_CHUNKS = 'EXTERNAL_MODULES_CANNOT_BE_INCLUDED_IN_MANUAL_CHUNKS', EXTERNAL_MODULES_CANNOT_BE_TRANSFORMED_TO_MODULES = 'EXTERNAL_MODULES_CANNOT_BE_TRANSFORMED_TO_MODULES', EXTERNAL_SYNTHETIC_EXPORTS = 'EXTERNAL_SYNTHETIC_EXPORTS', FILE_NAME_CONFLICT = 'FILE_NAME_CONFLICT', FILE_NOT_FOUND = 'FILE_NOT_FOUND', FIRST_SIDE_EFFECT = 'FIRST_SIDE_EFFECT', ILLEGAL_IDENTIFIER_AS_NAME = 'ILLEGAL_IDENTIFIER_AS_NAME', ILLEGAL_REASSIGNMENT = 'ILLEGAL_REASSIGNMENT', INCONSISTENT_IMPORT_ASSERTIONS = 'INCONSISTENT_IMPORT_ASSERTIONS', INPUT_HOOK_IN_OUTPUT_PLUGIN = 'INPUT_HOOK_IN_OUTPUT_PLUGIN', INVALID_CHUNK = 'INVALID_CHUNK', INVALID_EXPORT_OPTION = 'INVALID_EXPORT_OPTION', INVALID_EXTERNAL_ID = 'INVALID_EXTERNAL_ID', INVALID_LOG_POSITION = 'INVALID_LOG_POSITION', INVALID_OPTION = 'INVALID_OPTION', INVALID_PLUGIN_HOOK = 'INVALID_PLUGIN_HOOK', INVALID_ROLLUP_PHASE = 'INVALID_ROLLUP_PHASE', INVALID_SETASSETSOURCE = 'INVALID_SETASSETSOURCE', INVALID_TLA_FORMAT = 'INVALID_TLA_FORMAT', MISSING_EXPORT = 'MISSING_EXPORT', MISSING_GLOBAL_NAME = 'MISSING_GLOBAL_NAME', MISSING_IMPLICIT_DEPENDANT = 'MISSING_IMPLICIT_DEPENDANT', MISSING_NAME_OPTION_FOR_IIFE_EXPORT = 'MISSING_NAME_OPTION_FOR_IIFE_EXPORT', MISSING_NODE_BUILTINS = 'MISSING_NODE_BUILTINS', MISSING_OPTION = 'MISSING_OPTION', MIXED_EXPORTS = 'MIXED_EXPORTS', MODULE_LEVEL_DIRECTIVE = 'MODULE_LEVEL_DIRECTIVE', NAMESPACE_CONFLICT = 'NAMESPACE_CONFLICT', NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE = 'NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE', OPTIMIZE_CHUNK_STATUS = 'OPTIMIZE_CHUNK_STATUS', PARSE_ERROR = 'PARSE_ERROR', PLUGIN_ERROR = 'PLUGIN_ERROR', SHIMMED_EXPORT = 'SHIMMED_EXPORT', SOURCEMAP_BROKEN = 'SOURCEMAP_BROKEN', SOURCEMAP_ERROR = 'SOURCEMAP_ERROR', SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT = 'SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT', THIS_IS_UNDEFINED = 'THIS_IS_UNDEFINED', UNEXPECTED_NAMED_IMPORT = 'UNEXPECTED_NAMED_IMPORT', UNKNOWN_OPTION = 'UNKNOWN_OPTION', UNRESOLVED_ENTRY = 'UNRESOLVED_ENTRY', UNRESOLVED_IMPORT = 'UNRESOLVED_IMPORT', UNUSED_EXTERNAL_IMPORT = 'UNUSED_EXTERNAL_IMPORT', VALIDATION_ERROR = 'VALIDATION_ERROR';
|
|
2268
2268
|
function logAddonNotGenerated(message, hook, plugin) {
|
|
2269
2269
|
return {
|
|
2270
2270
|
code: ADDON_ERROR,
|
|
@@ -2759,6 +2759,18 @@ function logEntryCannotBeExternal(unresolvedId) {
|
|
|
2759
2759
|
message: `Entry module "${relativeId(unresolvedId)}" cannot be external.`
|
|
2760
2760
|
};
|
|
2761
2761
|
}
|
|
2762
|
+
function logExternalModulesCannotBeIncludedInManualChunks(source) {
|
|
2763
|
+
return {
|
|
2764
|
+
code: EXTERNAL_MODULES_CANNOT_BE_INCLUDED_IN_MANUAL_CHUNKS,
|
|
2765
|
+
message: `"${source}" cannot be included in manualChunks because it is resolved as an external module by the "external" option or plugins.`
|
|
2766
|
+
};
|
|
2767
|
+
}
|
|
2768
|
+
function logExternalModulesCannotBeTransformedToModules(source) {
|
|
2769
|
+
return {
|
|
2770
|
+
code: EXTERNAL_MODULES_CANNOT_BE_TRANSFORMED_TO_MODULES,
|
|
2771
|
+
message: `${source} is resolved as a module now, but it was an external module before. Please check whether there are conflicts in your Rollup options "external" and "manualChunks", manualChunks cannot include external modules.`
|
|
2772
|
+
};
|
|
2773
|
+
}
|
|
2762
2774
|
function logUnresolvedEntry(unresolvedId) {
|
|
2763
2775
|
return {
|
|
2764
2776
|
code: UNRESOLVED_ENTRY,
|
|
@@ -14377,7 +14389,7 @@ function getExportBlock$1(exports, dependencies, namedExportsMode, interop, snip
|
|
|
14377
14389
|
if (specifier.reexported === '*') {
|
|
14378
14390
|
if (exportBlock)
|
|
14379
14391
|
exportBlock += n;
|
|
14380
|
-
const copyPropertyIfNecessary = `{${n}${t}if${_}(k${_}!==${_}'default'${_}&&${_}!
|
|
14392
|
+
const copyPropertyIfNecessary = `{${n}${t}if${_}(k${_}!==${_}'default'${_}&&${_}!Object.prototype.hasOwnProperty.call(exports,${_}k))${_}${getDefineProperty(name, specifier.needsLiveBinding, t, snippets)}${s}${n}}`;
|
|
14381
14393
|
exportBlock += `Object.keys(${name}).forEach(${getFunctionIntro(['k'], {
|
|
14382
14394
|
isAsync: false,
|
|
14383
14395
|
name: null
|
|
@@ -17723,7 +17735,7 @@ class Bundle {
|
|
|
17723
17735
|
const manualChunkAliasByEntry = new Map();
|
|
17724
17736
|
const chunkEntries = await Promise.all(Object.entries(manualChunks).map(async ([alias, files]) => ({
|
|
17725
17737
|
alias,
|
|
17726
|
-
entries: await this.graph.moduleLoader.addAdditionalModules(files)
|
|
17738
|
+
entries: await this.graph.moduleLoader.addAdditionalModules(files, true)
|
|
17727
17739
|
})));
|
|
17728
17740
|
for (const { alias, entries } of chunkEntries) {
|
|
17729
17741
|
for (const entry of entries) {
|
|
@@ -17740,11 +17752,14 @@ class Bundle {
|
|
|
17740
17752
|
getModuleInfo: this.graph.getModuleInfo
|
|
17741
17753
|
};
|
|
17742
17754
|
for (const module of this.graph.modulesById.values()) {
|
|
17743
|
-
|
|
17744
|
-
|
|
17745
|
-
if (
|
|
17755
|
+
const manualChunkAlias = getManualChunk(module.id, manualChunksApi);
|
|
17756
|
+
if (typeof manualChunkAlias === 'string') {
|
|
17757
|
+
if (module instanceof Module) {
|
|
17746
17758
|
manualChunkAliasesWithEntry.push([manualChunkAlias, module]);
|
|
17747
17759
|
}
|
|
17760
|
+
else {
|
|
17761
|
+
return error(logExternalModulesCannotBeIncludedInManualChunks(module.id));
|
|
17762
|
+
}
|
|
17748
17763
|
}
|
|
17749
17764
|
}
|
|
17750
17765
|
manualChunkAliasesWithEntry.sort(([aliasA], [aliasB]) => aliasA > aliasB ? 1 : aliasA < aliasB ? -1 : 0);
|
|
@@ -24308,8 +24323,8 @@ class ModuleLoader {
|
|
|
24308
24323
|
? options.treeshake.moduleSideEffects
|
|
24309
24324
|
: () => true;
|
|
24310
24325
|
}
|
|
24311
|
-
async addAdditionalModules(unresolvedModules) {
|
|
24312
|
-
const result = this.extendLoadModulesPromise(Promise.all(unresolvedModules.map(id => this.loadEntryModule(id, false, undefined, null))));
|
|
24326
|
+
async addAdditionalModules(unresolvedModules, isAddForManualChunks) {
|
|
24327
|
+
const result = this.extendLoadModulesPromise(Promise.all(unresolvedModules.map(id => this.loadEntryModule(id, false, undefined, null, isAddForManualChunks))));
|
|
24313
24328
|
await this.awaitLoadModulesPromise();
|
|
24314
24329
|
return result;
|
|
24315
24330
|
}
|
|
@@ -24472,6 +24487,9 @@ class ModuleLoader {
|
|
|
24472
24487
|
await this.handleExistingModule(existingModule, isEntry, isPreload);
|
|
24473
24488
|
return existingModule;
|
|
24474
24489
|
}
|
|
24490
|
+
if (existingModule instanceof ExternalModule) {
|
|
24491
|
+
return error(logExternalModulesCannotBeTransformedToModules(existingModule.id));
|
|
24492
|
+
}
|
|
24475
24493
|
const module = new Module(this.graph, id, this.options, isEntry, moduleSideEffects, syntheticNamedExports, meta, assertions);
|
|
24476
24494
|
this.modulesById.set(id, module);
|
|
24477
24495
|
this.graph.watchFiles[id] = true;
|
|
@@ -24647,17 +24665,19 @@ class ModuleLoader {
|
|
|
24647
24665
|
}
|
|
24648
24666
|
return resolvedId;
|
|
24649
24667
|
}
|
|
24650
|
-
async loadEntryModule(unresolvedId, isEntry, importer, implicitlyLoadedBefore) {
|
|
24668
|
+
async loadEntryModule(unresolvedId, isEntry, importer, implicitlyLoadedBefore, isLoadForManualChunks = false) {
|
|
24651
24669
|
const resolveIdResult = await resolveId(unresolvedId, importer, this.options.preserveSymlinks, this.pluginDriver, this.resolveId, null, EMPTY_OBJECT, true, EMPTY_OBJECT);
|
|
24652
24670
|
if (resolveIdResult == null) {
|
|
24653
24671
|
return error(implicitlyLoadedBefore === null
|
|
24654
24672
|
? logUnresolvedEntry(unresolvedId)
|
|
24655
24673
|
: logUnresolvedImplicitDependant(unresolvedId, implicitlyLoadedBefore));
|
|
24656
24674
|
}
|
|
24657
|
-
|
|
24658
|
-
|
|
24675
|
+
const isExternalModules = typeof resolveIdResult === 'object' && resolveIdResult.external;
|
|
24676
|
+
if (resolveIdResult === false || isExternalModules) {
|
|
24659
24677
|
return error(implicitlyLoadedBefore === null
|
|
24660
|
-
?
|
|
24678
|
+
? isExternalModules && isLoadForManualChunks
|
|
24679
|
+
? logExternalModulesCannotBeIncludedInManualChunks(unresolvedId)
|
|
24680
|
+
: logEntryCannotBeExternal(unresolvedId)
|
|
24661
24681
|
: logImplicitDependantCannotBeExternal(unresolvedId, implicitlyLoadedBefore));
|
|
24662
24682
|
}
|
|
24663
24683
|
return this.fetchModule(this.getResolvedIdWithDefaults(typeof resolveIdResult === 'object'
|
package/dist/es/shared/watch.js
CHANGED
package/dist/getLogFilter.js
CHANGED
package/dist/loadConfigFile.js
CHANGED
package/dist/rollup.js
CHANGED
package/dist/shared/index.js
CHANGED
package/dist/shared/rollup.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/*
|
|
2
2
|
@license
|
|
3
|
-
Rollup.js v3.26.
|
|
4
|
-
|
|
3
|
+
Rollup.js v3.26.2
|
|
4
|
+
Thu, 06 Jul 2023 11:18:49 GMT - commit 5d8e2e3032ca9ed120d67b977fb4ce86fc00e6cf
|
|
5
5
|
|
|
6
6
|
https://github.com/rollup/rollup
|
|
7
7
|
|
|
@@ -30,7 +30,7 @@ function _interopNamespaceDefault(e) {
|
|
|
30
30
|
|
|
31
31
|
const tty__namespace = /*#__PURE__*/_interopNamespaceDefault(tty);
|
|
32
32
|
|
|
33
|
-
var version$1 = "3.26.
|
|
33
|
+
var version$1 = "3.26.2";
|
|
34
34
|
|
|
35
35
|
function ensureArray$1(items) {
|
|
36
36
|
if (Array.isArray(items)) {
|
|
@@ -368,7 +368,7 @@ function augmentCodeLocation(properties, pos, source, id) {
|
|
|
368
368
|
}
|
|
369
369
|
// Error codes should be sorted alphabetically while errors should be sorted by
|
|
370
370
|
// error code below
|
|
371
|
-
const ADDON_ERROR = 'ADDON_ERROR', ALREADY_CLOSED = 'ALREADY_CLOSED', AMBIGUOUS_EXTERNAL_NAMESPACES = 'AMBIGUOUS_EXTERNAL_NAMESPACES', ANONYMOUS_PLUGIN_CACHE = 'ANONYMOUS_PLUGIN_CACHE', ASSET_NOT_FINALISED = 'ASSET_NOT_FINALISED', ASSET_NOT_FOUND = 'ASSET_NOT_FOUND', ASSET_SOURCE_ALREADY_SET = 'ASSET_SOURCE_ALREADY_SET', ASSET_SOURCE_MISSING = 'ASSET_SOURCE_MISSING', BAD_LOADER = 'BAD_LOADER', CANNOT_CALL_NAMESPACE = 'CANNOT_CALL_NAMESPACE', CANNOT_EMIT_FROM_OPTIONS_HOOK = 'CANNOT_EMIT_FROM_OPTIONS_HOOK', CHUNK_NOT_GENERATED = 'CHUNK_NOT_GENERATED', CHUNK_INVALID = 'CHUNK_INVALID', CIRCULAR_DEPENDENCY = 'CIRCULAR_DEPENDENCY', CIRCULAR_REEXPORT = 'CIRCULAR_REEXPORT', CYCLIC_CROSS_CHUNK_REEXPORT = 'CYCLIC_CROSS_CHUNK_REEXPORT', DEPRECATED_FEATURE = 'DEPRECATED_FEATURE', DUPLICATE_IMPORT_OPTIONS = 'DUPLICATE_IMPORT_OPTIONS', DUPLICATE_PLUGIN_NAME = 'DUPLICATE_PLUGIN_NAME', EMPTY_BUNDLE = 'EMPTY_BUNDLE', EVAL = 'EVAL', EXTERNAL_SYNTHETIC_EXPORTS = 'EXTERNAL_SYNTHETIC_EXPORTS', FAIL_AFTER_WARNINGS = 'FAIL_AFTER_WARNINGS', FILE_NAME_CONFLICT = 'FILE_NAME_CONFLICT', FILE_NOT_FOUND = 'FILE_NOT_FOUND', FIRST_SIDE_EFFECT = 'FIRST_SIDE_EFFECT', ILLEGAL_IDENTIFIER_AS_NAME = 'ILLEGAL_IDENTIFIER_AS_NAME', ILLEGAL_REASSIGNMENT = 'ILLEGAL_REASSIGNMENT', INCONSISTENT_IMPORT_ASSERTIONS = 'INCONSISTENT_IMPORT_ASSERTIONS', INPUT_HOOK_IN_OUTPUT_PLUGIN = 'INPUT_HOOK_IN_OUTPUT_PLUGIN', INVALID_CHUNK = 'INVALID_CHUNK', INVALID_CONFIG_MODULE_FORMAT = 'INVALID_CONFIG_MODULE_FORMAT', INVALID_EXPORT_OPTION = 'INVALID_EXPORT_OPTION', INVALID_EXTERNAL_ID = 'INVALID_EXTERNAL_ID', INVALID_LOG_POSITION = 'INVALID_LOG_POSITION', INVALID_OPTION = 'INVALID_OPTION', INVALID_PLUGIN_HOOK = 'INVALID_PLUGIN_HOOK', INVALID_ROLLUP_PHASE = 'INVALID_ROLLUP_PHASE', INVALID_SETASSETSOURCE = 'INVALID_SETASSETSOURCE', INVALID_TLA_FORMAT = 'INVALID_TLA_FORMAT', MISSING_CONFIG = 'MISSING_CONFIG', MISSING_EXPORT = 'MISSING_EXPORT', MISSING_EXTERNAL_CONFIG = 'MISSING_EXTERNAL_CONFIG', MISSING_GLOBAL_NAME = 'MISSING_GLOBAL_NAME', MISSING_IMPLICIT_DEPENDANT = 'MISSING_IMPLICIT_DEPENDANT', MISSING_NAME_OPTION_FOR_IIFE_EXPORT = 'MISSING_NAME_OPTION_FOR_IIFE_EXPORT', MISSING_NODE_BUILTINS = 'MISSING_NODE_BUILTINS', MISSING_OPTION = 'MISSING_OPTION', MIXED_EXPORTS = 'MIXED_EXPORTS', MODULE_LEVEL_DIRECTIVE = 'MODULE_LEVEL_DIRECTIVE', NAMESPACE_CONFLICT = 'NAMESPACE_CONFLICT', NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE = 'NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE', ONLY_INLINE_SOURCEMAPS = 'ONLY_INLINE_SOURCEMAPS', OPTIMIZE_CHUNK_STATUS = 'OPTIMIZE_CHUNK_STATUS', PARSE_ERROR = 'PARSE_ERROR', PLUGIN_ERROR = 'PLUGIN_ERROR', SHIMMED_EXPORT = 'SHIMMED_EXPORT', SOURCEMAP_BROKEN = 'SOURCEMAP_BROKEN', SOURCEMAP_ERROR = 'SOURCEMAP_ERROR', SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT = 'SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT', THIS_IS_UNDEFINED = 'THIS_IS_UNDEFINED', UNEXPECTED_NAMED_IMPORT = 'UNEXPECTED_NAMED_IMPORT', UNKNOWN_OPTION = 'UNKNOWN_OPTION', UNRESOLVED_ENTRY = 'UNRESOLVED_ENTRY', UNRESOLVED_IMPORT = 'UNRESOLVED_IMPORT', UNUSED_EXTERNAL_IMPORT = 'UNUSED_EXTERNAL_IMPORT', VALIDATION_ERROR = 'VALIDATION_ERROR';
|
|
371
|
+
const ADDON_ERROR = 'ADDON_ERROR', ALREADY_CLOSED = 'ALREADY_CLOSED', AMBIGUOUS_EXTERNAL_NAMESPACES = 'AMBIGUOUS_EXTERNAL_NAMESPACES', ANONYMOUS_PLUGIN_CACHE = 'ANONYMOUS_PLUGIN_CACHE', ASSET_NOT_FINALISED = 'ASSET_NOT_FINALISED', ASSET_NOT_FOUND = 'ASSET_NOT_FOUND', ASSET_SOURCE_ALREADY_SET = 'ASSET_SOURCE_ALREADY_SET', ASSET_SOURCE_MISSING = 'ASSET_SOURCE_MISSING', BAD_LOADER = 'BAD_LOADER', CANNOT_CALL_NAMESPACE = 'CANNOT_CALL_NAMESPACE', CANNOT_EMIT_FROM_OPTIONS_HOOK = 'CANNOT_EMIT_FROM_OPTIONS_HOOK', CHUNK_NOT_GENERATED = 'CHUNK_NOT_GENERATED', CHUNK_INVALID = 'CHUNK_INVALID', CIRCULAR_DEPENDENCY = 'CIRCULAR_DEPENDENCY', CIRCULAR_REEXPORT = 'CIRCULAR_REEXPORT', CYCLIC_CROSS_CHUNK_REEXPORT = 'CYCLIC_CROSS_CHUNK_REEXPORT', DEPRECATED_FEATURE = 'DEPRECATED_FEATURE', DUPLICATE_IMPORT_OPTIONS = 'DUPLICATE_IMPORT_OPTIONS', DUPLICATE_PLUGIN_NAME = 'DUPLICATE_PLUGIN_NAME', EMPTY_BUNDLE = 'EMPTY_BUNDLE', EVAL = 'EVAL', EXTERNAL_MODULES_CANNOT_BE_INCLUDED_IN_MANUAL_CHUNKS = 'EXTERNAL_MODULES_CANNOT_BE_INCLUDED_IN_MANUAL_CHUNKS', EXTERNAL_MODULES_CANNOT_BE_TRANSFORMED_TO_MODULES = 'EXTERNAL_MODULES_CANNOT_BE_TRANSFORMED_TO_MODULES', EXTERNAL_SYNTHETIC_EXPORTS = 'EXTERNAL_SYNTHETIC_EXPORTS', FAIL_AFTER_WARNINGS = 'FAIL_AFTER_WARNINGS', FILE_NAME_CONFLICT = 'FILE_NAME_CONFLICT', FILE_NOT_FOUND = 'FILE_NOT_FOUND', FIRST_SIDE_EFFECT = 'FIRST_SIDE_EFFECT', ILLEGAL_IDENTIFIER_AS_NAME = 'ILLEGAL_IDENTIFIER_AS_NAME', ILLEGAL_REASSIGNMENT = 'ILLEGAL_REASSIGNMENT', INCONSISTENT_IMPORT_ASSERTIONS = 'INCONSISTENT_IMPORT_ASSERTIONS', INPUT_HOOK_IN_OUTPUT_PLUGIN = 'INPUT_HOOK_IN_OUTPUT_PLUGIN', INVALID_CHUNK = 'INVALID_CHUNK', INVALID_CONFIG_MODULE_FORMAT = 'INVALID_CONFIG_MODULE_FORMAT', INVALID_EXPORT_OPTION = 'INVALID_EXPORT_OPTION', INVALID_EXTERNAL_ID = 'INVALID_EXTERNAL_ID', INVALID_LOG_POSITION = 'INVALID_LOG_POSITION', INVALID_OPTION = 'INVALID_OPTION', INVALID_PLUGIN_HOOK = 'INVALID_PLUGIN_HOOK', INVALID_ROLLUP_PHASE = 'INVALID_ROLLUP_PHASE', INVALID_SETASSETSOURCE = 'INVALID_SETASSETSOURCE', INVALID_TLA_FORMAT = 'INVALID_TLA_FORMAT', MISSING_CONFIG = 'MISSING_CONFIG', MISSING_EXPORT = 'MISSING_EXPORT', MISSING_EXTERNAL_CONFIG = 'MISSING_EXTERNAL_CONFIG', MISSING_GLOBAL_NAME = 'MISSING_GLOBAL_NAME', MISSING_IMPLICIT_DEPENDANT = 'MISSING_IMPLICIT_DEPENDANT', MISSING_NAME_OPTION_FOR_IIFE_EXPORT = 'MISSING_NAME_OPTION_FOR_IIFE_EXPORT', MISSING_NODE_BUILTINS = 'MISSING_NODE_BUILTINS', MISSING_OPTION = 'MISSING_OPTION', MIXED_EXPORTS = 'MIXED_EXPORTS', MODULE_LEVEL_DIRECTIVE = 'MODULE_LEVEL_DIRECTIVE', NAMESPACE_CONFLICT = 'NAMESPACE_CONFLICT', NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE = 'NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE', ONLY_INLINE_SOURCEMAPS = 'ONLY_INLINE_SOURCEMAPS', OPTIMIZE_CHUNK_STATUS = 'OPTIMIZE_CHUNK_STATUS', PARSE_ERROR = 'PARSE_ERROR', PLUGIN_ERROR = 'PLUGIN_ERROR', SHIMMED_EXPORT = 'SHIMMED_EXPORT', SOURCEMAP_BROKEN = 'SOURCEMAP_BROKEN', SOURCEMAP_ERROR = 'SOURCEMAP_ERROR', SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT = 'SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT', THIS_IS_UNDEFINED = 'THIS_IS_UNDEFINED', UNEXPECTED_NAMED_IMPORT = 'UNEXPECTED_NAMED_IMPORT', UNKNOWN_OPTION = 'UNKNOWN_OPTION', UNRESOLVED_ENTRY = 'UNRESOLVED_ENTRY', UNRESOLVED_IMPORT = 'UNRESOLVED_IMPORT', UNUSED_EXTERNAL_IMPORT = 'UNUSED_EXTERNAL_IMPORT', VALIDATION_ERROR = 'VALIDATION_ERROR';
|
|
372
372
|
function logAddonNotGenerated(message, hook, plugin) {
|
|
373
373
|
return {
|
|
374
374
|
code: ADDON_ERROR,
|
|
@@ -921,6 +921,18 @@ function logEntryCannotBeExternal(unresolvedId) {
|
|
|
921
921
|
message: `Entry module "${relativeId(unresolvedId)}" cannot be external.`
|
|
922
922
|
};
|
|
923
923
|
}
|
|
924
|
+
function logExternalModulesCannotBeIncludedInManualChunks(source) {
|
|
925
|
+
return {
|
|
926
|
+
code: EXTERNAL_MODULES_CANNOT_BE_INCLUDED_IN_MANUAL_CHUNKS,
|
|
927
|
+
message: `"${source}" cannot be included in manualChunks because it is resolved as an external module by the "external" option or plugins.`
|
|
928
|
+
};
|
|
929
|
+
}
|
|
930
|
+
function logExternalModulesCannotBeTransformedToModules(source) {
|
|
931
|
+
return {
|
|
932
|
+
code: EXTERNAL_MODULES_CANNOT_BE_TRANSFORMED_TO_MODULES,
|
|
933
|
+
message: `${source} is resolved as a module now, but it was an external module before. Please check whether there are conflicts in your Rollup options "external" and "manualChunks", manualChunks cannot include external modules.`
|
|
934
|
+
};
|
|
935
|
+
}
|
|
924
936
|
function logUnresolvedEntry(unresolvedId) {
|
|
925
937
|
return {
|
|
926
938
|
code: UNRESOLVED_ENTRY,
|
|
@@ -15866,7 +15878,7 @@ function getExportBlock$1(exports, dependencies, namedExportsMode, interop, snip
|
|
|
15866
15878
|
if (specifier.reexported === '*') {
|
|
15867
15879
|
if (exportBlock)
|
|
15868
15880
|
exportBlock += n;
|
|
15869
|
-
const copyPropertyIfNecessary = `{${n}${t}if${_}(k${_}!==${_}'default'${_}&&${_}!
|
|
15881
|
+
const copyPropertyIfNecessary = `{${n}${t}if${_}(k${_}!==${_}'default'${_}&&${_}!Object.prototype.hasOwnProperty.call(exports,${_}k))${_}${getDefineProperty(name, specifier.needsLiveBinding, t, snippets)}${s}${n}}`;
|
|
15870
15882
|
exportBlock += `Object.keys(${name}).forEach(${getFunctionIntro(['k'], {
|
|
15871
15883
|
isAsync: false,
|
|
15872
15884
|
name: null
|
|
@@ -19105,7 +19117,7 @@ class Bundle {
|
|
|
19105
19117
|
const manualChunkAliasByEntry = new Map();
|
|
19106
19118
|
const chunkEntries = await Promise.all(Object.entries(manualChunks).map(async ([alias, files]) => ({
|
|
19107
19119
|
alias,
|
|
19108
|
-
entries: await this.graph.moduleLoader.addAdditionalModules(files)
|
|
19120
|
+
entries: await this.graph.moduleLoader.addAdditionalModules(files, true)
|
|
19109
19121
|
})));
|
|
19110
19122
|
for (const { alias, entries } of chunkEntries) {
|
|
19111
19123
|
for (const entry of entries) {
|
|
@@ -19122,11 +19134,14 @@ class Bundle {
|
|
|
19122
19134
|
getModuleInfo: this.graph.getModuleInfo
|
|
19123
19135
|
};
|
|
19124
19136
|
for (const module of this.graph.modulesById.values()) {
|
|
19125
|
-
|
|
19126
|
-
|
|
19127
|
-
if (
|
|
19137
|
+
const manualChunkAlias = getManualChunk(module.id, manualChunksApi);
|
|
19138
|
+
if (typeof manualChunkAlias === 'string') {
|
|
19139
|
+
if (module instanceof Module) {
|
|
19128
19140
|
manualChunkAliasesWithEntry.push([manualChunkAlias, module]);
|
|
19129
19141
|
}
|
|
19142
|
+
else {
|
|
19143
|
+
return error(logExternalModulesCannotBeIncludedInManualChunks(module.id));
|
|
19144
|
+
}
|
|
19130
19145
|
}
|
|
19131
19146
|
}
|
|
19132
19147
|
manualChunkAliasesWithEntry.sort(([aliasA], [aliasB]) => aliasA > aliasB ? 1 : aliasA < aliasB ? -1 : 0);
|
|
@@ -25460,8 +25475,8 @@ class ModuleLoader {
|
|
|
25460
25475
|
? options.treeshake.moduleSideEffects
|
|
25461
25476
|
: () => true;
|
|
25462
25477
|
}
|
|
25463
|
-
async addAdditionalModules(unresolvedModules) {
|
|
25464
|
-
const result = this.extendLoadModulesPromise(Promise.all(unresolvedModules.map(id => this.loadEntryModule(id, false, undefined, null))));
|
|
25478
|
+
async addAdditionalModules(unresolvedModules, isAddForManualChunks) {
|
|
25479
|
+
const result = this.extendLoadModulesPromise(Promise.all(unresolvedModules.map(id => this.loadEntryModule(id, false, undefined, null, isAddForManualChunks))));
|
|
25465
25480
|
await this.awaitLoadModulesPromise();
|
|
25466
25481
|
return result;
|
|
25467
25482
|
}
|
|
@@ -25624,6 +25639,9 @@ class ModuleLoader {
|
|
|
25624
25639
|
await this.handleExistingModule(existingModule, isEntry, isPreload);
|
|
25625
25640
|
return existingModule;
|
|
25626
25641
|
}
|
|
25642
|
+
if (existingModule instanceof ExternalModule) {
|
|
25643
|
+
return error(logExternalModulesCannotBeTransformedToModules(existingModule.id));
|
|
25644
|
+
}
|
|
25627
25645
|
const module = new Module(this.graph, id, this.options, isEntry, moduleSideEffects, syntheticNamedExports, meta, assertions);
|
|
25628
25646
|
this.modulesById.set(id, module);
|
|
25629
25647
|
this.graph.watchFiles[id] = true;
|
|
@@ -25799,17 +25817,19 @@ class ModuleLoader {
|
|
|
25799
25817
|
}
|
|
25800
25818
|
return resolvedId;
|
|
25801
25819
|
}
|
|
25802
|
-
async loadEntryModule(unresolvedId, isEntry, importer, implicitlyLoadedBefore) {
|
|
25820
|
+
async loadEntryModule(unresolvedId, isEntry, importer, implicitlyLoadedBefore, isLoadForManualChunks = false) {
|
|
25803
25821
|
const resolveIdResult = await resolveId(unresolvedId, importer, this.options.preserveSymlinks, this.pluginDriver, this.resolveId, null, EMPTY_OBJECT, true, EMPTY_OBJECT);
|
|
25804
25822
|
if (resolveIdResult == null) {
|
|
25805
25823
|
return error(implicitlyLoadedBefore === null
|
|
25806
25824
|
? logUnresolvedEntry(unresolvedId)
|
|
25807
25825
|
: logUnresolvedImplicitDependant(unresolvedId, implicitlyLoadedBefore));
|
|
25808
25826
|
}
|
|
25809
|
-
|
|
25810
|
-
|
|
25827
|
+
const isExternalModules = typeof resolveIdResult === 'object' && resolveIdResult.external;
|
|
25828
|
+
if (resolveIdResult === false || isExternalModules) {
|
|
25811
25829
|
return error(implicitlyLoadedBefore === null
|
|
25812
|
-
?
|
|
25830
|
+
? isExternalModules && isLoadForManualChunks
|
|
25831
|
+
? logExternalModulesCannotBeIncludedInManualChunks(unresolvedId)
|
|
25832
|
+
: logEntryCannotBeExternal(unresolvedId)
|
|
25813
25833
|
: logImplicitDependantCannotBeExternal(unresolvedId, implicitlyLoadedBefore));
|
|
25814
25834
|
}
|
|
25815
25835
|
return this.fetchModule(this.getResolvedIdWithDefaults(typeof resolveIdResult === 'object'
|
package/dist/shared/watch-cli.js
CHANGED
package/dist/shared/watch.js
CHANGED