@eui/tools 6.12.32 → 6.12.34

package/.version.properties

@@ -1 +1 @@
-6.12.32
+6.12.34

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.12.34 (2023-08-02)
+
+##### Chores
+
+* **other:**
+  * check for already published package on publish script - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([4a0e4db7](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/4a0e4db7bee3d1224285f3d3d61a0b603d61f240))
+
+* * *
+* * *
+## 6.12.33 (2023-07-26)
+
+##### Chores
+
+* **other:**
+  * integrate workspaces links generation on pre-build route replacement - MWP-9751 [MWP-9751](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9751)  ([6ee4edc3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6ee4edc307230443351043877d1d529bb1e199c5))
+
+* * *
+* * *
 ## 6.12.32 (2023-07-24)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.12.32",
+    "version": "6.12.34",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/sandbox.js

@@ -20,6 +20,7 @@ const translationUtils = require('./scripts/utils/pre-build/translations/transla
 const preBuildUtils = require('./scripts/utils/pre-build/pre-build-utils');
 const apiUtils = require('./scripts/utils/api-utils');
 const versionUtils = require('./scripts/csdr/version/version-utils');
+const publishUtils = require('./scripts/utils/publish/publish-utils');
 
 // console.log(configUtils.packages.getPackages());
 // console.log(configUtils.packages.getPackage('eui-tools'));
@@ -1256,13 +1257,44 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //   .catch((e) => {
 //     console.log(e);
 //   })
+// Promise.resolve()
+//   .then(() => {
+//     // old package without gates forced
+//     const pkg = configUtils.packages.getPackage('cc-flex-ui', true);
+//     console.log(pkg);
+
+//     return auditUtils.styles.audit(pkg);
+//   })
+//   .then((report) => {
+//     console.log(report);
+//   })
+
+//   .catch((e) => {
+//     console.log(e);
+//   })
+
+
+
+// BUILD PACKAGE FIRST !!
+
+const pkg = configUtils.packages.getPackage('eui');
+const pkgChild = configUtils.packages.getPackage('eui-base');
+const version = '15.4.1';
+
 Promise.resolve()
   .then(() => {
-    // old package without gates forced
-    const pkg = configUtils.packages.getPackage('cc-flex-ui', true);
-    console.log(pkg);
+    return versionUtils.package.updateVersion(pkg,version);
+  })
+  .then(() => {
+    return buildPackageUtils.postBuild(pkg);
+  })
+  .then(() => {
+    // IF individual child packages have to be published individually
 
-    return auditUtils.styles.audit(pkg);
+    // console.log(pkgChild);
+    // const publishNpmCore = require('./scripts/utils/publish/npm');
+    // return publishNpmCore.publishCore(pkgChild, 'https://registry.npmjs.org', true)
+    return publishUtils.publish(pkg);
   })
   .then((report) => {
     console.log(report);

package/scripts/utils/pre-build/routes-replacement/routes-replacement.js

@@ -106,6 +106,11 @@ const injectRoutesConfig = (project) => {
 
   tools.logInfo(`${routesConfigPath} - injecting in ${project.paths.assetsPath}`);
   tools.copydir(routesConfigPath, project.paths.assetsPath);
+
+  const workspacesConfigPath = path.join(pkgAssetsPath, project.externalRoutesSources.workspacesConfigAssetsPath);
+  tools.logInfo(`${workspacesConfigPath} - injecting in ${project.paths.assetsPath}`);
+  tools.copydir(workspacesConfigPath, project.paths.assetsPath);
+
 };
 
 
@@ -418,6 +423,8 @@ const generateLinks = (project, routes, envTargetFinal) => {
   const routeDefsBaseLinksJSON = require(path.join(project.paths.assetsPath, routeDefsBaseLinksFileName));
   const routeDefsBaseFilename = 'route-defs-base.json';
   const routeDefsBaseJSON = require(path.join(project.paths.assetsPath, routeDefsBaseFilename));
+  const workspaceDefsBaseFilename = 'workspace-defs-base.json';
+  const workspaceDefsBaseJSON = require(path.join(project.paths.assetsPath, workspaceDefsBaseFilename));
 
   const getRouteMenuDef = (link) => {
     let routeDef = null;
@@ -476,11 +483,36 @@ const generateLinks = (project, routes, envTargetFinal) => {
     }
   };
 
+  // global links combining routes links and workspaces links
+  let workspaceLinks = [];
+
+  // Combining workspaces definitions with base links definitions
+
+  workspaceDefsBaseJSON.forEach((wp) => {
+    if (wp.baseLinkDefs) {
+      wp.baseLinkDefs.forEach((wpLink) => {
+        workspaceLinks.push({
+          ...wpLink,
+          workspace: wp.id
+        });
+      });
+    }
+  });
+
+  tools.logInfo('Workspaces links generated :');
+  console.log(workspaceLinks);
+
+  const globalLinks = [
+    ...routeDefsBaseLinksJSON,
+    ...workspaceLinks,
+  ];
+
+
   // processing each link and matching route from routes base data definitions
 
   const linksGenerated = [];
 
-  routeDefsBaseLinksJSON.forEach((link) => {
+  globalLinks.forEach((link) => {
     let newLink = null;
 
     if (link.parentId) {

package/scripts/utils/publish/npm.js

@@ -22,17 +22,28 @@ const getPkgVersion = (pkg) => {
   return version;
 }
 
-const publishCore = (pkg, registry, isPublicAccess) => {
+async function runCommandWithOutput(_args, cwdFolder) {
+  const { error, stdout, stderr } = await execa('npm', _args, { cwd: cwdFolder });
+
+  return {
+    error, stdout, stderr
+  };
+}
+
+const publishCore = module.exports.publishCore = (pkg, registry, isPublicAccess) => {
   tools.logInfo(`Publishing package "${pkg.name}" from "${pkg.paths.publish}" on ${registry}`);
 
-  let command = `npm publish ${pkg.paths.publish} --registry ${registry}`;
+  let args = ['publish', pkg.paths.publish, '--registry', registry];
+
+  // let command = `npm publish ${pkg.paths.publish} --registry ${registry}`;
 
   if (isPublicAccess) {
-    command += ' --access public';
+    args.push('--access public');
+    // command += ' --access public';
   }
 
   if (dryRun) {
-    tools.logInfo(`DRY-RUN: npm publish command to be executed : ${command}`);
+    tools.logInfo(`DRY-RUN: npm publish command to be executed : ${args}`);
 
     return notificationUtils.package.sendPackageMessage({
       package: pkg,
@@ -41,12 +52,16 @@ const publishCore = (pkg, registry, isPublicAccess) => {
 
   } else {
 
-    tools.logInfo(`Executing command : ${command}`);
+    tools.logInfo(`Executing command : ${args}`);
 
     const version = getPkgVersion(pkg);
 
-    return execa.shell(command, { stdio: 'inherit' })
-      .then(() => {
+    return runCommandWithOutput(args, process.cwd())
+    // return execa.shell(command, { stdio: 'inherit' })
+      .then((out) => {
+        tools.logInfo('NPM output');
+        console.log(out.stdout);
+
         tools.logSuccess('OK => Package release succeeded! version : ' + version);
 
         return notificationUtils.package.sendPackageMessage({
@@ -64,19 +79,27 @@ const publishCore = (pkg, registry, isPublicAccess) => {
       })
 
       .catch((e) => {
-        tools.logError(`Error publishing package "${pkg.name}"`);
-        console.log(e);
+        // continue publication of other sub-packages in the same group (eUI f.e.) if one of the sub-packages
+        // have already been published, as npmjs does not allow re-publication of same pkg version
+        if (e.stderr !== undefined && e.stderr.indexOf('You cannot publish over the previously published versions') > -1) {
+          console.log('PACKAGE ALREADY PUBLISHED');
+          return Promise.resolve();
 
-        return notificationUtils.package.sendPackageMessage({
-          package: pkg,
-          version: version,
-          exception: e,
-          title: '[PACKAGE RELEASE FAILED]',
-          subtitle: `Error while publishing Package to *${registry}*`
-        })
-          .then(() => {
-            process.exit(1);
-          });
+        } else {
+          tools.logError(`Error publishing package "${pkg.name}"`);
+          console.log(e.stderr);
+
+          return notificationUtils.package.sendPackageMessage({
+            package: pkg,
+            version: version,
+            exception: e,
+            title: '[PACKAGE RELEASE FAILED]',
+            subtitle: `Error while publishing Package to *${registry}*`
+          })
+            .then(() => {
+              process.exit(1);
+            });
+        }
       });
   }
 }