npm - @eui/tools - Versions diffs - 4.15.8 → 5.0.0-rc.4 - Mend

@eui/tools 4.15.8 → 5.0.0-rc.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

package/.version.properties CHANGED Viewed

	@@ -1 +1 @@
1	- 4.15.8
1	+ 5.0.0-rc.4

package/CHANGELOG.md CHANGED Viewed

@@ -1,27 +1,37 @@
-## 4.15.8 (2021-09-20)
+## 5.0.0-rc.4 (2021-09-20)
 ##### Bug Fixes
-* **pre-build:**
-  * transfer openid files and envTargetFiles to src target only - EUI-2999 [EUI-2999](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-2999)  ([ac01259c](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/ac01259c13ab814bdf72fdfbc148d6e02e3cc908))
+* **other:**
+  * check eui-styles-base on dependencies pulling - adapted from 4.x fixes - EUI-4112 [EUI-4112](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4112)  ([cb633675](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/cb633675984b71ad6cf96dce2cfc8cac7d3e53b7))
+* * *
+* * *
+## 5.0.0-rc.3 (2021-09-08)
+##### Bug Fixes
+* **other:**
+  * adjusted to lower postcss dependencies and plugins - EUI-4112 [EUI-4112](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4112)  ([4caa36b2](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/4caa36b2b3abdb3ee6b0863d840870cac761e0f5))
 * * *
 * * *
-## 4.15.7 (2021-09-16)
+## 5.0.0-rc.2 (2021-09-08)
 ##### Bug Fixes
 * **other:**
-  * keep the default openid-login-config.json file for replacement of dynamic assets/config env files - EUI-2999 [EUI-2999](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-2999)  ([a1ddc333](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a1ddc333ec413f4cbbb4e59d8f119d106f5b307d))
+  * showcase skeleton adapted for v13 - EUI-4112 [EUI-4112](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4112)  ([2c4442b3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/2c4442b3274df53e48c0eb9d35317f639402185e))
 * * *
 * * *
-## 4.15.6 (2021-09-14)
+## 5.0.0-rc.1 (2021-09-08)
 ##### Bug Fixes
 * **other:**
-  * no commits metadata found when exception thrown no valid issues found - EUI-2999 [EUI-2999](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-2999)  ([b5929a6c](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b5929a6c0639d2eb1edd27cfc887ee3a9a850562))
+  * adapted build styles package external lib inclusion - EUI-4112 [EUI-4112](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4112)  ([2d4f407f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/2d4f407f61d64799f0ce38987445f79081ea7bc9))
+  * adaptation for eUI 13.x project and packages - EUI-4112 [EUI-4112](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4112)  ([adb2b314](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/adb2b314bf9e80a69ab947cea164d2833eaff12b))
 * * *
 * * *

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
     "name": "@eui/tools",
-    "version": "4.15.8",
-    "tag": "latest",
+    "version": "5.0.0-rc.4",
+    "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
     "main": "index.js",
@@ -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"
+        "sass": "1.39.0",
+        "postcss": "7.0.36",
+        "cssnano": "4.1.11",
+        "autoprefixer": "9.6.1"
     }
 }

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

