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

package/.version.properties

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

package/CHANGELOG.md

@@ -1,3 +1,44 @@
+## 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
+
+* **other:**
+  * dependencies composite fetch on parent package - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([78f56a43](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/78f56a43d26068fad835074d4e07e53c8b9d8384))
+
+* * *
+* * *
+## 5.0.0-rc.6 (2021-10-11)
+
+##### Chores
+
+* **other:**
+  * adapted builder and remove ngx-build-plus - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([4c9377f3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/4c9377f3e9269c640b8cec5278735eab2cdb48f7))
+
+* * *
+* * *
+## 5.0.0-rc.5 (2021-09-21)
+
+##### Chores
+
+* **other:**
+  * added development mode in angular generated config - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([a12920db](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a12920db9c9e48eea7be4b33c1a1ebaac33c19a8))
+
+* * *
+* * *
 ## 5.0.0-rc.4 (2021-09-20)
 
 ##### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "5.0.0-rc.4",
+    "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

@@ -244,13 +244,16 @@ const angularProjectDefFullSkeleton = {
   "projectType": "application",
   "prefix": "app",
   "schematics": {
-      "@schematics/angular:component": {
-          "styleext": "scss"
-      }
+    "@schematics/angular:component": {
+      "style": "scss"
+    },
+    "@schematics/angular:application": {
+      "strict": true
+    }
   },
   "architect": {
       "build": {
-          "builder": "ngx-build-plus:build",
+          "builder": "@angular-devkit/build-angular:browser",
           "options": {
               "outputPath": "apps/@project.name@/dist",
               "index": "apps/@project.name@/src/index.html",
@@ -280,7 +283,6 @@ const angularProjectDefFullSkeleton = {
                   "optimization": false,
                   "outputHashing": "all",
                   "sourceMap": false,
-                  "extractCss": true,
                   "namedChunks": true,
                   "aot": true,
                   "extractLicenses": true,
@@ -311,7 +313,6 @@ const angularProjectDefFullSkeleton = {
                   },
                   "outputHashing": "all",
                   "sourceMap": false,
-                  "extractCss": true,
                   "namedChunks": true,
                   "aot": true,
                   "extractLicenses": true,
@@ -324,8 +325,17 @@ const angularProjectDefFullSkeleton = {
                           "maximumError": "6mb"
                       }
                   ]
+              },
+              "development": {
+                  "buildOptimizer": false,
+                  "optimization": false,
+                  "vendorChunk": true,
+                  "extractLicenses": false,
+                  "sourceMap": true,
+                  "namedChunks": true
               }
-          }
+          },
+          "defaultConfiguration": "production"
       },
       "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -339,8 +349,12 @@ const angularProjectDefFullSkeleton = {
               },
               "production": {
                   "browserTarget": "@project.name@:build:production"
+              },
+              "development": {
+                "browserTarget": "@project.name@:build:development"
               }
-          }
+          },
+          "defaultConfiguration": "development"
       }
   }
 };
@@ -421,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": {
@@ -440,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"
       }
@@ -451,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": {
@@ -470,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"
       }
@@ -622,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/install/common.js

@@ -218,14 +218,14 @@ const getLocalPackagesDeps = () => {
 const getLocalPackageCompositeDeps = (pkg) => {
   let pkgJsonFile;
 
-  if (pkg.parent) {
-    return {};
+  if (pkg.child) {
+    pkgJsonFile = path.join(process.cwd(), 'packages', pkg.parentPkg, 'packages', pkg.folder || pkg.name, 'dependencies-composite.json');
   } else {
-    if (pkg.child) {
-      pkgJsonFile = path.join(process.cwd(), 'packages', pkg.parentPkg, 'packages', pkg.folder || pkg.name, 'dependencies-composite.json');
-    } else {
-      pkgJsonFile = path.join(process.cwd(), 'packages', pkg.name, 'dependencies-composite.json');
-    }
+    pkgJsonFile = path.join(process.cwd(), 'packages', pkg.name, 'dependencies-composite.json');
+  }
+
+  if (tools.isFileExists(pkgJsonFile)) {
+    console.log(`found ${pkgJsonFile}, parsing...`);
   }
 
   return tools.getJsonFileContent(pkgJsonFile) || {};

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();