@eui/tools 5.2.8 → 5.2.11

package/.version.properties

@@ -1 +1 @@
-5.2.8
+5.2.11

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.2.11 (2022-05-21)
+
+##### Chores
+
+* **other:**
+  * added v13 and v14 package skeletons - adapted for envTarget remote skeleton - doc - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([5324dd32](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5324dd32a669368f438f54ddeacaf65958b6ec83))
+
+* * *
+* * *
+## 5.2.10 (2022-05-19)
+
+##### Chores
+
+* **other:**
+  * force updated yarn.lock - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([f9cfaefe](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f9cfaefe906201751caa33c29752011c65bb2a60))
+
+* * *
+* * *
+## 5.2.9 (2022-05-19)
+
+##### Chores
+
+* **other:**
+  * adapted optimized build to only TRN and PROD for MWP - forced yarn.lock in v13 builds for eUI build failure - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([730cb1a2](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/730cb1a2e2fde1677f2f03605e5a0255f9f75654))
+
+* * *
+* * *
 ## 5.2.8 (2022-05-16)
 
 ##### Bug Fixes

package/bin/scripts/csdr-sync.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const syncUtils = require('../../scripts/csdr/sync/sync-utils');
+const { syncUtils } = require('../../scripts');
 
 Promise.resolve()
   .then(() => {

package/docs/01-intro.md

@@ -0,0 +1,78 @@
+author: Roels G - DIGIT.B.3
+last reviesion: 
+
+date | who ? | what ?
+--- | --- | ---
+2022-05-18 | roelsgr | document creation
+<hr>
+<br><br>
+
+# eUI tools - part 1 - Introduction
+
+## History
+
+The initial main purpose of eUI tools was to have a comitted pipeline and avoid duplication of code in Bamboo, yes at that time there wasn't any Bamboo specs, which would have facilited the approach, if we wanted to have the pipeline as compiled code... which makes it not so handy for maintenance and "live" testing.
+
+But nevertheless, eUI tools was there, at first it was really a bunch of promises scripts triggered by a bin files like npm library allowing obfuscation of pipeline flow : assemble/build/set version/publish. 
+
+For sure like all things, it started simple and got more complicated, but it's in constant refactoring, basically things become unreadable  time for a refactoring ;)
+
+## Challenges ?
+
+Probably the most crucial one to tackle : eUI tools should use itself to build itself, sounds like recursive stuffs, but that's one of the main advantage of javascript maybe here.
+
+This with the help of the CSDR pipeline for sure, executed through job/stage in gitlab.
+
+Why ? because the pipeline when building a package / npm / backend etc... is split in 2 main parts : 
+- the "init" phase: initialize / clone / mount the necessary repository(ies) instructed by the build param, basically a "pkg" package name and in CSDR it's always the repository name, easy to spot / easy and a few other arguments like : git "branch",  associated "project", and some other deployment parameters.
+- the "release" phase : where the build / test / versioning / metadata entries / publication are done.
+
+The fact that the init is decoupled from the release part makes it easy, the init is almost always static from version to version, so once building eUI tools, it initializes itself, clone its last version in the repository that has been pushed and after that symlinks itself on its node_modules installation, making at that time build itself as all the modules called from the release phase are now the ones of the latest commited version cloned during the init phase before.
+
+What's the benefits ? allow new stages in the pipeline to be developed and used directly by the eUI tools themselves, this way, if there's a build failure at that level for itself, it's not shipped so it does not have any impact on others using it (basically all CSDR developers / eUI but it's safer there as the ultimate latest version of the package is not pushed constantly : only when eUI new version is released)
+
+Another challenge here was to use the exact same build tools / installation scripts / synchronization script both for local development 
+and on the CI side. So when commands are executed locally, they are battle tested when it comes to execute them too on the CI.
+This makes it handy for developers building locally their packages first to have the exact same result as they would have when the pipeline is executing to build and publish their code.
+
+
+## Why this exists ? bunch of bash script can do the same after all
+
+Sure they can, but needs probably need to be a Unix expert to fully understand at first sight what's their purpose, in this agglomerated bunch of cryptic abbreviations and pipes ;)
+
+So Javascript as the most stupid and simple language was used for the first early version, quickly became unreadable too because of its verbosity at some point for executing internal functions, promises etc...
+
+So let's enter the black box ;)
+
+
+## Where to start ?
+
+As it's a bin bash execution javascript library, it all starts in the **/bin** folder.
+
+Over each bin sub-scripts (launched by eui-script SCRIPT_NAME from any eUI app root package.json).
+
+**eui-scripts.js** is the entry point file is the "bin" files defined in the package.json. This is used for scripts execution, and handle command line parameters so : 
+```
+eui-scripts SCRIPT_NAME [params]
+```
+
+Called scripts are located in **/scripts**, and basically their structure is almost always the same, if we take for example the most commonly used one : *sync*
+```
+const { syncUtils } = require('../../scripts');
+
+Promise.resolve()
+  .then(() => {
+    return syncUtils.sync();
+  })
+  .catch((e) => {
+    console.log(e);
+    process.exit(1);
+  })
+```
+Most of the times it contains : 
+
+- **core** script import: here *syncUtils*,
+- **promise wrapper**, for simplicity of the code (ok more verbose) everything is a promise in the core scripts.
+- **catch** exiting the current process and displaying the exception handled or undhandled when excuting the core script.
+
+

package/package.json

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

package/scripts/csdr/cli/package.js

@@ -14,8 +14,12 @@ const TARGET_ROOT_PATH = path.join(process.cwd(), 'packages');
 const SKELETONS_ROOT_PATH = path.join(__dirname, 'skeletons', 'package');
 const FRONTEND_SKELETON_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend');
 const FRONTEND_SKELETON_EUI10_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-eui10');
+const FRONTEND_SKELETON_EUI13_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-eui13');
+const FRONTEND_SKELETON_EUI14_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-eui14');
 const FRONTEND_SKELETON_REMOTE_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-remote');
 const FRONTEND_SKELETON_REMOTE_EUI10_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-remote-eui10');
+const FRONTEND_SKELETON_REMOTE_EUI13_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-remote-eui13');
+const FRONTEND_SKELETON_REMOTE_EUI14_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-remote-eui14');
 const FRONTEND_OPTION_ROUTE_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-option-route');
 const BACKEND_SKELETON_PATH = path.join(SKELETONS_ROOT_PATH, 'backend');
 
@@ -32,10 +36,13 @@ const defaultConfig = {
   },
   pkgFrontendVersion: {
     DEFAULT: 'eui7',
-    EUI10: 'eui10'
+    EUI10: 'eui10',
+    EUI13: 'eui13',
+    EUI14: 'eui14',
   },
   isRouteModule: true,
   isCsdrRepo: true,
+  isEnvTargetRemote: true,
   externalRepoName: null,
   pkgGroupId: 'eu.europa.ec.cc'
 };
