@tangelo/tangelo-configuration-toolkit 1.23.1 → 1.23.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/src/lib/get-repoconfig.js +1 -1
  3. package/src/modules/fonto/index.js +1 -1
  4. package/src/modules/info/index.js +2 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tangelo/tangelo-configuration-toolkit",
3
- "version": "1.23.1",
3
+ "version": "1.23.2",
4
4
  "engines": {
5
5
  "node": ">=14.0.0"
6
6
  },
package/src/lib/get-repoconfig.js CHANGED
@@ -12,7 +12,7 @@ module.exports = function getRepoconfig(repoPath) {
12
12
 
13
13
  const dtDisplayName = dtSqlInsert.match(/'([^']+)' display_name/)[1];
14
14
  const ntName = ntSqlInsert.match(/'([^']+)' name/)[1];
15
- const xpiDir = ntSqlInsert.match(/'([^']+)' xsl_prep_inc/)[1];
15
+ const xpiDir = ntSqlInsert.match(/'([^']+)' xsl_prep_inc/)?.[1] ?? dtSqlInsert.match(/'([^']+)' xsl_xincludes/)[1];
16
16
 
17
17
  const path_cmscustom = xpiDir.replace(/\/[^/]+$/, '').split(/\//);
18
18
  const path_dbconfig = p.replace(/.*\/database\/config\/(.*)\/[^/]+/, '$1').split(/[/\\]/);
package/src/modules/fonto/index.js CHANGED
@@ -54,7 +54,7 @@ module.exports = function fonto (argv) {
54
54
  const data = execSync(`${fdtCommand(fontoVersionCurrent)} editor versions`, {encoding: 'UTF-8'});
55
55
  fontoVersionNew = data.match(/\d+\.\d+\.\d+/g).find(v => allowedFontoVersionRegex.test(v));
56
56
  }
57
- else if (!allowedFontoVersionRegex.test(fontoVersionNew)) {
57
+ else if (fontoVersionNew !== 'nightly' && !allowedFontoVersionRegex.test(fontoVersionNew)) {
58
58
  _error(`Fonto version ${fontoVersionNew} is not compatible with the current TDI submodule commit!\nExecute: ${'tct fonto --init latest'.cyan}`);
59
59
  }
60
60
 
package/src/modules/info/index.js CHANGED
@@ -172,7 +172,8 @@ module.exports = function info (argv) {
172
172
  const id = dtRow.match(/(\d+) id/)?.[1];
173
173
  const name = dtRow.match(/'([^']+)' display_name/)?.[1];
174
174
  const dbPath = p.match(/(database\/config\/(:?.*)\/)txd_document_types.sql/i)?.[1];
175
- const prPath = ntSqlInsert.match(/'([^']+)' xsl_prep_inc/)[1].replace('prepare_xincludes.xsl', '');
175
+ const xincl = ntSqlInsert.match(/'([^']+)' xsl_prep_inc/)?.[1] ?? dtRow.match(/'([^']+)' xsl_xincludes/)[1];
176
+ const prPath = xincl.replace('prepare_xincludes.xsl', '');
176
177
 
177
178
  doctypesInfo.addRows([
178
179
  {id, name, paths: 'config/cmscustom/'+ prPath},