@eui/tools 5.3.75 → 5.3.77

package/.version.properties

@@ -1 +1 @@
-5.3.75
+5.3.77

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 5.3.77 (2022-10-24)
+
+##### Chores
+
+* **other:**
+  * added check for remote envTarget always on master - added lunr for eUI showcase search indexation - EUI-6448 [EUI-6448](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6448)  ([24bae11f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/24bae11ff62fa9eb9c8cf0c64fc1f1ccaee35bbe))
+
+* * *
+* * *
+## 5.3.76 (2022-10-20)
+
+##### Bug Fixes
+
+* **karma:**
+  * tests - EUI-6702 [EUI-6702](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6702)  ([fa48abd6](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/fa48abd64eb3a83b1344e84f62c452447ca8d40f))
+
+* * *
+* * *
 ## 5.3.75 (2022-10-20)
 
 ##### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "5.3.75",
+    "version": "5.3.77",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -16,25 +16,25 @@
         "chalk": "4.1.2",
         "fs-extra": "9.0.0",
         "replace-in-file": "4.1.3",
-        "semver": "7.3.4",
+        "semver": "7.3.8",
         "cross-spawn": "6.0.5",
         "eol": "0.9.1",
         "rimraf": "3.0.2",
         "ncp": "2.0.0",
-        "moment": "2.29.3",
-        "moment-timezone": "0.5.34",
+        "moment": "2.29.4",
+        "moment-timezone": "0.5.37",
         "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",
+        "json-server": "0.17.0",
         "faker": "5.5.3",
-        "nodemon": "2.0.12",
+        "nodemon": "2.0.20",
         "lowdb": "1.0.0",
         "event-stream": "3.3.4",
         "empty-module": "0.0.2",
         "autoprefixer": "9.6.1",
-        "sass": "1.39.0",
+        "sass": "1.55.0",
         "postcss": "7.0.36",
         "cssnano": "4.1.11",
         "extend": "3.0.2",
@@ -43,7 +43,9 @@
         "nyc": "15.1.0",
         "node-fetch": "2.6.7",
         "sendmail": "1.6.1",
+        "svg-sprite": "2.0.0",
         "imagemin": "7.0.1",
-        "imagemin-svgo": "9.0.0"
+        "imagemin-svgo": "9.0.0",
+        "lunr": "2.3.9"
     }
 }

package/sandbox.js

@@ -864,16 +864,16 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 
 
 
-const pkg = configUtils.packages.getPackage('opsys-epc-esub-bo-ui', true);
+// const pkg = configUtils.packages.getPackage('opsys-epc-esub-bo-ui', true);
 
-Promise.resolve()
-  .then(() => {
-    return metadataUtils.package.getPackageVersionsByMajor(pkg, '9', false)
-  })
-  .then((versions) => {
-    console.log(versions);
-    console.log(versions.splice(-1)[0].version);
-  })
+// Promise.resolve()
+//   .then(() => {
+//     return metadataUtils.package.getPackageVersionsByMajor(pkg, '9', false)
+//   })
+//   .then((versions) => {
+//     console.log(versions);
+//     console.log(versions.splice(-1)[0].version);
+//   })
 
 
 // PROJECT VERSION CSDR BUILD TESTING (à la carte way === MWP / PMO MOBILE / SEDIA)
@@ -913,3 +913,45 @@ Promise.resolve()
 //   })
 
 
+// const lunr = require('lunr');
+
+// Promise.resolve()
+// .then(() => {
+//   const rootPath = path.join(process.cwd(), 'apps', 'eui-showcase-ux-components', 'src', 'assets', 'samples');
+
+//   let documents = [];
+
+//   const sampleTypes = tools.getFolders(rootPath);
+//   sampleTypes.forEach((sampleType) => {
+//     const sampleSubTypes = tools.getFolders(path.join(rootPath, sampleType));
+//     sampleSubTypes.forEach((sampleSubType) => {
+//       const components = tools.getFolders(path.join(rootPath, sampleType, sampleSubType));
+//       components.forEach((cmp) => {
+//         const samples = tools.getFolders(path.join(rootPath, sampleType, sampleSubType, cmp, 'samples'));
+//         samples.forEach((sample) => {
+//           const metadata = {
+//             "name": `${sampleType}/${sampleSubType}/${cmp}#${sample}`,
+//             "fileContent":  tools.getFileContent(path.join(rootPath, sampleType, sampleSubType, cmp, 'samples', sample, 'component.html')),
+//           }
+//           documents.push(metadata);
+//         })
+//       });
+//     })
+//   })
+
+//   var idx = lunr(function () {
+//     this.ref('name')
+//     this.field('fileContent')
+
+//     documents.forEach(function (doc) {
+//       this.add(doc)
+//     }, this)
+//   })
+
+//   tools.writeFileContent(path.join(process.cwd(),'full-index.txt'), JSON.stringify(idx));
+
+//   console.log(idx.search('test'));
+// })
+
+
+

package/scripts/csdr/config/angular.js

