@eui/tools 4.15.11 → 4.15.12

package/.version.properties

@@ -1 +1 @@
-4.15.11
+4.15.12

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 4.15.12 (2021-10-27)
+
+##### Chores
+
+* **other:**
+  * adapted and removed obsolete imports and dependencies - adapted node-sass after transfer to eui deps - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([4e486138](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/4e486138aedba1434942074aefa4a4cfe4500101))
+  * merge functionalities from eUI tools 5.x - eUI 13 features - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([0aa8a160](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0aa8a16064f637d3e699049081c39e2207e13737))
+
+* * *
+* * *
 ## 4.15.11 (2021-10-21)
 
 ##### Chores

package/bin/eui-scripts.js

@@ -9,6 +9,7 @@ const scriptIndex = args.findIndex(
     x => x === 'clean-package' ||
     x === 'clean-all' ||
     x === 'build-package' ||
+    x === 'build-package-sub' ||
     x === 'build-element' ||
     x === 'build-deps' ||
     x === 'build-all' ||
@@ -45,6 +46,7 @@ switch (script) {
     case 'clean-package':
     case 'clean-all':
     case 'build-package':
+    case 'build-package-sub':
     case 'build-element':
     case 'build-deps':
     case 'build-all':

package/bin/scripts/build-package-sub.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const tools = require('../../scripts/utils/tools');
+const buildPackageUtils = require('../../scripts/utils/build/package/build-package-utils');
+const configUtils = require('../../scripts/csdr/config/config-utils');
+
+Promise.resolve()
+  .then(() => {
+    const { subEntry } = tools.getArgs();
+    const pkg = configUtils.packages.getPackage();
+    return buildPackageUtils.buildSubEntry(pkg, subEntry);
+  })
+  .then(() => {
+    tools.logSuccess();
+  })
+  .catch((e) => {
+    tools.logError('ERROR found while building package');
+    console.error(e);
+    process.exit(1);
+  })

package/global.test.js

@@ -3,7 +3,7 @@ describe('eUI tools - test imports', () => {
 
     // utils
     const changelogUtils = require('./scripts/utils/changelog-utils');
-    const confluenceUtils = require('./scripts/utils/confluence-utils');
+    // const confluenceUtils = require('./scripts/utils/confluence-utils');
     const gitUtils = require('./scripts/utils/git-utils');
     const mavenUtils = require('./scripts/utils/maven-utils');
     const pipelineUtils = require('./scripts/utils/pipeline-utils');
@@ -97,8 +97,8 @@ describe('eUI tools - test imports', () => {
     const csdrInstallLocalDev = require('./scripts/csdr/install/local-dev');
 
     // csdr - jira
-    const csdrJiraUtils = require('./scripts/csdr/jira/jira-utils');
-    const csdrJiraUpdate = require('./scripts/csdr/jira/update');
+    // const csdrJiraUtils = require('./scripts/csdr/jira/jira-utils');
+    // const csdrJiraUpdate = require('./scripts/csdr/jira/update');
 
     // csdr - metadata
     const csdrMetadataAppEnvs = require('./scripts/csdr/metadata/app-envs');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "4.15.11",
+    "version": "4.15.12",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -22,29 +22,25 @@
         "rimraf": "3.0.2",
         "ncp": "2.0.0",
         "confluence-api": "1.4.0",
-        "moment": "2.24.0",
-        "moment-timezone": "0.5.25",
-        "sanitize-html": "2.3.3",
+        "moment": "2.29.1",
+        "moment-timezone": "0.5.33",
         "npm-run-all": "4.1.5",
         "figures": "3.2.0",
-        "xml2js": "0.4.19",
+        "xml2js": "0.4.23",
         "https-proxy-agent": "2.2.3",
-        "postcss": "7.0.18",
-        "postcss-cli": "6.1.3",
-        "autoprefixer": "9.6.1",
         "jest": "26.6.3",
         "supertest": "4.0.2",
-        "memfs": "3.1.2",
-        "json-server": "0.16.1",
-        "faker": "4.1.0",
-        "nodemon": "1.19.0",
+        "memfs": "3.2.4",
+        "json-server": "0.16.3",
+        "faker": "5.5.3",
+        "nodemon": "2.0.12",
         "lowdb": "1.0.0",
         "event-stream": "3.3.4",
-        "node-sass-tilde-importer": "1.0.2",
-        "axios": "0.21.1",
         "empty-module": "0.0.2",
-        "pa11y-ci": "2.4.0",
         "sendmail": "1.6.1",
-        "node-sass": "4.14.1"
+        "autoprefixer": "9.6.1",
+        "sass": "1.39.0",
+        "postcss": "7.0.36",
+        "cssnano": "4.1.11"
     }
 }

package/sandbox.js

@@ -596,7 +596,8 @@ const notificationUtils = require('./scripts/utils/notification/notification-uti
 
 return Promise.resolve()
   .then(() => {
-    const folder = path.join(process.cwd(),'packages', 'eui-tools');
-    console.log(tools.getPackageFolderStats(folder));
+    const prjName = 'eui-showcase-ux';
+    const prj = configUtils.projects.getCsdrProject(prjName);
+    console.log(prj);
   })
 

package/scripts/csdr/cli/app.js

@@ -14,12 +14,17 @@ const configUtils = require('../config/config-utils');
 const TARGET_ROOT_PATH = path.join(process.cwd(), 'apps');
 const APP_DEFAULT_SKELETON_PATH = path.join(__dirname, 'skeletons', 'app');
 const APP_SHOWCASE_SKELETON_PATH = path.join(__dirname, 'skeletons', 'app-showcase');
+const APP_SHOWCASE_SKELETON_EUI13_PATH = path.join(__dirname, 'skeletons', 'app-showcase-eui13');
 
 const defaultConfig = {
   appType: {
     DEFAULT: 'default',
     SHOWCASE: 'showcase'
   },
+  appVersion: {
+    DEFAULT: 'eui10',
+    EUI13: 'eui13'
+  },
   appName: 'my-app',
   appScope: '@app'
 }
@@ -44,6 +49,24 @@ const prompt = () => {
             }
           }
         },
+        {
+          type: 'list',
+          name: 'appVersion',
+          message: 'Select eUI version target :',
+          choices: [
+            { name: 'v10', value: defaultConfig.pkgFrontendVersion.DEFAULT },
+            { name: 'v13', value: defaultConfig.pkgFrontendVersion.EUI13 },
+          ],
+          default: defaultConfig.appType.DEFAULT,
+          when: function (answers) {
+            return (answers.appType === defaultConfig.appType.SHOWCASE);
+          },
+          validate: function (value) {
+            if (value.length) {
+              return true;
+            }
+          }
+        },
         {
           name: 'appName',
           type: 'input',
@@ -66,7 +89,7 @@ const prompt = () => {
 
 
 
-const build = (name, scope, appType, targetPath) => {
+const build = (name, scope, appType, targetPath, appVersion) => {
   tools.logTitle('Generating application');
 
   return Promise.resolve()
@@ -81,7 +104,11 @@ const build = (name, scope, appType, targetPath) => {
         return tools.copydir(APP_DEFAULT_SKELETON_PATH, targetPath, true);
 
       } else if (appType === defaultConfig.appType.SHOWCASE) {
-        return tools.copydir(APP_SHOWCASE_SKELETON_PATH, targetPath, true);
+        if (appVersion === defaultConfig.appVersion.EUI13) {
+          return tools.copydir(APP_SHOWCASE_SKELETON_EUI13_PATH, targetPath, true);
+        } else {
+          return tools.copydir(APP_SHOWCASE_SKELETON_PATH, targetPath, true);
+        }
       }
     })
 
@@ -157,7 +184,7 @@ module.exports.generate = () => {
 
       const targetPath = path.join(TARGET_ROOT_PATH, answers.appName);
 
-      return build(answers.appName, answers.appScope, answers.appType, targetPath);
+      return build(answers.appName, answers.appScope, answers.appType, targetPath, answers.appVersion);
     })
 
     .catch((e) => {

package/scripts/csdr/cli/skeletons/app-showcase-eui13/angular-config.json

@@ -0,0 +1,33 @@
+{
+    "build": {
+        "assets": [
+            "apps/@app.name@/src/_generated/favicon.ico",
+            "apps/@app.name@/src/assets",
+            {
+                "glob": "**/*",
+                "input": "node_modules/@eui/core/assets/",
+                "output": "./assets"
+            },
+            {
+                "glob": "**/*",
+                "input": "node_modules/@eui/styles-base/src/assets/",
+                "output": "./assets"
+            }
+        ],
+        "styles": [
+            "node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css",
+            "packages/eui/packages/styles/src/styles/eui-showcase-dev-only.scss",
+            "packages/eui/packages/styles/src/styles/eui-next-dev-only.scss"
+        ],
+        "stylesBuild": [
+            "node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css",
+            "node_modules/@eui/styles/dist/styles/eui-showcase.css",
+            "node_modules/@eui/styles/dist/styles/eui-next.css"
+        ],
+        "scripts": [
+            "node_modules/prismjs/plugins/line-numbers/prism-line-numbers.js",
+            "node_modules/marked/lib/marked.js",
+            "node_modules/prismjs/prism.js"
+        ]
+    }
+}

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

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

package/scripts/csdr/cli/skeletons/app-showcase-eui13/gitignore_TO_REPLACE

@@ -0,0 +1,50 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+**/node_modules
+**/target
+**/build
+**/dist
+**/out-tsc
+**/tmp
+**/tests/reports
+# /src/assets/i18n-compiled/*
+# /src/assets/openid-login-config*
+
+# 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
+
+# System Files
+.DS_Store
+Thumbs.db
+
+/*.iml
+
+/src/_generated

package/scripts/csdr/cli/skeletons/app-showcase-eui13/package.json

@@ -0,0 +1,6 @@
+{
+    "name": "@app.name@",
+    "version": "1.0.0",
+    "license": "EUPL-1.1",
+    "private": true
+}

package/scripts/csdr/cli/skeletons/app-showcase-eui13/scripts.json

@@ -0,0 +1,3 @@
+{
+    "@app.name@:start": "eui-scripts serve-app @app.name@"
+}

package/scripts/csdr/cli/skeletons/app-showcase-eui13/src/app/app-routing.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, ExtraOptions } from '@angular/router';
+
+import { routes } from './app.routes';
+
+const routerOptions: ExtraOptions = {
+    anchorScrolling: 'enabled',
+    scrollPositionRestoration: 'enabled',
+    scrollOffset: [0, 65],
+};
+
+@NgModule({
+    imports: [
+        RouterModule.forRoot(routes, routerOptions),
+    ],
+    exports: [
+        RouterModule,
+    ],
+})
+export class AppRoutingModule {
+}

package/scripts/csdr/cli/skeletons/app-showcase-eui13/src/app/app.component.html

@@ -0,0 +1,26 @@
+<eui-app [isSidebarOpen]="true" isSidebarHidden="false">
+    <eui-app-toolbar>
+        <eui-toolbar>
+            <eui-toolbar-logo></eui-toolbar-logo>
+            <eui-toolbar-app appName="eUI"></eui-toolbar-app>
+            <eui-toolbar-items euiPositionRight>
+                <eui-toolbar-item-user-profile>
+                    <eui-user-profile-menu>
+                        <eui-user-profile-menu-item>
+                            <eui-icon iconClass="eui-icon-person-thin"></eui-icon> My profile information
+                        </eui-user-profile-menu-item>
+                        <eui-user-profile-menu-item>
+                            <eui-icon iconClass="eui-icon-logout-thin"></eui-icon> Sign out
+                        </eui-user-profile-menu-item>
+                    </eui-user-profile-menu>
+                </eui-toolbar-item-user-profile>
+            </eui-toolbar-items>
+        </eui-toolbar>
+    </eui-app-toolbar>
+
+    <eui-app-sidebar>
+        <eui-app-sidebar-body>
+            <eui-app-sidebar-menu [items]="sidebarItems" [hasIcons]="true" [hasTooltip]="false"></eui-app-sidebar-menu>
+        </eui-app-sidebar-body>
+    </eui-app-sidebar>
+</eui-app>

package/scripts/csdr/cli/skeletons/app-showcase-eui13/src/app/app.component.ts

@@ -0,0 +1,19 @@
+import { Component } from '@angular/core';
+import { I18nService } from '@eui/core';
+
+@Component({
+    /* tslint:disable-next-line */
+    selector: 'app-root',
+    templateUrl: './app.component.html',
+})
+export class AppComponent {
+    sidebarItems = [
+        { label: 'Home', url: '/home', iconClass: 'eui-icon-home' },
+    ];
+
+    constructor(
+        protected i18nService: I18nService,
+    ) {
+        this.i18nService.init();
+    }
+}

package/scripts/csdr/cli/skeletons/app-showcase-eui13/src/app/app.routes.ts

@@ -0,0 +1,7 @@
+import { Routes } from '@angular/router';
+
+export const routes: Routes = [
+    { path: '', redirectTo: 'home', pathMatch: 'full' },
+    { path: 'index.html', redirectTo: 'home', pathMatch: 'full' },
+    { path: 'home', loadChildren: () => import('./features/_home/home.module').then(m => m.Module) },
+];

package/scripts/csdr/cli/skeletons/app-showcase-eui13/src/app/features/_home/home-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { HomeComponent } from './home.component';
+
+const routes: Routes = [
+    { path: '', component: HomeComponent },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes),
+    ],
+})
+export class HomeRoutingModule {}

package/scripts/csdr/cli/skeletons/app-showcase-eui13/src/app/features/_home/home.component.html

@@ -0,0 +1,7 @@
+<eui-page>
+    <eui-page-header label="Home"></eui-page-header>
+
+    <eui-page-content>
+        Page content
+    </eui-page-content>
+</eui-page>

package/scripts/csdr/cli/skeletons/app-showcase-eui13/src/app/features/_home/home.component.ts

@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+    templateUrl: './home.component.html',
+})
+export class HomeComponent {
+
+}

