fix: wait for scripts to finish before running the next one

dominykas · Jan 29, 2019 · 77c8c4c · 77c8c4c
1 parent 04dd93c
commit 77c8c4c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/bin/allow-scripts.js b/bin/allow-scripts.js
@@ -4,4 +4,8 @@
 
 const Allow = require('..');
 
-Allow.run();
+Allow.run().catch((err) => {
+
+    console.error(err);
+    process.exit(1);
+});
diff --git a/lib/index.js b/lib/index.js
@@ -52,7 +52,7 @@ internals.runScript = (stage, { childPkg, path, cwd }) => {
     console.log();
     console.log(`==========> ${stage} ${path}...`);
 
-    Npm.runScript(childPkg, stage, Path.join(cwd, path), {
+    return Npm.runScript(childPkg, stage, Path.join(cwd, path), {
         dir: cwd,
         log: Object.assign({
             pause: () => {},
@@ -66,7 +66,7 @@ internals.runScript = (stage, { childPkg, path, cwd }) => {
     });
 };
 
-exports.run = (cmd = 'install') => {
+exports.run = async (cmd = 'install') => {
 
     const cwd = process.cwd();
     const pkg = require(Path.join(cwd, 'package.json'));
@@ -103,7 +103,15 @@ exports.run = (cmd = 'install') => {
             return allowScripts[name];
         });
 
-    allowedScripts.forEach(([path, childPkg]) =>  internals.runScript('preinstall', { childPkg, path, cwd }));
-    allowedScripts.forEach(([path, childPkg]) =>  internals.runScript('install', { childPkg, path, cwd }));
-    allowedScripts.forEach(([path, childPkg]) =>  internals.runScript('postinstall', { childPkg, path, cwd }));
+    for (const [path, childPkg] of allowedScripts) {
+        await internals.runScript('preinstall', { childPkg, path, cwd });
+    }
+
+    for (const [path, childPkg] of allowedScripts) {
+        await internals.runScript('install', { childPkg, path, cwd });
+    }
+
+    for (const [path, childPkg] of allowedScripts) {
+        await internals.runScript('postinstall', { childPkg, path, cwd });
+    }
 };