@eui/tools 6.13.6 → 6.13.8

package/.version.properties

@@ -1 +1 @@
-6.13.6
+6.13.8

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.13.8 (2023-11-13)
+
+##### Chores
+
+* **other:**
+  * adapted for non-esbuild MWP v17 angular injected config - EUI-7843 [EUI-7843](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7843)  ([cb64af60](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/cb64af609496abad3e1459bd46c0b72316183b97))
+
+* * *
+* * *
+## 6.13.7 (2023-11-06)
+
+##### Chores
+
+* **other:**
+  * updated to forced deps for MWP releases v16 and v10 on multi-environments - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([04de9b3e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/04de9b3eadaaf712368cb15459e3d34337d23034))
+
+* * *
+* * *
 ## 6.13.6 (2023-10-26)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -1344,12 +1344,23 @@ const publishUtils = require('./scripts/utils/publish/publish-utils');
 //     console.log(e);
 //   })
 
+// Promise.resolve()
+//   .then(() => {
+//     const util = require('./scripts/csdr/release/package/common');
+//     const branches = util.getBranches();
+//     console.log(branches);
+//   })
+//   .catch((e) => {
+//     console.log(e);
+//   })
+
 Promise.resolve()
   .then(() => {
-    const util = require('./scripts/csdr/release/package/common');
-    const branches = util.getBranches();
-    console.log(branches);
+    const prj = configUtils.projects.getCsdrProject('my-workplace-host');
+    const envTarget = 'INT';
+    return installUtils.projects.getDeps(prj, envTarget);
   })
