@eui/tools 6.2.22 → 6.2.24

package/.version.properties

@@ -1 +1 @@
-6.2.22
+6.2.24

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.2.24 (2022-11-14)
+
+##### Bug Fixes
+
+* **other:**
+  * configuration injection issues for MWP localdev - wrong pkg declaration - MWP-9010 [MWP-9010](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9010)  ([34f088f9](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/34f088f9aa8c9bc70138bfb0863b64614779f0e0))
+
+* * *
+* * *
+## 6.2.23 (2022-11-14)
+
+##### Bug Fixes
+
+* **other:**
+  * force root project export of gitlab variables - MWP-9010 [MWP-9010](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9010)  ([27a75cec](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/27a75cecd5a2e61ca17ef4c66097335c3e72c604))
+
+* * *
+* * *
 ## 6.2.22 (2022-11-14)
 
 ##### Bug Fixes

package/package.json

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

package/sandbox.js

@@ -1049,10 +1049,15 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //   })
 
 
-Promise.resolve()
-  .then(() => {
-    const prjName = 'my-workplace-host';
-    const project = configUtils.projects.getCsdrProject(prjName);
+// Promise.resolve()
+//   .then(() => {
+//     const prjName = 'my-workplace-host';
+//     const project = configUtils.projects.getCsdrProject(prjName);
+
+//     return injectionUtils.routesReplacement.buildRoutes(project, 'TST', true);
+//   })
+
+const rootDirectory = fs.realpathSync(process.cwd());
+const rootDirectory2 = process.cwd();
 
-    return injectionUtils.routesReplacement.buildRoutes(project, 'TST', true);
-  })
+console.log(rootDirectory, rootDirectory2);

package/scripts/csdr/config/angular.js

