@eui/tools 6.10.4 → 6.11.0

package/.version.properties

@@ -1 +1 @@
-6.10.4
+6.11.0

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.11.0 (2023-04-15)
+
+##### New Features
+
+* **other:**
+  * upgraded various dependencies - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([70266e8b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/70266e8b2ade525192bf2047dc773c0e63c8ef97))
+
+* * *
+* * *
+## 6.10.5 (2023-04-15)
+
+##### Chores
+
+* **other:**
+  * added simple participant skeleton - fix wrong registration of package frontend on creation - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([c2121754](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c2121754a8706141841dc9cae2d3b34e066aae87))
+
+* * *
+* * *
 ## 6.10.4 (2023-04-15)
 
 ##### Refactors

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.10.4",
+    "version": "6.11.0",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -16,40 +16,40 @@
         "chalk": "4.1.2",
         "fs-extra": "9.0.0",
         "replace-in-file": "4.1.3",
-        "semver": "7.3.8",
+        "semver": "7.4.0",
         "cross-spawn": "6.0.5",
         "eol": "0.9.1",
         "rimraf": "3.0.2",
         "ncp": "2.0.0",
         "moment": "2.29.4",
-        "moment-timezone": "0.5.40",
+        "moment-timezone": "0.5.43",
         "npm-run-all": "4.1.5",
         "figures": "3.2.0",
         "xml2js": "0.4.23",
-        "https-proxy-agent": "2.2.3",
-        "json-server": "0.16.3",
+        "https-proxy-agent": "5.0.1",
+        "json-server": "0.17.3",
         "faker": "5.5.3",
-        "nodemon": "2.0.20",
+        "nodemon": "2.0.22",
         "lowdb": "1.0.0",
         "event-stream": "3.3.4",
         "empty-module": "0.0.2",
-        "autoprefixer": "10.4.13",
-        "sass": "1.58.0",
+        "autoprefixer": "10.4.14",
+        "sass": "1.62.0",
         "postcss": "8.4.21",
         "cssnano": "5.1.14",
         "extend": "3.0.2",
         "mocha": "10.2.0",
         "chai": "4.3.7",
         "nyc": "15.1.0",
-        "node-fetch": "2.6.9",
+        "node-fetch": "3.3.1",
         "svg-sprite": "2.0.2",
         "imagemin": "7.0.1",
         "imagemin-svgo": "9.0.0",
         "concat": "1.0.3",
-        "file-saver": "^2.0.5",
-        "morgan": "^1.10.0",
-        "open": "^8.4.0",
-        "body-parser": "^1.20.1",
-        "express": "^4.18.2"
+        "file-saver": "2.0.5",
+        "morgan": "1.10.0",
+        "open": "9.1.0",
+        "body-parser": "1.20.2",
+        "express": "4.18.2"
     }
 }

package/scripts/app/public/package-init.html

@@ -97,6 +97,16 @@
                                     </div>
                                 </div>
                             </div>
+                            <!-- <div class="row mt-3 mb-3">
+                                <div class="col-sm-4">
+                                    <label class="form-check-label d-flex justify-content-end"> Participant package type - NgRx (advanced) ?</label>
+                                </div>
+                                <div class="col-sm-8">
+                                    <div class="form-check form-switch">
+                                        <input class="form-check-input" type="checkbox" v-model="params.pkgFrontendParticipantNgRx" />
+                                    </div>
+                                </div>
+                            </div> -->
                         </div>
 
                         <div v-if="params.pkgFrontendType === 'remote'">

package/scripts/app/public/package-init.js

