Merge pull request #27 from FDiskas/patch-1

Update tasks.js
pmadruga · Nov 25, 2019 · c4df2d3 · c4df2d3
2 parents 6c0f790 + d50880a
commit c4df2d3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -46,6 +46,7 @@ This is a combination of the commands suggested in the React Native documentatio
 | Yarn cache           | `yarn cache clean`            | Yes                      | Yes        | true     | --keep-node-modules    |
 | Yarn packages        | `yarn install`                | No                       | Yes        | true     | --keep-node-modules    |
 | NPM cache            | `npm cache verify`            | Yes                      | Yes        | true     | --keep-node-modules    |
+| NPM Install          | `npm ci`                      | Yes                      | Yes        | true     | --keep-node-modules    |
 | iOS build folder     | `rm -rf ios/build`            | Yes                      | Yes        | false    | --remove-iOS-build     |
 | iOS pods folder      | `rm -rf ios/pods`             | Yes                      | Yes        | false    | --remove-iOS-pods      |
 | Android build folder | `rm -rf android/build`        | Yes                      | Yes        | false    | --remove-android-build |

diff --git a/source/index.js b/source/index.js
@@ -40,6 +40,7 @@ options
       executeTask(tasks.wipeNodeModules)
         .then(() => executeTask(tasks.yarnCacheClean))
         .then(() => executeTask(tasks.npmCacheVerify))
+        .then(() => executeTask(tasks.npmInstall))
         .then(() => executeTask(tasks.yarnInstall))
         .then(() => options.getUpdatePods() && executeTask(tasks.updatePods))
         .catch(() => {

diff --git a/source/internals/tasks.js b/source/internals/tasks.js
@@ -51,18 +51,23 @@ const tasks = {
   },
   yarnCacheClean: {
     name: 'yarn cache clean (if yarn is installed)',
-    command: 'yarn cache clean || true',
+    command: 'test -f yarn.lock && yarn cache clean || true',
     args: []
   },
   yarnInstall: {
     name: 'yarn install (if yarn is installed)',
-    command: 'yarn install || true',
+    command: 'test -f yarn.lock && yarn install || true',
     args: []
   },
   npmCacheVerify: {
     name: 'npm cache verify',
     command: 'npm',
     args: ['cache', 'verify']
+  },
+  npmInstall: {
+    name: 'npm ci',
+    command: 'test -f package-lock.json && npm ci || true',
+    args: []
   }
 };
 
@@ -74,7 +79,8 @@ const autoTasks = [
   tasks.wipeTempCaches,
   tasks.wipeNodeModules,
   tasks.yarnCacheClean,
-  tasks.npmCacheVerify
+  tasks.npmCacheVerify,
+  tasks.npmInstall
 ];
 
 module.exports = {