@@ -78,6 +85,9 @@ const prompt = () => {
             { name: 'Remote element micro-frontend', value: defaultConfig.pkgFrontendType.REMOTE },
           ],
           default: defaultConfig.pkgFrontendType.DEFAULT,
+          when: function (answers) {
+            return (answers.pkgType === defaultConfig.pkgType.FRONTEND);
+          },
           validate: function (value) {
             if (value.length) {
               return true;
@@ -91,6 +101,8 @@ const prompt = () => {
           choices: [
             { name: 'v7', value: defaultConfig.pkgFrontendVersion.DEFAULT },
             { name: 'v10', value: defaultConfig.pkgFrontendVersion.EUI10 },
+            { name: 'v13', value: defaultConfig.pkgFrontendVersion.EUI13 },
+            { name: 'v14', value: defaultConfig.pkgFrontendVersion.EUI14 },
           ],
           default: defaultConfig.pkgFrontendType.DEFAULT,
           when: function (answers) {
@@ -126,6 +138,19 @@ const prompt = () => {
             );
           }
         },
+        {
+          name: 'isEnvTargetRemote',
+          type: 'confirm',
+          message: 'Is this an envTarget/à la carte remote ? (root package needs to be created first with same scope/name)',
+          default: defaultConfig.isEnvTargetRemote,
+          when: function (answers) {
+            return (
+              answers.pkgType === defaultConfig.pkgType.FRONTEND &&
+              answers.pkgFrontendType === defaultConfig.pkgFrontendType.REMOTE &&
+              answers.pkgFrontendVersion !== defaultConfig.pkgFrontendVersion.DEFAULT
+            );
+          }
+        },
         {
           name: 'isCsdrRepo',
           type: 'confirm',
@@ -168,6 +193,14 @@ const buildFrontend = (name, scope, frontendType, frontendVersion, isRouteModule
       fullName += '-eui10-remote-el-ui';
       npmPkgName = `${scope}/${name}-eui10-remote-el`;
 
+    } else if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI13) {
+      fullName += '-eui13-remote-el-ui';
+      npmPkgName = `${scope}/${name}-eui13-remote-el`;
+
+    } else if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI14) {
+      fullName += '-eui14-remote-el-ui';
+      npmPkgName = `${scope}/${name}-eui14-remote-el`;
+
     } else {
       fullName += '-remote-el-ui';
       npmPkgName = `${scope}/${name}-remote-el`;
@@ -206,12 +239,31 @@ const buildFrontend = (name, scope, frontendType, frontendVersion, isRouteModule
       if (frontendType === defaultConfig.pkgFrontendType.REMOTE) {
         if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI10) {
           return tools.copydir(FRONTEND_SKELETON_REMOTE_EUI10_PATH, targetPath, true);
+
+        } else if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI13) {
+          tools.copydir(FRONTEND_SKELETON_REMOTE_EUI10_PATH, targetPath, true);
+          return tools.copydir(FRONTEND_SKELETON_REMOTE_EUI13_PATH, targetPath, true);
+
+        } else if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI14) {
+          tools.copydir(FRONTEND_SKELETON_REMOTE_EUI10_PATH, targetPath, true);
+          return tools.copydir(FRONTEND_SKELETON_REMOTE_EUI14_PATH, targetPath, true);
+
         } else {
           return tools.copydir(FRONTEND_SKELETON_REMOTE_PATH, targetPath, true);
         }
+
       } else {
         if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI10) {
           return tools.copydir(FRONTEND_SKELETON_EUI10_PATH, targetPath, true);
+
+        } else if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI13) {
+          tools.copydir(FRONTEND_SKELETON_EUI10_PATH, targetPath, true);
+          return tools.copydir(FRONTEND_SKELETON_EUI13_PATH, targetPath, true);
+
+        } else if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI14) {
+          tools.copydir(FRONTEND_SKELETON_EUI10_PATH, targetPath, true);
+          return tools.copydir(FRONTEND_SKELETON_EUI14_PATH, targetPath, true);
+
         } else {
           return tools.copydir(FRONTEND_SKELETON_PATH, targetPath, true);
         }
