@eui/tools 6.3.32 → 6.3.33

package/.version.properties

@@ -1 +1 @@
-6.3.32
+6.3.33

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.3.33 (2023-02-14)
+
+##### Chores
+
+* **other:**
+  * adapted post-build operation for remote v15 - cleanup unused assets - testing remotes imports for MWP playground devX - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([f11ffff8](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f11ffff88b66a3a78591d847151ce9edb946c70f))
+
+* * *
+* * *
 ## 6.3.32 (2023-02-14)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -1134,12 +1134,17 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //     console.log(e);
 //   })
 
-Promise.resolve()
-  .then(() => {
-    // const remotes = configUtils.remotes.getRemotes();
-    // console.log(remotes);
-    return installUtils.remotes.installDeps();
-  })
+// const prj = configUtils.projects.getCsdrProject('my-workplace-host-playground');
+
+// Promise.resolve()
+//   .then(() => {
+//     return installUtils.projects.getLocalProjectRemoteDeps(prj);
+//   })
+//   .then((deps) => {
+//     return installUtils.projects.importLocalProjectRemotes(prj, deps);
+//   })
+//   .then(() => {
+//   })
 
 
 // Promise.resolve()
@@ -1152,4 +1157,14 @@ Promise.resolve()
 //   })
 
 
+Promise.resolve()
+  .then(() => {
+    const remote = configUtils.remotes.getRemote('cc-task-centre-eui15-remote-el-ui');
+    return buildPackageUtils.element.postBuild(remote, '1.0.0');
+  })
+  .then(() => {
+    console.log('ok');
+  })
+
+
 

package/scripts/csdr/config/packages.js

@@ -72,9 +72,11 @@ module.exports.getPackageByNpmPkg = (npmPkg, fromCsdrConfig) => {
 }
 
 module.exports.isLocalPackage = (npmPkg) => {
-  return getPackages().filter((p) => {
-    return p.npmPkg === npmPkg
-  })[0] !== null;
+  tools.logInfo(`Checking if ${npmPkg} is localled installed`);
+
+  const packagesFound = getPackages().filter(p => p.npmPkg === npmPkg);
+
+  return packagesFound.length > 0;
 }
 
 

package/scripts/csdr/config/remotes.js

@@ -19,8 +19,6 @@ module.exports.getRemote = (remoteName) => {
     remoteName = tools.getArgs().root;
   }
 
-  tools.logInfo(`Getting remote config for ${remoteName}`);
-
   const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
   const remoteConfig = remotesConfig[remoteName];
 
@@ -83,7 +81,14 @@ module.exports.getCsdrRemotes = (hostName, euiVersion) => {
     }
   }
 
-  tools.logInfo(`Getting remotes for host: ${hostName} - euiVersion: ${euiVersion}`);
+  tools.logInfo(`Getting remotes`);
+
+  if (hostName) {
+    tools.logInfo(`--- for host: ${hostName}`);
+  }
+  if (euiVersion) {
+    tools.logInfo(`--- for euiVersion: ${euiVersion}`);
+  }
 
   const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
   const remotesArray = Object.keys(remotesConfig).map((r) => {
@@ -115,3 +120,22 @@ module.exports.getRemotes = () => {
   })
   return outputRemotes;
 }
+
+module.exports.getRemoteByNpmPkg = (npmPkg, fromCsdrConfig) => {
+  let remotes;
+
+  if (fromCsdrConfig) {
+    remotes = this.getCsdrRemotes();
+
+  } else {
+    remotes = this.getRemotes();
+  }
+
+  return remotes.filter((r) => {
+    return r.npmPkg === npmPkg;
+  })[0];
+}
+
+module.exports.isLocalRemote = (npmPkg) => {
+  return this.getRemoteByNpmPkg(npmPkg) !== undefined;
+}

package/scripts/csdr/install/projects.js

