@eui/tools 6.12.65 → 6.13.1

package/.version.properties

@@ -1 +1 @@
-6.12.65
+6.13.1

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.13.1 (2023-10-14)
+
+##### Chores
+
+* **other:**
+  * adapted v17 skeletons adding option to disable esbuild through config (issue with latest angular) - EUI-7843 [EUI-7843](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7843)  ([242c8ca2](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/242c8ca2d903ce4543d20bf936298b83f6c7c480))
+
+* * *
+* * *
+## 6.13.0 (2023-10-12)
+
+##### New Features
+
+* **other:**
+  * adapted skeletons for v17 pkg and remotes - MWP-10178 [MWP-10178](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-10178)  ([2399bbdf](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/2399bbdf3ecc975da90a7dafeeb11421df6e866c))
+
+* * *
+* * *
 ## 6.12.65 (2023-10-10)
 
 ##### Chores

package/package.json

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

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

@@ -29,7 +29,8 @@ new Vue({
             ],
             frontendVersions: [
               { label: "15.x", value: "15" },
-              { label: "16.x", value: "16" }
+              { label: "16.x", value: "16" },
+              { label: "17.x", value: "17" }
             ],
             frontendTypes: [
                 { label: "default UI package", value: "default" },
@@ -44,7 +45,7 @@ new Vue({
         getDefaultParams() {
             return {
                 pkgType: "frontend",
-                pkgFrontendVersion: "15",
+                pkgFrontendVersion: "16",
                 pkgFrontendType: "default",
                 pkgScope: "@zzz",
                 pkgName: "my-package",

package/scripts/csdr/cli/constants.js

@@ -11,6 +11,9 @@ module.exports.FRONTEND_SKELETON_EUI15_PARTICIPANT_NGRX_PATH = path.join(this.SK
 module.exports.FRONTEND_SKELETON_EUI16_PATH = path.join(this.SKELETONS_ROOT_PATH, 'frontend', '16.x', 'default');
 module.exports.FRONTEND_SKELETON_EUI16_PARTICIPANT_DEFAULT_PATH = path.join(this.SKELETONS_ROOT_PATH, 'frontend', '16.x', 'participant-default');
 module.exports.FRONTEND_SKELETON_EUI16_PARTICIPANT_NGRX_PATH = path.join(this.SKELETONS_ROOT_PATH, 'frontend', '16.x', 'participant-ngrx');
+module.exports.FRONTEND_SKELETON_EUI17_PATH = path.join(this.SKELETONS_ROOT_PATH, 'frontend', '17.x', 'default');
+module.exports.FRONTEND_SKELETON_EUI17_PARTICIPANT_DEFAULT_PATH = path.join(this.SKELETONS_ROOT_PATH, 'frontend', '17.x', 'participant-default');
+module.exports.FRONTEND_SKELETON_EUI17_PARTICIPANT_NGRX_PATH = path.join(this.SKELETONS_ROOT_PATH, 'frontend', '17.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');
 
@@ -26,6 +29,7 @@ module.exports.CONFIG_OPTIONS = {
   pkgFrontendVersion: {
     EUI15: '15',
     EUI16: '16',
+    EUI17: '17'
   }
 }
 

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

@@ -161,6 +161,16 @@ const generateDefault = (args = constants.DEFAULT_CONFIG) => {
         } else {
           tools.copydir(constants.FRONTEND_SKELETON_EUI16_PATH, targetPath, true);
         }
+      } else if (args.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI17) {
+        if (args.pkgFrontendParticipant) {
+          if (args.pkgFrontendParticipantNgRx) {
+            tools.copydir(constants.FRONTEND_SKELETON_EUI17_PARTICIPANT_NGRX_PATH, targetPath, true);
+          } else {
+            tools.copydir(constants.FRONTEND_SKELETON_EUI17_PARTICIPANT_DEFAULT_PATH, targetPath, true);
+          }
+        } else {
+          tools.copydir(constants.FRONTEND_SKELETON_EUI17_PATH, targetPath, true);
+        }
       }
 
       // REPLACING PLACEHOLDERS

package/scripts/csdr/cli/package.js

@@ -35,6 +35,10 @@ const generateArgs = (args) => {
     } else if (args.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI16) {
       fullName += '-eui16-remote-el-ui';
       npmPkgName = `${args.pkgScope}/${args.pkgName}-eui16-remote-el`;
+
+    } else if (args.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI17) {
+      fullName += '-eui17-remote-el-ui';
+      npmPkgName = `${args.pkgScope}/${args.pkgName}-eui17-remote-el`;
     }
   }
 

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

@@ -0,0 +1,43 @@
+{
+    "extends": "../../.eslintrc.mwp-eui16.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/17.x/default/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/17.x/default/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/17.x/default/dependencies-base.json

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

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

@@ -0,0 +1,4 @@
+{
+    "@eui/deps-base": "^17.0.0",
+    "@csdr/core": "^6.0.0"
+}

package/scripts/csdr/cli/skeletons/package/frontend/17.x/default/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/17.x/default/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/17.x/default/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/17.x/default/package.json

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

package/scripts/csdr/cli/skeletons/package/frontend/17.x/default/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/17.x/default/src/index.ts

@@ -0,0 +1,2 @@
+export { @module.class.name@Module, @module.class.name@CommonModule } from './lib/module';
+export { RoutingModule, routes } from './lib/routing-module';

package/scripts/csdr/cli/skeletons/package/frontend/17.x/default/src/lib/components/main.component.html

@@ -0,0 +1,42 @@
+<eui-page>
+    <eui-page-header [label]="'@module.scope-name@.TITLE' | translate">
+        <eui-page-header-action-items>
+
+        </eui-page-header-action-items>
+    </eui-page-header>
+
+    <eui-page-content>
+
+        <eui-page-columns>
+
+            <eui-page-column
+                label="{{ '@module.scope-name@.FILTER' | translate }}"
+                [size]="'3xl'"
+                [isCollapsible]="true">
+
+                <eui-page-column-body>
+
+                    <!-- QUICK FILTER SECTION -->
+                    <div class="eui-u-flex eui-u-flex-column eui-u-mt-xs">
+                        <div class="eui-u-flex eui-u-flex-row">
+                            <div class="eui-u-font-size-l"><strong>{{ '@module.scope-name@.QUICK_SECTION' | translate }}</strong></div>
+                        </div>
+                    </div>
+
+                </eui-page-column-body>
+            </eui-page-column>
+
+            <eui-page-column label="{{ '@module.scope-name@.SEARCH_RESULT' | translate }}">
+
+                <eui-page-column-header-body>
+                </eui-page-column-header-body>
+
+                <eui-page-column-body>
+                </eui-page-column-body>
+
+            </eui-page-column>
+
+        </eui-page-columns>
+
+    </eui-page-content>
+</eui-page>

package/scripts/csdr/cli/skeletons/package/frontend/17.x/default/src/lib/components/main.component.ts

@@ -0,0 +1,8 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+    selector: '@module.scope-name@-cp',
+    templateUrl: './main.component.html',
+})
+export class @module.class.name@Component {
+}

package/scripts/csdr/cli/skeletons/package/frontend/17.x/default/src/lib/constants.ts

@@ -0,0 +1 @@
+export const namespace = '@module.class.name@:main';

package/scripts/csdr/cli/skeletons/package/frontend/17.x/default/src/lib/containers/container.component.ts

@@ -0,0 +1,28 @@
+import { ChangeDetectionStrategy, Component, Input, OnInit, OnDestroy } from '@angular/core';
+
+import { BreadcrumbsService } from '@csdr/core';
+
+@Component({
+    selector: '@module.scope-name@-ct',
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    template: `
+        <@module.scope-name@-cp>
+        </@module.scope-name@-cp>`,
+})
+export class @module.class.name@ContainerComponent implements OnInit, OnDestroy {
+
+    constructor(private breadcrumbs: BreadcrumbsService) {
+    }
+
+    ngOnInit(): void {
+        this.breadcrumbs.removeAll();
+        this.breadcrumbs.addItem({
+            id: '@module.scope-name@',
+            description: '@module.class.name@',
+            url: '/@module.scope-name@',
+        });
+    }
+
+    ngOnDestroy(): void {
+    }
+}

package/scripts/csdr/cli/skeletons/package/frontend/17.x/default/src/lib/module.ts

@@ -0,0 +1,80 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+// import { StoreModule } from '@ngrx/store';
+// import { EffectsModule } from '@ngrx/effects';
+
+import { TranslateModule } from '@ngx-translate/core';
+
+import { EuiButtonModule } from '@eui/components/eui-button';
+import { EuiPageModule } from '@eui/components/eui-page';
+
+// -- eUI module imports specific (recommended for treeshakability)
+const EUI_MODULES = [
+    EuiButtonModule,
+    EuiPageModule,
+];
+
+// -- Components --
+import { @module.class.name@Component } from './components/main.component';
+
+const COMPONENTS = [
+    @module.class.name@Component,
+];
+
+// -- Containers --
+import { @module.class.name@ContainerComponent } from './containers/container.component';
+
+const CONTAINERS = [
+    @module.class.name@ContainerComponent,
+];
+
+// -- Effects --
+const EFFECTS = [
+];
+
+// -- Reducer --
+// import { TOKEN, reducerProvider } from './store/reducers';
+
+// -- Services --
+const SERVICES = [
+];
+
+// -- Constants --
+import { namespace } from './constants';
+
+// -- Routes --
+import { RoutingModule } from './routing-module';
+
+@NgModule({
+    imports: [
+        CommonModule,
+        // StoreModule.forFeature(namespace, TOKEN),
+        // EffectsModule.forFeature(EFFECTS),
+        TranslateModule,
+
+        ...EUI_MODULES,
+    ],
+    declarations: [
+        ...COMPONENTS,
+        ...CONTAINERS,
+    ],
+    providers: [
+        // reducerProvider,
+        ...SERVICES,
+    ],
+    exports: [],
+})
+export class @module.class.name@CommonModule {
+}
+
+@NgModule({
+    imports: [
+        @module.class.name@CommonModule,
+        RoutingModule,
+    ],
+    exports: [
+        @module.class.name@CommonModule,
+    ],
+})
+export class @module.class.name@Module {
+}

package/scripts/csdr/cli/skeletons/package/frontend/17.x/default/src/lib/routing-module.ts

@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { @module.class.name@ContainerComponent } from './containers/container.component';
+
+export const routes: Routes = [
+    {
+        path: '',
+        pathMatch: 'full',
+        component: @module.class.name@ContainerComponent,
+    },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes),
+    ],
+    exports: [
+        RouterModule,
+    ],
+})
+export class RoutingModule {
+}

package/scripts/csdr/cli/skeletons/package/frontend/17.x/default/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/17.x/default/tsconfig.lib.json

@@ -0,0 +1,33 @@
+{
+  "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,
+    "useDefineForClassFields": false,
+    "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/17.x/default/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/cli/skeletons/package/frontend/17.x/participant-default/.eslintrc.json

@@ -0,0 +1,43 @@
+{
+    "extends": "../../.eslintrc-mwp-eui16.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/17.x/participant-default/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/17.x/participant-default/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/17.x/participant-default/dependencies-base.json

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

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

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

package/scripts/csdr/cli/skeletons/package/frontend/17.x/participant-default/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/17.x/participant-default/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/17.x/participant-default/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/17.x/participant-default/package.json

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