@eui/tools 6.12.21 → 6.12.23

package/.version.properties

@@ -1 +1 @@
-6.12.21
+6.12.23

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.12.23 (2023-06-26)
+
+##### Bug Fixes
+
+* **other:**
+  * license key injection - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([92ab18cd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/92ab18cdd86d4b44637b60a4a728242506a0a6fe))
+
+* * *
+* * *
+## 6.12.22 (2023-06-26)
+
+##### Bug Fixes
+
+* **other:**
+  * ag-grid license injection race condition - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([7337d6ed](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/7337d6eddba6419f0aa6405abef3a2e03cd4ffdf))
+
+* * *
+* * *
 ## 6.12.21 (2023-06-26)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/init/remotes.js

@@ -196,6 +196,28 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
           // license token is replaced at post-install, we get it from the remote root UI pkg assets at specific location
           if (remote.skeletonConfig.aggridLicenseInjection) {
             tools.copy(optionAgGridPath, remoteSrcPath);
+
+            const rootPkgLicensePath = path.join(
+              remote.paths.repoNodeModules,
+              remote.skeletonConfig.rootNpmPkg,
+              'assets', 'ag-grid-license', 'license.json'
+            );
+
+            if (tools.isFileExists(rootPkgLicensePath)) {
+              const licenseJSON = tools.getJsonFileContent(rootPkgLicensePath);
+              const license = licenseJSON.license;
+              tools.logInfo(`license key found : ${license}`);
+
+              const mainTsPath = path.join(remote.paths.src, 'main.ts');
+              console.log(`replacing in ${mainTsPath}`);
+              tools.replaceInFileSync(mainTsPath, 'LICENSE_KEY_VALUE', license);
+
+              tools.logInfo('main.ts content after replacement : ');
+              const mainTsContent = tools.getFileContent(mainTsPath);
+              console.log(mainTsContent);
+
+              tools.logSuccess('OK => main.ts replaced');
+            }
           }
 
         // if options, all options are checked and default modules defs are injected following certain conditions

package/scripts/csdr/install/build-package.js

@@ -39,10 +39,6 @@ module.exports.installRemote = (pkg, envTarget, compositeType) => {
       deps = outputDeps;
     })
 
-    .then(() => {
-      return innerRemotes.postInstall(pkg);
-    })
-
     // returning metadata dependencies
     .then(() => {
       return deps;

package/scripts/csdr/install/remotes.js

@@ -171,49 +171,3 @@ module.exports.installDeps = (pkg, envTarget, compositeType) => {
       throw e;
     })
   }
-
-
-  module.exports.postInstall = (pkg) => {
-    tools.logTitle('Executing post-install for remote skeleton replacement fetched from root UI package');
-
-    if (!pkg.fullSkeletonSources) {
-      return;
-    }
-
-    if (!pkg.skeletonConfig) {
-      return;
-    }
-
-    if (pkg.skeletonConfig.aggridLicenseInjection) {
-      return Promise.resolve()
-      .then(() => {
-        const rootPkgLicensePath = path.join(
-          pkg.paths.repoNodeModules,
-          pkg.skeletonConfig.rootNpmPkg,
-          'assets', 'ag-grid-license', 'license.json'
-        );
-
-        if (!tools.isFileExists(rootPkgLicensePath)) {
-          throw 'NO_LICENSE_FILE_FOUND';
-        }
-
-        const licenseJSON = tools.getJsonFileContent(rootPkgLicensePath);
-        const license = licenseJSON.license;
-        tools.logInfo(`license key found : ${license}`);
-
-        const mainTsPath = path.join(pkg.paths.src, 'main.ts');
-        console.log(`replacing in ${mainTsPath}`);
-        tools.replaceInFileSync(mainTsPath, 'LICENSE_KEY_VALUE', license);
-
-        tools.logInfo('main.ts content after replacement : ');
-        const mainTsContent = tools.getFileContent(mainTsPath);
-        console.log(mainTsContent);
-
-        tools.logSuccess('OK => main.ts replaced');
-      })
-
-      .catch((e) => {
-        throw e;
-      })
-    }
-  }