Merge pull request #144 from d0p3t/master

builders: Fix webpack builder lock for multiple configs
citizenfx · Jan 14, 2021 · 7680f31 · 7680f31
2 parents 88f4f97 + e2fe323
commit 7680f31
Show file tree

Hide file tree

Showing 3 changed files with 2,330 additions and 2,328 deletions.
diff --git a/resources/[system]/[builders]/webpack/webpack_builder.js b/resources/[system]/[builders]/webpack/webpack_builder.js
@@ -104,6 +104,8 @@ const webpackBuildTask = {
                         await sleep(3000);
                     }
 
+                    console.log(`${resourceName}: started building ${configName}`);
+
                     buildingInProgress = true;
                     currentBuildingModule = resourceName;
 
@@ -140,7 +142,7 @@ const webpackBuildTask = {
                             }
 
                             console.log(`${resourceName}: built ${configName}`);
-
+                            buildingInProgress = false;
                             resolve();
                         });
                     }));

diff --git a/resources/[system]/[builders]/webpack/webpack_runner.js b/resources/[system]/[builders]/webpack/webpack_runner.js
@@ -1,4 +1,4 @@
-const weebpack = require('webpack');
+const webpack = require('webpack');
 const path = require('path');
 const fs = require('fs');
 
@@ -59,7 +59,7 @@ module.exports = (inp, callback) => {
 
 	config.plugins.push(new SaveStatePlugin(inp));
 
-	weebpack(config, (err, stats) => {
+	webpack(config, (err, stats) => {
 		if (err) {
 			callback(err);
 			return;