@eui/tools 5.3.81 → 5.3.83

package/.version.properties

@@ -1 +1 @@
-5.3.81
+5.3.83

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 5.3.83 (2022-10-28)
+
+##### Bug Fixes
+
+* **other:**
+  * routes replacements for v7 MWP - MWP-8915 [MWP-8915](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8915)  ([f705e15c](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f705e15cc24e92a3905269cbc2ed8f327189f6ca))
+
+* * *
+* * *
+## 5.3.82 (2022-10-27)
+
+##### Chores
+
+* **other:**
+  * adapted v14 and v15 remotes skeletons - MWP-8915 [MWP-8915](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8915)  ([0b49db6c](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0b49db6c99e382f5413a6638140f84de8422bfbd))
+
+* * *
+* * *
 ## 5.3.81 (2022-10-27)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/cli/package.js

@@ -14,12 +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_EUI15_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-eui15');
 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_SKELETON_REMOTE_EUI15_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-remote-eui15');
 const FRONTEND_OPTION_ROUTE_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-option-route');
 const BACKEND_SKELETON_PATH = path.join(SKELETONS_ROOT_PATH, 'backend');
 
@@ -37,8 +37,8 @@ const defaultConfig = {
   pkgFrontendVersion: {
     DEFAULT: 'eui7',
     EUI10: 'eui10',
-    EUI13: 'eui13',
     EUI14: 'eui14',
+    EUI15: 'eui15',
   },
   isRouteModule: true,
   isCsdrRepo: true,
@@ -101,8 +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 },
+            { name: 'v15', value: defaultConfig.pkgFrontendVersion.EUI15 },
           ],
           default: defaultConfig.pkgFrontendType.DEFAULT,
           when: function (answers) {
@@ -198,14 +198,14 @@ const buildFrontend = (
       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 if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI15) {
+      fullName += '-eui15-remote-el-ui';
+      npmPkgName = `${scope}/${name}-eui15-remote-el`;
+
     } else {
       fullName += '-remote-el-ui';
       npmPkgName = `${scope}/${name}-remote-el`;
@@ -254,14 +254,14 @@ const buildFrontend = (
         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 if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI15) {
+          tools.copydir(FRONTEND_SKELETON_REMOTE_EUI10_PATH, targetPath, true);
+          return tools.copydir(FRONTEND_SKELETON_REMOTE_EUI15_PATH, targetPath, true);
+
         } else {
           return tools.copydir(FRONTEND_SKELETON_REMOTE_PATH, targetPath, true);
         }
@@ -270,14 +270,14 @@ const buildFrontend = (
         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 if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI15) {
+          tools.copydir(FRONTEND_SKELETON_EUI10_PATH, targetPath, true);
+          return tools.copydir(FRONTEND_SKELETON_EUI15_PATH, targetPath, true);
+
         } else {
           return tools.copydir(FRONTEND_SKELETON_PATH, targetPath, true);
         }

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

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

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

@@ -0,0 +1,11 @@
+import {
+    EuiBlockContentComponentModule,
+    EuiButtonModule,
+    EuiLabelModule,
+} from '@eui/components-next';
+
+export const EUI_COMPONENTS_MODULES = [
+    EuiBlockContentComponentModule,
+    EuiButtonModule,
+    EuiLabelModule,
+];

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

@@ -16,14 +16,10 @@ import {
     EUI_CONFIG_TOKEN,
     translateConfig,
 } from '@eui/core';
-import {
-    EuiBlockContentComponentModule,
-    EuiButtonModule,
-    EuiLabelModule,
-} from '@eui/components-next';
-import {
-    CsdrCoreModule,
-} from '@csdr/core';
+
+import { EUI_COMPONENTS_MODULES } from './eui-components';
+
+import { CsdrCoreModule } from '@csdr/core';
 
 import { TOKEN, reducerProvider, metaReducers } from './reducers/index';
 import { CustomSerializer } from './reducers/custom-route-serializer';
@@ -32,9 +28,7 @@ import { environment } from '../environments/environment';
 import { appConfig } from '../config';
 
 import { Module as RootPackageCommonModule } from '@module.scope@/@module.name@';
-import {
-    DEFAULT_MAPPED_PROVIDERS,
-} from '@csdr/integration/element';
+import { DEFAULT_MAPPED_PROVIDERS } from '@csdr/integration/element';
 import { RoutingModule } from './routing.module';
 
 import { FallbackComponent } from './fallback.component';
@@ -54,12 +48,10 @@ import { ModuleComponent } from './module.component';
         CoreModule.forRoot(),
         CsdrCoreModule.forRoot(),
 
-        EuiBlockContentComponentModule,
-        EuiButtonModule,
-        EuiLabelModule,
-
         RootPackageCommonModule,
         RoutingModule,
+
+        ...EUI_COMPONENTS_MODULES,
     ],
     declarations: [
         FallbackComponent,

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/config/global.ts

@@ -22,9 +22,9 @@ const i18nConfig: I18nConfig = {
  */
 export const GLOBAL: GlobalConfig = {
     /* URL that needs to be used in the appRouting of the MWP */
-    baseUrl: '@module.name@-v10',
+    baseUrl: '@module.name@',
     /* Element tag name that needs to be unique - make sure it doesn't collide with any other MWP element */
-    elementName: '@module.scope-name@-v10',
+    elementName: '@module.scope-name@',
     /* in case you are using NgRx give it a unique name (mostly for debugging) */
     storeName: '@module.scope-name@',
     i18n: i18nConfig,

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

@@ -0,0 +1,84 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "apps",
+  "projects": {
+    "@module.full.name@": {
+      "root": ".",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {},
+      "architect": {
+        "build": {
+          "builder": "ngx-build-plus:build",
+          "options": {
+              "deployUrl": "/mwp/assets/elements/@module.full.name@/bundles/",
+            "outputPath": "dist",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.app.json",
+            "scripts": [
+              "./node_modules/@webcomponents/custom-elements/src/native-shim.js"
+            ],
+            "assets": [
+              "src/assets"
+            ],
+              "styles": [
+                  "./node_modules/@eui/styles/dist/styles/eui.css"
+              ]
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true
+            },
+            "serve-dist": {
+              "outputPath": "serve-dist",
+              "wath": true
+            }
+          }
+        },
+        "serve": {
+          "builder": "./node_modules/@angular-devkit/build-angular:dev-server",
+          "options": {
+              "deployUrl": "/assets/elements/@module.full.name@/bundles/",
+              "browserTarget": "@module.full.name@:build:serve-dist"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "@module.full.name@:build:production"
+            }
+          }
+        },
+        "test": {
+          "builder": "./node_modules/@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "scripts": []
+          }
+        }
+      }
+    }
+  },
+  "cli": {
+    "analytics": false
+  }
+}

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

