@eui/tools 5.0.0-rc.3 → 5.0.0-rc.4

package/.version.properties

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

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 5.0.0-rc.4 (2021-09-20)
+
+##### Bug Fixes
+
+* **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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "5.0.0-rc.3",
+    "version": "5.0.0-rc.4",
     "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

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

@@ -1,8 +1,8 @@
 {
     "build": {
         "assets": [
-            "apps/%app.name%/src/_generated/favicon.ico",
-            "apps/%app.name%/src/assets",
+            "apps/@app.name@/src/_generated/favicon.ico",
+            "apps/@app.name@/src/assets",
             {
                 "glob": "**/*",
                 "input": "node_modules/@eui/core/assets/",
@@ -10,13 +10,8 @@
             },
             {
                 "glob": "**/*",
-                "input": "node_modules/@eui/styles/dist/assets/images",
-                "output": "./assets/images"
-            },
-            {
-                "glob": "**/*",
-                "input": "node_modules/@eui/styles-base/dist/assets/images",
-                "output": "./assets/images"
+                "input": "node_modules/@eui/styles-base/src/assets/",
+                "output": "./assets"
             }
         ],
         "styles": [

package/scripts/csdr/config/angular.js

@@ -267,8 +267,6 @@ const angularProjectDefFullSkeleton = {
                   }
               ],
               "styles": [
-                  "node_modules/@eui/styles/dist/styles/eui.css",
-                  "node_modules/@eui/styles/dist/styles/eui-next.css"
               ]
           },
           "configurations": {

package/scripts/csdr/install/common.js

@@ -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/release/package/release-package.js

@@ -8,6 +8,7 @@ const utils = require('../../../utils');
 
 // CSDR RELATED
 const configUtils = require('../../config/config-utils');
+const metadataUtils = require('../../metadata/metadata-utils');
 
 // INNER MODULES
 const innerCommon = require('./common');
@@ -47,12 +48,19 @@ module.exports.run = () => {
         return innerCommon.preReleaseChecks(pkg);
       })
 
+      // FETCHING COMMITS METADATA
+      .then(() => {
+        return metadataUtils.commit.getMetadata(pkg);
+      })
+      .then((metadata) => {
+        pkgMetadata = metadata;
+      })
+
       // COMMIT METADATA CHECKS
       .then(() => {
         return innerCommon.commitMetadataChecks(pkg);
       })
       .then((metadata) => {
-        // storing commitMetadata for later use
         pkgMetadata = metadata;
       })
 

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

@@ -47,12 +47,12 @@ const compileSassFileDartSass = (folder, filename) => {
 
       plugins.push(autoprefixer({
         grid: 'no-autoplace',
-        browsers: [
-          "> 0.5% in alt-eu",
-          "last 2 version",
-          "not dead",
-          "not op_mini all"
-        ]
+        // browsers: [
+        //   "> 0.5% in alt-eu",
+        //   "last 2 version",
+        //   "not dead",
+        //   "not op_mini all"
+        // ]
       }));
       plugins.push(cssnano({ safe: true }));
 

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

@@ -84,22 +84,30 @@ module.exports.preBuild = (project, envTarget, build) => {
         tools.logInfo('Executing scripts files replacement for openId Connect');
 
         let rootTargetFolder = 'src';
-        if (build) {
-          rootTargetFolder = 'dist';
-        }
+        // if (build) {
+        //   rootTargetFolder = 'dist';
+        // }
 
+        tools.logInfo(`Copying node_modules/oidc-client/dist/oidc-client.min.js to ${rootTargetFolder}/assets/oidc-client.min.js`);
         tools.copy(
           path.join(process.cwd(), 'node_modules/oidc-client/dist/oidc-client.min.js'),
           path.join(project.paths.angularPath, `${rootTargetFolder}/assets/oidc-client.min.js`)
         );
+        tools.logSuccess();
+
+        tools.logInfo(`Copying node_modules/jsrsasign/lib/jsrsasign-all-min.js to ${rootTargetFolder}/assets/jsrsasign-all-min.js`);
         tools.copy(
           path.join(process.cwd(), 'node_modules/jsrsasign/lib/jsrsasign-all-min.js'),
           path.join(project.paths.angularPath, `${rootTargetFolder}/assets/jsrsasign-all-min.js`)
         );
+        tools.logSuccess();
+
+        tools.logInfo(`Copying node_modules/@eui/base/assets/openid/openid-login.js to ${rootTargetFolder}/assets/openid-login.js`);
         tools.copy(
           path.join(process.cwd(), 'node_modules/@eui/base/assets/openid/openid-login.js'),
           path.join(project.paths.angularPath, `${rootTargetFolder}/assets/openid-login.js`)
         );
+        tools.logSuccess();
       }
 
       if (configEnvTarget) {
@@ -128,12 +136,12 @@ module.exports.injectAppConfig = (project, configEnvTarget, build) => {
       }
 
       let rootTargetFolder = 'src';
-      if (build) {
-        rootTargetFolder = 'dist';
-      }
+      // if (build) {
+      //   rootTargetFolder = 'dist';
+      // }
 
-      tools.logInfo(`Replacing default ${rootTargetFolder}/assets/env-json-config.json file by ${envFilePath} content`);
-      tools.copy(envFilePath, path.join(project.paths.angularPath, `${rootTargetFolder}/assets/config/env-json-config.json`));
+      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`));
 
       tools.logSuccess();
     })