@depup/webpack 5.111.1-depup.2 → 5.112.0-depup.0

package/lib/javascript/StartupHelpers.js

@@ -5,21 +5,21 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const Template = require("../template/Template");
 const { isSubset } = require("../util/SetHelpers");
 const { getAllChunks } = require("./ChunkHelpers");
 
 /** @import Hash from "../util/Hash" */
-/** @import Chunk, { ChunkId } from "../Chunk" */
+/** @import Chunk, { ChunkId } from "../graph/Chunk" */
 /**
  * @import ChunkGraph, {
  * 	ModuleId,
  * 	EntryModuleWithChunkGroup
- * } from "../ChunkGraph"
+ * } from "../graph/ChunkGraph"
  */
-/** @import Entrypoint from "../Entrypoint" */
-/** @import RuntimeTemplate from "../RuntimeTemplate" */
+/** @import Entrypoint from "../graph/Entrypoint" */
+/** @import RuntimeTemplate from "../template/RuntimeTemplate" */
 
 const EXPORT_PREFIX = `var ${RuntimeGlobals.exports} = `;
 

package/lib/{UseStrictPlugin.js → javascript/UseStrictPlugin.js}

@@ -5,17 +5,17 @@
 
 "use strict";
 
+const ConstDependency = require("../dependencies/core/ConstDependency");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("./ModuleTypeConstants");
-const ConstDependency = require("./dependencies/ConstDependency");
+} = require("../module/ModuleTypeConstants");
 
-/** @import { JavascriptParserOptions } from "../declarations/WebpackOptions" */
-/** @import Compiler from "./Compiler" */
-/** @import { BuildInfo } from "./Module" */
-/** @import JavascriptParser, { Range } from "./javascript/JavascriptParser" */
+/** @import { JavascriptParserOptions } from "../../declarations/WebpackOptions" */
+/** @import Compiler from "../Compiler" */
+/** @import { BuildInfo } from "../module/Module" */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "UseStrictPlugin";
 
@@ -36,21 +36,18 @@ class UseStrictPlugin {
 				 */
 				const handler = (parser, parserOptions) => {
 					parser.hooks.program.tap(PLUGIN_NAME, (ast) => {
-						const firstNode = ast.body[0];
-						if (
-							firstNode &&
-							firstNode.type === "ExpressionStatement" &&
-							firstNode.expression.type === "Literal" &&
-							firstNode.expression.value === "use strict"
-						) {
+						for (const statement of ast.body) {
+							const directive = parser.getDirective(statement);
+							if (directive === undefined) break;
+							if (directive !== "use strict") continue;
 							// Remove "use strict" expression. It will be added later by the renderer again.
 							// This is necessary in order to not break the strict mode when webpack prepends code.
 							// @see https://github.com/webpack/webpack/issues/1970
 							const dep = new ConstDependency(
 								"",
-								/** @type {Range} */ (firstNode.range)
+								/** @type {Range} */ (statement.range)
 							);
-							dep.loc = parser.getLocation(firstNode);
+							dep.loc = parser.getLocation(statement);
 							parser.state.module.addPresentationalDependency(dep);
 							/** @type {BuildInfo} */
 							(parser.state.module.buildInfo).strict = true;

package/lib/{dependencies → javascript}/WebpackIsIncludedDependency.js

@@ -5,15 +5,15 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
-const Template = require("../Template");
+const ModuleDependency = require("../dependencies/core/ModuleDependency");
+const Dependency = require("../graph/Dependency");
+const Template = require("../template/Template");
 const makeSerializable = require("../util/makeSerializable");
-const ModuleDependency = require("./ModuleDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import { ReferencedExports } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import ModuleGraph from "../ModuleGraph" */
+/** @import { ReferencedExports } from "../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../template/DependencyTemplate" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 /** @import { Range } from "../javascript/JavascriptParser" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 
@@ -47,10 +47,11 @@ class WebpackIsIncludedDependency extends ModuleDependency {
 	}
 }
 
-makeSerializable(
-	WebpackIsIncludedDependency,
+makeSerializable(WebpackIsIncludedDependency, [
+	"webpack/lib/javascript/WebpackIsIncludedDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/WebpackIsIncludedDependency"
-);
+]);
 
 WebpackIsIncludedDependency.Template = class WebpackIsIncludedDependencyTemplate extends (
 	ModuleDependency.Template

package/lib/{WebpackIsIncludedPlugin.js → javascript/WebpackIsIncludedPlugin.js}

@@ -5,19 +5,19 @@
 
 "use strict";
 
+const IgnoreErrorModuleFactory = require("../errors/IgnoreErrorModuleFactory");
+const {
+	toConstantDependency
+} = require("../javascript/JavascriptParserHelpers");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("./ModuleTypeConstants");
-const WebpackIsIncludedDependency = require("./dependencies/WebpackIsIncludedDependency");
-const IgnoreErrorModuleFactory = require("./errors/IgnoreErrorModuleFactory");
-const {
-	toConstantDependency
-} = require("./javascript/JavascriptParserHelpers");
+} = require("../module/ModuleTypeConstants");
+const WebpackIsIncludedDependency = require("./WebpackIsIncludedDependency");
 
-/** @import Compiler from "./Compiler" */
-/** @import JavascriptParser, { Range } from "./javascript/JavascriptParser" */
+/** @import Compiler from "../Compiler" */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "WebpackIsIncludedPlugin";