@eui/tools 6.12.16 → 6.12.18

package/.version.properties

@@ -1 +1 @@
-6.12.16
+6.12.18

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.12.18 (2023-06-24)
+
+##### Bug Fixes
+
+* **other:**
+  * license key injection - metadata export on build for remote - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([c575f414](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c575f414189b6a1306ca4652088a390bd749d3a2))
+
+* * *
+* * *
+## 6.12.17 (2023-06-24)
+
+##### Bug Fixes
+
+* **other:**
+  * added ag-grid license injection for v15 up remotes - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([72e3f699](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/72e3f69973c2f8ae604a8fc000a418d1d6849ad4))
+
+* * *
+* * *
 ## 6.12.16 (2023-06-24)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/init/remotes/16.x/full/options/ag-grid/main.ts

@@ -0,0 +1,15 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { AppModule } from './app/module';
+import { environment } from './environments/environment';
+if (environment.production) {
+    enableProdMode();
+}
+
+import { LicenseManager } from 'ag-grid-enterprise';
+// tslint:disable-next-line
+LicenseManager.setLicenseKey(LICENSE_KEY);
+
+platformBrowserDynamic()
+    .bootstrapModule(AppModule)
+    .catch(err => console.log(err));

package/scripts/csdr/init/remotes.js

@@ -192,6 +192,11 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
         if (!remote.skeletonConfig.options) {
           definitionsContent.push('StoreModule.forRoot(TOKEN, { metaReducers })');
 
+          // ag-grid license specific main.ts
+          // 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);
+          }
 
         // if options, all options are checked and default modules defs are injected following certain conditions
         } else {
@@ -247,12 +252,6 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
             }
             tools.replaceInPath(remoteSrcPath, '<!-- BLOCK_CONTAINER_PLACEHOLDER -->', blockContainerPlaceholder);
           }
-
-          // ag-grid license specific main.ts
-          // license token is replaced at post-install, we get it from the remote root UI pkg assets at specific location
-          if (remote.skeletonConfig.options.aggridLicenseInjection) {
-            tools.copy(optionAgGridPath, remoteSrcPath);
-          }
         }
 
         // replace option in module.ts placeholders

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

@@ -28,21 +28,26 @@ module.exports.installPackage = (prj, pkg, isMaster) => {
 }
 
 module.exports.installRemote = (pkg, envTarget, compositeType) => {
+  let deps;
+
   return Promise.resolve()
     // checking remotes
     .then(() => {
       return innerRemotes.installDeps(pkg, envTarget, compositeType);
     })
-
-    // returning metadata dependencies
-    .then((deps) => {
-      return deps;
+    .then((outputDeps) => {
+      deps = outputDeps;
     })
 
     .then(() => {
       return innerRemotes.postInstall(pkg);
     })
 
+    // returning metadata dependencies
+    .then(() => {
+      return deps;
+    })
+
     .catch((e) => {
       throw e;
     })

package/scripts/csdr/install/remotes.js

@@ -184,14 +184,14 @@ module.exports.installDeps = (pkg, envTarget, compositeType) => {
       return;
     }
 
-    if (!pkg.skeletonConfig.options) {
-      return;
-    }
-
-    if (pkg.skeletonConfig.options.aggridLicenseInjection) {
+    if (pkg.skeletonConfig.aggridLicenseInjection) {
       return Promise.resolve()
       .then(() => {
-        const rootPkgLicensePath = path.join(pkg.paths.repoNodeModules, 'assets', 'ag-grid-license', 'license.json');
+        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';
@@ -202,7 +202,8 @@ module.exports.installDeps = (pkg, envTarget, compositeType) => {
         tools.logInfo(`license key found : ${license}`);
 
         const mainTsPath = path.join(pkg.paths.src, 'main.ts');
-        tools.replaceInFileSync(mainTsPath, '@ag-grid-license@', license);
+        console.log(`replacing in ${mainTsPath}`);
+        tools.replaceInFileSync(mainTsPath, 'LICENSE_KEY', license);
 
         tools.logSuccess('OK => main.ts replaced');
       })