-  .catch((e) => {
-    console.log(e);
+
+  .then((compositeDeps) => {
+    console.log(compositeDeps);
   })

package/scripts/csdr/config/angular.js

@@ -17,6 +17,7 @@ const {
   angularProjectDefV13,
   angularProjectDefV14,
   angularProjectDefV17,
+  angularProjectDefV17esbuild,
   angularProjectLightDef,
   angularProjectDefFullSkeleton,
   angularProjectDefFullSkeletonV13,
@@ -252,8 +253,13 @@ module.exports.registerAngularProjectDef = (project, build = false, element = fa
           projectDef = JSON.stringify(angularProjectDefV14);
           tools.logInfo(`----using angularProjectDefV14`);
         } else if (euiVersion === '17.x') {
-          projectDef = JSON.stringify(angularProjectDefV17);
-          tools.logInfo(`----using angularProjectDefV17`);
+          if (project.build.esbuild) {
+            projectDef = JSON.stringify(angularProjectDefV17esbuild);
+            tools.logInfo(`----using angularProjectDefV17esbuild`);
+          } else {
+            projectDef = JSON.stringify(angularProjectDefV17);
+            tools.logInfo(`----using angularProjectDefV17`);
+          }
         } else {
           if (project.build && project.build.csdrFileReplacement === true) {
             projectDef = JSON.stringify(angularProjectLightDef);

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

@@ -543,6 +543,147 @@ module.exports.angularProjectDefV14 = {
 
 
 module.exports.angularProjectDefV17 = {
+  "root": "",
+  "sourceRoot": "apps/@project.name@/src",
+  "projectType": "application",
+  "prefix": "app",
+  "schematics": {
+    "@schematics/angular:component": {
+      "style": "scss"
+    },
+    "@schematics/angular:application": {
+      "strict": true
+    }
+  },
+  "architect": {
+      "lint": {
+        "builder": "@angular-eslint/builder:lint",
+        "options": {
+          "lintFilePatterns": [
+            "apps/@project.name@/**/*.ts",
+            "apps/@project.name@/**/*.html"
+          ],
+          "eslintConfig": "apps/@project.name@/.eslintrc.json"
+        }
+      },
+      "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+              "outputPath": "apps/@project.name@/dist",
+              "index": "apps/@project.name@/src/index.html",
+              "main": "apps/@project.name@/src/main.ts",
+              "polyfills": "apps/@project.name@/src/polyfills.ts",
+              "tsConfig": "apps/@project.name@/tsconfig.app.json",
+              "assets": [
+                  "apps/@project.name@/src/favicon.ico",
+                  "apps/@project.name@/src/assets",
+                  {
+                      "glob": "**/*",
+                      "input": "node_modules/@eui/core/assets/",
+                      "output": "./assets"
+                  }
+              ],
+              "styles": [
+              ]
+          },
+          "configurations": {
+              "production": {
+                  "fileReplacements": [
+                      {
+                          "replace": "apps/@project.name@/src/environments/environment.ts",
+                          "with": "apps/@project.name@/src/environments/environment.prod.ts"
+                      }
+                  ],
+                  "outputHashing": "all",
+                  "extractLicenses": true,
+                  "budgets": [
+                      {
+                          "type": "initial",
+                          "maximumWarning": "2mb",
+                          "maximumError": "8mb"
+                      }
+                  ]
+              },
+              "production-optimized": {
+                  "fileReplacements": [
+                      {
+                          "replace": "apps/@project.name@/src/environments/environment.ts",
+                          "with": "apps/@project.name@/src/environments/environment.prod.ts"
+                      }
+                  ],
+                  "optimization": {
+                    "scripts": true,
+                    "styles": {
+                        "minify": false,
+                        "inlineCritical": true
+                    },
+                    "fonts": true
+                  },
+                  "outputHashing": "all",
+                  "extractLicenses": true,
+                  "budgets": [
+                      {
+                          "type": "initial",
+                          "maximumWarning": "2mb",
+                          "maximumError": "8mb"
+                      }
+                  ]
+              },
+              "production-optimized-no-openid": {
+                "fileReplacements": [
+                    {
+                        "replace": "apps/@project.name@/src/environments/environment.ts",
+                        "with": "apps/@project.name@/src/environments/environment.prod.ts"
+                    }
+                ],
+                "optimization": {
+                  "scripts": true,
+                  "styles": {
+                      "minify": false,
+                      "inlineCritical": true
+                  },
+                  "fonts": true
+                },
+                "outputHashing": "all",
+                "extractLicenses": true,
+                "budgets": [
+                    {
+                        "type": "initial",
+                        "maximumWarning": "2mb",
+                        "maximumError": "8mb"
+                    }
+                ]
+              },
+              "development": {
+                  "optimization": false,
+                  "sourceMap": true
+              }
+          },
+          "defaultConfiguration": "production"
+      },
+      "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+              "browserTarget": "@project.name@:build"
+          },
+          "configurations": {
+              "proxy-mock": {
+                  "browserTarget": "@project.name@:build:development",
+                  "proxyConfig": "apps/@project.name@/proxy-mock.conf.json"
+              },
+              "production": {
+                  "browserTarget": "@project.name@:build:production"
+              },
+              "development": {
+                "browserTarget": "@project.name@:build:development"
+              }
+          },
+          "defaultConfiguration": "development"
+      }
+  }
+};
+
+module.exports.angularProjectDefV17esbuild = {
   "root": "",
   "sourceRoot": "apps/@project.name@/src",
   "projectType": "application",
@@ -573,7 +714,8 @@ module.exports.angularProjectDefV17 = {
               "index": "apps/@project.name@/src/index.html",
               "browser": "apps/@project.name@/src/main.ts",
               "polyfills": [
-                "zone.js"
+                "zone.js",
+                "event-source-polyfill"
               ],
               "tsConfig": "apps/@project.name@/tsconfig.app.json",
               "assets": [

package/scripts/csdr/install/composite-core.js

@@ -60,6 +60,8 @@ const getCompositeDepsByEnv = (compositePath, envTarget, compositeType, envsMeta
 
   // if default composite type then we iterate over all detected composite files by env
   if (compositeType === 'DEFAULT') {
+    let depsToResolve = false;
+
     return Promise.resolve()
     .then(() => {
       tools.logTitle('Processing accumulated composites for ALL composite types');
@@ -69,13 +71,27 @@ const getCompositeDepsByEnv = (compositePath, envTarget, compositeType, envsMeta
       filesByEnv.forEach((f) => {
         tools.logInfo(`Parsing : ${f}`);
         const compositeFile = path.join(process.cwd(), compositePath, f);
-        const fileDeps = tools.getJsonFileContent(compositeFile).lockedDependencies || {};
-        console.log(JSON.stringify(fileDeps, null, 2));
-        returnedDeps = { ...returnedDeps, ...fileDeps};
+        const fileDeps = tools.getJsonFileContent(compositeFile);
+        const deps = fileDeps.lockedDependencies || fileDeps.forcedCarretDependencies || {};
+        console.log(JSON.stringify(deps, null, 2));
+        returnedDeps = { ...returnedDeps, ...deps};
+        if (fileDeps.forcedCarretDependencies) {
+          depsToResolve = true;
+        }
       });
 
       return { ...prevEnvDeps, ...returnedDeps };
     })
+
+    .then((deps) => {
+      if (depsToResolve) {
+        tools.logInfo('Resolving forced dependencies for env');
+        return innerCommon.getResolvedCarretDeps(deps, true, false);
+      } else {
+        return deps;
+      }
+    })
+
     .then((deps) => {
       tools.logInfo('Scanning resulting deps for RC detection (do avoid RC spreading up to non DEV envs)');
       const depsToScan = Object.keys(deps);