@tangelo/tangelo-configuration-toolkit 1.22.1 → 1.23.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangelo/tangelo-configuration-toolkit",
-  "version": "1.22.1",
+  "version": "1.23.1",
   "engines": {
     "node": ">=14.0.0"
   },
@@ -36,7 +36,7 @@
     "gulp-filter": "^7.0.0",
     "gulp-plumber": "^1.2.1",
     "gulp-print": "^5.0.2",
-    "gulp-sass": "^5.0.0",
+    "gulp-sass": "^6.0.0",
     "gulp-sourcemaps": "^3.0.0",
     "inquirer": "^8.2.0",
     "istextorbinary": "^6.0.0",
@@ -45,7 +45,7 @@
     "object-assign-deep": "^0.4.0",
     "p-limit": "^3.1.0",
     "replace-in-file": "^6.3.2",
-    "sass": "^1.43.5",
+    "sass": "^1.79.0",
     "saxon-js": "^2.5.0",
     "ssh2-sftp-client": "^9.1.0",
     "through2": "^4.0.2",

package/src/cli.js

@@ -34,7 +34,8 @@ module.exports = function cli () {
         init: {alias: 'i', desc: 'Create repository content structure', conflicts: ['p', 's', 'c']},
         project: {alias: 'p', desc: 'Create project configuration', conflicts: ['i', 's', 'c']},
         symlinks: {alias: 's', desc: 'Recreate symlinks to TDI', conflicts: ['p', 'i', 'c']},
-        oxygen: {alias: 'x', desc: 'Create or update oXygen project file (.xpr)', conflicts: ['p', 'i', 'c']}
+        oxygen: {alias: 'x', desc: 'Create or update oXygen project file (.xpr)', conflicts: ['p', 'i', 'c']},
+        file: {alias: 'f', desc: '[hidden] Use preset answers from appconfig', requiresArg: true, hidden: !_devmode}
       },
       handler: require('./modules/build')
     })

package/src/lib/get-repoconfig.js