@@ -1,103 +1,33 @@
 {
-    "config": {
-        "root": "",
-        "sourceRoot": "apps/@app.name@/src",
-        "projectType": "application",
-        "prefix": "app",
-        "schematics": {
-            "@schematics/angular:component": {
-                "styleext": "scss"
-            }
-        },
-        "architect": {
-            "build": {
-                "builder": "ngx-build-plus:build",
-                "options": {
-                    "outputPath": "apps/@app.name@/dist",
-                    "index": "apps/@app.name@/src/_generated/index.html",
-                    "main": "apps/@app.name@/src/_generated/main.ts",
-                    "polyfills": "apps/@app.name@/src/_generated/polyfills.ts",
-                    "tsConfig": "apps/@app.name@/tsconfig.app.json",
-                    "assets": [
-                        "apps/@app.name@/src/_generated/favicon.ico",
-                        "apps/@app.name@/src/assets",
-                        {
-                            "glob": "**/*",
-                            "input": "node_modules/@eui/core/assets/",
-                            "output": "./assets"
-                        }
-                    ],
-                    "styles": [
-                        "node_modules/@eui/styles/dist/styles/eui.css",
-                        "node_modules/@eui/styles/dist/styles/eui-next.css"
-                    ]
-                },
-                "configurations": {
-                    "production": {
-                        "fileReplacements": [
-                            {
-                                "replace": "apps/@app.name@/src/_generated/environments/environment.ts",
-                                "with": "apps/@app.name@/src/_generated/environments/environment.prod.ts"
-                            }
-                        ],
-                        "optimization": false,
-                        "outputHashing": "all",
-                        "sourceMap": false,
-                        "extractCss": true,
-                        "namedChunks": true,
-                        "aot": true,
-                        "extractLicenses": true,
-                        "vendorChunk": false,
-                        "buildOptimizer": false,
-                        "budgets": [
-                            {
-                                "type": "initial",
-                                "maximumWarning": "2mb",
-                                "maximumError": "6mb"
-                            }
-                        ]
-                    },
-                    "production-optimized": {
-                        "fileReplacements": [
-                            {
-                                "replace": "apps/@app.name@/src/_generated/environments/environment.ts",
-                                "with": "apps/@app.name@/src/_generated/environments/environment.prod.ts"
-                            }
-                        ],
-                        "optimization": true,
-                        "outputHashing": "all",
-                        "sourceMap": false,
-                        "extractCss": true,
-                        "namedChunks": true,
-                        "aot": true,
-                        "extractLicenses": true,
-                        "vendorChunk": false,
-                        "buildOptimizer": true,
-                        "budgets": [
-                            {
-                                "type": "initial",
-                                "maximumWarning": "2mb",
-                                "maximumError": "6mb"
-                            }
-                        ]
-                    }
-                }
+    "build": {
+        "assets": [
+            "apps/@app.name@/src/_generated/favicon.ico",
+            "apps/@app.name@/src/assets",
+            {
+                "glob": "**/*",
+                "input": "node_modules/@eui/core/assets/",
+                "output": "./assets"
             },
-            "serve": {
-                "builder": "@angular-devkit/build-angular:dev-server",
-                "options": {
-                    "browserTarget": "@app.name@:build"
-                },
-                "configurations": {
-                    "proxy-mock": {
-                        "browserTarget": "@app.name@:build",
-                        "proxyConfig": "apps/@app.name@/proxy-mock.conf.json"
-                    },
-                    "production": {
-                        "browserTarget": "@app.name@:build:production"
-                    }
-                }
+            {
+                "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/dependencies-composite.json CHANGED Viewed

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

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

@@ -1,20 +1,22 @@
 <eui-app [isSidebarOpen]="true" isSidebarHidden="false">
-    <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-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>

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

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

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

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
-import { EuiPageModule } from '@eui/components-next';
+import { SharedModule } from '../shared/shared.module';
 import { HomeRoutingModule } from './home-routing.module';
 import { HomeComponent } from './home.component';
@@ -8,7 +8,7 @@ import { HomeComponent } from './home.component';
 @NgModule({
     imports: [
         HomeRoutingModule,
-        EuiPageModule,
+        SharedModule,
     ],
     declarations: [
         HomeComponent,

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

@@ -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/src/index.html ADDED Viewed

@@ -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>

package/scripts/csdr/config/angular.js CHANGED Viewed

@@ -132,7 +132,14 @@ const angularProjectDef = {
               "with": "node_modules/@eui/base/assets/openid/openid-login.js"
             }
           ],
-          "optimization": true,
+          "optimization": {
+            "scripts": true,
+            "styles": {
+                "minify": false,
+                "inlineCritical": false
+            },
+            "fonts": true
+          },
           "outputHashing": "all",
           "sourceMap": false,
           "extractCss": true,
@@ -156,7 +163,14 @@ const angularProjectDef = {
               "with": "apps/@project.name@/src/environments/environment.prod.ts"
             }
           ],
-          "optimization": true,
+          "optimization": {
+            "scripts": true,
+            "styles": {
+                "minify": false,
+                "inlineCritical": false
+            },
+            "fonts": true
+          },
           "outputHashing": "all",
           "sourceMap": false,
           "extractCss": true,
@@ -253,8 +267,6 @@ const angularProjectDefFullSkeleton = {
                   }
               ],
               "styles": [
-                  "node_modules/@eui/styles/dist/styles/eui.css",
-                  "node_modules/@eui/styles/dist/styles/eui-next.css"
               ]
           },
           "configurations": {
@@ -289,7 +301,14 @@ const angularProjectDefFullSkeleton = {
                           "with": "apps/@project.name@/src/_generated/environments/environment.prod.ts"
                       }
                   ],
-                  "optimization": true,
+                  "optimization": {
+                    "scripts": true,
+                    "styles": {
+                        "minify": false,
+                        "inlineCritical": true
+                    },
+                    "fonts": true
+                  },
                   "outputHashing": "all",
                   "sourceMap": false,
                   "extractCss": true,
@@ -374,7 +393,14 @@ const angularProjectDefConfigurationOptimized = {
       "with": "node_modules/@eui/base/assets/openid/openid-login.js"
     }
   ],
-  "optimization": true,
+  "optimization": {
+    "scripts": true,
+    "styles": {
+        "minify": false,
+        "inlineCritical": true
+    },
+    "fonts": true
+  },
   "outputHashing": "all",
   "sourceMap": false,
   "extractCss": true,
@@ -422,6 +448,36 @@ const angularPackageDef = {
   }
 };
+const angularPackageDefv13 = {
+  "root": "@path@/@module.name@",
+  "sourceRoot": "@path@/@module.name@/src",
+  "projectType": "library",
+  "prefix": "lib",
+  "architect": {
+    "build": {
+      "builder": "@angular-devkit/build-angular:ng-packagr",
+      "options": {
+        "tsConfig": "@path@/@module.name@/tsconfig.lib.json",
+        "project": "@path@/@module.name@/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "@path@/@module.name@/tsconfig.lib.prod.json"
+        }
+      }
+    },
+    "test": {
+      "builder": "@angular-devkit/build-angular:karma",
+      "options": {
+        "main": "@path@/@module.name@/src/test.ts",
+        "tsConfig": "@path@/@module.name@/tsconfig.spec.json",
+        "karmaConfig": "@path@/@module.name@/karma.conf.js"
+      }
+    }
+  }
+};
 const angularElementProjectDef = {
   "root": "@module.name@/",
   "sourceRoot": "@module.name@/src",
@@ -560,7 +616,12 @@ module.exports.registerAngularPackage = (pkg, isReset) => {
     pathBase = 'packages/' + pkg.parentPkg + '/packages';
   }
-  const projectDef = JSON.stringify(angularPackageDef);
+  let projectDef = JSON.stringify(angularPackageDef);
+  if (pkg.build && pkg.build.euiVersion === '13.x') {
+    projectDef = JSON.stringify(angularPackageDefv13);
+  }
   const replaceModule = tools.replaceAll(projectDef, '@module.name@', pkg.folder || pkg.name);
   const replacePath = tools.replaceAll(replaceModule, '@path@', pathBase);

package/scripts/csdr/install/common.js CHANGED Viewed

@@ -199,7 +199,7 @@ const getLocalPackagesDeps = () => {
     const pdeps = Object.keys(pkgDeps)
       .reduce((acc, k) => {
         if (k.indexOf('@eui') !== -1 ) {
-          if (k.indexOf('@eui/ecl') !== -1) {
+          if (k.indexOf('@eui/ecl') !== -1 || k.indexOf('@eui/styles-base') !== -1) {
             acc[k] = pkgDeps[k];
           }
         } else {

package/scripts/csdr/jira/jira-utils.js CHANGED Viewed

@@ -3,7 +3,7 @@
 // GLOBAL
 const execa = require('execa');
 const moment = require('moment');
-const axios = require('axios');
+// const axios = require('axios');
 // LOCAL
 const tools = require('../../utils/tools');
@@ -135,27 +135,27 @@ const doCall = (options) => {
   const JIRA_BASE_URL = 'https://webgate.ec.europa.eu/CITnet/jira/rest/api/2/';
   const { jiraUser, jiraPassword } = tools.getArgs();
-  axios.defaults.headers.post['Content-Type'] = 'application/json';
-  axios.defaults.headers.put['Content-Type'] = 'application/json';
+  // axios.defaults.headers.post['Content-Type'] = 'application/json';
+  // axios.defaults.headers.put['Content-Type'] = 'application/json';
   return Promise.resolve()
     .then(() => {
-      return axios({
-        baseURL: JIRA_BASE_URL,
-        url: options.url,
-        method: options.method,
-        data: options.data || {},
-        auth: {
-          username: jiraUser,
-          password: jiraPassword
-        }
-      })
-        .then((response) => {
-          return response;
-        })
-        .catch((e) => {
-          throw e;
-        });
+      // return axios({
+      //   baseURL: JIRA_BASE_URL,
+      //   url: options.url,
+      //   method: options.method,
+      //   data: options.data || {},
+      //   auth: {
+      //     username: jiraUser,
+      //     password: jiraPassword
+      //   }
+      // })
+      //   .then((response) => {
+      //     return response;
+      //   })
+      //   .catch((e) => {
+      //     throw e;
+      //   });
     })
 }

package/scripts/csdr/metadata/app-envs.js CHANGED Viewed

@@ -3,7 +3,7 @@
 // GLOBAL
 const path = require('path');
 const moment = require('moment');
-const sanitizeHtml = require('sanitize-html');
+// const sanitizeHtml = require('sanitize-html');
 // LOCAL
 const tools = require('../../utils/tools');
@@ -100,7 +100,8 @@ const envsMetadataToTable = (metadata) => {
       tools.logSuccess();
-      return sanitizeHtml(content);
+      // return sanitizeHtml(content);
+      return content;
     })
     .catch((e) => {

package/scripts/csdr/metadata/app-history.js CHANGED Viewed

@@ -3,7 +3,7 @@
 // GLOBAL
 const path = require('path');
 const execa = require('execa');
-const sanitizeHtml = require('sanitize-html');
+// const sanitizeHtml = require('sanitize-html');
 const moment = require('moment');
 const semver = require('semver');
@@ -395,7 +395,8 @@ const historyMetadataToTable = (metadata) => {
   tools.logSuccess();
-  return sanitizeHtml(content);
+  // return sanitizeHtml(content);
+  return content;
 }

package/scripts/csdr/metadata/package-history.js CHANGED Viewed

@@ -3,7 +3,6 @@
 // GLOBAL
 const path = require('path');
 const execa = require('execa');
-const sanitizeHtml = require('sanitize-html');
 const moment = require('moment');
 const semver = require('semver');

package/scripts/csdr/release/package/common.js CHANGED Viewed

@@ -381,8 +381,6 @@ module.exports.sendSuccessNotification = (pkg, version, pkgMetadata) => {
 module.exports.sendErrorNotification = (pkg, exception, pkgMetadata) => {
-  console.log(pkgMetadata);
   return Promise.resolve()
   .then(() => {
     utils.tools.logTitle('ERROR !!!!! an unexpected error occured....');

package/scripts/utils/build/package/styles.js CHANGED Viewed

@@ -13,7 +13,7 @@ const notificationUtils = require('../../notification/notification-utils');
 let { deps, skipClean, skipLint, skipTest, skipCompile, skipDoc } = tools.getArgs();
-const compileSassFile = (folder, filename, isNodeSassTildeImporterActive) => {
+const compileSassFileDartSass = (folder, filename) => {
   const filePath = path.join(folder, 'styles', filename);
   tools.logInfo(`Compiling ${filePath}.scss...`);
@@ -22,55 +22,54 @@ const compileSassFile = (folder, filename, isNodeSassTildeImporterActive) => {
     .then(() => {
       tools.logInfo('Compiling SCSS...');
-      if (isNodeSassTildeImporterActive !== false) {
-        tools.logInfo('building with tilde importer');
-        return execa('node-sass', [
-          filePath + '.scss',
-          filePath + '.temp.css',
-          '--importer',
-          './node_modules/node-sass-tilde-importer',
-          '--output-style',
-          'compressed',
-          '--source-map',
-          true,
-          '--source-map-contents'
-        ]);
-      } else {
-        tools.logInfo('building without tilde importer');
-        return execa('node-sass', [
-          filePath + '.scss',
-          filePath + '.temp.css',
-          '--importer',
-          '--output-style',
-          'compressed',
-          '--source-map',
-          true,
-          '--source-map-contents'
-        ]);
-      }
-    })
+      const sass = require('sass');
-    .then((output) => {
-      // console.log(output);
-      console.log('Size ::: ' + fs.statSync(filePath + '.temp.css').size);
+      return sass.renderSync({
+        file: filePath + '.scss',
+        outFile: filePath + '.temp.css',
+        sourceMap: true,
+        sourceMapContents: true,
+        sourceMapEmbed: true,
+        includePaths: [
+          path.resolve(process.cwd(), 'node_modules'),
+        ],
+      });
     })
-    .then(() => {
-      tools.logInfo('Running postCss over generated css file...');
-      return execa('postcss', [
-        filePath + '.temp.css',
-        '--config',
-        path.join(__dirname, 'postcss.config.js'),
-        '--no-map',
-        '--verbose',
-        '--output',
-        filePath + '.css'
-      ]);
+    .then((sassResult) => {
+      const finalDest = filePath + '.css';
+      const cssnano = require('cssnano');
+      const autoprefixer = require('autoprefixer');
+      const postcss = require('postcss');
+      const plugins = [];
+      plugins.push(autoprefixer({
+        grid: 'no-autoplace',
+        // browsers: [
+        //   "> 0.5% in alt-eu",
+        //   "last 2 version",
+        //   "not dead",
+        //   "not op_mini all"
+        // ]
+      }));
+      plugins.push(cssnano({ safe: true }));
+      return postcss(plugins)
+      .process(sassResult.css, {
+        map: { inline: false, prev: sassResult.map.toString() },
+        from: filePath + '.scss',
+        to: finalDest,
+      })
+      .then((postcssResult) => {
+        // fs.mkdirSync(path.dirname(dest), { recursive: true });
+        fs.writeFileSync(finalDest, postcssResult.css);
+        if (postcssResult.map) {
+          fs.writeFileSync(`${finalDest}.map`, postcssResult.map);
+        }
+      });
     })
     .then((output) => {
@@ -84,6 +83,7 @@ const compileSassFile = (folder, filename, isNodeSassTildeImporterActive) => {
       tools.remove(filePath + '.temp.css');
       tools.remove(filePath + '.temp.css.map');
     })
     .catch((e) => {
       console.log(e);
       throw e;
@@ -91,6 +91,99 @@ const compileSassFile = (folder, filename, isNodeSassTildeImporterActive) => {
 }
+// const compileSassFileNodeSass = (folder, filename, isNodeSassTildeImporterActive) => {
+//   const filePath = path.join(folder, 'styles', filename);
+//   tools.logInfo(`Compiling ${filePath}.scss...`);
+//   return Promise.resolve()
+//     .then(() => {
+//       tools.logInfo('Compiling SCSS...');
+//       if (isNodeSassTildeImporterActive !== false) {
+//         tools.logInfo('building with tilde importer');
+//         return execa('node-sass', [
+//           filePath + '.scss',
+//           filePath + '.temp.css',
+//           '--importer',
+//           './node_modules/node-sass-tilde-importer',
+//           '--output-style',
+//           'compressed',
+//           '--source-map',
+//           true,
+//           '--source-map-contents'
+//         ]);
+//       } else {
+//         tools.logInfo('building without tilde importer');
+//         return execa('node-sass', [
+//           filePath + '.scss',
+//           filePath + '.temp.css',
+//           '--importer',
+//           '--output-style',
+//           'compressed',
+//           '--source-map',
+//           true,
+//           '--source-map-contents'
+//         ]);
+//       }
+//     })
+//     .then((output) => {
+//       // console.log(output);
+//       console.log('Size ::: ' + fs.statSync(filePath + '.temp.css').size);
+//     })
+//     .then(() => {
+//       tools.logInfo('Running postCss over generated css file...');
+//       return execa('postcss', [
+//         filePath + '.temp.css',
+//         '--config',
+//         path.join(__dirname, 'postcss.config.js'),
+//         '--no-map',
+//         '--verbose',
+//         '--output',
+//         filePath + '.css'
+//       ]);
+//     })
+//     .then((output) => {
+//       // console.log(output);
+//       console.log('Size ::: ' + fs.statSync(filePath + '.css').size);
+//     })
+//     .then(() => {
+//       tools.logSuccess(`OK ==> generated ${filePath}.css`);
+//       tools.remove(filePath + '.temp.css');
+//       tools.remove(filePath + '.temp.css.map');
+//     })
+//     .catch((e) => {
+//       console.log(e);
+//       throw e;
+//     })
+// }
+const compileSassFile = (pkg, folder, filename, isNodeSassTildeImporterActive) => {
+  return Promise.resolve()
+    .then(() => {
+      // if (pkg.build && pkg.build.dartSass) {
+        return compileSassFileDartSass(folder, filename);
+      // } else {
+      //   return compileSassFileNodeSass(folder, filename, isNodeSassTildeImporterActive);
+      // }
+    })
+    .catch((e) => {
+      console.log(e);
+      throw e;
+    })
+}
 module.exports.build = (pkg) => {
@@ -125,7 +218,7 @@ module.exports.build = (pkg) => {
       .then(() => Promise.resolve().then(() => {
         return pkg.stylesheets.reduce((promise, file) => {
           return promise.then(() => (
-            compileSassFile(tmpFolder, file, pkg.build && pkg.build.isNodeSassTildeImporterActive)
+            compileSassFile(pkg, tmpFolder, file, pkg.build && pkg.build.isNodeSassTildeImporterActive)
           )).catch((e) => {
             console.log(e);
             throw e;

package/scripts/utils/pre-build/injection/app-sources-full-skeleton/src/_generated/app/app.module.ts CHANGED Viewed

@@ -12,7 +12,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import {
     CoreModule, CoreModuleEffects, translateConfig, EUI_CONFIG_TOKEN,
 } from '@eui/core';
-import { EuiAllModule } from '@eui/components-next';
+import { EuiAllModule } from '@eui/components';
 import { appConfig } from '../config/index';
 import { environment } from '../environments/environment';

package/scripts/utils/pre-build/injection/app-sources-full-skeleton/src/_generated/favicon.ico ADDED Viewed

Binary file

package/scripts/utils/pre-build/injection/app-sources-full-skeleton/tsconfig.app.json CHANGED Viewed

@@ -3,7 +3,8 @@
     "compilerOptions": {
       "outDir": "./dist",
       "types": [],
-      "target": "ES2015",
+      "module": "ESNext",
+      "target": "ES2016",
       "lib": ["es2020", "dom"]
     },
     "exclude": [

package/scripts/utils/pre-build/projects.js CHANGED Viewed

@@ -139,6 +139,7 @@ module.exports.injectAppConfig = (project, configEnvTarget, build) => {
       // if (build) {
       //   rootTargetFolder = 'dist';
       // }
       tools.logInfo(`Replacing default ${rootTargetFolder}/assets/openid-login-config.json file by ${envFilePath} content`);
       tools.copy(envFilePath, path.join(project.paths.angularPath, `${rootTargetFolder}/assets/openid-login-config.json`));