@tangelo/tangelo-configuration-toolkit 1.9.0 → 1.9.3

package/index.js

@@ -106,6 +106,7 @@ else {
 }
 
 
+global._tdiSubmoduleExists = fs.existsSync(path.join(_paths.repo, _paths.tdi));
 global._isPre42 = fs.existsSync(path.join(_paths.repo, _paths.tdi, 'create_new_project')); // folder changed in 4.2
 global._isPre51 = !fs.existsSync(path.join(_paths.repo, _paths.tdi, 'src')); // folder changed in 5.1 (check new folder because old one could still exist after branch switch)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangelo/tangelo-configuration-toolkit",
-  "version": "1.9.0",
+  "version": "1.9.3",
   "description": "Tangelo Configuration Toolkit is a command-line toolkit which offers support for developing a Tangelo configuration.",
   "bin": {
     "tct": "bin/index.js",
@@ -17,8 +17,8 @@
   "author": "Iddo Fontijn <iddo.fontijn@tangelo.nl>",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "babel-core": "^6.26.3",
-    "babel-preset-es2015-without-strict": "0.0.4",
+    "@babel/core": "^7.17.4",
+    "@babel/preset-env": "^7.16.11",
     "cli-spinner": "^0.2.10",
     "compare-versions": "^4.1.1",
     "del": "^6.0.0",
@@ -28,7 +28,7 @@
     "global-modules-path": "^2.3.1",
     "globby": "^6.1.0",
     "gulp": "^4.0.2",
-    "gulp-babel": "^7.0.1",
+    "gulp-babel": "^8.0.0",
     "gulp-eol": "^0.2.0",
     "gulp-filter": "^7.0.0",
     "gulp-plumber": "^1.2.1",
@@ -37,11 +37,11 @@
     "gulp-sourcemaps": "^3.0.0",
     "inquirer": "^8.2.0",
     "istextorbinary": "^6.0.0",
-    "minimatch": "^3.0.4",
+    "minimatch": "^5.0.0",
     "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)
@@ -53,7 +53,7 @@ module.exports = function(ftpConfig, remotedir) {
         cb();
         return sftp.end();
       })
-      .catch(err => _error(err));
+      .catch(err => _error(`Could not connect to server${err ? ': '+err.message : ''}`));
     }
 
   )

package/src/modules/deploy/config.js

@@ -54,7 +54,9 @@ module.exports = {
         parallel: serverConfig.config.parallel,
         username: serverConfig.config.username,
         agent: process.platform=='win32' ? 'pageant' : process.env.SSH_AUTH_SOCK,
-        agentForward: process.platform!='win32'
+        agentForward: process.platform!='win32',
+        readyTimeout: 10000,
+        retries: 1
       }
     };
 
@@ -105,7 +107,7 @@ module.exports = {
 
     this.transferPatterns = [transferPattern, tdiPattern, ...this.giPatterns, '!**/*.crdownload']; // ignore patterns must come last
 
-    if (this.deliveryPack && transferPattern.includes(_paths.tdi)) this.transferPatterns.push(`${_paths.tdi}/src/database/create.sql`); // create.sql is called by tdi install
+    if (this.deliveryPack && transferPattern.includes(_paths.tdi)) this.transferPatterns.push(`${_paths.tdi}/src/database/create*.sql`); // create(_exists).sql is called by tdi install
 
     // add time parameters to all xopus requests to overcome cache
     const ts = new Date().toISOString().replace(/-|:/g, '').substring(0,15);

package/src/modules/deploy/execute.js

@@ -1,3 +1,4 @@
+const babel_pe        = require('@babel/preset-env');
 const execGitCommand  = require('../../lib/exec-git-command');
 const fs              = require('fs-extra');
 const globby          = require('globby');
@@ -6,7 +7,6 @@ const {NodeSSH}       = require('node-ssh');
 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');
 const g_eol           = require('gulp-eol');
 const g_filter        = require('gulp-filter');
@@ -156,7 +156,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({presets: [[babel_pe, {modules: false}]], comments: false, minified: true})) // function must be executed here, otherwise second execution during watch fails
   .pipe(g_sourcemaps.write('.'))
   .pipe(jsF.restore)
   .pipe(sassF)

package/src/modules/deploy/index.js

@@ -1,7 +1,8 @@
-const del     = require('del');
-const gulp    = require('gulp');
-const path    = require('path');
-const tinylr  = require('tiny-lr');
+const del         = require('del');
+const gulp        = require('gulp');
+const path        = require('path');
+const sftpClient  = require('ssh2-sftp-client');
+const tinylr      = require('tiny-lr');
 
 const {remote, transfer} = require('./execute');
 const c = require('./config');
@@ -60,6 +61,12 @@ module.exports = function deploy (argv) {
       }
     };
 
+    // check connection
+    if (!c.localTransfer) {
+      const sftp = new sftpClient();
+      sftp.connect(c.server.ftpConfig).then(() => sftp.end()).catch(err => _error(`Could not connect to server${err ? ': '+err.message : ''}`));
+    }
+
     // for fonto, only watch dev/dist (for the build, does not detect "assets" most of the times btw)
     gulp.watch([...c.transferPatterns, `!**/fonto/!(${c.envDev?'dev|':''}dist)/**`])
     .on('all', (event, filepath) => {

package/src/modules/fonto/index.js

@@ -6,18 +6,20 @@ const path      = require('path');
 
 module.exports = function fonto (argv) {
 
+  if (!_tdiSubmoduleExists) _error('TDI submodule folder is missing.');
+
   process.chdir(_paths.apply || '.');
-  
+
   // find fonto instances by searching for manifest.json files having a fonto property
   const fontoPaths = globby.sync(['**/manifest.json', `!${_paths.tdi}/**`])
     .filter(p => (fs.readJsonSync(p, {throws: false}) || {}).edition == 'fontoxml-platform-base')
     .map(p => p.replace('manifest.json', ''))
   ;
-  
+
   if (fontoPaths.length==0) _error('No Fonto instance found.');
-  
+
   let promiseChain = Promise.resolve(); // for sequentially executing commands for each fonto instance
-  
+
   fontoPaths.forEach((p, i) => {
     promiseChain = promiseChain
     .then(() => {
@@ -40,5 +42,5 @@ module.exports = function fonto (argv) {
   .catch(error => {
     if (error) _warn(error.message || error);
   });
-  
+
 };

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);
     });