fix: call runScript only when relevant script exists for main package

dominykas · Feb 11, 2019 · 964ff7e · 964ff7e
1 parent d36866a
commit 964ff7e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -51,6 +51,10 @@ internals.queue = (tree) => {
 
 internals.runScript = (stage, { pkg, path, cwd, unsafePerm }, options) => {
 
+    if (!pkg.scripts || !pkg.scripts[stage]) {
+        return;
+    }
+
     console.log();
 
     if (options.dryRun) {
@@ -154,21 +158,15 @@ exports.run = async (options) => {
     await internals.runScript('preinstall', { pkg, path: '', cwd, unsafePerm: true }, options);
 
     for (const { path, childPkg } of allowedPackages) {
-        if (childPkg.scripts.preinstall) {
-            await internals.runScript('preinstall', { pkg: childPkg, path, cwd }, options);
-        }
+        await internals.runScript('preinstall', { pkg: childPkg, path, cwd }, options);
     }
 
     for (const { path, childPkg } of allowedPackages) {
-        if (childPkg.scripts.install) {
-            await internals.runScript('install', { pkg: childPkg, path, cwd }, options);
-        }
+        await internals.runScript('install', { pkg: childPkg, path, cwd }, options);
     }
 
     for (const { path, childPkg } of allowedPackages) {
-        if (childPkg.scripts.postinstall) {
-            await internals.runScript('postinstall', { pkg: childPkg, path, cwd }, options);
-        }
+        await internals.runScript('postinstall', { pkg: childPkg, path, cwd }, options);
     }
 
     await internals.runScript('install', { pkg, path: '', cwd, unsafePerm: true }, options);

diff --git a/test/fixtures/deep.json b/test/fixtures/deep.json
@@ -6,6 +6,7 @@
     "@example/basic": "*",
     "@example/with-preinstall-script": "*"
   },
+  "scripts": {},
   "allowScripts": {
     "@example/basic": "*",
     "@example/with-preinstall-script": "*",

diff --git a/test/index.js b/test/index.js
@@ -76,8 +76,11 @@ describe('allow-scripts', () => {
             await Allow.run({});
 
             expect(fixture.getActualResult()).to.equal(Fixtures.expectedResults.deep);
-            expect(fixture.getLog()).not.to.contain('without-scripts');
-            expect(fixture.getLog()).not.to.contain('without-install-scripts');
+
+            const log = fixture.getLog();
+            expect(log).not.to.contain('without-scripts');
+            expect(log).not.to.contain('without-install-scripts');
+            expect(log).not.to.contain('install @example/deep');
         });
 
         it('executes allowed scripts (skips cycles)', async () => {