@tangelo/tangelo-configuration-toolkit 1.8.0-beta.3 → 1.8.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangelo/tangelo-configuration-toolkit",
-  "version": "1.8.0-beta.3",
+  "version": "1.8.0-beta.4",
   "description": "Tangelo Configuration Toolkit is a command-line toolkit which offers support for developing a Tangelo configuration.",
   "bin": {
     "tct": "bin/index.js",
@@ -34,15 +34,14 @@
     "gulp-plumber": "^1.2.1",
     "gulp-print": "^5.0.2",
     "gulp-sass": "^5.0.0",
-    "gulp-simple-rename": "^0.1.3",
     "gulp-sourcemaps": "^3.0.0",
     "inquirer": "^8.2.0",
     "istextorbinary": "^6.0.0",
     "minimatch": "^3.0.4",
     "node-ssh": "^12.0.2",
     "object-assign-deep": "^0.4.0",
-    "replace-in-file": "^6.0.0",
-    "sass": "^1.43.4",
+    "replace-in-file": "^3.4.4",
+    "sass": "^1.43.5",
     "saxon-js": "^2.3.0",
     "scp2": "^0.5.0",
     "tiny-lr": "^2.0.0",

package/src/modules/deploy/execute.js

@@ -2,17 +2,15 @@ const fs            = require('fs-extra');
 const globby        = require('globby');
 const gulp          = require('gulp');
 const {NodeSSH}     = require('node-ssh');
-const path          = require('path');
 const through2      = require('through2');
 const {spawnSync}   = require('child_process');
 
-const g_babel       = require('gulp-babel');
 const g_babel_env   = require('babel-preset-es2015-without-strict');
+const g_babel       = require('gulp-babel')({presets: [g_babel_env], comments: false, minified: true});
 const g_eol         = require('gulp-eol');
 const g_filter      = require('gulp-filter');
 const g_plumber     = require('gulp-plumber');
 const g_print       = require('gulp-print');
-const g_rename      = require('gulp-simple-rename');
 const g_replace     = require('../../lib/gulp-batch-replace-with-filter');
 const g_resolveIncl = require('../../lib/gulp-resolve-includes');
 const g_sass        = require('gulp-sass')(require('sass'));
@@ -157,7 +155,7 @@ const transfer = (paths, lrServer) => {
   .pipe(xpsF.restore)
   .pipe(jsF)
   .pipe(g_sourcemaps.init())
-  .pipe(g_babel({ presets: [g_babel_env], comments: false, minified: true }))
+  .pipe(g_babel)
   .pipe(g_sourcemaps.write('.'))
   .pipe(jsF.restore)
   .pipe(sassF)
@@ -170,8 +168,8 @@ const transfer = (paths, lrServer) => {
   .pipe(shF.restore)
   .pipe(g_plumber.stop())
   .pipe(g_replace(c.replaceStrings))
-  .pipe(g_rename(path => path.replace(/fonto[\\\/]dist/, 'fonto').replace(/(fonto[\\\/]).+(assets[\\\/]schemas)/, '$1$2'))) // change destination path for fonto build and schemas
   .pipe(through2.obj((file, enc, cb) => {
+    if (file.path.match(/fonto[\\\/]dist/)) file.path = file.path.replace(/fonto[\\\/]dist/, 'fonto'); // change destination path for fonto build
     if (!file.relative.endsWith('.map')) files.push(file.relative); // collect all file paths in array for livereload
     cb(null, file);
   }))

package/src/modules/migrate/steps.js

@@ -5,7 +5,6 @@ const path      = require('path');
 const rif       = require('replace-in-file');
 
 
-const rifSync   = (options)         => rif.sync(options).filter(result => result.hasChanged).map(result => result.file);
 const getPaths  = (search, filter)  =>
   globby
   .sync(search, {dot: true, ignore: [_paths.tdi + '/**','**/cmscustom/tdi/**']})
@@ -48,9 +47,9 @@ module.exports = function steps (step, dry, filter) {
         r.to    = r.fromtoPairs.map(p => p[1]);
       }
 
-      r.files = rifSync(r);                                                 // execute first time
+      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 = rifSync(r);  // execute repeatedly for modified files only (with safety limit of 20)
+      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)
 
       _write('Files modified:', filesModCount);
     });