update

lib/DefinePlugin.js

@@ -354,20 +354,18 @@ class DefinePlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const definitions = this.definitions;
-
-		/**
-		 * @type {Map<string, Set<string>>}
-		 */
-		const finalByNestedKey = new Map();
-		/**
-		 * @type {Map<string, Set<string>>}
-		 */
-		const nestedByFinalKey = new Map();
-
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
+				/**
+				 * @type {Map<string, Set<string>>}
+				 */
+				const finalByNestedKey = new Map();
+				/**
+				 * @type {Map<string, Set<string>>}
+				 */
+				const nestedByFinalKey = new Map();
+
 				const logger = compilation.getLogger("webpack.DefinePlugin");
 				compilation.dependencyTemplates.set(
 					ConstDependency,
@@ -512,11 +510,11 @@ class DefinePlugin {
 												if (
 													!finalSet ||
 													!finalSet.has(id) ||
-													!definitions[fullKey]
+													!this.definitions[fullKey]
 												) {
 													return;
 												}
-												obj[id] = definitions[fullKey];
+												obj[id] = this.definitions[fullKey];
 											}
 											let strCode = stringifyObj(
 												obj,
@@ -736,7 +734,7 @@ class DefinePlugin {
 							);
 					};
 
-					walkDefinitions(definitions, "");
+					walkDefinitions(this.definitions, "");
 				};
 
 				normalModuleFactory.hooks.parser
@@ -825,8 +823,8 @@ class DefinePlugin {
 					}
 				};
 
-				walkDefinitionsForKeys(definitions);
+				walkDefinitionsForKeys(this.definitions);
-				walkDefinitionsForValues(definitions, "");
+				walkDefinitionsForValues(this.definitions, "");
 
 				compilation.valueCacheVersions.set(
 					VALUE_DEP_MAIN,

lib/DotenvPlugin.js

@@ -251,7 +251,7 @@ const getEnvFilesForMode = (inputFileSystem, dir, mode) => {
  * @param {Record<string, string>} env environment variables
  * @returns {Record<string, string>} formatted definitions
  */
-const formatDefinitions = (env) => {
+const envToDefinitions = (env) => {
 	const definitions = /** @type {Record<string, string>} */ ({});
 
 	for (const [key, value] of Object.entries(env)) {
@@ -278,8 +278,10 @@ class DotenvPlugin {
 	apply(compiler) {
 		/** @type {string[] | undefined} */
 		let fileDependenciesCache;
+		const definePlugin = new compiler.webpack.DefinePlugin({});
+		definePlugin.apply(compiler);
 
-		compiler.hooks.beforeCompile.tapAsync(PLUGIN_NAME, (_params, callback) => {
+		compiler.hooks.beforeRun.tapAsync(PLUGIN_NAME, (_params, callback) => {
 			const inputFileSystem = /** @type {InputFileSystem} */ (
 				compiler.inputFileSystem
 			);
@@ -296,10 +298,8 @@ class DotenvPlugin {
 				(err, env, fileDependencies) => {
 					if (err) return callback(err);
 
-					const definitions = formatDefinitions(env || {});
+					const definitions = envToDefinitions(env || {});
-					const DefinePlugin = compiler.webpack.DefinePlugin;
+					definePlugin.definitions = definitions;
-
-					new DefinePlugin(definitions).apply(compiler);
 					fileDependenciesCache = fileDependencies;
 
 					callback();