@tangelo/tangelo-configuration-toolkit 1.8.2 → 1.8.3

package/index.js

@@ -62,7 +62,7 @@ global._packages = {
   TCT: {name: '@tangelo/tangelo-configuration-toolkit', version: require('./package.json')?.version},
   FDT: {name: '@fontoxml/fontoxml-development-tools'}
 }
-_packages.FDT.version = require(`${getPath(_packages.FDT.name)}/package.json`)?.version;
+_packages.FDT.version = fs.readJsonSync(`${getPath(_packages.FDT.name)}/package.json`, {throws: false})?.version;
 
 try { global._appconfig = _paths.appconfig && fs.readJsonSync(_paths.appconfig) || {}; }
 catch({message}) { _error('Error in '+message); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangelo/tangelo-configuration-toolkit",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "description": "Tangelo Configuration Toolkit is a command-line toolkit which offers support for developing a Tangelo configuration.",
   "bin": {
     "tct": "bin/index.js",
@@ -34,7 +34,6 @@
     "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",
@@ -45,6 +44,7 @@
     "sass": "^1.43.5",
     "saxon-js": "^2.3.0",
     "scp2": "^0.5.0",
+    "through2": "^4.0.2",
     "tiny-lr": "^2.0.0",
     "yargs": "^16.2.0"
   },

package/src/cli.js

@@ -10,7 +10,8 @@ const checkForPackageUpdate = (package) => (
   exec(`npm view -g ${_packages[package].name} version`)
   .then(r => {
     const versionAvailable = r.stdout.match(/([\d/.]+)/)[1];
-    if (compare(_packages[package].version, versionAvailable, '<')) {
+    if (!_packages[package].version) _warn(`${package} is not installed! Run ` + `npm i -g ${_packages[package].name}`.white);
+    else if (compare(_packages[package].version, versionAvailable, '<')) {
       updateAppdata({[`updateCheck${package}`]: {executed: new Date(), versionAvailable}});
       return versionAvailable;
     }

package/src/lib/gulp-simple-rename.js

@@ -0,0 +1,11 @@
+// replacement for the official (but deprecated) gulp-simple-rename
+// kept same name because of usage in tdi
+
+const through2  = require('through2');
+
+module.exports = (fn) => {
+  return through2.obj((file, enc, cb) => {
+    file.path = fn(file.path);
+    cb(null, file);
+  });
+};

package/src/modules/deploy/execute.js

@@ -6,7 +6,7 @@ const through2      = require('through2');
 const {spawnSync}   = require('child_process');
 
 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_babel       = require('gulp-babel');
 const g_eol         = require('gulp-eol');
 const g_filter      = require('gulp-filter');
 const g_plumber     = require('gulp-plumber');
@@ -155,7 +155,7 @@ const transfer = (paths, lrServer) => {
   .pipe(xpsF.restore)
   .pipe(jsF)
   .pipe(g_sourcemaps.init())
-  .pipe(g_babel)
+  .pipe(g_babel({presets: [g_babel_env], comments: false, minified: true}))
   .pipe(g_sourcemaps.write('.'))
   .pipe(jsF.restore)
   .pipe(sassF)
@@ -169,7 +169,7 @@ const transfer = (paths, lrServer) => {
   .pipe(g_plumber.stop())
   .pipe(g_replace(c.replaceStrings))
   .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
+    file.path = file.path.replace(/(fonto)(?:[\\\/]dist|.+([\\\/]assets[\\\/]schemas))/, '$1$2'); // change destination path for fonto build and schemas
     if (!file.relative.endsWith('.map')) files.push(file.relative); // collect all file paths in array for livereload
     cb(null, file);
   }))