@@ -2,5 +2,7 @@
     "@eui/deps-base": "^14.0.0",
 
     "@csdr/core": "^3.0.0",
-    "@csdr/integration": "^3.0.0"
+    "@csdr/integration": "^3.0.0",
+
+    "@module.scope@/@module.name@": "^1.0.0"
 }

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui14/src/app/eui-components.ts

@@ -0,0 +1,9 @@
+import { EuiBlockContentComponentModule } from '@eui/components/eui-block-content';
+import { EuiButtonModule } from '@eui/components/eui-button';
+import { EuiLabelModule } from '@eui/components/atoms';
+
+export const EUI_COMPONENTS_MODULES = [
+    EuiBlockContentComponentModule,
+    EuiButtonModule,
+    EuiLabelModule,
+];

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui15/angular.json

@@ -0,0 +1,84 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "apps",
+  "projects": {
+    "@module.full.name@": {
+      "root": ".",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {},
+      "architect": {
+        "build": {
+          "builder": "ngx-build-plus:build",
+          "options": {
+              "deployUrl": "/mwp/assets/elements/@module.full.name@/bundles/",
+            "outputPath": "dist",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.app.json",
+            "scripts": [
+              "./node_modules/@webcomponents/custom-elements/src/native-shim.js"
+            ],
+            "assets": [
+              "src/assets"
+            ],
+              "styles": [
+                  "./node_modules/@eui/styles/dist/styles/eui.css"
+              ]
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true
+            },
+            "serve-dist": {
+              "outputPath": "serve-dist",
+              "wath": true
+            }
+          }
+        },
+        "serve": {
+          "builder": "./node_modules/@angular-devkit/build-angular:dev-server",
+          "options": {
+              "deployUrl": "/assets/elements/@module.full.name@/bundles/",
+              "browserTarget": "@module.full.name@:build:serve-dist"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "@module.full.name@:build:production"
+            }
+          }
+        },
+        "test": {
+          "builder": "./node_modules/@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "scripts": []
+          }
+        }
+      }
+    }
+  },
+  "cli": {
+    "analytics": false
+  }
+}

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

@@ -0,0 +1,8 @@
+{
+    "@eui/deps-base": "^15.0.0",
+
+    "@csdr/core": "^3.0.0",
+    "@csdr/integration": "^3.0.0",
+
+    "@module.scope@/@module.name@": "^1.0.0"
+}

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui15/src/app/eui-components.ts

@@ -0,0 +1,9 @@
+import { EuiBlockContentComponentModule } from '@eui/components/eui-block-content';
+import { EuiButtonModule } from '@eui/components/eui-button';
+import { EuiLabelModule } from '@eui/components/atoms';
+
+export const EUI_COMPONENTS_MODULES = [
+    EuiBlockContentComponentModule,
+    EuiButtonModule,
+    EuiLabelModule,
+];

package/scripts/utils/pre-build/injection/routes-replacement.js

@@ -255,7 +255,7 @@ const replaceRoutes = (project, envTarget, build, routesFileContent) => {
       finalRouteDefs.forEach((route) => {
         if (debug) tools.logInfo(`====> route : ${route.path}`);
 
-        if (project.build && (project.build.euiVersion === '7.x' || project.build.euiVersion === '10.x')) {
+        if (project.build && (!project.build.euiVersion || project.build.euiVersion === '7.x' || project.build.euiVersion === '10.x')) {
           tools.logInfo('Legacy routes replacement for v7 and v10');
           placeHolderContent += replaceRouteLegacy(route);
         } else {

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

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

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

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