@@ -267,7 +319,7 @@ const buildFrontend = (name, scope, frontendType, frontendVersion, isRouteModule
       return configUtils.angular.registerModulePaths(pkg);
     })
     .then(() => {
-      return configUtils.global.registerCsdrPackage(pkg, frontendType === defaultConfig.pkgFrontendType.REMOTE);
+      return configUtils.global.registerCsdrPackage(pkg, frontendType === defaultConfig.pkgFrontendType.REMOTE, scope, name);
     })
 
     .then(() => {

package/scripts/csdr/cli/skeletons/package/frontend-eui10/dependencies-base.json

@@ -0,0 +1,2 @@
+{
+}

package/scripts/csdr/cli/skeletons/package/frontend-eui10/dependencies-composite.json

@@ -0,0 +1,3 @@
+{
+    "@eui/deps-base": "^10.0.0"
+}

package/scripts/csdr/cli/skeletons/package/frontend-eui13/dependencies-composite.json

@@ -0,0 +1,3 @@
+{
+    "@eui/deps-base": "^13.0.0"
+}

package/scripts/csdr/cli/skeletons/package/frontend-eui14/dependencies-composite.json

@@ -0,0 +1,3 @@
+{
+    "@eui/deps-base": "^14.0.0"
+}

package/scripts/csdr/cli/skeletons/package/frontend-option-route/src/index.ts

@@ -0,0 +1,2 @@
+export * from './lib/module';
+export * from './lib/routing.module';

package/scripts/csdr/cli/skeletons/package/frontend-option-route/src/lib/{module.module.ts → module.ts}

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 
-import { RoutingModule } from './module-routing.module';
+import { RoutingModule } from './routing.module';
 
 import { Cmp1Component } from './components/cmp1/cmp1.component';
 
@@ -14,4 +14,4 @@ import { Cmp1Component } from './components/cmp1/cmp1.component';
     exports: [
     ],
 })
-export class ModuleModule { }
+export class CommonModule { }

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/browserslist

@@ -1,10 +1,6 @@
-# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-# For IE 9-11 support, please uncomment the last line of the file and adjust as needed
-> 0.5%
-last 2 versions
+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
-not dead
-IE 9-11
-

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/dependencies-composite-ACC.json

@@ -0,0 +1,4 @@
+{
+    "lockedDependencies": {
+    }
+}

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/dependencies-composite-DLT.json

@@ -0,0 +1,4 @@
+{
+    "lockedDependencies": {
+    }
+}

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/dependencies-composite-INT.json

@@ -0,0 +1,4 @@
+{
+    "lockedDependencies": {
+    }
+}

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/dependencies-composite-PROD.json