@@ -20,8 +20,10 @@ const {
   angularProjectDefFullSkeletonV13,
   angularProjectDefFullSkeletonV14,
   angularProjectDefConfiguration,
+  angularProjectDefConfigurationHost,
   angularProjectDefConfigurationLight,
   angularProjectDefConfigurationOptimized,
+  angularProjectDefConfigurationOptimizedHost,
   angularProjectDefConfigurationOptimizedLight,
   angularPackageDef,
   angularPackageSubEntryDef,
@@ -276,8 +278,13 @@ module.exports.registerAngularProjectDef = (project, build = false, element = fa
           configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimizedLight);
         } else {
           tools.logInfo('Injecting angular configuration file replacement');
-          configurationDef = JSON.stringify(angularProjectDefConfiguration);
-          configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimized);
+          if (project.host) {
+            configurationDef = JSON.stringify(angularProjectDefConfigurationHost);
+            configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimizedHost);
+          } else {
+            configurationDef = JSON.stringify(angularProjectDefConfiguration);
+            configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimized);
+          }
         }
 
         angularConfigFile.configurations.forEach((conf) => {

package/scripts/csdr/config/config-skeletons.js

@@ -1032,6 +1032,38 @@ module.exports.angularProjectDefConfiguration = {
 };
 
 
+module.exports.angularProjectDefConfigurationHost = {
+  "buildOptimizer": false,
+  "optimization": false,
+  "vendorChunk": true,
+  "extractLicenses": false,
+  "sourceMap": true,
+  "namedChunks": true,
+  "fileReplacements": [
+    {
+      "replace": "hosts/@project.name@/src/assets/openid-login-config.json",
+      "with": "hosts/@project.name@/src/assets/@config.filename@"
+    },
+    {
+      "replace": "hosts/@project.name@/src/environments/environment.ts",
+      "with": "hosts/@project.name@/src/environments/environment.@config.key@.ts"
+    },
+    {
+      "replace": "hosts/@project.name@/src/assets/oidc-client.min.js",
+      "with": "node_modules/oidc-client/dist/oidc-client.min.js"
+    },
+    {
+      "replace": "hosts/@project.name@/src/assets/jsrsasign-all-min.js",
+      "with": "node_modules/jsrsasign/lib/jsrsasign-all-min.js"
+    },
+    {
+      "replace": "hosts/@project.name@/src/assets/openid-login.js",
+      "with": "node_modules/@eui/base/assets/openid/openid-login.js"
+    }
+  ]
+};
+
+
 module.exports.angularProjectDefConfigurationLight = {
   "buildOptimizer": false,
   "optimization": false,
@@ -1089,6 +1121,48 @@ module.exports.angularProjectDefConfigurationOptimized = {
   ]
 }
 
+module.exports.angularProjectDefConfigurationOptimizedHost = {
+  "fileReplacements": [
+    {
+      "replace": "hosts/@project.name@/src/assets/openid-login-config.json",
+      "with": "hosts/@project.name@/src/assets/@config.filename@"
+    },
+    {
+      "replace": "hosts/@project.name@/src/environments/environment.ts",
+      "with": "hosts/@project.name@/src/environments/environment.@config.key@.ts"
+    },
+    {
+      "replace": "hosts/@project.name@/src/assets/oidc-client.min.js",
+      "with": "node_modules/oidc-client/dist/oidc-client.min.js"
+    },
+    {
+      "replace": "hosts/@project.name@/src/assets/jsrsasign-all-min.js",
+      "with": "node_modules/jsrsasign/lib/jsrsasign-all-min.js"
+    },
+    {
+      "replace": "hosts/@project.name@/src/assets/openid-login.js",
+      "with": "node_modules/@eui/base/assets/openid/openid-login.js"
+    }
+  ],
+  "optimization": true,
+  "outputHashing": "all",
+  "sourceMap": false,
+  "extractCss": true,
+  "namedChunks": true,
+  "aot": true,
+  "extractLicenses": true,
+  "vendorChunk": false,
+  "buildOptimizer": true,
+  "budgets": [
+      {
+          "type": "initial",
+          "maximumWarning": "2mb",
+          "maximumError": "8mb"
+      }
+  ]
+}
+
+
 
 module.exports.angularProjectDefConfigurationOptimizedLight = {
   "fileReplacements": [

package/scripts/csdr/install/local-dev.js

@@ -12,7 +12,7 @@ const innerProjects = require('./projects');
 const innerPackages = require('./packages');
 
 module.exports.installPackage = (pkgName) => {
-  pkg = configUtils.packages.getPackage(pkgName, false, true);
+  const pkg = configUtils.packages.getPackage(pkgName, false, true);
 
   return Promise.resolve()
     .then(() => {

package/scripts/csdr/metadata/package-history.js

@@ -96,7 +96,7 @@ const storeMetadata = (pkg, diffMetadata, newVersion) => {
         tools.logInfo(`Unique issues found for this version : ${issuesList}`);
 
         if (!dryRun) {
-          return pipelineUtils.setVariables(pkg.paths.root, `export ISSUES_LIST=${issuesList}\n`);
+          return pipelineUtils.setVariables(process.cwd(), `export ISSUES_LIST=${issuesList}\n`);
         }
       }
     })

package/scripts/csdr/release/package/common.js

@@ -609,7 +609,7 @@ module.exports.exportPipelineVariables = (pkg, compositeType) => {
         utils.tools.logWarning('dryRun...skipping export');
       } else {
         utils.tools.logInfo('Exporting appTarget variable');
-        return utils.pipeline.setVariables(pkg.paths.root, variablesContent);
+        return utils.pipeline.setVariables(process.cwd(), variablesContent);
       }
     }
   })

package/scripts/utils/pre-build/injection/externals.js

@@ -133,18 +133,6 @@ const injectExternalAppRootCore = (project, build = false, injectedNpmPkg, injec
           return tools.copydirFiles(appRootSrcPath, projectRootPath, true);
         })
 
-        .then(() => {
-          tools.logInfo('Check angular-config.json replacement of project');
-
-          const angularConfigFile = path.join(projectRootPath, 'angular-config.json');
-          let angularConfigJson = tools.getJsonFileContent(angularConfigFile);
-          angularConfigJson = JSON.stringify(angularConfigJson, null, 2);
-
-          angularConfigJson = tools.replaceAll(angularConfigJson, '@project.name@', project.name);
-
-          return tools.writeFileContent(angularConfigFile, angularConfigJson);
-        })
-
         .catch((e) => {
           throw e;
         })
@@ -252,6 +240,19 @@ module.exports.injectExternalAppSources = (project, build = false, init = false)
         })
       }
     })
+
+    .then(() => {
+      tools.logInfo('Check angular-config.json replacement of project');
+
+      const angularConfigFile = path.join(process.cwd(), project.folder, 'angular-config.json');
+      delete require.cache[angularConfigFile];
+      let angularConfigJson = tools.getJsonFileContent(angularConfigFile);
+      angularConfigJson = JSON.stringify(angularConfigJson, null, 2);
+      angularConfigJson = tools.replaceAll(angularConfigJson, '@project.name@', project.name);
+
+      return tools.writeFileContent(angularConfigFile, angularConfigJson);
+    })
+
     .catch((e) => {
       throw e;
     })