@tangelo/tangelo-configuration-toolkit 1.10.2 → 1.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangelo/tangelo-configuration-toolkit",
-  "version": "1.10.2",
+  "version": "1.10.3",
   "description": "Tangelo Configuration Toolkit is a command-line toolkit which offers support for developing a Tangelo configuration.",
   "bin": {
     "tct": "bin/index.js",

package/src/lib/worker-with-spinner.js

@@ -20,6 +20,7 @@ module.exports = function workerWithSpinner (spinnerTxt, workerFn, postMsg, onMe
       onMessageFn(msg);
       resolve();
     });
+    worker.on('error', err => _error('\n' + err.stdout));
     worker.postMessage(postMsg);
   });
 

package/src/modules/deploy/index.js

@@ -76,8 +76,8 @@ module.exports = function deploy (argv) {
             // 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) ||
-            /fonto[\\\/]dist/.test(filepath) ||
-            (/fonto[\\\/]dev/.test(filepath) && c.envDev) ||
+            /fonto[\\\/]dist[\\\/]/.test(filepath) ||
+            (/fonto[\\\/]dev[\\\/]/.test(filepath) && c.envDev) ||
             /fonto[\\\/]packages[\\\/]sx-shell-.*?[\\\/]assets[\\\/]schemas[\\\/]/.test(filepath)
           )
       ) {

package/src/modules/fonto/commands.js

@@ -149,7 +149,7 @@ module.exports = {
       // execute "fdt elements" for each schema package, ignore default elements, and combine results
       const schemasPerElement = {};
       Object.entries(rootSchemas).forEach(([path, obj]) => {
-        const data            = execSync(`fdt elements --schema ${obj.packageName} -C name`, {encoding: 'UTF-8'});
+        const data            = execSync(`fdt elements --schema packages/${obj.packageName}/src/assets/schemas/${obj.packageName}.json -C name`, {encoding: 'UTF-8'});
         const elements        = data.replace(/^.*?Name\*|Printed name\*.*$/gs, '').split(/\s+/);
         const customElements  = [...new Set(elements)].filter(e => e && !ignoreElements.includes(e));
 
@@ -195,7 +195,7 @@ module.exports = {
       // execute "fdt attributes" for each schema package, ignore default attributes, and combine results
       const schemasPerAttribute = {};
       Object.entries(rootSchemas).forEach(([path, obj]) => {
-        const data              = execSync(`fdt attributes --schema ${obj.packageName}`, {encoding: 'UTF-8'});
+        const data              = execSync(`fdt attributes --schema packages/${obj.packageName}/src/assets/schemas/${obj.packageName}.json`, {encoding: 'UTF-8'});
         const attributes        = data.replace(/^.*?Default value\s+|\s+Printed name\*.*$/gs, '').split(/\n\s+/).map(a => a.split(/\s+/)).map(a =>
           a[0] + (a[2]=='required' ? ' (required)' : '') + (a[3]=='-' ? ' (no default)' : '')
         );