package/scripts/csdr/cli/skeletons/app-showcase-eui13/src/app/features/_home/home.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../shared/shared.module';
+
+import { HomeRoutingModule } from './home-routing.module';
+import { HomeComponent } from './home.component';
+
+@NgModule({
+    imports: [
+        HomeRoutingModule,
+        SharedModule,
+    ],
+    declarations: [
+        HomeComponent,
+    ],
+})
+export class Module {}

package/scripts/csdr/cli/skeletons/app-showcase-eui13/src/app/features/shared/shared.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+
+import { EuiAllModule } from '@eui/components';
+
+@NgModule({
+    imports: [
+        EuiAllModule,
+    ],
+    declarations: [
+    ],
+    exports: [
+        EuiAllModule,
+    ],
+})
+export class SharedModule {}

package/scripts/csdr/cli/skeletons/app-showcase-eui13/src/assets/app-metadata.json

@@ -0,0 +1,8 @@
+{
+    "appVersion": "10.3.2-snapshot-1617092098271",
+    "appReleaseDate": "30/03/2021 08:25",
+    "appInfos": "10.3.2-snapshot-1617092098271 - 30/03/2021 08:25",
+    "metadata": {
+        "@eui/deps-base": "10.3.2-snapshot-1617092098271"
+    }
+}