@@ -7,8 +7,8 @@ module.exports = function getRepoconfig(repoPath) {
   return globby
     .sync('database/config/**/txd_document_types.sql', {cwd: repoPath, absolute: true})
     .map(p => {
-      const dtSqlInsert = fs.readFileSync(p).toString().match(/select(.*?)from/s)[1];
-      const ntSqlInsert = fs.readFileSync(p.replace('txd_document_types', 'txd_node_types')).toString().match(/select(.*?)from/s)[1];
+      const dtSqlInsert = fs.readFileSync(p).toString().match(/select(.*?)from(?=\s+dual)/s)[1];
+      const ntSqlInsert = fs.readFileSync(p.replace('txd_document_types', 'txd_node_types')).toString().match(/select(.*?)from(?=\s+dual)/s)[1];
 
       const dtDisplayName = dtSqlInsert.match(/'([^']+)' display_name/)[1];
       const ntName        = ntSqlInsert.match(/'([^']+)' name/)[1];

package/src/lib/tcl-config.js

@@ -3,7 +3,7 @@ const globby = require('globby');
 const path = require('path');
 const sass = require('sass');
 const SaxonJS = require('saxon-js');
-
+const url = require('url');
 
 module.exports = class TclConfig {
 
@@ -37,8 +37,8 @@ module.exports = class TclConfig {
   static #transformJsonToCss(tclFilePathRel, json, moduleName) {
     this.#jsonToScssFile ??= _modulesTdi.require(this.#JSON_TO_SCSS_FILE_PATH, {message: false});
     const scss = this.#jsonToScssFile(json.project, moduleName);
-    const url = new URL(path.join('file://', path.resolve(tclFilePathRel)));
-    return sass.compileString(scss, {url, style: 'compressed'}).css;
+    const fileUrl = url.pathToFileURL(tclFilePathRel);
+    return sass.compileString(scss, {url: fileUrl, style: 'compressed'}).css;
   }
 
   static #addCssImportToHtml(dir) {

package/src/modules/build/index.js

@@ -37,13 +37,13 @@ module.exports = function build (argv) {
 
   if ((argv.init || argv.project) && _isPre51()) _error('This option only works when using branch release/5.1 and up.');
 
-  const predefinedAnswers = (argv.init === 'file' || argv.project === 'file') ? _appconfig.build : undefined;
+  const predefinedAnswers = argv.file ? _appconfig.build?.[argv.file] : undefined;
   // if not chosen to use predefined values by passing "file", erase the "build" property for old TDI commits
   _appconfig.build = predefinedAnswers;
 
   if (argv.init) _modulesTdi.require('build/init')(createSymlinks, predefinedAnswers);
 
-  if (argv.project === 'file') _modulesTdi.require('build/project').projectNew(createSymlinks, _repoconfig[0], predefinedAnswers);
+  if (argv.project && argv.file) _modulesTdi.require('build/project').projectNew(createSymlinks, _repoconfig[0], predefinedAnswers);
   else if (argv.project) {
     inquirer
       .prompt([{

package/src/modules/deploy/config.js

@@ -51,8 +51,8 @@ function setServer (searchString) {
     if (!(port && parallel && username)) _error('Config is incomplete!');
     this.server.ftpConfig = {
       host, port, parallel, username,
-      agent: process.platform === 'win32' ? 'pageant' : process.env.SSH_AUTH_SOCK,
-      agentForward: process.platform !== 'win32',
+      agent: process.env.SSH_AUTH_SOCK ?? process.platform === 'win32' ? '\\\\.\\pipe\\openssh-ssh-agent' : undefined,
+      agentForward: true,
       readyTimeout: 15000,
       retries: 1
     };

package/src/modules/deploy/index.js

@@ -10,7 +10,7 @@ const c = require('./config');
 const s = require('./srcset');
 const inquirer = require('inquirer');
 
-const checkDeployment = async (ftpConfig) => {
+const checkDeployment = async ftpConfig => {
   const deployToDevServer = /\.dev\./.test( ftpConfig?.host );
   const deployToTestServer = /\.t(e)?st\./.test( ftpConfig?.host );
   const deployToProdServer = c?.deliveryPack || !( deployToDevServer || deployToTestServer );
@@ -39,7 +39,7 @@ const checkDeployment = async (ftpConfig) => {
     _error(`You're not deploying from the most recent commit in branch "${_git.commitLocal().branch}"! Update your repository: ${'tct git --update-repo'.cyan}`);
   }
 
-  // Ask for continuation of deployment for production environements only; and only if not deploying from a prd branch or when there exist uncommitted changes
+  // Ask for continuation of deployment for production environments only; and only if not deploying from a prd branch or when there exist uncommitted changes
   if ( (!isPrdBranch || _git.hasUncommittedFiles()) && deployToProdServer &&
         !( await inquirer.prompt(
           {type: 'confirm', message: 'Are you sure you want to continue?', name: 'confirm', default: false}
@@ -58,9 +58,10 @@ module.exports = async function deploy (argv) {
   c.prepareForCopy(argv.filter);
   const {ftpConfig, remotedir} = c.server;
 
-  // Deployment checks; cancel deployment when checks require
-  const deploy = await checkDeployment(ftpConfig);
-  if (deploy?.cancel) { return; }
+  if (!argv.test && ftpConfig) { // only perform deployment checks when actually transferring to remote server
+    const deploy = await checkDeployment(ftpConfig);
+    if (deploy?.cancel) return;
+  }
 
   if (ftpConfig) {
     const logPath = path.join(remotedir, 'log/deployments.log').toFws;
@@ -68,7 +69,7 @@ module.exports = async function deploy (argv) {
 
     ftpConfig.eventPut = file => {
       _write(file.destination.replace(remotedir, ''));
-      if      (path.extname(file.destination)=='.sh')
+      if      (path.extname(file.destination)==='.sh')
         re.add('chmod 755 '+file.destination, 'Permissions set: '+file.destination);
       else if (file.destination.match(/cmscustom.*hce.*config.xml/))
         re.add('touch '+c.getRemotePath('hce/hce-config.xml'), 'Touched: '+c.getRemotePath('hce/hce-config.xml'));
@@ -134,7 +135,7 @@ module.exports = async function deploy (argv) {
     gulp.watch(c.transferPatterns)
       .on('all', (event, filepath) => {
 
-        if ((event=='add' || event=='change') && (
+        if ((event==='add' || event==='change') && (
         // within fonto, transfer build files only, but also schema files, because
         // the "dist" folder isn't watched properly: it does not detect "assets" anymore after building once
           !/cmscustom.+fonto[\\/]/.test(filepath) ||
@@ -146,7 +147,7 @@ module.exports = async function deploy (argv) {
           transfers.add(filepath);
         }
 
-        else if (event=='unlink' && !/fonto/.test(filepath)) {  // ignore fonto files
+        else if (event==='unlink' && !/fonto/.test(filepath)) {  // ignore fonto files
           s.removeFromCache(filepath);
 
           if (!path.parse(filepath).base.match(/\.scss/)) {
@@ -171,14 +172,14 @@ function deployLogInfo (watch, filter, files, action) {
 
   let logline = `${timestamp} ${action.padEnd(5)} [${user}] [${branch}:${hash.substring(0, 7)}${uncommittedChanges}] [${filter}]`;
 
-  if (action == 'START') {
+  if (action === 'START') {
     if (uncommittedChanges) {
       const uncommittedChanges = _git.status().replace(/\?\?/g, ' U').split('\n');
       logline += '\n  Uncommitted changes:\n    ' + uncommittedChanges.join('\n   ');
     }
     const filepaths = files.map(({destination}) => destination);
     logline += `\n  Transferring ${filepaths.length} file${filepaths.length > 1 ? 's' : ''}`;
-    if (watch || filepaths.length == 1) logline += ':\n    ' + filepaths.join('\n    ');
+    if (watch || filepaths.length === 1) logline += ':\n    ' + filepaths.join('\n    ');
     else logline += ' in dir:\n    ' + getCommonPath(filepaths);
   }
   return logline.replace(/"/g, '\\"');

package/src/modules/git/index.js

@@ -194,6 +194,7 @@ function updateSubmodule({dates = [], updateSubmodule: releaseBranchName}) {
       // update submodule
       const updateSubmoduleMsg = execGitCommand(`submodule update --remote`, _paths.repo);
       if (updateSubmoduleMsg.error) _error(`Update submodule failed\n${updateSubmoduleMsg.error}`);
+      execGitCommand(`add tangelo-default-implementation`, _paths.repo);
       _info(`TDI submodule updated:\n${updateSubmoduleMsg}\n`);
     }