@eui/tools 6.15.21 → 6.16.1

package/.version.properties

@@ -1 +1 @@
-6.15.21
+6.16.1

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.16.1 (2024-03-19)
+
+##### Bug Fixes
+
+* **other:**
+  * excluding next package version for hotfix checks on versions gathering - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([6f1cff6e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6f1cff6e7163ec7f1cfbcaf62a119f866031f8ae))
+
+* * *
+* * *
+## 6.16.0 (2024-03-07)
+
+##### New Features
+
+* **other:**
+  * adapted injection for eUI 18 showcases - EUI-9014 [EUI-9014](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9014)  ([854211ab](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/854211ab304d8e16376ef408193a0d21bad16138))
+
+* * *
+* * *
 ## 6.15.21 (2024-03-05)
 
 ##### Reverts

package/package.json

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

package/sandbox.js

@@ -1502,11 +1502,23 @@ const publishUtils = require('./scripts/utils/publish/publish-utils');
 //     console.log(e);
 //   })
 
+// Promise.resolve()
+//   .then(() => {
+//     const config = configUtils.global.getConfig();
+//     console.log(config);
+
+//     const isSonarEnabled = metadataUtils.common.isSonarEnabled();
+//     console.log(isSonarEnabled);
+//   })
+
 Promise.resolve()
   .then(() => {
-    const config = configUtils.global.getConfig();
-    console.log(config);
+    const pkg = configUtils.packages.getPackage('eui-mobile-core', true);
+    console.log(pkg);
+
+    const pkgVersions = metadataUtils.packageUtils.getPackageVersions(pkg);
+    console.log(pkgVersions);
 
-    const isSonarEnabled = metadataUtils.common.isSonarEnabled();
-    console.log(isSonarEnabled);
+    const versions = metadataUtils.packageUtils.getLastMajorVersion(pkg, '17', false, true);
+    console.log(versions);
   })

package/scripts/csdr/config/angular.js