@@ -47,6 +47,7 @@ new Vue({
                 pkgName: "my-package",
                 csdrRepo: true,
                 pkgFrontendParticipant: false,
+                pkgFrontendParticipantNgRx: false,
                 pkgGroupId: "eu.europa.ec.cc",
                 remoteConfig: {
                     rmTeamName: "cc-digit-ui-rm",
@@ -129,6 +130,7 @@ new Vue({
                         params.externalRepoName = this.params.externalRepoName;
                     }
                     params.pkgFrontendParticipant = this.params.pkgFrontendParticipant;
+                    params.pkgFrontendParticipantNgRx = this.params.pkgFrontendParticipantNgRx;
                 } else {
                     params.remoteConfig = this.params.remoteConfig;
                 }

package/scripts/csdr/cli/constants.js

@@ -6,7 +6,8 @@ module.exports.TARGET_ROOT_PATH = path.join(process.cwd(), 'packages');
 module.exports.TARGET_ROOT_REMOTES_PATH = path.join(process.cwd(), 'remotes');
 module.exports.SKELETONS_ROOT_PATH = path.join(__dirname, 'skeletons', 'package');
 module.exports.FRONTEND_SKELETON_EUI15_PATH = path.join(this.SKELETONS_ROOT_PATH, 'frontend', '15.x', 'default');
-module.exports.FRONTEND_SKELETON_EUI15_PARTICIPANT_PATH = path.join(this.SKELETONS_ROOT_PATH, 'frontend', '15.x', 'participant');
+module.exports.FRONTEND_SKELETON_EUI15_PARTICIPANT_DEFAULT_PATH = path.join(this.SKELETONS_ROOT_PATH, 'frontend', '15.x', 'participant-default');
+module.exports.FRONTEND_SKELETON_EUI15_PARTICIPANT_NGRX_PATH = path.join(this.SKELETONS_ROOT_PATH, 'frontend', '15.x', 'participant-ngrx');
 module.exports.BACKEND_SKELETON_PATH = path.join(this.SKELETONS_ROOT_PATH, 'backend');
 module.exports.VIRTUAL_REMOTE_SKELETON_ROOT_PATH = path.join(__dirname, 'skeletons', 'virtual-remote');
 

package/scripts/csdr/cli/package-build-frontend.js

@@ -141,7 +141,11 @@ const generateDefault = (args = constants.DEFAULT_CONFIG) => {
       tools.logInfo('Copying skeleton to target');
       if (args.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15) {
         if (args.pkgFrontendParticipant) {
-          tools.copydir(constants.FRONTEND_SKELETON_EUI15_PARTICIPANT_PATH, targetPath, true);
+          if (args.pkgFrontendParticipantNgRx) {
+            tools.copydir(constants.FRONTEND_SKELETON_EUI15_PARTICIPANT_NGRX_PATH, targetPath, true);
+          } else {
+            tools.copydir(constants.FRONTEND_SKELETON_EUI15_PARTICIPANT_DEFAULT_PATH, targetPath, true);
+          }
         } else {
           tools.copydir(constants.FRONTEND_SKELETON_EUI15_PATH, targetPath, true);
         }
@@ -161,7 +165,8 @@ const generateDefault = (args = constants.DEFAULT_CONFIG) => {
         npmPkgName: args.npmPkgName,
         paths: {
           root: targetPath
-        }
+        },
+        tsConfigFileName: 'tsconfig.lib.json'
       };
 
       tools.logInfo('Adding CSDR config entry');

package/scripts/csdr/cli/skeletons/package/frontend/15.x/default/.eslintrc.json

@@ -25,7 +25,7 @@
                     "error",
                     {
                         "type": "element",
-                        "prefix": ["@module.scope-name@"],
+                        "prefix": ["@module.scope.string@"],
                         "style": "kebab-case"
                     }
                 ],
@@ -33,7 +33,7 @@
                     "error",
                     {
                         "type": "attribute",
-                        "prefix": ["@module.scope-name@"],
+                        "prefix": ["@module.scope.string@"],
                         "style": "camelCase"
                     }
                 ]

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-default/.eslintrc.json

@@ -0,0 +1,43 @@
+{
+    "extends": "../../.eslintrc.mwp.json",
+    "ignorePatterns": [
+        "!**/*",
+        "**/*.d.ts",
+        "dist",
+        "test",
+        "coverage",
+        "externals",
+        "legacy"
+    ],
+    "overrides": [
+        {
+            "files": [
+                "*.ts"
+            ],
+            "parserOptions": {
+                "project": [
+                    "packages/@module.full.name@/tsconfig.lib.json",
+                    "packages/@module.full.name@/tsconfig.spec.json"
+                ]
+            },
+            "rules": {
+                "@angular-eslint/component-selector": [
+                    "error",
+                    {
+                        "type": "element",
+                        "prefix": ["@module.scope.string@"],
+                        "style": "kebab-case"
+                    }
+                ],
+                "@angular-eslint/directive-selector": [
+                    "error",
+                    {
+                        "type": "attribute",
+                        "prefix": ["@module.scope.string@"],
+                        "style": "camelCase"
+                    }
+                ]
+            }
+        }
+    ]
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-default/dependencies-composite.json

@@ -0,0 +1,4 @@
+{
+    "@eui/deps-base": "^15.0.0",
+    "@cc/shared": "^4.0.0"
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-default/src/index.ts

@@ -0,0 +1,2 @@
+export { @module.class.name@Module } from './lib/module';
+export { @module.class.name@Component } from './lib/components/participant/participant.component';

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-default/src/lib/components/participant/participant.component.html

@@ -0,0 +1 @@
+Hello from <strong>participant</strong>

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-default/src/lib/components/participant/participant.component.ts

@@ -0,0 +1,19 @@
+import { Component, OnInit, Input } from '@angular/core';
+
+import { BlockComponent, ParticipantBlock } from '@cc/shared';
+
+@Component({
+    selector: '@module.scope.string@-participant-cp',
+    templateUrl: './participant.component.html',
+})
+export class @module.class.name@Component implements BlockComponent, OnInit {
+    @Input() readonly block: ParticipantBlock; // it should be an extension of ParticipantBlock
+
+    constructor() {
+        // constructor
+    }
+
+    ngOnInit(): void {
+        console.log('init');
+    }
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-default/src/lib/module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { TranslateModule } from '@ngx-translate/core';
+
+import { CcSharedModule } from '@cc/shared';
+
+import { @module.class.name@Component } from './components/participant/participant.component';
+
+@NgModule({
+    imports: [
+        CommonModule,
+        TranslateModule,
+        CcSharedModule,
+    ],
+    declarations: [
+        @module.class.name@Component,
+    ],
+    exports: [
+        @module.class.name@Component,
+    ],
+})
+export class @module.class.name@Module {
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/{participant → participant-default}/src/test.ts.TO_REPLACE

@@ -5,7 +5,7 @@ import 'zone.js/dist/zone-testing';
 import { getTestBed } from '@angular/core/testing';
 import {
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
+  platformBrowserDynamicTesting,
 } from '@angular/platform-browser-dynamic/testing';
 
 declare const require: any;
@@ -13,7 +13,7 @@ declare const require: any;
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(),
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-ngrx/assets/i18n/en.json

@@ -0,0 +1,6 @@
+{
+    "@module.scope-name@.TITLE": "@module.scope-name@",
+    "@module.scope-name@.FILTER": "Search filter",
+    "@module.scope-name@.QUICK_SECTION": "Quick filter",
+    "@module.scope-name@.SEARCH_RESULT": "Filter results"
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-ngrx/assets/i18n/fr.json

@@ -0,0 +1,6 @@
+{
+    "@module.scope-name@.TITLE": "**fr** @module.scope-name@ **fr**",
+    "@module.scope-name@.FILTER": "**fr** Search filter **fr**",
+    "@module.scope-name@.QUICK_SECTION": "**fr** Quick filter **fr**",
+    "@module.scope-name@.SEARCH_RESULT": "**fr** Filter results **fr**"
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-ngrx/dependencies-base.json

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

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-ngrx/gitignore_TO_REPLACE

@@ -0,0 +1,46 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+**/node_modules
+**/target
+**/build
+**/dist
+**/out-tsc
+**/tmp
+**/test/reports
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+yarn-error.log
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+**/src/**/*.js
+**/src/**/*.map
+
+# System Files
+.DS_Store
+Thumbs.db

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-ngrx/karma.conf.js

@@ -0,0 +1,7 @@
+const karmaConfig = require('@eui/tools/karma/karma.conf.pkg');
+
+module.exports = function (config) {
+    config.set(
+        karmaConfig.get(config, '@module.full.name@', {})
+    );
+};

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-ngrx/ng-package.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "./dist",
+  "lib": {
+    "entryFile": "src/index.ts"
+  }
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-ngrx/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@module.scope@/@module.name@",
+  "version": "1.0.0"
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-ngrx/src/dummy.spec.ts.TO_REPLACE

@@ -0,0 +1,5 @@
+describe('First test', () => {
+    it('should work', () => {
+        expect(true).toBe(true);
+    });
+});

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-ngrx/src/test.ts.TO_REPLACE

@@ -0,0 +1,21 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/zone';
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+
+declare const require: any;
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-ngrx/tsconfig.lib.json

@@ -0,0 +1,32 @@
+{
+  "extends": "../../tsconfig.build.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/lib",
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "node",
+    "declaration": true,
+    "sourceMap": true,
+    "inlineSources": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "types": [],
+    "lib": [
+      "ES2022",
+      "dom"
+    ]
+  },
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true,
+    "enableResourceInlining": true
+  },
+  "exclude": [
+    "src/test.ts",
+    "**/*.spec.ts"
+  ]
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant-ngrx/tsconfig.spec.json

@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.build.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/spec",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "src/test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}

package/scripts/csdr/config/register.js

@@ -117,7 +117,7 @@ module.exports.registerCsdrPackage = (pkg, rootPkgScope, rootPkgName, euiVersion
 
       if (remoteConfig.options.participant) {
         moduleJson.skeletonConfig.options.participant = remoteConfig.options.participant;
-        moduleJson.skeletonConfig.blockContainerName = `${rootPkgScope.substr(1)}-${rootPkgName}-ct`;
+        moduleJson.skeletonConfig.blockContainerName = `${rootPkgScope.substr(1)}-participant-cp`;
       }
     }
   }