@eui/tools 6.16.29 → 6.16.31

package/.version.properties

@@ -1 +1 @@
-6.16.29
+6.16.31

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.16.31 (2024-07-02)
+
+##### Chores
+
+* **other:**
+  * added extraLocales option for remote v17 - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([f4c2539f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f4c2539f111e3ee8b13a46525b54e1e44102e2a8))
+
+* * *
+* * *
+## 6.16.30 (2024-06-20)
+
+##### Chores
+
+* **other:**
+  * added preprod env in the sequence for app and remote - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([54e8a913](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/54e8a913a093c15d0589fb7149ed559d11004951))
+
+* * *
+* * *
 ## 6.16.29 (2024-06-13)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/init/remotes/17.x/full/options/extra-locales/config/global.ts

@@ -0,0 +1,151 @@
+import { registerLocaleData } from '@angular/common';
+
+// import and register locale manually
+import localeEn from '@angular/common/locales/en';
+import localeEN_150 from '@angular/common/locales/en-150';
+import localeEN_AT from '@angular/common/locales/en-AT';
+import localeEN_BE from '@angular/common/locales/en-BE';
+import localeEN_CH from '@angular/common/locales/en-CH';
+import localeEN_CY from '@angular/common/locales/en-CY';
+import localeEN_DE from '@angular/common/locales/en-DE';
+import localeEN_DK from '@angular/common/locales/en-DK';
+import localeEN_FI from '@angular/common/locales/en-FI';
+import localeEN_GG from '@angular/common/locales/en-GG';
+import localeEN_GI from '@angular/common/locales/en-GI';
+import localeEN_IE from '@angular/common/locales/en-IE';
+import localeEN_IM from '@angular/common/locales/en-IM';
+import localeEN_JE from '@angular/common/locales/en-JE';
+import localeEN_MT from '@angular/common/locales/en-MT';
+import localeEN_NL from '@angular/common/locales/en-NL';
+import localeEN_SE from '@angular/common/locales/en-SE';
+import localeEN_SI from '@angular/common/locales/en-SI';
+import localeEnExtra from '@angular/common/locales/extra/en';
+import localeEnExtra_150 from '@angular/common/locales/extra/en-150';
+import localeEnExtra_AT from '@angular/common/locales/extra/en-AT';
+import localeEnExtra_BE from '@angular/common/locales/extra/en-BE';
+import localeEnExtra_CH from '@angular/common/locales/extra/en-CH';
+import localeEnExtra_CY from '@angular/common/locales/extra/en-CY';
+import localeEnExtra_DE from '@angular/common/locales/extra/en-DE';
+import localeEnExtra_DK from '@angular/common/locales/extra/en-DK';
+import localeEnExtra_FI from '@angular/common/locales/extra/en-FI';
+import localeEnExtra_GG from '@angular/common/locales/extra/en-GG';
+import localeEnExtra_GI from '@angular/common/locales/extra/en-GI';
+import localeEnExtra_IE from '@angular/common/locales/extra/en-IE';
+import localeEnExtra_IM from '@angular/common/locales/extra/en-IM';
+import localeEnExtra_JE from '@angular/common/locales/extra/en-JE';
+import localeEnExtra_MT from '@angular/common/locales/extra/en-MT';
+import localeEnExtra_NL from '@angular/common/locales/extra/en-NL';
+import localeEnExtra_SE from '@angular/common/locales/extra/en-SE';
+import localeEnExtra_SI from '@angular/common/locales/extra/en-SI';
+import localeFr from '@angular/common/locales/fr';
+import localeFR_MC from '@angular/common/locales/fr-MC';
+import localeFR_LU from '@angular/common/locales/fr-LU';
+import localeFR_CH from '@angular/common/locales/fr-CH';
+import localeFR_BE from '@angular/common/locales/fr-BE';
+import localeFRExtra_BE from '@angular/common/locales/extra/fr-BE';
+import localeFRExtra_CH from '@angular/common/locales/extra/fr-CH';
+import localeFRExtra_LU from '@angular/common/locales/extra/fr-LU';
+import localeFRExtra_MC from '@angular/common/locales/extra/fr-MC';
+import localeFrExtra from '@angular/common/locales/extra/fr';
+
+import { GlobalConfig, I18nConfig, LocaleServiceConfig } from '@eui/core';
+
+import * as moment from 'moment';
+
+/**
+ * import and register locales (currently MWP uses only French and English)
+ */
+registerLocaleData(localeEn, 'en', localeEnExtra);
+registerLocaleData(localeFr, 'fr', localeFrExtra);
+registerLocaleData(localeEN_150, localeEnExtra_150);
+registerLocaleData(localeEN_AT, localeEnExtra_AT);
+registerLocaleData(localeEN_BE, localeEnExtra_BE);
+registerLocaleData(localeEN_CH, localeEnExtra_CH);
+registerLocaleData(localeEN_CY, localeEnExtra_CY);
+registerLocaleData(localeEN_DE, localeEnExtra_DE);
+registerLocaleData(localeEN_DK, localeEnExtra_DK);
+registerLocaleData(localeEN_FI, localeEnExtra_FI);
+registerLocaleData(localeEN_GG, localeEnExtra_GG);
+registerLocaleData(localeEN_GI, localeEnExtra_GI);
+registerLocaleData(localeEN_IE, localeEnExtra_IE);
+registerLocaleData(localeEN_IM, localeEnExtra_IM);
+registerLocaleData(localeEN_JE, localeEnExtra_JE);
+registerLocaleData(localeEN_MT, localeEnExtra_MT);
+registerLocaleData(localeEN_NL, localeEnExtra_NL);
+registerLocaleData(localeEN_SE, localeEnExtra_SE);
+registerLocaleData(localeEN_SI, localeEnExtra_SI);
+registerLocaleData(localeFR_MC, localeFRExtra_MC);
+registerLocaleData(localeFR_LU, localeFRExtra_LU);
+registerLocaleData(localeFR_CH, localeFRExtra_CH);
+registerLocaleData(localeFR_BE, localeFRExtra_BE);
+
+
+moment.defineLocale('en-be', {
+    parentLocale: 'en',
+    longDateFormat: {
+        /** LTS: Specifies the format for displaying time with seconds. */
+        LT: 'HH:mm',
+        /** LT: Specifies the format for displaying time without seconds. */
+        LTS: 'HH:mm:ss',
+        /** L: Specifies the format for displaying the date in short format. */
+        L: 'DD/MM/YYYY',
+        /** LL: Specifies the format for displaying the date in long format. */
+        LL: 'D MMMM YYYY',
+        /** LLL: Specifies the format for displaying the date and time. */
+        LLL: 'D MMMM YYYY HH:mm',
+        /** LLLL: Specifies the format for displaying the full date and time with the day of the week. */
+        LLLL: 'dddd, D MMMM YYYY HH:mm',
+    }
+});
+
+moment.defineLocale('en-fr', {
+    parentLocale: 'en',
+    longDateFormat: {
+        LT: 'HH:mm',
+        LTS: 'HH:mm:ss',
+        L: 'DD/MM/YYYY',
+        LL: 'D MMMM YYYY',
+        LLL: 'D MMMM YYYY HH:mm',
+        LLLL: 'dddd, D MMMM YYYY HH:mm'
+    }
+});
+
+/**
+ * Internationalization Configuration
+ */
+const i18nConfig: I18nConfig = {
+    i18nLoader: {
+        i18nFolders: ['elements/@remote.name@/bundles/assets/i18n-compiled'],
+    },
+    i18nService: {
+        languages: ['en', 'fr'],
+        defaultLanguage: 'en',
+    },
+};
+
+/**
+ * Locale Configuration
+ */
+const localeConfig: LocaleServiceConfig = {
+    id: 'en',
+    available: ['en', 'fr'],
+    bindWithTranslate: true,
+    affectGlobalLocale: true,
+};
+
+/**
+ * Global Configuration
+ */
+export const GLOBAL: GlobalConfig = {
+    /* URL that needs to be used in the appRouting of the MWP */
+    baseUrl: '@base.url@',
+    /* Element tag name that needs to be unique - make sure it doesn't collide with any other MWP element */
+    elementName: '@element.name@',
+    /* in case you are using NgRx give it a unique name (mostly for debugging) */
+    storeName: '@store.name@',
+    i18n: i18nConfig,
+    locale: localeConfig,
+    eui: {
+        assetsBaseUrl: 'assets/elements/@remote.name@/bundles/assets',
+    },
+};

