@tangelo/tangelo-configuration-toolkit 1.9.1 → 1.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangelo/tangelo-configuration-toolkit",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Tangelo Configuration Toolkit is a command-line toolkit which offers support for developing a Tangelo configuration.",
   "bin": {
     "tct": "bin/index.js",
@@ -41,7 +41,7 @@
     "node-ssh": "^12.0.2",
     "object-assign-deep": "^0.4.0",
     "p-limit": "^3.1.0",
-    "replace-in-file": "^3.4.4",
+    "replace-in-file": "^6.3.2",
     "sass": "^1.43.5",
     "saxon-js": "^2.3.0",
     "ssh2-sftp-client": "^7.2.2",

package/src/lib/gulp-sftp.js

@@ -25,7 +25,7 @@ module.exports = function(ftpConfig, remotedir) {
       if (!files[0]) cb();
 
       const paths = [...new Set(files.map(({destination}) => path.dirname(destination)))] // collect unique paths
-        .filter((p1, i, a) => !a.find(p2 => p1 != p2 && p2.includes(p1))) // remove paths being part of others
+        .filter((p1, i, a) => !a.find(p2 => p1 != p2 && p2.includes(p1+'/'))) // remove paths being part of others
       ;
 
       sftp.connect(ftpConfig)

package/src/modules/migrate/steps.js

@@ -2,10 +2,10 @@ const fs        = require('fs-extra');
 const globby    = require('globby');
 const minimatch = require('minimatch');
 const path      = require('path');
-const rif       = require('replace-in-file');
+const rif      = require('replace-in-file');
 
 
-const getPaths  = (search, filter)  =>
+const getPaths = (search, filter) =>
   globby
   .sync(search, {dot: true, ignore: [_paths.tdi + '/**','**/cmscustom/tdi/**']})
   .filter(p => !filter || minimatch(p, filter)
@@ -47,9 +47,11 @@ module.exports = function steps (step, dry, filter) {
         r.to    = r.fromtoPairs.map(p => p[1]);
       }
 
-      r.files = rif.sync(r);                                                // execute first time
-      const filesModCount = r.files.length;                                 // save file count
-      for (let i=0; i<20 && !dry && r.files[0]; i++) r.files = rif.sync(r); // execute repeatedly for modified files only (with safety limit of 20)
+      let filesModCount;
+      for (let i=0; i<20 && !dry && r.files[0]; i++) { // execute repeatedly for modified files only (with safety limit of 20)
+        r.files = rif.sync(r).filter(f => f.hasChanged).map(f => f.file);
+        if (i==0) filesModCount = r.files.length; // save count only after first run (after this only subsets are processed)
+      }
 
       _write('Files modified:', filesModCount);
     });