@rpcbase/cli 0.186.0 → 0.188.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.186.0",
+  "version": "0.188.0",
   "type": "module",
   "files": [
     "src"

package/src/cmd-deploy/index.js

@@ -43,6 +43,14 @@ const sharedInfrastructureIncludePatterns = [
 
 const sharedInfrastructureExcludePatterns = [
   "/infrastructure/data/***",
+  "/infrastructure/mongot/config.yml",
+  "/infrastructure/mongot/passwordFile",
+]
+
+const generatedInfrastructureExcludePatterns = [
+  "data/",
+  "mongot/config.yml",
+  "mongot/passwordFile",
 ]
 
 const toArray = (value) => {
@@ -58,6 +66,8 @@ const resolveFrom = (baseDir, value) => (
   path.isAbsolute(value) ? value : path.resolve(baseDir, value)
 )
 
+const installCommand = "if [ -f package-lock.json ] || [ -f npm-shrinkwrap.json ]; then npm ci; elif [ -f package.json ]; then npm install --package-lock=false --no-audit --no-fund; fi"
+
 const toRelativePattern = (baseDir, value) => {
   const resolved = resolveFrom(baseDir, value)
   const relative = path.relative(baseDir, resolved)
@@ -145,7 +155,7 @@ const prepareDeploySource = ({
       const infrastructureRsyncCmd = [
         "rsync -a",
         "--delete",
-        buildRsyncFilterArgs({ excludes: baseExcludeList.concat(["data/"]).concat(excludePatterns) }),
+        buildRsyncFilterArgs({ excludes: baseExcludeList.concat(generatedInfrastructureExcludePatterns).concat(excludePatterns) }),
         shellQuote(withTrailingSlash(infrastructureDir)),
         shellQuote(withTrailingSlash(deployInfrastructureDir)),
       ].filter(Boolean).join(" ")
@@ -402,7 +412,7 @@ export const deploy = async (argv) => {
         syncSharedEnvFiles(deployRoot, preparedDeploy.sharedEnvFileNames)
 
         const infrastructureExcludeArgs = baseExcludeList
-          .concat(["data/"])
+          .concat(generatedInfrastructureExcludePatterns)
           .concat(deployExcludePatterns)
 
         const infrastructureRsyncCmd = [
@@ -416,7 +426,7 @@ export const deploy = async (argv) => {
 
         log(`Running: ${infrastructureRsyncCmd}`)
         execSync(infrastructureRsyncCmd, { stdio: argv.verbose ? "inherit" : "ignore" })
-        await ssh(`cd ~/apps/${baseDeployDir}/infrastructure && [ -f package.json ] && npm ci || true`)
+        await ssh(`cd ~/apps/${baseDeployDir}/infrastructure && ${installCommand}`)
         console.log("Refreshing shared infrastructure before deploying the inactive app instance.")
         await ssh(`cd ~/apps/${baseDeployDir}/infrastructure && for f in ensure-*.js; do [ -f "$f" ] || continue; node "$f"; done && node ctrl.js up-infra prod`, true)
       }
@@ -452,7 +462,7 @@ export const deploy = async (argv) => {
         }
         await runInstanceAction("down", activeInstance)
       } else {
-        await ssh(`cd ~/apps/${deployDir}/infrastructure && [ -f package.json ] && npm ci || true`)
+        await ssh(`cd ~/apps/${deployDir}/infrastructure && ${installCommand}`)
         log("Restarting application...")
         await ssh(`cd ~/apps/${deployDir}/infrastructure && node ctrl.js down prod`, true)
         log("Application stopped. Starting it up again...")