package/scripts/csdr/init/remotes.js

@@ -106,7 +106,7 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
       }
 
       // adding dependencies per env
-      const envs = ['INT', 'ACC', 'DLT', 'TRN', 'PROD'];
+      const envs = ['INT', 'ACC', 'DLT', 'TRN', 'PREPROD', 'PROD'];
 
       envs.forEach((env) => {
         if (remote.dependencies[env]) {
@@ -169,6 +169,7 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
 
         const optionUserReducersPath = path.join(fullOptionsPath, 'user-reducers');
         const optionAllLocalesPath = path.join(fullOptionsPath, 'all-locales');
+        const optionExtraLocalesPath = path.join(fullOptionsPath, 'extra-locales');
         const optionParticipantPath = path.join(fullOptionsPath, 'participant');
         const optionAgGridPath = path.join(fullOptionsPath, 'ag-grid');
         const optionUserReducersDef = tools.getJsonFileContent(path.join(fullOptionsPath, 'definitions', 'user-reducers.json'));
@@ -261,6 +262,11 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
             tools.copy(optionAllLocalesPath, remoteSrcPath);
           }
 
+          // extra-locales specific sources
+          if (remote.skeletonConfig.options.extraLocales) {
+            tools.copy(optionExtraLocalesPath, remoteSrcPath);
+          }
+
           // zipkin
           if (remote.skeletonConfig.options.zipkin) {
             pushContent(optionZipkinDef);

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

@@ -204,7 +204,7 @@ module.exports.getCompositeDeps = (
 
      /**
       * For TRN, the base versions of packages is
-      * Default : dependencies of LATEST PROD known composite
+      * Default : dependencies of LATEST ACC known composite
       * overridden by : hotfixDependencies if any
       */
       if (envTarget === 'TRN') {
@@ -216,6 +216,20 @@ module.exports.getCompositeDeps = (
         );
       }
 
+      /**
+      * For PREPROD, the base versions of packages is
+      * Default : dependencies of LATEST ACC known composite
+      * overridden by : hotfixDependencies if any
+      */
+      if (envTarget === 'PREPROD') {
+        return getCompositeDepsByEnv(
+          compositePath,
+          envTarget,
+          envsMetadata,
+          'ACC', 'PREPROD'
+        );
+      }
+
 
       /**
       * For DLT, the base versions of packages is

package/scripts/csdr/version/common.js

@@ -192,13 +192,22 @@ module.exports.getNewVersionDefault = (envTarget, versionsMetadata, envsMetadata
 
       // =====================================================================
       // TRN targets : format : X.Y.Z-envTarget.n
-      //   - where X.Y.Z is the last root version of PROD env target
+      //   - where X.Y.Z is the last root version of ACC env target
       // =====================================================================
 
       if (envTarget === 'TRN') {
         version = getNewVersionForEnv(versionsMetadata, envsMetadata, 'ACC', 'TRN');
       }
 
+      // =====================================================================
+      // PREPROD targets : format : X.Y.Z-envTarget.n
+      //   - where X.Y.Z is the last root version of ACC env target
+      // =====================================================================
+
+      if (envTarget === 'PREPROD') {
+        version = getNewVersionForEnv(versionsMetadata, envsMetadata, 'ACC', 'PREPROD');
+      }
+
       // =====================================================================
       // FOR PROD : format X.Y.Z(+1)
       //   - where X.Y.Z is the last version of PROD with the same INT root

package/scripts/utils/build/app/build-app-utils.js

@@ -214,7 +214,7 @@ module.exports.angular = (
         args.push(`--configuration=${configuration}`);
       } else {
         let isOptimizedBuild = false;
-        if (envTarget && (envTarget === 'ACC' || envTarget === 'DLT' || envTarget === 'TRN' || envTarget === 'PROD')) {
+        if (envTarget && (envTarget === 'ACC' || envTarget === 'DLT' || envTarget === 'TRN' || envTarget === 'PREPROD' || envTarget === 'PROD')) {
           isOptimizedBuild = true;
         }