@eui/tools 5.0.0-rc.7 → 5.0.0-rc.8

package/.version.properties

@@ -1 +1 @@
-5.0.0-rc.7
+5.0.0-rc.8

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 5.0.0-rc.8 (2021-10-25)
+
+##### Chores
+
+* **other:**
+  * updated package.json version - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([0029f3c5](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0029f3c57c6bed7880091b93e39e4e464584f141))
+  * added option for no src package testing for eui-components - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([d6cb7036](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d6cb7036b33bafc3dd35657f77e678dbc7c5badf))
+##### Bug Fixes
+
+* **other:**
+  * http-proxy-agent wrong version - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([78a5427e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/78a5427e3fe5aaa83fed7e597fe34d641ad6c86e))
+
+* * *
+* * *
 ## 5.0.0-rc.7 (2021-10-21)
 
 ##### Bug Fixes

package/package.json

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

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 pkgName = 'eui';
+    const pkg = configUtils.packages.getPackage(pkgName, true);
+    console.log(pkg);
   })
 

package/scripts/csdr/config/angular.js

@@ -15,7 +15,7 @@ const angularConfigDef = {
   "projects": {}
 };
 
- 
+
 const angularProjectDef = {
   "root": "",
   "sourceRoot": "apps/@project.name@/src",
@@ -435,7 +435,7 @@ const angularProjectDefConfigurationOptimized = {
 
 const angularPackageDef = {
   "root": "@path@/@module.name@",
-  "sourceRoot": "@path@/@module.name@/src",
+  "sourceRoot": "@path@/@module.name@@srcRoot@",
   "projectType": "library",
   "prefix": "lib",
   "architect": {
@@ -454,7 +454,7 @@ const angularPackageDef = {
     "test": {
       "builder": "@angular-devkit/build-angular:karma",
       "options": {
-        "main": "@path@/@module.name@/src/test.ts",
+        "main": "@path@/@module.name@@srcRoot@/testing/test.ts",
         "tsConfig": "@path@/@module.name@/tsconfig.spec.json",
         "karmaConfig": "@path@/@module.name@/karma.conf.js"
       }
@@ -465,7 +465,7 @@ const angularPackageDef = {
 
 const angularPackageDefv13 = {
   "root": "@path@/@module.name@",
-  "sourceRoot": "@path@/@module.name@/src",
+  "sourceRoot": "@path@/@module.name@@srcRoot@",
   "projectType": "library",
   "prefix": "lib",
   "architect": {
@@ -484,7 +484,7 @@ const angularPackageDefv13 = {
     "test": {
       "builder": "@angular-devkit/build-angular:karma",
       "options": {
-        "main": "@path@/@module.name@/src/test.ts",
+        "main": "@path@/@module.name@@srcRoot@/testing/test.ts",
         "tsConfig": "@path@/@module.name@/tsconfig.spec.json",
         "karmaConfig": "@path@/@module.name@/karma.conf.js"
       }
@@ -636,10 +636,16 @@ module.exports.registerAngularPackage = (pkg, isReset) => {
     projectDef = JSON.stringify(angularPackageDefv13);
   }
 
+  let srcRoot = '/src';
+  if (pkg.build && typeof pkg.build.srcRootDefault === 'boolean' && pkg.build.srcRootDefault === false) {
+    srcRoot = '';
+  }
+
   const replaceModule = tools.replaceAll(projectDef, '@module.name@', pkg.folder || pkg.name);
   const replacePath = tools.replaceAll(replaceModule, '@path@', pathBase);
+  const replaceSrcRoot = tools.replaceAll(replacePath, '@srcRoot@', srcRoot);
 
-  jsonFile['projects'][pkg.name] = JSON.parse(replacePath);
+  jsonFile['projects'][pkg.name] = JSON.parse(replaceSrcRoot);
 
   tools.writeJsonFileSync(file, jsonFile);
 }

package/scripts/csdr/sync/sync-utils.js

@@ -8,6 +8,8 @@ const configUtils = require('../config/config-utils');
 
 const tools = require('../../utils/tools');
 
+const { skipPull } = tools.getArgs();
+
 module.exports.sync = () => {
   return Promise.resolve()
   .then(() => {
@@ -22,8 +24,10 @@ module.exports.sync = () => {
     tools.logSuccess();
   })
   .then(() => {
-    tools.logInfo(`Pulling root folder ...`);
-    return execa.shellSync(`git pull`, { cwd: path.join(process.cwd()), stdio: 'inherit' });
+    if (!skipPull) {
+      tools.logInfo(`Pulling root folder ...`);
+      return execa.shellSync(`git pull`, { cwd: path.join(process.cwd()), stdio: 'inherit' });
+    }
   })
   .then(() => {
     tools.logSuccess();