package/scripts/csdr/cli/skeletons/app-showcase-eui13/src/assets/config/env-json-config.json

@@ -0,0 +1,41 @@
+{
+    "global": {
+        "appTitle": "CSDR-app",
+        "i18n": {
+            "i18nService": {
+                "defaultLanguage": "en",
+                "languages": [
+                    "en",
+                    "fr",
+                    "es"
+                ]
+            },
+            "i18nLoader": {
+                "i18nFolders": [
+                    "i18n-eui",
+                    "i18n-ecl",
+                    "i18n"
+                ]
+            }
+        }
+    },
+    "versions": {},
+    "modules": {
+        "core": {
+            "api": {
+                "base": "assets/",
+                "user": {
+                    "base": "config/",
+                    "details": "user-details.json",
+                    "preferences": "user-preferences.json",
+                    "rights": "user-rights.json"
+                }
+            }
+        },
+        "users": {
+            "api": {
+                "base": "https://jsonplaceholder.typicode.com/users"
+            }
+        }
+    }
+}

package/scripts/csdr/cli/skeletons/app-showcase-eui13/src/index.html

@@ -0,0 +1,22 @@
+<!doctype html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <title>eUI - UX</title>
+  <base href="/">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <script src="https://ec.europa.eu/wel/cookie-consent/consent.js" type="text/javascript" defer></script>
+</head>
+
+<body>
+  <app-root>
+    <div id="loader-wrapper">
+      <div id="loader"></div>
+    </div>
+  </app-root>
+</body>
+
+</html>