@@ -1145,10 +1145,6 @@ const angularPackageDef = {
     "test": {
       "builder": "@angular-devkit/build-angular:karma",
       "options": {
-        "polyfills": [
-          "zone.js",
-          "zone.js/testing"
-        ],
         "main": "@path@/@module.name@/src/test.ts",
         "tsConfig": "@path@/@module.name@/tsconfig.spec.json",
         "karmaConfig": "@path@/@module.name@/karma.conf.js"
@@ -1158,6 +1154,35 @@ const angularPackageDef = {
 };
 
 const angularPackageSubEntryDef = {
+  "root": "packages/eui/packages/components/@subEntry.path@",
+  "sourceRoot": "packages/eui/packages/components/@subEntry.path@",
+  "projectType": "library",
+  "prefix": "lib",
+  "architect": {
+    "build": {
+      "builder": "@angular-devkit/build-angular:ng-packagr",
+      "options": {
+        "tsConfig": "packages/eui/packages/components/@tsconfig@",
+        "project": "packages/eui/packages/components/@subEntry.path@/@subEntry.package.name@"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "packages/eui/packages/components/@tsconfig@"
+        }
+      }
+    },
+    "test": {
+      "builder": "@angular-devkit/build-angular:karma",
+      "options": {
+        "main": "packages/eui/packages/components/@subEntry.path@/test.ts",
+        "tsConfig": "packages/eui/packages/components/@subEntry.path@/tsconfig.spec.json",
+        "karmaConfig": "packages/eui/packages/components/@subEntry.path@/karma.conf.js"
+      }
+    }
+  }
+};
+
+const angularPackageSubEntryDef15 = {
   "root": "packages/eui/packages/components/@subEntry.path@",
   "sourceRoot": "packages/eui/packages/components/@subEntry.path@",
   "projectType": "library",
@@ -1301,6 +1326,10 @@ const angularPackageDefV15 = {
     "test": {
       "builder": "@angular-devkit/build-angular:karma",
       "options": {
+        "polyfills": [
+          "zone.js",
+          "zone.js/testing"
+        ],
         "tsConfig": "@path@/@module.name@/tsconfig.spec.json",
         "karmaConfig": "@path@/@module.name@/karma.conf.js"
       }
@@ -1561,35 +1590,39 @@ module.exports.registerAngularPackageSubEntry = (subEntryName, subEntryPath, pkg
   let projectDef = JSON.stringify(angularPackageSubEntryDef);
 
   if (packageEuiVersion === '15.x') {
+    projectDef = JSON.stringify(angularPackageSubEntryDef15);
     projectDef = projectDef.replace('"main":"packages/eui/packages/components/@subEntry.path@/test.ts",', '');
   }
   projectDef = tools.replaceAll(projectDef, '@subEntry.path@', subEntryName)
   projectDef = tools.replaceAll(projectDef, '@subEntry.package.name@', 'ng-package.json');
   projectDef = tools.replaceAll(projectDef, '@tsconfig@', pkg.tsConfigFileName);
-  // if tsconfig is missing add it
-  const tsConfigSpecPath = path.join(process.cwd(), JSON.parse(projectDef).architect.test.options.tsConfig);
-  // check if tsconfig exists otherwise created it
-  if (!tools.isFileExists(tsConfigSpecPath)) {
-    // determine tsconfig path
-    const tsConfigFolder = JSON.parse(projectDef).architect.build.options.tsConfig.replace(/\/tsconfig.*/g, '');
-    const projectFolder = JSON.parse(projectDef).architect.build.options.project.replace('/ng-package.json', '');
-    const parent = projectFolder.replace(tsConfigFolder, '').split('/').length - 1;
-    // calculate the parent tsconfig path
-    tsConfigSpecDef.extends = '../'.repeat(parent) + 'tsconfig.json';
-
-    // check if parent tsconfig.json is missing
-    if(!tools.isFileExists(path.join(process.cwd(), projectFolder,  tsConfigSpecDef.extends))) {
-      tools.logError('The tsconfig.json file is missing in the parent folder of the sub entry: ' + subEntryName);
-      return;
-    }
 
-    tools.writeJsonFileSync(tsConfigSpecPath, tsConfigSpecDef);
-  }
+  if (packageEuiVersion === '15.x') {
+    // if tsconfig is missing add it
+    const tsConfigSpecPath = path.join(process.cwd(), JSON.parse(projectDef).architect.test.options.tsConfig);
+    // check if tsconfig exists otherwise created it
+    if (!tools.isFileExists(tsConfigSpecPath)) {
+      // determine tsconfig path
+      const tsConfigFolder = JSON.parse(projectDef).architect.build.options.tsConfig.replace(/\/tsconfig.*/g, '');
+      const projectFolder = JSON.parse(projectDef).architect.build.options.project.replace('/ng-package.json', '');
+      const parent = projectFolder.replace(tsConfigFolder, '').split('/').length - 1;
+      // calculate the parent tsconfig path
+      tsConfigSpecDef.extends = '../'.repeat(parent) + 'tsconfig.json';
+
+      // check if parent tsconfig.json is missing
+      if(!tools.isFileExists(path.join(process.cwd(), projectFolder,  tsConfigSpecDef.extends))) {
+        tools.logError('The tsconfig.json file is missing in the parent folder of the sub entry: ' + subEntryName);
+        return;
+      }
 
-  // if karma.conf.js is missing add it
-  const karmaConfPath = path.join(process.cwd(), JSON.parse(projectDef).architect.test.options.karmaConfig);
-  if(!tools.isFileExists(karmaConfPath)) {
-    tools.writeFileContent(karmaConfPath, karmaConfDef)
+      tools.writeJsonFileSync(tsConfigSpecPath, tsConfigSpecDef);
+    }
+
+    // if karma.conf.js is missing add it
+    const karmaConfPath = path.join(process.cwd(), JSON.parse(projectDef).architect.test.options.karmaConfig);
+    if(!tools.isFileExists(karmaConfPath)) {
+      tools.writeFileContent(karmaConfPath, karmaConfDef)
+    }
   }
 
   jsonFile['projects'][subEntryName] = JSON.parse(projectDef);

package/scripts/csdr/init/resources/nodejs-10.x/resolutions.json

@@ -7,5 +7,5 @@
     "update-notifier": "4.1.3",
     "glob": ">=7.0.0 <8.0.0",
     "nopt": ">=5.0.0 <6.0.0",
-    "svgstore": "2.0.3"
+    "winston": "2.4.6"
 }

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

@@ -88,7 +88,13 @@ module.exports.init = (pkg, envTarget, compositeType) => {
   // checking if at least the branch has been given as a parameter
   if (!branches.branch) {
     utils.tools.logError('ERROR : "branch" NOT PROVIDED as argument !!!');
-    process.exit(1);
+    throw 'BRANCH_NOT_PROVIDED';
+
+  // for envTarget / à la carte remote delivery, only master branch is allowed
+  } else {
+    if (pkg.remote && pkg.build && pkg.build.envTargetActive && !branches.isMaster) {
+      throw 'REMOTE_ENVTARGET_NOT_MASTER_BRANCH';
+    }
   }
 
   return Promise.resolve()

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

@@ -16,6 +16,7 @@ const innerMaven = require('./maven');
 const innerStyles = require('./styles');
 const innerAngular = require('./angular');
 const innerElement = require('./element');
+const innerPackages = require("../../../csdr/config/packages");
 
 // RE-EXPORTS MODULES
 module.exports.element = innerElement;
@@ -222,13 +223,22 @@ module.exports.buildSubEntry = (pkg, subEntry) => {
       }
     })
     .then(() => {
-      const { skipTest } = tools.getArgs();
-      if(!skipTest) {
-        tools.logInfo('Testing...');
-        const ng = path.resolve(process.cwd(), 'node_modules', '@angular', 'cli', 'bin', 'ng');
-        let args = ['--max_old_space_size=8096', ng, 'test', subEntry, '--code-coverage', '--watch=false'];
-        tools.logInfo(`running ng test : with args: ${args} on folder : ${pkg.paths.pkgRootDirectory}`);
-        return execa('node', args, { cwd: pkg.paths.pkgRootDirectory, stdio: 'inherit' });
+      let packageEuiVersion;
+      if (pkg.build && pkg.build.euiVersion) {
+        packageEuiVersion = pkg.build.euiVersion;
+      } else {
+        packageEuiVersion = innerPackages.getPackageEuiVerison(pkg);
+      }
+
+      if(packageEuiVersion === '15.x') {
+        const { skipTest } = tools.getArgs();
+        if(!skipTest) {
+          tools.logInfo('Testing...');
+          const ng = path.resolve(process.cwd(), 'node_modules', '@angular', 'cli', 'bin', 'ng');
+          let args = ['--max_old_space_size=8096', ng, 'test', subEntry, '--code-coverage', '--watch=false'];
+          tools.logInfo(`running ng test : with args: ${args} on folder : ${pkg.paths.pkgRootDirectory}`);
+          return execa('node', args, { cwd: pkg.paths.pkgRootDirectory, stdio: 'inherit' });
+        }
       }
     })
     .then(() => {

package/scripts/utils/notification/common.js

@@ -69,6 +69,16 @@ module.exports.getMessage = (options) => {
         message.detailText = 'Uncompatible version of eUI found installed in the local CSDR project, please adjust and keep same compatible versions of eUI packages and projects';
         break;
 
+      case 'BRANCH_NOT_PROVIDED':
+        message.detailTitle = 'RELEASE BRANCH missing - ABORTING!';
+        message.detailText = 'Package release needs to have a branch to build from as parameter from Bamboo';
+        break;
+
+      case 'REMOTE_ENVTARGET_NOT_MASTER_BRANCH':
+        message.detailTitle = 'REMOTE envTarget type branchis different from master - ABORTING!';
+        message.detailText = 'For envTarget remote delivery or "à la carte", only the master branch is allowed for build, contact support if any question';
+        break;
+
       default:
         message.detailTitle = 'GENERAL ERROR!';
         message.detailText = options.exception;