webpack 5.97.1 → 5.104.1
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/README.md +368 -434
- package/bin/webpack.js +15 -9
- package/hot/dev-server.js +18 -3
- package/hot/emitter-event-target.js +7 -0
- package/hot/lazy-compilation-node.js +45 -29
- package/hot/lazy-compilation-universal.js +18 -0
- package/hot/lazy-compilation-web.js +15 -5
- package/hot/load-http.js +7 -0
- package/hot/log.js +15 -15
- package/hot/only-dev-server.js +19 -4
- package/hot/poll.js +1 -0
- package/lib/APIPlugin.js +48 -50
- package/lib/AbstractMethodError.js +1 -0
- package/lib/AsyncDependenciesBlock.js +4 -5
- package/lib/AutomaticPrefetchPlugin.js +22 -22
- package/lib/BannerPlugin.js +35 -40
- package/lib/Cache.js +12 -9
- package/lib/CacheFacade.js +13 -13
- package/lib/CaseSensitiveModulesWarning.js +6 -6
- package/lib/Chunk.js +68 -47
- package/lib/ChunkGraph.js +174 -95
- package/lib/ChunkGroup.js +32 -24
- package/lib/ChunkTemplate.js +8 -8
- package/lib/CleanPlugin.js +90 -42
- package/lib/CodeGenerationResults.js +12 -9
- package/lib/CompatibilityPlugin.js +70 -21
- package/lib/Compilation.js +827 -550
- package/lib/Compiler.js +137 -109
- package/lib/ConcatenationScope.js +45 -8
- package/lib/ConditionalInitFragment.js +1 -1
- package/lib/ConstPlugin.js +89 -59
- package/lib/ContextExclusionPlugin.js +5 -4
- package/lib/ContextModule.js +66 -51
- package/lib/ContextModuleFactory.js +51 -30
- package/lib/ContextReplacementPlugin.js +89 -34
- package/lib/CssModule.js +8 -4
- package/lib/DefinePlugin.js +209 -57
- package/lib/DelegatedModule.js +34 -23
- package/lib/DelegatedModuleFactoryPlugin.js +27 -24
- package/lib/DelegatedPlugin.js +4 -2
- package/lib/DependenciesBlock.js +0 -2
- package/lib/Dependency.js +37 -19
- package/lib/DependencyTemplate.js +2 -0
- package/lib/DependencyTemplates.js +5 -6
- package/lib/DllEntryPlugin.js +8 -4
- package/lib/DllModule.js +11 -12
- package/lib/DllModuleFactory.js +2 -2
- package/lib/DllPlugin.js +9 -6
- package/lib/DllReferencePlugin.js +60 -65
- package/lib/DotenvPlugin.js +462 -0
- package/lib/DynamicEntryPlugin.js +8 -8
- package/lib/EntryOptionPlugin.js +8 -6
- package/lib/EntryPlugin.js +5 -3
- package/lib/Entrypoint.js +19 -0
- package/lib/EnvironmentNotSupportAsyncWarning.js +0 -3
- package/lib/EnvironmentPlugin.js +26 -19
- package/lib/ErrorHelpers.js +6 -6
- package/lib/EvalDevToolModulePlugin.js +17 -14
- package/lib/EvalSourceMapDevToolPlugin.js +156 -142
- package/lib/ExportsInfo.js +180 -115
- package/lib/ExportsInfoApiPlugin.js +2 -2
- package/lib/ExternalModule.js +256 -102
- package/lib/ExternalModuleFactoryPlugin.js +66 -29
- package/lib/ExternalsPlugin.js +57 -2
- package/lib/FileSystemInfo.js +313 -247
- package/lib/FlagAllModulesAsUsedPlugin.js +2 -2
- package/lib/FlagDependencyExportsPlugin.js +29 -19
- package/lib/FlagDependencyUsagePlugin.js +9 -10
- package/lib/FlagEntryExportAsUsedPlugin.js +1 -1
- package/lib/Generator.js +43 -10
- package/lib/GraphHelpers.js +11 -3
- package/lib/HookWebpackError.js +35 -7
- package/lib/HotModuleReplacementPlugin.js +149 -108
- package/lib/HotUpdateChunk.js +0 -3
- package/lib/IgnoreErrorModuleFactory.js +2 -2
- package/lib/IgnorePlugin.js +16 -13
- package/lib/IgnoreWarningsPlugin.js +6 -4
- package/lib/InitFragment.js +41 -23
- package/lib/InvalidDependenciesModuleWarning.js +2 -3
- package/lib/JavascriptMetaInfoPlugin.js +2 -4
- package/lib/LibManifestPlugin.js +12 -13
- package/lib/LoaderOptionsPlugin.js +12 -14
- package/lib/LoaderTargetPlugin.js +5 -3
- package/lib/MainTemplate.js +18 -29
- package/lib/ManifestPlugin.js +235 -0
- package/lib/Module.js +138 -60
- package/lib/ModuleBuildError.js +4 -2
- package/lib/ModuleDependencyError.js +4 -3
- package/lib/ModuleDependencyWarning.js +4 -3
- package/lib/ModuleError.js +1 -1
- package/lib/ModuleFactory.js +10 -3
- package/lib/ModuleFilenameHelpers.js +63 -60
- package/lib/ModuleGraph.js +195 -70
- package/lib/ModuleGraphConnection.js +14 -20
- package/lib/ModuleInfoHeaderPlugin.js +15 -16
- package/lib/ModuleNotFoundError.js +1 -1
- package/lib/ModuleParseError.js +8 -4
- package/lib/ModuleSourceTypeConstants.js +189 -0
- package/lib/ModuleTemplate.js +7 -8
- package/lib/ModuleTypeConstants.js +37 -15
- package/lib/ModuleWarning.js +1 -1
- package/lib/MultiCompiler.js +64 -49
- package/lib/MultiStats.js +19 -14
- package/lib/MultiWatching.js +7 -11
- package/lib/NoEmitOnErrorsPlugin.js +5 -3
- package/lib/NodeStuffPlugin.js +438 -126
- package/lib/NormalModule.js +322 -201
- package/lib/NormalModuleFactory.js +230 -117
- package/lib/NormalModuleReplacementPlugin.js +37 -39
- package/lib/NullFactory.js +3 -2
- package/lib/OptimizationStages.js +1 -1
- package/lib/OptionsApply.js +1 -1
- package/lib/Parser.js +5 -3
- package/lib/PlatformPlugin.js +3 -1
- package/lib/PrefetchPlugin.js +6 -4
- package/lib/ProgressPlugin.js +48 -49
- package/lib/ProvidePlugin.js +7 -5
- package/lib/RawModule.js +26 -12
- package/lib/RecordIdsPlugin.js +88 -110
- package/lib/RequestShortener.js +3 -1
- package/lib/ResolverFactory.js +15 -14
- package/lib/RuntimeGlobals.js +216 -153
- package/lib/RuntimeModule.js +7 -6
- package/lib/RuntimePlugin.js +115 -62
- package/lib/RuntimeTemplate.js +248 -76
- package/lib/SelfModuleFactory.js +2 -2
- package/lib/SizeFormatHelpers.js +2 -2
- package/lib/SourceMapDevToolModuleOptionsPlugin.js +17 -27
- package/lib/SourceMapDevToolPlugin.js +72 -59
- package/lib/Stats.js +2 -3
- package/lib/Template.js +31 -24
- package/lib/TemplatedPathPlugin.js +24 -21
- package/lib/UseStrictPlugin.js +1 -1
- package/lib/WarnCaseSensitiveModulesPlugin.js +36 -37
- package/lib/WarnDeprecatedOptionPlugin.js +7 -8
- package/lib/WarnNoModeSetPlugin.js +3 -1
- package/lib/WatchIgnorePlugin.js +11 -9
- package/lib/Watching.js +27 -29
- package/lib/WebpackError.js +10 -3
- package/lib/WebpackIsIncludedPlugin.js +4 -5
- package/lib/WebpackOptionsApply.js +263 -135
- package/lib/asset/AssetBytesGenerator.js +171 -0
- package/lib/asset/AssetBytesParser.js +37 -0
- package/lib/asset/AssetGenerator.js +285 -223
- package/lib/asset/AssetModulesPlugin.js +103 -41
- package/lib/asset/AssetParser.js +7 -3
- package/lib/asset/AssetSourceGenerator.js +41 -17
- package/lib/asset/RawDataUrlModule.js +17 -9
- package/lib/async-modules/AsyncModuleHelpers.js +52 -0
- package/lib/async-modules/AwaitDependenciesInitFragment.js +39 -24
- package/lib/async-modules/InferAsyncModulesPlugin.js +25 -26
- package/lib/buildChunkGraph.js +36 -17
- package/lib/cache/AddBuildDependenciesPlugin.js +5 -6
- package/lib/cache/IdleFileCachePlugin.js +22 -20
- package/lib/cache/MemoryCachePlugin.js +3 -3
- package/lib/cache/MemoryWithGcCachePlugin.js +17 -11
- package/lib/cache/PackFileCacheStrategy.js +198 -170
- package/lib/cache/ResolverCachePlugin.js +58 -48
- package/lib/cache/getLazyHashedEtag.js +5 -4
- package/lib/cli.js +197 -39
- package/lib/config/browserslistTargetHandler.js +110 -85
- package/lib/config/defaults.js +514 -113
- package/lib/config/normalization.js +91 -64
- package/lib/config/target.js +30 -18
- package/lib/container/ContainerEntryDependency.js +0 -1
- package/lib/container/ContainerEntryModule.js +16 -15
- package/lib/container/ContainerEntryModuleFactory.js +2 -2
- package/lib/container/ContainerPlugin.js +5 -6
- package/lib/container/ContainerReferencePlugin.js +27 -30
- package/lib/container/FallbackDependency.js +2 -1
- package/lib/container/FallbackModule.js +19 -14
- package/lib/container/FallbackModuleFactory.js +2 -2
- package/lib/container/HoistContainerReferencesPlugin.js +7 -7
- package/lib/container/ModuleFederationPlugin.js +4 -4
- package/lib/container/RemoteModule.js +14 -14
- package/lib/container/RemoteRuntimeModule.js +2 -2
- package/lib/container/options.js +9 -9
- package/lib/css/CssGenerator.js +366 -74
- package/lib/css/CssLoadingRuntimeModule.js +26 -16
- package/lib/css/CssMergeStyleSheetsRuntimeModule.js +56 -0
- package/lib/css/CssModulesPlugin.js +191 -142
- package/lib/css/CssParser.js +1756 -740
- package/lib/css/walkCssTokens.js +180 -67
- package/lib/debug/ProfilingPlugin.js +135 -51
- package/lib/dependencies/AMDDefineDependencyParserPlugin.js +29 -28
- package/lib/dependencies/AMDPlugin.js +18 -11
- package/lib/dependencies/AMDRequireArrayDependency.js +5 -4
- package/lib/dependencies/AMDRequireContextDependency.js +2 -1
- package/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js +35 -26
- package/lib/dependencies/AMDRuntimeModules.js +3 -1
- package/lib/dependencies/CachedConstDependency.js +24 -18
- package/lib/dependencies/CommonJsExportRequireDependency.js +31 -24
- package/lib/dependencies/CommonJsExportsDependency.js +2 -1
- package/lib/dependencies/CommonJsExportsParserPlugin.js +50 -36
- package/lib/dependencies/CommonJsFullRequireDependency.js +7 -13
- package/lib/dependencies/CommonJsImportsParserPlugin.js +146 -127
- package/lib/dependencies/CommonJsPlugin.js +29 -18
- package/lib/dependencies/CommonJsRequireContextDependency.js +4 -3
- package/lib/dependencies/CommonJsSelfReferenceDependency.js +4 -4
- package/lib/dependencies/ConstDependency.js +2 -2
- package/lib/dependencies/ContextDependency.js +10 -5
- package/lib/dependencies/ContextDependencyHelpers.js +21 -13
- package/lib/dependencies/ContextDependencyTemplateAsId.js +10 -9
- package/lib/dependencies/ContextDependencyTemplateAsRequireCall.js +13 -10
- package/lib/dependencies/ContextElementDependency.js +23 -12
- package/lib/dependencies/CssIcssExportDependency.js +402 -22
- package/lib/dependencies/CssIcssImportDependency.js +116 -51
- package/lib/dependencies/CssIcssSymbolDependency.js +33 -35
- package/lib/dependencies/CssImportDependency.js +17 -14
- package/lib/dependencies/CssUrlDependency.js +8 -13
- package/lib/dependencies/DynamicExports.js +19 -19
- package/lib/dependencies/ExportsInfoDependency.js +13 -10
- package/lib/dependencies/ExternalModuleDependency.js +7 -7
- package/lib/dependencies/ExternalModuleInitFragment.js +3 -2
- package/lib/dependencies/ExternalModuleInitFragmentDependency.js +96 -0
- package/lib/dependencies/HarmonyAcceptDependency.js +96 -5
- package/lib/dependencies/HarmonyAcceptImportDependency.js +2 -5
- package/lib/dependencies/HarmonyCompatibilityDependency.js +0 -1
- package/lib/dependencies/HarmonyDetectionParserPlugin.js +10 -30
- package/lib/dependencies/HarmonyEvaluatedImportSpecifierDependency.js +19 -8
- package/lib/dependencies/HarmonyExportDependencyParserPlugin.js +136 -99
- package/lib/dependencies/HarmonyExportExpressionDependency.js +1 -1
- package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js +152 -61
- package/lib/dependencies/HarmonyExportInitFragment.js +2 -2
- package/lib/dependencies/HarmonyExportSpecifierDependency.js +2 -2
- package/lib/dependencies/HarmonyExports.js +5 -5
- package/lib/dependencies/HarmonyImportDependency.js +92 -45
- package/lib/dependencies/HarmonyImportDependencyParserPlugin.js +201 -163
- package/lib/dependencies/HarmonyImportSideEffectDependency.js +5 -6
- package/lib/dependencies/HarmonyImportSpecifierDependency.js +69 -42
- package/lib/dependencies/HarmonyModulesPlugin.js +16 -11
- package/lib/dependencies/HarmonyTopLevelThisParserPlugin.js +15 -15
- package/lib/dependencies/ImportContextDependency.js +15 -1
- package/lib/dependencies/ImportDependency.js +25 -7
- package/lib/dependencies/ImportEagerDependency.js +7 -5
- package/lib/dependencies/ImportMetaContextDependencyParserPlugin.js +23 -13
- package/lib/dependencies/ImportMetaContextPlugin.js +2 -2
- package/lib/dependencies/ImportMetaPlugin.js +172 -20
- package/lib/dependencies/ImportParserPlugin.js +327 -49
- package/lib/dependencies/ImportPhase.js +121 -0
- package/lib/dependencies/ImportPlugin.js +3 -1
- package/lib/dependencies/ImportWeakDependency.js +7 -5
- package/lib/dependencies/JsonExportsDependency.js +54 -28
- package/lib/dependencies/LoaderDependency.js +0 -3
- package/lib/dependencies/LoaderImportDependency.js +0 -3
- package/lib/dependencies/LoaderPlugin.js +24 -25
- package/lib/dependencies/LocalModulesHelpers.js +4 -4
- package/lib/dependencies/ModuleDecoratorDependency.js +2 -4
- package/lib/dependencies/ModuleDependency.js +14 -13
- package/lib/dependencies/ModuleDependencyTemplateAsRequireId.js +1 -0
- package/lib/dependencies/ModuleHotAcceptDependency.js +1 -1
- package/lib/dependencies/NullDependency.js +2 -0
- package/lib/dependencies/ProvidedDependency.js +8 -10
- package/lib/dependencies/PureExpressionDependency.js +1 -2
- package/lib/dependencies/RequireContextDependency.js +2 -1
- package/lib/dependencies/RequireContextDependencyParserPlugin.js +47 -44
- package/lib/dependencies/RequireContextPlugin.js +5 -2
- package/lib/dependencies/RequireEnsureDependenciesBlock.js +3 -3
- package/lib/dependencies/RequireEnsureDependenciesBlockParserPlugin.js +101 -99
- package/lib/dependencies/RequireEnsurePlugin.js +6 -6
- package/lib/dependencies/RequireIncludeDependency.js +2 -2
- package/lib/dependencies/RequireIncludeDependencyParserPlugin.js +33 -34
- package/lib/dependencies/RequireIncludePlugin.js +1 -0
- package/lib/dependencies/RequireResolveContextDependency.js +1 -1
- package/lib/dependencies/RequireResolveDependency.js +3 -3
- package/lib/dependencies/RuntimeRequirementsDependency.js +3 -4
- package/lib/dependencies/StaticExportsDependency.js +3 -5
- package/lib/dependencies/SystemPlugin.js +4 -4
- package/lib/dependencies/URLContextDependency.js +65 -0
- package/lib/dependencies/URLDependency.js +3 -8
- package/lib/dependencies/URLPlugin.js +18 -159
- package/lib/dependencies/WebAssemblyExportImportedDependency.js +3 -3
- package/lib/dependencies/WebAssemblyImportDependency.js +2 -2
- package/lib/dependencies/WebpackIsIncludedDependency.js +2 -3
- package/lib/dependencies/WorkerDependency.js +8 -6
- package/lib/dependencies/WorkerPlugin.js +131 -67
- package/lib/dependencies/getFunctionExpression.js +2 -2
- package/lib/dependencies/processExportInfo.js +4 -4
- package/lib/esm/ExportWebpackRequireRuntimeModule.js +1 -1
- package/lib/esm/ModuleChunkFormatPlugin.js +232 -179
- package/lib/esm/ModuleChunkLoadingPlugin.js +112 -57
- package/lib/esm/ModuleChunkLoadingRuntimeModule.js +102 -28
- package/lib/formatLocation.js +2 -2
- package/lib/hmr/HotModuleReplacement.runtime.js +41 -29
- package/lib/hmr/HotModuleReplacementRuntimeModule.js +1 -1
- package/lib/hmr/JavascriptHotModuleReplacement.runtime.js +43 -33
- package/lib/hmr/JavascriptHotModuleReplacementHelper.js +37 -0
- package/lib/hmr/LazyCompilationPlugin.js +67 -54
- package/lib/hmr/lazyCompilationBackend.js +23 -18
- package/lib/ids/ChunkModuleIdRangePlugin.js +14 -11
- package/lib/ids/DeterministicChunkIdsPlugin.js +32 -37
- package/lib/ids/DeterministicModuleIdsPlugin.js +52 -52
- package/lib/ids/HashedModuleIdsPlugin.js +15 -13
- package/lib/ids/IdHelpers.js +66 -49
- package/lib/ids/NamedChunkIdsPlugin.js +14 -17
- package/lib/ids/NamedModuleIdsPlugin.js +12 -14
- package/lib/ids/NaturalChunkIdsPlugin.js +6 -4
- package/lib/ids/NaturalModuleIdsPlugin.js +4 -3
- package/lib/ids/OccurrenceChunkIdsPlugin.js +7 -5
- package/lib/ids/OccurrenceModuleIdsPlugin.js +8 -7
- package/lib/ids/SyncModuleIdsPlugin.js +18 -13
- package/lib/index.js +54 -14
- package/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js +116 -119
- package/lib/javascript/BasicEvaluatedExpression.js +26 -18
- package/lib/javascript/ChunkFormatHelpers.js +70 -0
- package/lib/javascript/ChunkHelpers.js +17 -5
- package/lib/javascript/CommonJsChunkFormatPlugin.js +114 -141
- package/lib/javascript/EnableChunkLoadingPlugin.js +7 -4
- package/lib/javascript/JavascriptGenerator.js +122 -100
- package/lib/javascript/JavascriptModulesPlugin.js +332 -152
- package/lib/javascript/JavascriptParser.js +1488 -1052
- package/lib/javascript/JavascriptParserHelpers.js +48 -47
- package/lib/javascript/StartupHelpers.js +23 -22
- package/lib/json/JsonData.js +4 -4
- package/lib/json/JsonGenerator.js +66 -32
- package/lib/json/JsonModulesPlugin.js +16 -6
- package/lib/json/JsonParser.js +23 -8
- package/lib/library/AbstractLibraryPlugin.js +45 -10
- package/lib/library/AmdLibraryPlugin.js +7 -5
- package/lib/library/AssignLibraryPlugin.js +71 -17
- package/lib/library/EnableLibraryPlugin.js +51 -25
- package/lib/library/ExportPropertyLibraryPlugin.js +12 -18
- package/lib/library/JsonpLibraryPlugin.js +5 -2
- package/lib/library/ModuleLibraryPlugin.js +230 -18
- package/lib/library/SystemLibraryPlugin.js +29 -11
- package/lib/library/UmdLibraryPlugin.js +35 -32
- package/lib/logging/Logger.js +18 -15
- package/lib/logging/createConsoleLogger.js +27 -27
- package/lib/logging/runtime.js +11 -11
- package/lib/logging/truncateArgs.js +5 -5
- package/lib/node/CommonJsChunkLoadingPlugin.js +72 -75
- package/lib/node/NodeEnvironmentPlugin.js +9 -3
- package/lib/node/NodeTargetPlugin.js +9 -1
- package/lib/node/NodeTemplatePlugin.js +2 -2
- package/lib/node/NodeWatchFileSystem.js +4 -4
- package/lib/node/ReadFileChunkLoadingRuntimeModule.js +22 -38
- package/lib/node/ReadFileCompileAsyncWasmPlugin.js +10 -11
- package/lib/node/ReadFileCompileWasmPlugin.js +11 -14
- package/lib/node/RequireChunkLoadingRuntimeModule.js +22 -30
- package/lib/node/nodeConsole.js +12 -7
- package/lib/optimize/AggressiveMergingPlugin.js +46 -47
- package/lib/optimize/AggressiveSplittingPlugin.js +233 -238
- package/lib/optimize/ConcatenatedModule.js +620 -251
- package/lib/optimize/EnsureChunkConditionsPlugin.js +58 -58
- package/lib/optimize/FlagIncludedChunksPlugin.js +93 -96
- package/lib/optimize/InnerGraph.js +139 -124
- package/lib/optimize/InnerGraphPlugin.js +29 -24
- package/lib/optimize/LimitChunkCountPlugin.js +32 -8
- package/lib/optimize/MangleExportsPlugin.js +22 -22
- package/lib/optimize/MergeDuplicateChunksPlugin.js +80 -81
- package/lib/optimize/MinChunkSizePlugin.js +12 -7
- package/lib/optimize/ModuleConcatenationPlugin.js +92 -71
- package/lib/optimize/RealContentHashPlugin.js +58 -44
- package/lib/optimize/RemoveEmptyChunksPlugin.js +8 -5
- package/lib/optimize/RemoveParentModulesPlugin.js +7 -4
- package/lib/optimize/RuntimeChunkPlugin.js +22 -25
- package/lib/optimize/SideEffectsFlagPlugin.js +44 -26
- package/lib/optimize/SplitChunksPlugin.js +209 -158
- package/lib/performance/AssetsOverSizeLimitWarning.js +1 -1
- package/lib/performance/EntrypointsOverSizeLimitWarning.js +2 -2
- package/lib/performance/SizeLimitsPlugin.js +8 -5
- package/lib/prefetch/ChunkPrefetchFunctionRuntimeModule.js +5 -7
- package/lib/prefetch/ChunkPrefetchPreloadPlugin.js +61 -64
- package/lib/prefetch/ChunkPrefetchStartupRuntimeModule.js +3 -4
- package/lib/prefetch/ChunkPrefetchTriggerRuntimeModule.js +2 -2
- package/lib/prefetch/ChunkPreloadTriggerRuntimeModule.js +2 -2
- package/lib/rules/BasicEffectRulePlugin.js +14 -5
- package/lib/rules/BasicMatcherRulePlugin.js +18 -7
- package/lib/rules/ObjectMatcherRulePlugin.js +17 -6
- package/lib/rules/RuleSetCompiler.js +73 -32
- package/lib/rules/UseEffectRulePlugin.js +61 -25
- package/lib/runtime/AsyncModuleRuntimeModule.js +74 -9
- package/lib/runtime/AutoPublicPathRuntimeModule.js +9 -4
- package/lib/runtime/BaseUriRuntimeModule.js +2 -2
- package/lib/runtime/CompatRuntimeModule.js +0 -1
- package/lib/runtime/CreateFakeNamespaceObjectRuntimeModule.js +1 -1
- package/lib/runtime/GetChunkFilenameRuntimeModule.js +34 -35
- package/lib/runtime/GetMainFilenameRuntimeModule.js +1 -1
- package/lib/runtime/GetTrustedTypesPolicyRuntimeModule.js +1 -1
- package/lib/runtime/LoadScriptRuntimeModule.js +0 -2
- package/lib/runtime/MakeDeferredNamespaceObjectRuntime.js +248 -0
- package/lib/runtime/PublicPathRuntimeModule.js +2 -2
- package/lib/runtime/RuntimeIdRuntimeModule.js +2 -1
- package/lib/runtime/StartupChunkDependenciesPlugin.js +39 -42
- package/lib/runtime/StartupChunkDependenciesRuntimeModule.js +10 -9
- package/lib/runtime/StartupEntrypointRuntimeModule.js +0 -1
- package/lib/runtime/SystemContextRuntimeModule.js +0 -2
- package/lib/runtime/ToBinaryRuntimeModule.js +64 -0
- package/lib/schemes/DataUriPlugin.js +9 -31
- package/lib/schemes/FileUriPlugin.js +11 -6
- package/lib/schemes/HttpUriPlugin.js +381 -261
- package/lib/schemes/VirtualUrlPlugin.js +222 -0
- package/lib/serialization/AggregateErrorSerializer.js +41 -0
- package/lib/serialization/BinaryMiddleware.js +51 -33
- package/lib/serialization/ErrorObjectSerializer.js +7 -2
- package/lib/serialization/FileMiddleware.js +101 -71
- package/lib/serialization/NullPrototypeObjectSerializer.js +5 -3
- package/lib/serialization/ObjectMiddleware.js +130 -54
- package/lib/serialization/PlainObjectSerializer.js +1 -1
- package/lib/serialization/Serializer.js +38 -20
- package/lib/serialization/SerializerMiddleware.js +121 -49
- package/lib/serialization/SingleItemMiddleware.js +9 -7
- package/lib/serialization/types.js +1 -1
- package/lib/sharing/ConsumeSharedModule.js +9 -9
- package/lib/sharing/ConsumeSharedPlugin.js +14 -14
- package/lib/sharing/ConsumeSharedRuntimeModule.js +11 -8
- package/lib/sharing/ProvideSharedModule.js +9 -11
- package/lib/sharing/ProvideSharedModuleFactory.js +5 -3
- package/lib/sharing/ProvideSharedPlugin.js +15 -10
- package/lib/sharing/SharePlugin.js +3 -4
- package/lib/sharing/ShareRuntimeModule.js +7 -6
- package/lib/sharing/resolveMatchedConfigs.js +27 -13
- package/lib/sharing/utils.js +37 -43
- package/lib/stats/DefaultStatsFactoryPlugin.js +455 -286
- package/lib/stats/DefaultStatsPresetPlugin.js +77 -46
- package/lib/stats/DefaultStatsPrinterPlugin.js +583 -419
- package/lib/stats/StatsFactory.js +75 -32
- package/lib/stats/StatsPrinter.js +71 -51
- package/lib/url/URLParserPlugin.js +264 -0
- package/lib/util/ArrayHelpers.js +6 -8
- package/lib/util/ArrayQueue.js +1 -1
- package/lib/util/AsyncQueue.js +11 -10
- package/lib/util/Hash.js +37 -5
- package/lib/util/IterableHelpers.js +4 -4
- package/lib/util/LazyBucketSortedSet.js +46 -27
- package/lib/util/LazySet.js +16 -10
- package/lib/util/MapHelpers.js +1 -1
- package/lib/util/ParallelismFactorCalculator.js +2 -2
- package/lib/util/Semaphore.js +3 -3
- package/lib/util/SetHelpers.js +6 -6
- package/lib/util/SortableSet.js +11 -9
- package/lib/util/StackedCacheMap.js +2 -2
- package/lib/util/StackedMap.js +3 -3
- package/lib/util/StringXor.js +2 -1
- package/lib/util/TupleQueue.js +11 -8
- package/lib/util/TupleSet.js +44 -19
- package/lib/util/URLAbsoluteSpecifier.js +3 -4
- package/lib/util/WeakTupleMap.js +56 -42
- package/lib/util/binarySearchBounds.js +4 -3
- package/lib/util/chainedImports.js +3 -1
- package/lib/util/cleverMerge.js +171 -107
- package/lib/util/comparators.js +265 -162
- package/lib/util/compileBooleanMatcher.js +120 -41
- package/lib/util/concatenate.js +20 -16
- package/lib/util/conventions.js +73 -74
- package/lib/util/create-schema-validation.js +8 -8
- package/lib/util/createHash.js +32 -135
- package/lib/util/dataURL.js +39 -0
- package/lib/util/deprecation.js +119 -116
- package/lib/util/deterministicGrouping.js +56 -47
- package/lib/util/extractSourceMap.js +319 -0
- package/lib/util/extractUrlAndGlobal.js +1 -1
- package/lib/util/findGraphRoots.js +19 -9
- package/lib/util/fs.js +169 -141
- package/lib/util/hash/BatchedHash.js +50 -10
- package/lib/util/hash/BulkUpdateHash.js +138 -0
- package/lib/util/hash/DebugHash.js +75 -0
- package/lib/util/hash/hash-digest.js +216 -0
- package/lib/util/hash/md4.js +2 -2
- package/lib/util/hash/wasm-hash.js +59 -17
- package/lib/util/identifier.js +124 -61
- package/lib/util/internalSerializables.js +4 -6
- package/lib/util/magicComment.js +9 -5
- package/lib/util/makeSerializable.js +2 -2
- package/lib/util/memoize.js +5 -2
- package/lib/util/objectToMap.js +3 -2
- package/lib/util/processAsyncTree.js +5 -5
- package/lib/util/propertyAccess.js +1 -1
- package/lib/util/propertyName.js +2 -3
- package/lib/util/registerExternalSerializer.js +16 -20
- package/lib/util/removeBOM.js +25 -0
- package/lib/util/runtime.js +72 -56
- package/lib/util/semver.js +44 -33
- package/lib/util/serialization.js +56 -56
- package/lib/util/smartGrouping.js +42 -27
- package/lib/util/source.js +5 -4
- package/lib/util/traverseDestructuringAssignmentProperties.js +45 -0
- package/lib/validateSchema.js +7 -9
- package/lib/wasm/EnableWasmLoadingPlugin.js +22 -12
- package/lib/wasm-async/AsyncWasmLoadingRuntimeModule.js +9 -5
- package/lib/wasm-async/AsyncWebAssemblyGenerator.js +15 -3
- package/lib/wasm-async/AsyncWebAssemblyJavascriptGenerator.js +28 -22
- package/lib/wasm-async/AsyncWebAssemblyModulesPlugin.js +47 -57
- package/lib/wasm-async/AsyncWebAssemblyParser.js +2 -10
- package/lib/wasm-async/UniversalCompileAsyncWasmPlugin.js +8 -4
- package/lib/wasm-sync/WasmChunkLoadingRuntimeModule.js +23 -17
- package/lib/wasm-sync/WasmFinalizeExportsPlugin.js +55 -57
- package/lib/wasm-sync/WebAssemblyGenerator.js +56 -41
- package/lib/wasm-sync/WebAssemblyInInitialChunkError.js +6 -3
- package/lib/wasm-sync/WebAssemblyJavascriptGenerator.js +25 -10
- package/lib/wasm-sync/WebAssemblyModulesPlugin.js +11 -12
- package/lib/wasm-sync/WebAssemblyParser.js +10 -17
- package/lib/wasm-sync/WebAssemblyUtils.js +1 -1
- package/lib/web/FetchCompileAsyncWasmPlugin.js +4 -4
- package/lib/web/FetchCompileWasmPlugin.js +6 -8
- package/lib/web/JsonpChunkLoadingPlugin.js +74 -74
- package/lib/web/JsonpChunkLoadingRuntimeModule.js +10 -26
- package/lib/web/JsonpTemplatePlugin.js +0 -1
- package/lib/webpack.js +107 -87
- package/lib/webworker/ImportScriptsChunkLoadingPlugin.js +79 -75
- package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js +38 -51
- package/lib/webworker/WebWorkerTemplatePlugin.js +1 -0
- package/module.d.ts +5 -0
- package/package.json +149 -129
- package/schemas/WebpackOptions.check.d.ts +1 -1
- package/schemas/WebpackOptions.check.js +2 -2
- package/schemas/WebpackOptions.json +543 -190
- package/schemas/plugins/BannerPlugin.check.d.ts +1 -1
- package/schemas/plugins/BannerPlugin.check.js +2 -2
- package/schemas/plugins/BannerPlugin.json +4 -0
- package/schemas/plugins/DllPlugin.check.d.ts +1 -1
- package/schemas/plugins/DllPlugin.check.js +1 -1
- package/schemas/plugins/DllReferencePlugin.check.d.ts +1 -1
- package/schemas/plugins/DllReferencePlugin.check.js +1 -1
- package/schemas/plugins/IgnorePlugin.check.d.ts +1 -1
- package/schemas/plugins/IgnorePlugin.check.js +1 -1
- package/schemas/plugins/IgnorePlugin.json +1 -1
- package/schemas/plugins/LoaderOptionsPlugin.check.d.ts +1 -1
- package/schemas/plugins/LoaderOptionsPlugin.check.js +1 -1
- package/schemas/plugins/{HashedModuleIdsPlugin.check.d.ts → ManifestPlugin.check.d.ts} +2 -2
- package/schemas/plugins/ManifestPlugin.check.js +6 -0
- package/schemas/plugins/ManifestPlugin.json +98 -0
- package/schemas/plugins/ProgressPlugin.check.d.ts +1 -1
- package/schemas/plugins/ProgressPlugin.check.js +1 -1
- package/schemas/plugins/ProgressPlugin.json +1 -1
- package/schemas/plugins/SourceMapDevToolPlugin.check.d.ts +1 -1
- package/schemas/plugins/SourceMapDevToolPlugin.check.js +2 -2
- package/schemas/plugins/SourceMapDevToolPlugin.json +23 -6
- package/schemas/plugins/WatchIgnorePlugin.check.d.ts +1 -1
- package/schemas/plugins/WatchIgnorePlugin.check.js +1 -1
- package/schemas/plugins/asset/AssetGeneratorOptions.check.d.ts +1 -1
- package/schemas/plugins/asset/AssetGeneratorOptions.check.js +1 -1
- package/schemas/plugins/asset/AssetInlineGeneratorOptions.check.d.ts +1 -1
- package/schemas/plugins/asset/AssetInlineGeneratorOptions.check.js +1 -1
- package/schemas/plugins/asset/AssetParserOptions.check.d.ts +1 -1
- package/schemas/plugins/asset/AssetParserOptions.check.js +1 -1
- package/schemas/plugins/asset/AssetResourceGeneratorOptions.check.d.ts +1 -1
- package/schemas/plugins/asset/AssetResourceGeneratorOptions.check.js +1 -1
- package/schemas/plugins/container/ContainerPlugin.check.d.ts +1 -1
- package/schemas/plugins/container/ContainerPlugin.check.js +1 -1
- package/schemas/plugins/container/ContainerReferencePlugin.check.d.ts +1 -1
- package/schemas/plugins/container/ContainerReferencePlugin.check.js +2 -2
- package/schemas/plugins/container/ContainerReferencePlugin.json +4 -1
- package/schemas/plugins/container/ExternalsType.check.d.ts +1 -1
- package/schemas/plugins/container/ExternalsType.check.js +2 -2
- package/schemas/plugins/container/ModuleFederationPlugin.check.d.ts +1 -1
- package/schemas/plugins/container/ModuleFederationPlugin.check.js +2 -2
- package/schemas/plugins/container/ModuleFederationPlugin.json +4 -1
- package/schemas/plugins/css/CssGeneratorOptions.check.d.ts +1 -1
- package/schemas/plugins/css/CssGeneratorOptions.check.js +1 -1
- package/schemas/plugins/css/CssModuleGeneratorOptions.check.d.ts +1 -1
- package/schemas/plugins/css/CssModuleGeneratorOptions.check.js +2 -2
- package/schemas/plugins/css/CssModuleParserOptions.check.d.ts +1 -1
- package/schemas/plugins/css/CssModuleParserOptions.check.js +2 -2
- package/schemas/plugins/css/CssParserOptions.check.d.ts +1 -1
- package/schemas/plugins/css/CssParserOptions.check.js +2 -2
- package/schemas/plugins/debug/ProfilingPlugin.check.d.ts +1 -1
- package/schemas/plugins/debug/ProfilingPlugin.check.js +1 -1
- package/schemas/plugins/ids/HashedModuleIdsPlugin.check.d.ts +7 -0
- package/schemas/plugins/ids/HashedModuleIdsPlugin.check.js +6 -0
- package/schemas/plugins/{HashedModuleIdsPlugin.json → ids/HashedModuleIdsPlugin.json} +15 -2
- package/schemas/plugins/ids/OccurrenceChunkIdsPlugin.check.d.ts +1 -1
- package/schemas/plugins/ids/OccurrenceChunkIdsPlugin.check.js +1 -1
- package/schemas/plugins/ids/OccurrenceModuleIdsPlugin.check.d.ts +1 -1
- package/schemas/plugins/ids/OccurrenceModuleIdsPlugin.check.js +1 -1
- package/schemas/plugins/{css/CssGlobalParserOptions.check.d.ts → json/JsonModulesPluginGenerator.check.d.ts} +1 -1
- package/schemas/plugins/json/JsonModulesPluginGenerator.check.js +6 -0
- package/schemas/plugins/json/JsonModulesPluginGenerator.json +3 -0
- package/schemas/plugins/{css/CssGlobalGeneratorOptions.check.d.ts → json/JsonModulesPluginParser.check.d.ts} +1 -1
- package/schemas/plugins/json/JsonModulesPluginParser.check.js +6 -0
- package/schemas/plugins/json/JsonModulesPluginParser.json +3 -0
- package/schemas/plugins/optimize/AggressiveSplittingPlugin.check.d.ts +1 -1
- package/schemas/plugins/optimize/AggressiveSplittingPlugin.check.js +1 -1
- package/schemas/plugins/optimize/LimitChunkCountPlugin.check.d.ts +1 -1
- package/schemas/plugins/optimize/LimitChunkCountPlugin.check.js +1 -1
- package/schemas/plugins/optimize/MergeDuplicateChunksPlugin.check.d.ts +1 -1
- package/schemas/plugins/optimize/MergeDuplicateChunksPlugin.check.js +1 -1
- package/schemas/plugins/optimize/MinChunkSizePlugin.check.d.ts +1 -1
- package/schemas/plugins/optimize/MinChunkSizePlugin.check.js +1 -1
- package/schemas/plugins/schemes/HttpUriPlugin.check.d.ts +1 -1
- package/schemas/plugins/schemes/HttpUriPlugin.check.js +1 -1
- package/schemas/plugins/schemes/VirtualUrlPlugin.check.d.ts +7 -0
- package/schemas/plugins/schemes/VirtualUrlPlugin.check.js +6 -0
- package/schemas/plugins/schemes/VirtualUrlPlugin.json +77 -0
- package/schemas/plugins/sharing/ConsumeSharedPlugin.check.d.ts +1 -1
- package/schemas/plugins/sharing/ConsumeSharedPlugin.check.js +1 -1
- package/schemas/plugins/sharing/ProvideSharedPlugin.check.d.ts +1 -1
- package/schemas/plugins/sharing/ProvideSharedPlugin.check.js +1 -1
- package/schemas/plugins/sharing/SharePlugin.check.d.ts +1 -1
- package/schemas/plugins/sharing/SharePlugin.check.js +1 -1
- package/types.d.ts +5115 -1863
- package/SECURITY.md +0 -9
- package/lib/ModuleSourceTypesConstants.js +0 -112
- package/lib/dependencies/CssLocalIdentifierDependency.js +0 -250
- package/lib/dependencies/CssSelfLocalIdentifierDependency.js +0 -111
- package/lib/library/ModernModuleLibraryPlugin.js +0 -144
- package/schemas/plugins/HashedModuleIdsPlugin.check.js +0 -6
- package/schemas/plugins/JsonModulesPluginParser.check.d.ts +0 -7
- package/schemas/plugins/JsonModulesPluginParser.check.js +0 -6
- package/schemas/plugins/JsonModulesPluginParser.json +0 -12
- package/schemas/plugins/css/CssAutoGeneratorOptions.check.d.ts +0 -7
- package/schemas/plugins/css/CssAutoGeneratorOptions.check.js +0 -6
- package/schemas/plugins/css/CssAutoGeneratorOptions.json +0 -3
- package/schemas/plugins/css/CssAutoParserOptions.check.d.ts +0 -7
- package/schemas/plugins/css/CssAutoParserOptions.check.js +0 -6
- package/schemas/plugins/css/CssAutoParserOptions.json +0 -3
- package/schemas/plugins/css/CssGlobalGeneratorOptions.check.js +0 -6
- package/schemas/plugins/css/CssGlobalGeneratorOptions.json +0 -3
- package/schemas/plugins/css/CssGlobalParserOptions.check.js +0 -6
- package/schemas/plugins/css/CssGlobalParserOptions.json +0 -3
|
@@ -7,10 +7,16 @@
|
|
|
7
7
|
|
|
8
8
|
const { SyncHook } = require("tapable");
|
|
9
9
|
|
|
10
|
+
/** @typedef {import("enhanced-resolve").ResolveRequest} ResolveRequest */
|
|
11
|
+
/** @typedef {import("../../declarations/WebpackOptions").Falsy} Falsy */
|
|
12
|
+
/** @typedef {import("../../declarations/WebpackOptions").RuleSetLoaderOptions} RuleSetLoaderOptions */
|
|
10
13
|
/** @typedef {import("../../declarations/WebpackOptions").RuleSetRule} RuleSetRule */
|
|
11
|
-
/** @typedef {import("../../declarations/WebpackOptions").RuleSetRules} RuleSetRules */
|
|
12
14
|
|
|
13
|
-
/** @typedef {
|
|
15
|
+
/** @typedef {(Falsy | RuleSetRule)[]} RuleSetRules */
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* @typedef {(value: EffectData[keyof EffectData]) => boolean} RuleConditionFunction
|
|
19
|
+
*/
|
|
14
20
|
|
|
15
21
|
/**
|
|
16
22
|
* @typedef {object} RuleCondition
|
|
@@ -26,30 +32,62 @@ const { SyncHook } = require("tapable");
|
|
|
26
32
|
*/
|
|
27
33
|
|
|
28
34
|
/**
|
|
29
|
-
* @typedef {
|
|
35
|
+
* @typedef {object} EffectData
|
|
36
|
+
* @property {string=} resource
|
|
37
|
+
* @property {string=} realResource
|
|
38
|
+
* @property {string=} resourceQuery
|
|
39
|
+
* @property {string=} resourceFragment
|
|
40
|
+
* @property {string=} scheme
|
|
41
|
+
* @property {ImportAttributes=} attributes
|
|
42
|
+
* @property {string=} mimetype
|
|
43
|
+
* @property {string} dependency
|
|
44
|
+
* @property {ResolveRequest["descriptionFileData"]=} descriptionData
|
|
45
|
+
* @property {string=} compiler
|
|
46
|
+
* @property {string} issuer
|
|
47
|
+
* @property {string} issuerLayer
|
|
30
48
|
*/
|
|
31
49
|
|
|
32
50
|
/**
|
|
33
51
|
* @typedef {object} CompiledRule
|
|
34
52
|
* @property {RuleCondition[]} conditions
|
|
35
|
-
* @property {(Effect|
|
|
53
|
+
* @property {(Effect | ((effectData: EffectData) => Effect[]))[]} effects
|
|
36
54
|
* @property {CompiledRule[]=} rules
|
|
37
55
|
* @property {CompiledRule[]=} oneOf
|
|
38
56
|
*/
|
|
39
57
|
|
|
58
|
+
/** @typedef {"use" | "use-pre" | "use-post"} EffectUseType */
|
|
59
|
+
|
|
60
|
+
/**
|
|
61
|
+
* @typedef {object} EffectUse
|
|
62
|
+
* @property {EffectUseType} type
|
|
63
|
+
* @property {{ loader: string, options?: string | null | Record<string, EXPECTED_ANY>, ident?: string }} value
|
|
64
|
+
*/
|
|
65
|
+
|
|
40
66
|
/**
|
|
41
|
-
* @typedef {object}
|
|
67
|
+
* @typedef {object} EffectBasic
|
|
42
68
|
* @property {string} type
|
|
43
|
-
* @property {
|
|
69
|
+
* @property {EXPECTED_ANY} value
|
|
44
70
|
*/
|
|
45
71
|
|
|
72
|
+
/** @typedef {EffectUse | EffectBasic} Effect */
|
|
73
|
+
|
|
74
|
+
/** @typedef {Map<string, RuleSetLoaderOptions>} References */
|
|
75
|
+
|
|
46
76
|
/**
|
|
47
77
|
* @typedef {object} RuleSet
|
|
48
|
-
* @property {
|
|
49
|
-
* @property {
|
|
78
|
+
* @property {References} references map of references in the rule set (may grow over time)
|
|
79
|
+
* @property {(effectData: EffectData) => Effect[]} exec execute the rule set
|
|
80
|
+
*/
|
|
81
|
+
|
|
82
|
+
/**
|
|
83
|
+
* @template T
|
|
84
|
+
* @template {T[keyof T]} V
|
|
85
|
+
* @typedef {({ [key in keyof Required<T>]: Required<T>[key] extends V ? key : never })[keyof T]} KeysOfTypes
|
|
50
86
|
*/
|
|
51
87
|
|
|
52
|
-
/** @typedef {
|
|
88
|
+
/** @typedef {Set<string>} UnhandledProperties */
|
|
89
|
+
|
|
90
|
+
/** @typedef {{ apply: (ruleSetCompiler: RuleSetCompiler) => void }} RuleSetPlugin */
|
|
53
91
|
|
|
54
92
|
class RuleSetCompiler {
|
|
55
93
|
/**
|
|
@@ -57,7 +95,7 @@ class RuleSetCompiler {
|
|
|
57
95
|
*/
|
|
58
96
|
constructor(plugins) {
|
|
59
97
|
this.hooks = Object.freeze({
|
|
60
|
-
/** @type {SyncHook<[string, RuleSetRule,
|
|
98
|
+
/** @type {SyncHook<[string, RuleSetRule, UnhandledProperties, CompiledRule, References]>} */
|
|
61
99
|
rule: new SyncHook([
|
|
62
100
|
"path",
|
|
63
101
|
"rule",
|
|
@@ -74,7 +112,7 @@ class RuleSetCompiler {
|
|
|
74
112
|
}
|
|
75
113
|
|
|
76
114
|
/**
|
|
77
|
-
* @param {
|
|
115
|
+
* @param {RuleSetRules} ruleSet raw user provided rules
|
|
78
116
|
* @returns {RuleSet} compiled RuleSet
|
|
79
117
|
*/
|
|
80
118
|
compile(ruleSet) {
|
|
@@ -91,7 +129,7 @@ class RuleSetCompiler {
|
|
|
91
129
|
for (const condition of rule.conditions) {
|
|
92
130
|
const p = condition.property;
|
|
93
131
|
if (Array.isArray(p)) {
|
|
94
|
-
/** @type {
|
|
132
|
+
/** @type {EXPECTED_ANY} */
|
|
95
133
|
let current = data;
|
|
96
134
|
for (const subProperty of p) {
|
|
97
135
|
if (
|
|
@@ -99,7 +137,7 @@ class RuleSetCompiler {
|
|
|
99
137
|
typeof current === "object" &&
|
|
100
138
|
Object.prototype.hasOwnProperty.call(current, subProperty)
|
|
101
139
|
) {
|
|
102
|
-
current = current[subProperty];
|
|
140
|
+
current = current[/** @type {keyof EffectData} */ (subProperty)];
|
|
103
141
|
} else {
|
|
104
142
|
current = undefined;
|
|
105
143
|
break;
|
|
@@ -110,7 +148,7 @@ class RuleSetCompiler {
|
|
|
110
148
|
continue;
|
|
111
149
|
}
|
|
112
150
|
} else if (p in data) {
|
|
113
|
-
const value = data[p];
|
|
151
|
+
const value = data[/** @type {keyof EffectData} */ (p)];
|
|
114
152
|
if (value !== undefined) {
|
|
115
153
|
if (!condition.fn(value)) return false;
|
|
116
154
|
continue;
|
|
@@ -147,7 +185,7 @@ class RuleSetCompiler {
|
|
|
147
185
|
|
|
148
186
|
return {
|
|
149
187
|
references: refs,
|
|
150
|
-
exec: data => {
|
|
188
|
+
exec: (data) => {
|
|
151
189
|
/** @type {Effect[]} */
|
|
152
190
|
const effects = [];
|
|
153
191
|
for (const rule of rules) {
|
|
@@ -161,7 +199,7 @@ class RuleSetCompiler {
|
|
|
161
199
|
/**
|
|
162
200
|
* @param {string} path current path
|
|
163
201
|
* @param {RuleSetRules} rules the raw rules provided by user
|
|
164
|
-
* @param {
|
|
202
|
+
* @param {References} refs references
|
|
165
203
|
* @returns {CompiledRule[]} rules
|
|
166
204
|
*/
|
|
167
205
|
compileRules(path, rules, refs) {
|
|
@@ -179,13 +217,14 @@ class RuleSetCompiler {
|
|
|
179
217
|
/**
|
|
180
218
|
* @param {string} path current path
|
|
181
219
|
* @param {RuleSetRule} rule the raw rule provided by user
|
|
182
|
-
* @param {
|
|
220
|
+
* @param {References} refs references
|
|
183
221
|
* @returns {CompiledRule} normalized and compiled rule for processing
|
|
184
222
|
*/
|
|
185
223
|
compileRule(path, rule, refs) {
|
|
224
|
+
/** @type {UnhandledProperties} */
|
|
186
225
|
const unhandledProperties = new Set(
|
|
187
226
|
Object.keys(rule).filter(
|
|
188
|
-
key => rule[/** @type {keyof RuleSetRule} */ (key)] !== undefined
|
|
227
|
+
(key) => rule[/** @type {keyof RuleSetRule} */ (key)] !== undefined
|
|
189
228
|
)
|
|
190
229
|
);
|
|
191
230
|
|
|
@@ -202,16 +241,18 @@ class RuleSetCompiler {
|
|
|
202
241
|
if (unhandledProperties.has("rules")) {
|
|
203
242
|
unhandledProperties.delete("rules");
|
|
204
243
|
const rules = rule.rules;
|
|
205
|
-
if (!Array.isArray(rules))
|
|
244
|
+
if (!Array.isArray(rules)) {
|
|
206
245
|
throw this.error(path, rules, "Rule.rules must be an array of rules");
|
|
246
|
+
}
|
|
207
247
|
compiledRule.rules = this.compileRules(`${path}.rules`, rules, refs);
|
|
208
248
|
}
|
|
209
249
|
|
|
210
250
|
if (unhandledProperties.has("oneOf")) {
|
|
211
251
|
unhandledProperties.delete("oneOf");
|
|
212
252
|
const oneOf = rule.oneOf;
|
|
213
|
-
if (!Array.isArray(oneOf))
|
|
253
|
+
if (!Array.isArray(oneOf)) {
|
|
214
254
|
throw this.error(path, oneOf, "Rule.oneOf must be an array of rules");
|
|
255
|
+
}
|
|
215
256
|
compiledRule.oneOf = this.compileRules(`${path}.oneOf`, oneOf, refs);
|
|
216
257
|
}
|
|
217
258
|
|
|
@@ -219,7 +260,7 @@ class RuleSetCompiler {
|
|
|
219
260
|
throw this.error(
|
|
220
261
|
path,
|
|
221
262
|
rule,
|
|
222
|
-
`Properties ${
|
|
263
|
+
`Properties ${[...unhandledProperties].join(", ")} are unknown`
|
|
223
264
|
);
|
|
224
265
|
}
|
|
225
266
|
|
|
@@ -228,14 +269,14 @@ class RuleSetCompiler {
|
|
|
228
269
|
|
|
229
270
|
/**
|
|
230
271
|
* @param {string} path current path
|
|
231
|
-
* @param {
|
|
272
|
+
* @param {RuleSetLoaderOptions} condition user provided condition value
|
|
232
273
|
* @returns {Condition} compiled condition
|
|
233
274
|
*/
|
|
234
275
|
compileCondition(path, condition) {
|
|
235
276
|
if (condition === "") {
|
|
236
277
|
return {
|
|
237
278
|
matchWhenEmpty: true,
|
|
238
|
-
fn: str => str === ""
|
|
279
|
+
fn: (str) => str === ""
|
|
239
280
|
};
|
|
240
281
|
}
|
|
241
282
|
if (!condition) {
|
|
@@ -248,14 +289,14 @@ class RuleSetCompiler {
|
|
|
248
289
|
if (typeof condition === "string") {
|
|
249
290
|
return {
|
|
250
291
|
matchWhenEmpty: condition.length === 0,
|
|
251
|
-
fn: str => typeof str === "string" && str.startsWith(condition)
|
|
292
|
+
fn: (str) => typeof str === "string" && str.startsWith(condition)
|
|
252
293
|
};
|
|
253
294
|
}
|
|
254
295
|
if (typeof condition === "function") {
|
|
255
296
|
try {
|
|
256
297
|
return {
|
|
257
298
|
matchWhenEmpty: condition(""),
|
|
258
|
-
fn: condition
|
|
299
|
+
fn: /** @type {RuleConditionFunction} */ (condition)
|
|
259
300
|
};
|
|
260
301
|
} catch (_err) {
|
|
261
302
|
throw this.error(
|
|
@@ -268,7 +309,7 @@ class RuleSetCompiler {
|
|
|
268
309
|
if (condition instanceof RegExp) {
|
|
269
310
|
return {
|
|
270
311
|
matchWhenEmpty: condition.test(""),
|
|
271
|
-
fn: v => typeof v === "string" && condition.test(v)
|
|
312
|
+
fn: (v) => typeof v === "string" && condition.test(v)
|
|
272
313
|
};
|
|
273
314
|
}
|
|
274
315
|
if (Array.isArray(condition)) {
|
|
@@ -324,7 +365,7 @@ class RuleSetCompiler {
|
|
|
324
365
|
const fn = matcher.fn;
|
|
325
366
|
conditions.push({
|
|
326
367
|
matchWhenEmpty: !matcher.matchWhenEmpty,
|
|
327
|
-
fn: /** @type {RuleConditionFunction} */ (v => !fn(v))
|
|
368
|
+
fn: /** @type {RuleConditionFunction} */ ((v) => !fn(v))
|
|
328
369
|
});
|
|
329
370
|
}
|
|
330
371
|
break;
|
|
@@ -360,8 +401,8 @@ class RuleSetCompiler {
|
|
|
360
401
|
return conditions[0];
|
|
361
402
|
}
|
|
362
403
|
return {
|
|
363
|
-
matchWhenEmpty: conditions.some(c => c.matchWhenEmpty),
|
|
364
|
-
fn: v => conditions.some(c => c.fn(v))
|
|
404
|
+
matchWhenEmpty: conditions.some((c) => c.matchWhenEmpty),
|
|
405
|
+
fn: (v) => conditions.some((c) => c.fn(v))
|
|
365
406
|
};
|
|
366
407
|
}
|
|
367
408
|
|
|
@@ -379,14 +420,14 @@ class RuleSetCompiler {
|
|
|
379
420
|
return conditions[0];
|
|
380
421
|
}
|
|
381
422
|
return {
|
|
382
|
-
matchWhenEmpty: conditions.every(c => c.matchWhenEmpty),
|
|
383
|
-
fn: v => conditions.every(c => c.fn(v))
|
|
423
|
+
matchWhenEmpty: conditions.every((c) => c.matchWhenEmpty),
|
|
424
|
+
fn: (v) => conditions.every((c) => c.fn(v))
|
|
384
425
|
};
|
|
385
426
|
}
|
|
386
427
|
|
|
387
428
|
/**
|
|
388
429
|
* @param {string} path current path
|
|
389
|
-
* @param {
|
|
430
|
+
* @param {EXPECTED_ANY} value value at the error location
|
|
390
431
|
* @param {string} message message explaining the problem
|
|
391
432
|
* @returns {Error} an error object
|
|
392
433
|
*/
|
|
@@ -7,11 +7,18 @@
|
|
|
7
7
|
|
|
8
8
|
const util = require("util");
|
|
9
9
|
|
|
10
|
+
/** @typedef {import("../../declarations/WebpackOptions").Falsy} Falsy */
|
|
10
11
|
/** @typedef {import("../../declarations/WebpackOptions").RuleSetLoader} RuleSetLoader */
|
|
11
12
|
/** @typedef {import("../../declarations/WebpackOptions").RuleSetLoaderOptions} RuleSetLoaderOptions */
|
|
12
13
|
/** @typedef {import("../../declarations/WebpackOptions").RuleSetRule} RuleSetRule */
|
|
14
|
+
/** @typedef {import("../../declarations/WebpackOptions").RuleSetUse} RuleSetUse */
|
|
15
|
+
/** @typedef {import("../../declarations/WebpackOptions").RuleSetUseItem} RuleSetUseItem */
|
|
13
16
|
/** @typedef {import("./RuleSetCompiler")} RuleSetCompiler */
|
|
14
17
|
/** @typedef {import("./RuleSetCompiler").Effect} Effect */
|
|
18
|
+
/** @typedef {import("./RuleSetCompiler").EffectData} EffectData */
|
|
19
|
+
/** @typedef {import("./RuleSetCompiler").EffectUseType} EffectUseType */
|
|
20
|
+
|
|
21
|
+
const PLUGIN_NAME = "UseEffectRulePlugin";
|
|
15
22
|
|
|
16
23
|
class UseEffectRulePlugin {
|
|
17
24
|
/**
|
|
@@ -20,7 +27,7 @@ class UseEffectRulePlugin {
|
|
|
20
27
|
*/
|
|
21
28
|
apply(ruleSetCompiler) {
|
|
22
29
|
ruleSetCompiler.hooks.rule.tap(
|
|
23
|
-
|
|
30
|
+
PLUGIN_NAME,
|
|
24
31
|
(path, rule, unhandledProperties, result, references) => {
|
|
25
32
|
/**
|
|
26
33
|
* @param {keyof RuleSetRule} property property
|
|
@@ -43,20 +50,27 @@ class UseEffectRulePlugin {
|
|
|
43
50
|
conflictWith("loader", "use");
|
|
44
51
|
conflictWith("options", "use");
|
|
45
52
|
|
|
46
|
-
const use = rule.use;
|
|
53
|
+
const use = /** @type {RuleSetUse} */ (rule.use);
|
|
47
54
|
const enforce = rule.enforce;
|
|
48
55
|
|
|
49
|
-
const type =
|
|
56
|
+
const type =
|
|
57
|
+
/** @type {EffectUseType} */
|
|
58
|
+
(enforce ? `use-${enforce}` : "use");
|
|
50
59
|
|
|
51
60
|
/**
|
|
52
61
|
* @param {string} path options path
|
|
53
62
|
* @param {string} defaultIdent default ident when none is provided
|
|
54
|
-
* @param {
|
|
55
|
-
* @returns {Effect|
|
|
63
|
+
* @param {RuleSetUseItem} item user provided use value
|
|
64
|
+
* @returns {(Effect | ((effectData: EffectData) => Effect[]))} effect
|
|
56
65
|
*/
|
|
57
66
|
const useToEffect = (path, defaultIdent, item) => {
|
|
58
67
|
if (typeof item === "function") {
|
|
59
|
-
return data =>
|
|
68
|
+
return (data) =>
|
|
69
|
+
useToEffectsWithoutIdent(
|
|
70
|
+
path,
|
|
71
|
+
/** @type {RuleSetUseItem | RuleSetUseItem[]} */
|
|
72
|
+
(item(data))
|
|
73
|
+
);
|
|
60
74
|
}
|
|
61
75
|
return useToEffectRaw(path, defaultIdent, item);
|
|
62
76
|
};
|
|
@@ -64,7 +78,7 @@ class UseEffectRulePlugin {
|
|
|
64
78
|
/**
|
|
65
79
|
* @param {string} path options path
|
|
66
80
|
* @param {string} defaultIdent default ident when none is provided
|
|
67
|
-
* @param {
|
|
81
|
+
* @param {Exclude<NonNullable<RuleSetUseItem>, EXPECTED_FUNCTION>} item user provided use value
|
|
68
82
|
* @returns {Effect} effect
|
|
69
83
|
*/
|
|
70
84
|
const useToEffectRaw = (path, defaultIdent, item) => {
|
|
@@ -78,7 +92,7 @@ class UseEffectRulePlugin {
|
|
|
78
92
|
}
|
|
79
93
|
};
|
|
80
94
|
}
|
|
81
|
-
const loader = item.loader;
|
|
95
|
+
const loader = /** @type {string} */ (item.loader);
|
|
82
96
|
const options = item.options;
|
|
83
97
|
let ident = item.ident;
|
|
84
98
|
if (options && typeof options === "object") {
|
|
@@ -104,41 +118,55 @@ class UseEffectRulePlugin {
|
|
|
104
118
|
|
|
105
119
|
/**
|
|
106
120
|
* @param {string} path options path
|
|
107
|
-
* @param {
|
|
121
|
+
* @param {RuleSetUseItem | (Falsy | RuleSetUseItem)[]} items user provided use value
|
|
108
122
|
* @returns {Effect[]} effects
|
|
109
123
|
*/
|
|
110
124
|
const useToEffectsWithoutIdent = (path, items) => {
|
|
111
125
|
if (Array.isArray(items)) {
|
|
112
|
-
return items
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
126
|
+
return items.filter(Boolean).map((item, idx) =>
|
|
127
|
+
useToEffectRaw(
|
|
128
|
+
`${path}[${idx}]`,
|
|
129
|
+
"[[missing ident]]",
|
|
130
|
+
/** @type {Exclude<RuleSetUseItem, EXPECTED_FUNCTION>} */
|
|
131
|
+
(item)
|
|
132
|
+
)
|
|
133
|
+
);
|
|
117
134
|
}
|
|
118
|
-
return [
|
|
135
|
+
return [
|
|
136
|
+
useToEffectRaw(
|
|
137
|
+
path,
|
|
138
|
+
"[[missing ident]]",
|
|
139
|
+
/** @type {Exclude<RuleSetUseItem, EXPECTED_FUNCTION>} */
|
|
140
|
+
(items)
|
|
141
|
+
)
|
|
142
|
+
];
|
|
119
143
|
};
|
|
120
144
|
|
|
121
145
|
/**
|
|
122
146
|
* @param {string} path current path
|
|
123
|
-
* @param {
|
|
124
|
-
* @returns {(Effect|
|
|
147
|
+
* @param {RuleSetUse} items user provided use value
|
|
148
|
+
* @returns {(Effect | ((effectData: EffectData) => Effect[]))[]} effects
|
|
125
149
|
*/
|
|
126
150
|
const useToEffects = (path, items) => {
|
|
127
151
|
if (Array.isArray(items)) {
|
|
128
152
|
return items.filter(Boolean).map((item, idx) => {
|
|
129
153
|
const subPath = `${path}[${idx}]`;
|
|
130
|
-
return useToEffect(
|
|
154
|
+
return useToEffect(
|
|
155
|
+
subPath,
|
|
156
|
+
subPath,
|
|
157
|
+
/** @type {RuleSetUseItem} */
|
|
158
|
+
(item)
|
|
159
|
+
);
|
|
131
160
|
});
|
|
132
161
|
}
|
|
133
|
-
return [
|
|
162
|
+
return [
|
|
163
|
+
useToEffect(path, path, /** @type {RuleSetUseItem} */ (items))
|
|
164
|
+
];
|
|
134
165
|
};
|
|
135
166
|
|
|
136
167
|
if (typeof use === "function") {
|
|
137
|
-
result.effects.push(data =>
|
|
138
|
-
useToEffectsWithoutIdent(
|
|
139
|
-
`${path}.use`,
|
|
140
|
-
use(/** @type {TODO} */ (data))
|
|
141
|
-
)
|
|
168
|
+
result.effects.push((data) =>
|
|
169
|
+
useToEffectsWithoutIdent(`${path}.use`, use(data))
|
|
142
170
|
);
|
|
143
171
|
} else {
|
|
144
172
|
for (const effect of useToEffects(`${path}.use`, use)) {
|
|
@@ -182,7 +210,15 @@ class UseEffectRulePlugin {
|
|
|
182
210
|
|
|
183
211
|
const ident =
|
|
184
212
|
options && typeof options === "object" ? path : undefined;
|
|
185
|
-
|
|
213
|
+
|
|
214
|
+
if (ident) {
|
|
215
|
+
references.set(
|
|
216
|
+
ident,
|
|
217
|
+
/** @type {RuleSetLoaderOptions} */
|
|
218
|
+
(options)
|
|
219
|
+
);
|
|
220
|
+
}
|
|
221
|
+
|
|
186
222
|
result.effects.push({
|
|
187
223
|
type: enforce ? `use-${enforce}` : "use",
|
|
188
224
|
value: {
|
|
@@ -11,8 +11,12 @@ const HelperRuntimeModule = require("./HelperRuntimeModule");
|
|
|
11
11
|
/** @typedef {import("../Compilation")} Compilation */
|
|
12
12
|
|
|
13
13
|
class AsyncModuleRuntimeModule extends HelperRuntimeModule {
|
|
14
|
-
|
|
14
|
+
/**
|
|
15
|
+
* @param {boolean=} deferInterop if defer import is used.
|
|
16
|
+
*/
|
|
17
|
+
constructor(deferInterop = false) {
|
|
15
18
|
super("async module");
|
|
19
|
+
this._deferInterop = deferInterop;
|
|
16
20
|
}
|
|
17
21
|
|
|
18
22
|
/**
|
|
@@ -22,10 +26,38 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
|
|
|
22
26
|
const compilation = /** @type {Compilation} */ (this.compilation);
|
|
23
27
|
const { runtimeTemplate } = compilation;
|
|
24
28
|
const fn = RuntimeGlobals.asyncModule;
|
|
29
|
+
const defer = this._deferInterop;
|
|
25
30
|
return Template.asString([
|
|
26
|
-
'var
|
|
27
|
-
|
|
28
|
-
|
|
31
|
+
'var hasSymbol = typeof Symbol === "function";',
|
|
32
|
+
'var webpackQueues = hasSymbol ? Symbol("webpack queues") : "__webpack_queues__";',
|
|
33
|
+
`var webpackExports = ${
|
|
34
|
+
defer ? `${RuntimeGlobals.asyncModuleExportSymbol}= ` : ""
|
|
35
|
+
}hasSymbol ? Symbol("webpack exports") : "${RuntimeGlobals.exports}";`,
|
|
36
|
+
'var webpackError = hasSymbol ? Symbol("webpack error") : "__webpack_error__";',
|
|
37
|
+
defer
|
|
38
|
+
? Template.asString([
|
|
39
|
+
`var webpackDone = ${RuntimeGlobals.asyncModuleDoneSymbol} = hasSymbol ? Symbol("webpack done") : "__webpack_done__";`,
|
|
40
|
+
`var webpackDefer = ${RuntimeGlobals.deferredModuleAsyncTransitiveDependenciesSymbol} = hasSymbol ? Symbol("webpack defer") : "__webpack_defer__";`,
|
|
41
|
+
`${RuntimeGlobals.deferredModuleAsyncTransitiveDependencies} = ${runtimeTemplate.basicFunction(
|
|
42
|
+
"asyncDeps",
|
|
43
|
+
[
|
|
44
|
+
Template.indent([
|
|
45
|
+
"var hasUnresolvedAsyncSubgraph = asyncDeps.some((id) => {",
|
|
46
|
+
Template.indent([
|
|
47
|
+
"var cache = __webpack_module_cache__[id];",
|
|
48
|
+
"return !cache || cache[webpackDone] === false;"
|
|
49
|
+
]),
|
|
50
|
+
"});",
|
|
51
|
+
"if (hasUnresolvedAsyncSubgraph) {",
|
|
52
|
+
Template.indent([
|
|
53
|
+
"return ({ then(onFulfilled, onRejected) { return Promise.all(asyncDeps.map(__webpack_require__)).then(onFulfilled, onRejected) } })"
|
|
54
|
+
]),
|
|
55
|
+
"}"
|
|
56
|
+
])
|
|
57
|
+
]
|
|
58
|
+
)}`
|
|
59
|
+
])
|
|
60
|
+
: "",
|
|
29
61
|
`var resolveQueue = ${runtimeTemplate.basicFunction("queue", [
|
|
30
62
|
"if(queue && queue.d < 1) {",
|
|
31
63
|
Template.indent([
|
|
@@ -45,6 +77,31 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
|
|
|
45
77
|
`deps.map(${runtimeTemplate.basicFunction("dep", [
|
|
46
78
|
'if(dep !== null && typeof dep === "object") {',
|
|
47
79
|
Template.indent([
|
|
80
|
+
defer
|
|
81
|
+
? Template.asString([
|
|
82
|
+
"if(!dep[webpackQueues] && dep[webpackDefer]) {",
|
|
83
|
+
Template.indent([
|
|
84
|
+
`var asyncDeps = ${RuntimeGlobals.deferredModuleAsyncTransitiveDependencies}(dep[webpackDefer]);`,
|
|
85
|
+
"if (asyncDeps) {",
|
|
86
|
+
Template.indent([
|
|
87
|
+
"var d = dep;",
|
|
88
|
+
"dep = {",
|
|
89
|
+
Template.indent([
|
|
90
|
+
"then(onFulfilled, onRejected) {",
|
|
91
|
+
Template.indent([
|
|
92
|
+
`asyncDeps.then(${runtimeTemplate.returningFunction(
|
|
93
|
+
"onFulfilled(d)"
|
|
94
|
+
)}, onRejected);`
|
|
95
|
+
]),
|
|
96
|
+
"}"
|
|
97
|
+
]),
|
|
98
|
+
"};"
|
|
99
|
+
]),
|
|
100
|
+
"} else return dep;"
|
|
101
|
+
]),
|
|
102
|
+
"}"
|
|
103
|
+
])
|
|
104
|
+
: "",
|
|
48
105
|
"if(dep[webpackQueues]) return dep;",
|
|
49
106
|
"if(dep.then) {",
|
|
50
107
|
Template.indent([
|
|
@@ -58,6 +115,7 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
|
|
|
58
115
|
"resolveQueue(queue);"
|
|
59
116
|
])});`,
|
|
60
117
|
"var obj = {};",
|
|
118
|
+
defer ? "obj[webpackDefer] = false;" : "",
|
|
61
119
|
`obj[webpackQueues] = ${runtimeTemplate.expressionFunction(
|
|
62
120
|
"fn(queue)",
|
|
63
121
|
"fn"
|
|
@@ -92,11 +150,12 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
|
|
|
92
150
|
"fn"
|
|
93
151
|
)};`,
|
|
94
152
|
"module.exports = promise;",
|
|
95
|
-
`
|
|
153
|
+
`var handle = ${runtimeTemplate.basicFunction("deps", [
|
|
96
154
|
"currentDeps = wrapDeps(deps);",
|
|
97
155
|
"var fn;",
|
|
98
156
|
`var getResult = ${runtimeTemplate.returningFunction(
|
|
99
157
|
`currentDeps.map(${runtimeTemplate.basicFunction("d", [
|
|
158
|
+
defer ? "if(d[webpackDefer]) return d;" : "",
|
|
100
159
|
"if(d[webpackError]) throw d[webpackError];",
|
|
101
160
|
"return d[webpackExports];"
|
|
102
161
|
])})`
|
|
@@ -114,16 +173,22 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
|
|
|
114
173
|
"q"
|
|
115
174
|
)};`,
|
|
116
175
|
`currentDeps.map(${runtimeTemplate.expressionFunction(
|
|
117
|
-
|
|
176
|
+
`${
|
|
177
|
+
defer ? "dep[webpackDefer]||" : ""
|
|
178
|
+
}dep[webpackQueues](fnQueue)`,
|
|
118
179
|
"dep"
|
|
119
180
|
)});`
|
|
120
181
|
]
|
|
121
182
|
)});`,
|
|
122
183
|
"return fn.r ? promise : getResult();"
|
|
123
|
-
])}
|
|
124
|
-
|
|
184
|
+
])}`,
|
|
185
|
+
`var done = ${runtimeTemplate.expressionFunction(
|
|
186
|
+
`(err ? reject(promise[webpackError] = err) : outerResolve(exports)), resolveQueue(queue)${
|
|
187
|
+
defer ? ", promise[webpackDone] = true" : ""
|
|
188
|
+
}`,
|
|
125
189
|
"err"
|
|
126
|
-
)}
|
|
190
|
+
)}`,
|
|
191
|
+
"body(handle, done);",
|
|
127
192
|
"queue && queue.d < 0 && (queue.d = 0);"
|
|
128
193
|
])};`
|
|
129
194
|
]);
|
|
@@ -23,7 +23,8 @@ class AutoPublicPathRuntimeModule extends RuntimeModule {
|
|
|
23
23
|
*/
|
|
24
24
|
generate() {
|
|
25
25
|
const compilation = /** @type {Compilation} */ (this.compilation);
|
|
26
|
-
const { scriptType, importMetaName, path } =
|
|
26
|
+
const { scriptType, importMetaName, path, environment } =
|
|
27
|
+
compilation.outputOptions;
|
|
27
28
|
const chunkName = compilation.getPath(
|
|
28
29
|
JavascriptModulesPlugin.getChunkFilenameTemplate(
|
|
29
30
|
/** @type {Chunk} */
|
|
@@ -41,13 +42,17 @@ class AutoPublicPathRuntimeModule extends RuntimeModule {
|
|
|
41
42
|
false
|
|
42
43
|
);
|
|
43
44
|
|
|
45
|
+
const global = environment.globalThis
|
|
46
|
+
? "globalThis"
|
|
47
|
+
: RuntimeGlobals.global;
|
|
48
|
+
|
|
44
49
|
return Template.asString([
|
|
45
50
|
"var scriptUrl;",
|
|
46
51
|
scriptType === "module"
|
|
47
52
|
? `if (typeof ${importMetaName}.url === "string") scriptUrl = ${importMetaName}.url`
|
|
48
53
|
: Template.asString([
|
|
49
|
-
`if (${
|
|
50
|
-
`var document = ${
|
|
54
|
+
`if (${global}.importScripts) scriptUrl = ${global}.location + "";`,
|
|
55
|
+
`var document = ${global}.document;`,
|
|
51
56
|
"if (!scriptUrl && document) {",
|
|
52
57
|
Template.indent([
|
|
53
58
|
// Technically we could use `document.currentScript instanceof window.HTMLScriptElement`,
|
|
@@ -72,7 +77,7 @@ class AutoPublicPathRuntimeModule extends RuntimeModule {
|
|
|
72
77
|
"// When supporting browsers where an automatic publicPath is not supported you must specify an output.publicPath manually via configuration",
|
|
73
78
|
'// or pass an empty string ("") and set the __webpack_public_path__ variable from your code to use your own logic.',
|
|
74
79
|
'if (!scriptUrl) throw new Error("Automatic publicPath is not supported in this browser");',
|
|
75
|
-
'scriptUrl = scriptUrl.replace(/#.*$/, "").replace(/\\?.*$/, "").replace(/\\/[^\\/]+$/, "/");',
|
|
80
|
+
'scriptUrl = scriptUrl.replace(/^blob:/, "").replace(/#.*$/, "").replace(/\\?.*$/, "").replace(/\\/[^\\/]+$/, "/");',
|
|
76
81
|
!undoPath
|
|
77
82
|
? `${RuntimeGlobals.publicPath} = scriptUrl;`
|
|
78
83
|
: `${RuntimeGlobals.publicPath} = scriptUrl + ${JSON.stringify(
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
const RuntimeGlobals = require("../RuntimeGlobals");
|
|
9
9
|
const RuntimeModule = require("../RuntimeModule");
|
|
10
10
|
|
|
11
|
-
/** @typedef {import("../../declarations/WebpackOptions").EntryDescriptionNormalized}
|
|
11
|
+
/** @typedef {import("../../declarations/WebpackOptions").EntryDescriptionNormalized} EntryDescription */
|
|
12
12
|
/** @typedef {import("../Chunk")} Chunk */
|
|
13
13
|
|
|
14
14
|
class BaseUriRuntimeModule extends RuntimeModule {
|
|
@@ -22,7 +22,7 @@ class BaseUriRuntimeModule extends RuntimeModule {
|
|
|
22
22
|
generate() {
|
|
23
23
|
const chunk = /** @type {Chunk} */ (this.chunk);
|
|
24
24
|
const options =
|
|
25
|
-
/** @type {
|
|
25
|
+
/** @type {EntryDescription} */
|
|
26
26
|
(chunk.getEntryOptions());
|
|
27
27
|
return `${RuntimeGlobals.baseURI} = ${
|
|
28
28
|
options.baseUri === undefined
|
|
@@ -10,7 +10,6 @@ const RuntimeModule = require("../RuntimeModule");
|
|
|
10
10
|
/** @typedef {import("../Chunk")} Chunk */
|
|
11
11
|
/** @typedef {import("../ChunkGraph")} ChunkGraph */
|
|
12
12
|
/** @typedef {import("../Compilation")} Compilation */
|
|
13
|
-
/** @typedef {import("../MainTemplate")} MainTemplate */
|
|
14
13
|
|
|
15
14
|
class CompatRuntimeModule extends RuntimeModule {
|
|
16
15
|
constructor() {
|
|
@@ -49,7 +49,7 @@ class CreateFakeNamespaceObjectRuntimeModule extends HelperRuntimeModule {
|
|
|
49
49
|
`${RuntimeGlobals.makeNamespaceObject}(ns);`,
|
|
50
50
|
"var def = {};",
|
|
51
51
|
"leafPrototypes = leafPrototypes || [null, getProto({}), getProto([]), getProto(getProto)];",
|
|
52
|
-
"for(var current = mode & 2 && value; typeof current == 'object' && !~leafPrototypes.indexOf(current); current = getProto(current)) {",
|
|
52
|
+
"for(var current = mode & 2 && value; (typeof current == 'object' || typeof current == 'function') && !~leafPrototypes.indexOf(current); current = getProto(current)) {",
|
|
53
53
|
Template.indent([
|
|
54
54
|
`Object.getOwnPropertyNames(current).forEach(${runtimeTemplate.expressionFunction(
|
|
55
55
|
`def[key] = ${runtimeTemplate.returningFunction("value[key]", "")}`,
|