@eui/tools 5.3.75 → 5.3.76

package/.version.properties

@@ -1 +1 @@
-5.3.75
+5.3.76

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 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.76",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

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/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(() => {