Merge scripts/makeIconkit.js and scripts/updateTranslations.js from master

Fixes the scripts when used as a npm package script

Author: manisandro

scripts/makeIconkit.js

@@ -14,12 +14,18 @@ const readJSON = (filename) => {
     }
 };
 
-const workspaces = readJSON('/package.json').workspaces || [];
+// Determine workspaces / dependencies
+const packageJson = readJSON('/package.json');
+const workspaces = packageJson.workspaces || [];
+const qwcDeps = Object.keys(packageJson.dependencies ?? {qwc2: "0"}).filter(dep => dep.startsWith("qwc"));
 
 let icons = [];
 for (const workspace of workspaces) {
     icons = icons.concat(glob.sync(workspace + "/icons/*.svg"));
 }
+for (const qwcDep of qwcDeps) {
+    icons = icons.concat(glob.sync('node_modules/' + qwcDep + '/icons/*.svg'));
+}
 icons = icons.concat(glob.sync("icons/*.svg"));
 
 // Filter duplicate icons (user icons can override submodule icons, hence reverse)

scripts/updateTranslations.js

@@ -54,7 +54,7 @@ const listDir = (dir, pattern) => {
     let results = [];
     const list = fs.readdirSync(dir);
     list.forEach((file) => {
-        if (file === 'node_modules') {
+        if (file === 'node_modules' || file === 'dist') {
             return;
         }
         const path = dir + '/' + file;
@@ -91,8 +91,10 @@ const updateTsConfig = (topdir, tsconfig, collectedMsgIds = null) => {
     return msgIds;
 };
 
-// Determine workspaces
-const workspaces = readJSON('/package.json').workspaces || [];
+// Determine workspaces / dependencies
+const packageJson = readJSON('/package.json');
+const workspaces = packageJson.workspaces || [];
+const qwcDeps = Object.keys(packageJson.dependencies ?? {qwc2: "0"}).filter(dep => dep.startsWith("qwc"));
 
 // Generate workspace translations
 let collectedMsgIds = new Set();
@@ -143,6 +145,10 @@ for (const lang of config.languages || []) {
     for (const workspace of workspaces) {
         data = merge(data, readJSON('/' + workspace + '/static/translations/' + lang + '.json'));
     }
+    // Merge translations from dependencies
+    for (const qwcDep of qwcDeps) {
+        data = merge(data, readJSON('/node_modules/' + qwcDep + '/static/translations/' + lang + '.json'));
+    }
 
     // Revert to original values for strings specified in overrides
     for (const path of config.overrides || []) {