@@ -0,0 +1,4 @@
+{
+    "lockedDependencies": {
+    }
+}

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/dependencies-composite-TRN.json

@@ -0,0 +1,4 @@
+{
+    "lockedDependencies": {
+    }
+}

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/gitignore_TO_REPLACE

@@ -62,3 +62,4 @@ package-lock.json
 **/_trash
 
 **/test/reports/
+/src

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/module.ts

@@ -46,8 +46,7 @@ import { CustomSerializer } from './reducers/custom-route-serializer';
 import { environment } from '../environments/environment';
 import { appConfig } from '../config';
 
-// TODO[REMOTE-SETUP] adapt to wrapped package import
-// import { TaskMgrCommonModule } from '@cc/task-manager';
+import { Module as RootPackageCommonModule } from '@module.scope@/@module.name@';
 import {
     ELEMENT_ROUTER_TOKEN,
     I18N_SERVICE_HOST_TOKEN,
@@ -87,8 +86,7 @@ export function openidConnectInterceptorFactory(config) {
         EuiButtonModule,
         EuiLabelModule,
 
-        // TODO[REMOTE-SETUP] adapt to wrapped package import
-        // TaskMgrCommonModule,
+        RootPackageCommonModule,
         RoutingModule,
     ],
     declarations: [

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/routing.module.ts

@@ -5,8 +5,7 @@ import { filter, distinctUntilChanged } from 'rxjs/operators';
 
 import { CCRoute, ELEMENT_ROUTER_TOKEN, IRouterService } from '@csdr/integration';
 
-// TODO[REMOTE-SETUP] adapt to wrapped package import
-// import { routes } from '@cc/task-manager';
+import { routes } from '@module.scope@/@module.name@';
 import { appConfig } from '../config/index';
 import { FallbackComponent } from './fallback.component';
 import { ModuleComponent } from './module.component';
@@ -15,8 +14,7 @@ const prefixedRoutes: Routes = [
     { path: '', component: ModuleComponent },
     {
         path: appConfig.global.baseUrl,
-        // TODO[REMOTE-SETUP] adapt to wrapped package import
-        // children: routes,
+        children: routes,
     },
     { path: '**', component: FallbackComponent },
 ];

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui13/dependencies-composite.json

@@ -0,0 +1,6 @@
+{
+    "@eui/deps-base": "^13.0.0",
+
+    "@csdr/core": "^3.0.0",
+    "@csdr/integration": "^3.0.0"
+}

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui14/dependencies-composite.json

@@ -0,0 +1,6 @@
+{
+    "@eui/deps-base": "^14.0.0",
+
+    "@csdr/core": "^3.0.0",
+    "@csdr/integration": "^3.0.0"
+}

package/scripts/csdr/config/global.js

@@ -457,7 +457,7 @@ module.exports.registerCsdrProject = (name, isFullSkeleton) => {
 
 // Register newly created package
 
-module.exports.registerCsdrPackage = (pkg, isRemote) => {
+module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName) => {
 
   const csdrConfigPackage = {
     "name": "@module.full.name@",
@@ -484,10 +484,20 @@ module.exports.registerCsdrPackage = (pkg, isRemote) => {
     ],
     "build": {
       "compiledTranslations": true,
-      "translationScopes": "eui,csdr,cc"
+      "translationScopes": "eui,csdr,cc,mywp",
+      "skipLint": true,
+      "skipTest": true,
+      "envTargetActive": true
+    },
+    "release": {
+       "team": "cc-ui-rm"
     },
     "slack": {
       "channel": "csdr-timeline-mwp-remotes-cc"
+    },
+    "externalSources": {
+      "npmPkg": "@module.rootPkg.scope@/@module.rootPkg.name@",
+      "folder": "assets/remote-sources"
     }
   }
 
@@ -504,6 +514,8 @@ module.exports.registerCsdrPackage = (pkg, isRemote) => {
   let replaceModule = tools.replaceAll(packageDef, '@module.full.name@', pkg.name);
   replaceModule = tools.replaceAll(replaceModule, '@module.repo.name@', pkg.repoName);
   replaceModule = tools.replaceAll(replaceModule, '@module.npmPkg.name@', pkg.npmPkgName);
+  replaceModule = tools.replaceAll(replaceModule, '@module.rootPkg.scope@', rootPkgScope);
+  replaceModule = tools.replaceAll(replaceModule, '@module.rootPkg.name@', rootPkgName);
 
   let file = path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json');
   let jsonFile = require(file);