@@ -243,15 +243,15 @@ module.exports.importLocalProjectRemotes = (prj, remoteDeps) => {
       tools.logInfo(`Initializing ${remoteDeps.length} remotes`);
 
       remoteDeps.forEach((remoteNpmPkg) => {
-        tools.logInfo(`Checking import for : ${remoteNpmPkg}`);
+        tools.logInfo(`\nChecking import for : ${remoteNpmPkg}`);
 
         // check if package has been installed locally
-        if (configUtils.packages.isLocalPackage(remoteNpmPkg)) {
+        if (configUtils.remotes.isLocalRemote(remoteNpmPkg)) {
           tools.logInfo('remote is installed locally...skipping import');
 
         } else {
-          const pkg = configUtils.packages.getPackageByNpmPkg(remoteNpmPkg, true);
-          const projectElementsPath = path.join(process.cwd(), prj.folder, 'src', 'assets', 'elements', pkg.name, 'bundles');
+          const remote = configUtils.remotes.getRemoteByNpmPkg(remoteNpmPkg, true);
+          const projectElementsPath = path.join(process.cwd(), prj.folder, 'src', 'assets', 'elements', remote.name, 'bundles');
 
           const npmPkgScope = remoteNpmPkg.substr(0, remoteNpmPkg.indexOf('/'));
           const npmPkgName = remoteNpmPkg.substr(remoteNpmPkg.indexOf('/') + 1);

package/scripts/utils/build/package/element.js

@@ -92,11 +92,13 @@ module.exports.build = (pkg, isMaster) => {
 
 
 module.exports.postBuild = (pkg, version) => {
-  tools.logInfo('Executing element post-build...');
+  tools.logTitle('Executing element post-build...');
 
   const remoteEuiVersion = configUtils.packages.getPackageEuiVersion(pkg);
   const euiVersionNumber = remoteEuiVersion.split('.')[0];
 
+  tools.logInfo(`remote: ${pkg.name} - eUI version : ${remoteEuiVersion}`);
+
   if (dryRun) {
     tools.logInfo('DRY-RUN...skipping');
     return;
@@ -127,6 +129,10 @@ module.exports.postBuild = (pkg, version) => {
       return remotesUtils.emptyIndexHtml(path.join(pkg.paths.dist, 'bundles'));
     })
 
+    .then(() => {
+      return remotesUtils.cleanupUnusedAssets(path.join(pkg.paths.dist, 'bundles', 'assets'), euiVersionNumber);
+    })
+
     .catch((e) => {
       throw e;
     })

package/scripts/utils/remotes/remotes-utils.js

@@ -78,3 +78,38 @@ module.exports.emptyIndexHtml = (destPath) => {
       throw e;
     })
 }
+
+
+module.exports.cleanupUnusedAssets = (assetsPath, euiVersionNumber = 10) => {
+  tools.logInfo(`Cleanup unused assets for version : ${euiVersionNumber} in ${assetsPath}`);
+
+  if (euiVersionNumber > 10) {
+
+    return Promise.resolve()
+    .then(() => {
+      return tools.rimraf(path.join(assetsPath, 'ecl'));
+    })
+    .then(() => {
+      return tools.rimraf(path.join(assetsPath, 'icons', 'ionicons'));
+    })
+    .then(() => {
+      return tools.rimraf(path.join(assetsPath, 'icons', 'svg'));
+    })
+    .then(() => {
+      return tools.rimraf(path.join(assetsPath, 'icons', 'svg-src'));
+    })
+    .then(() => {
+      return tools.rimraf(path.join(assetsPath, 'icons', 'flags'));
+    })
+    .then(() => {
+      return tools.rimraf(path.join(assetsPath, 'fonts'));
+    })
+    .then(() => {
+      return tools.rimraf(path.join(assetsPath, 'i18n-eui'));
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+  }
+}

package/scripts/utils/tools.js

@@ -181,6 +181,7 @@ function rmdir(path) {
 }
 
 function rimraf(inputPath) {
+  this.logInfo(`Removing ${inputPath}...`);
   let exec = path.resolve(process.cwd(), 'node_modules', 'rimraf', 'bin.js');
   if (!isFileExists(exec)) {
       // special location when used within eUI CLI