@@ -94,7 +94,7 @@ module.exports.registerAngularPackage = (pkg, isReset) => {
   if (packageEuiVersion === '14.x') {
     projectDef = JSON.stringify(angularPackageDefV14);
   }
-  if (packageEuiVersion === '15.x' || packageEuiVersion === '16.x' || packageEuiVersion === '17.x') {
+  if (packageEuiVersion === '15.x' || packageEuiVersion === '16.x' || packageEuiVersion === '17.x' || packageEuiVersion === '18.x') {
     projectDef = JSON.stringify(angularPackageDefV15);
   }
 
@@ -124,7 +124,7 @@ module.exports.registerAngularPackageSubEntry = (subEntryName, subEntryPath, pkg
 
   let projectDef = JSON.stringify(angularPackageSubEntryDef);
 
-  if (packageEuiVersion === '15.x' || packageEuiVersion === '16.x' || packageEuiVersion === '17.x') {
+  if (packageEuiVersion === '15.x' || packageEuiVersion === '16.x' || packageEuiVersion === '17.x' || packageEuiVersion === '18.x') {
     projectDef = JSON.stringify(angularPackageSubEntryDef15);
     projectDef = projectDef.replace('"main":"packages/eui/packages/components/@subEntry.path@/test.ts",', '');
   }
@@ -132,7 +132,7 @@ module.exports.registerAngularPackageSubEntry = (subEntryName, subEntryPath, pkg
   projectDef = tools.replaceAll(projectDef, '@subEntry.package.name@', 'ng-package.json');
   projectDef = tools.replaceAll(projectDef, '@tsconfig@', pkg.tsConfigFileName);
 
-  if (packageEuiVersion === '15.x' || packageEuiVersion === '16.x' || packageEuiVersion === '17.x') {
+  if (packageEuiVersion === '15.x' || packageEuiVersion === '16.x' || packageEuiVersion === '17.x' || packageEuiVersion === '18.x') {
     // if tsconfig is missing add it
     const tsConfigSpecPath = path.join(process.cwd(), JSON.parse(projectDef).architect.test.options.tsConfig);
     // check if tsconfig exists otherwise created it
@@ -232,7 +232,7 @@ module.exports.registerAngularProjectDef = (project, build = false, element = fa
         } else if (euiVersion === '14.x' || euiVersion === '15.x' || euiVersion === '16.x') {
           projectDef = JSON.stringify(angularProjectDefFullSkeletonV14);
           tools.logInfo(`----using angularProjectDefFullSkeletonV14`);
-        } else if (euiVersion === '17.x') {
+        } else if (euiVersion === '17.x' || euiVersion === '18.x') {
           if (project.build.esbuild) {
             projectDef = JSON.stringify(angularProjectDefFullSkeletonV17esbuild);
             tools.logInfo(`----using angularProjectDefFullSkeletonV17esbuild`);
@@ -252,7 +252,7 @@ module.exports.registerAngularProjectDef = (project, build = false, element = fa
         } else if (euiVersion === '14.x' || euiVersion === '15.x' || euiVersion === '16.x') {
           projectDef = JSON.stringify(angularProjectDefV14);
           tools.logInfo(`----using angularProjectDefV14`);
-        } else if (euiVersion === '17.x') {
+        } else if (euiVersion === '17.x' || euiVersion === '18.x') {
           if (project.build.esbuild) {
             projectDef = JSON.stringify(angularProjectDefV17esbuild);
             tools.logInfo(`----using angularProjectDefV17esbuild`);

package/scripts/csdr/init/remotes/18.x/base/angular.json

@@ -0,0 +1,87 @@
+{
+    "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+    "version": 1,
+    "newProjectRoot": "apps",
+    "projects": {
+      "@remote.name@": {
+        "root": ".",
+        "sourceRoot": "src",
+        "projectType": "application",
+        "prefix": "app",
+        "schematics": {},
+        "architect": {
+          "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+            "options": {
+              "outputPath": "dist",
+              "index": "src/index.html",
+              "main": "src/main.ts",
+              "polyfills": "src/polyfills.ts",
+              "tsConfig": "tsconfig.app.json",
+              "sourceMap": {
+                "scripts": true,
+                "styles": false,
+                "hidden": true,
+                "vendor": true
+              },
+              "scripts": [
+                "./node_modules/@webcomponents/custom-elements/src/native-shim.js"
+              ],
+              "assets": [
+                "src/assets",
+                {
+                    "glob": "**/*",
+                    "input": "node_modules/@eui/core/assets/",
+                    "output": "./assets"
+                },
+                {
+                    "glob": "**/*",
+                    "input": "node_modules/@eui/styles-base/dist/assets/",
+                    "output": "./assets"
+                }
+              ],
+              "styles": [
+                  "node_modules/@eui/styles/dist/styles/eui.css",
+                  "node_modules/@eui/styles/dist/styles/eui-extra-utilities.css",
+                  "node_modules/@eui/styles/dist/styles/eui-legacy-bootstrap.css",
+                  "node_modules/@eui/styles/dist/styles/eui-legacy-icons-font.css",
+                  "node_modules/@eui/styles/dist/styles/eui-legacy-utilities.css"
+              ]
+            },
+            "configurations": {
+              "development": {
+                "buildOptimizer": false,
+                "optimization": false,
+                "vendorChunk": true,
+                "extractLicenses": false,
+                "sourceMap": false,
+                "namedChunks": true
+              },
+              "production": {
+                "fileReplacements": [
+                  {
+                    "replace": "src/environments/environment.ts",
+                    "with": "src/environments/environment.prod.ts"
+                  }
+                ],
+                "optimization": true,
+                "outputHashing": "all",
+                "sourceMap": false,
+                "namedChunks": false,
+                "aot": true,
+                "extractLicenses": true,
+                "vendorChunk": false,
+                "buildOptimizer": true
+              },
+              "serve-dist": {
+                "outputPath": "serve-dist"
+              }
+            }
+          }
+        }
+      }
+    },
+    "cli": {
+      "analytics": false
+    }
+  }

package/scripts/csdr/init/remotes/18.x/base/browserslist

@@ -0,0 +1,6 @@
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
+Firefox ESR

package/scripts/csdr/init/remotes/18.x/base/package.json_TO_REPLACE

@@ -0,0 +1,10 @@
+{
+    "name": "generated",
+    "version": "1.0.0-SNAPSHOT.0",
+    "files": [
+        "bundles"
+    ],
+    "dependencies": {},
+    "resolutions": {
+    }
+}

package/scripts/csdr/init/remotes/18.x/base/tsconfig.app.json

@@ -0,0 +1,24 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/app",
+    "target": "ES2022",
+    "module": "ES2022",
+    "lib": [
+      "ES2022",
+      "dom"
+    ],
+    "types": [
+        "node"
+    ],
+    "paths": {
+        "os": ["./node_modules/empty-module/index.js"],
+        "node-fetch": ["./node_modules/empty-module/index.js"],
+        "zipkin": ["./node_modules/zipkin/dist/zipkin.js"]
+    }
+  },
+  "exclude": [
+    "src/test.ts",
+    "**/*.spec.ts"
+  ]
+}