@eui/tools 4.15.11 → 4.15.12

package/scripts/csdr/config/angular.js

@@ -326,6 +326,130 @@ const angularProjectDefFullSkeleton = {
   }
 };
 
+
+const angularProjectDefFullSkeletonV13 = {
+  "root": "",
+  "sourceRoot": "apps/@project.name@/src",
+  "projectType": "application",
+  "prefix": "app",
+  "schematics": {
+    "@schematics/angular:component": {
+      "style": "scss"
+    },
+    "@schematics/angular:application": {
+      "strict": true
+    }
+  },
+  "architect": {
+      "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+              "outputPath": "apps/@project.name@/dist",
+              "index": "apps/@project.name@/src/index.html",
+              "main": "apps/@project.name@/src/_generated/main.ts",
+              "polyfills": "apps/@project.name@/src/_generated/polyfills.ts",
+              "tsConfig": "apps/@project.name@/tsconfig.app.json",
+              "assets": [
+                  "apps/@project.name@/src/favicon.ico",
+                  "apps/@project.name@/src/assets",
+                  {
+                      "glob": "**/*",
+                      "input": "node_modules/@eui/core/assets/",
+                      "output": "./assets"
+                  }
+              ],
+              "styles": [
+              ]
+          },
+          "configurations": {
+              "production": {
+                  "fileReplacements": [
+                      {
+                          "replace": "apps/@project.name@/src/_generated/environments/environment.ts",
+                          "with": "apps/@project.name@/src/_generated/environments/environment.prod.ts"
+                      }
+                  ],
+                  "optimization": false,
+                  "outputHashing": "all",
+                  "sourceMap": false,
+                  "namedChunks": true,
+                  "aot": true,
+                  "extractLicenses": true,
+                  "vendorChunk": false,
+                  "buildOptimizer": false,
+                  "budgets": [
+                      {
+                          "type": "initial",
+                          "maximumWarning": "2mb",
+                          "maximumError": "6mb"
+                      }
+                  ]
+              },
+              "production-optimized-no-openid": {
+                  "fileReplacements": [
+                      {
+                          "replace": "apps/@project.name@/src/_generated/environments/environment.ts",
+                          "with": "apps/@project.name@/src/_generated/environments/environment.prod.ts"
+                      }
+                  ],
+                  "optimization": {
+                    "scripts": true,
+                    "styles": {
+                        "minify": false,
+                        "inlineCritical": true
+                    },
+                    "fonts": true
+                  },
+                  "outputHashing": "all",
+                  "sourceMap": false,
+                  "namedChunks": true,
+                  "aot": true,
+                  "extractLicenses": true,
+                  "vendorChunk": false,
+                  "buildOptimizer": true,
+                  "budgets": [
+                      {
+                          "type": "initial",
+                          "maximumWarning": "2mb",
+                          "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",
+          "options": {
+              "browserTarget": "@project.name@:build"
+          },
+          "configurations": {
+              "proxy-mock": {
+                  "browserTarget": "@project.name@:build",
+                  "proxyConfig": "apps/@project.name@/proxy-mock.conf.json"
+              },
+              "production": {
+                  "browserTarget": "@project.name@:build:production"
+              },
+              "development": {
+                "browserTarget": "@project.name@:build:development"
+              }
+          },
+          "defaultConfiguration": "development"
+      }
+  }
+};
+
+
+
 const angularProjectDefConfiguration = {
   "fileReplacements": [
     {
@@ -422,6 +546,58 @@ 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.lib.json",
+        "project": "packages/eui/packages/components/@subEntry.path@/package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "packages/eui/packages/components/tsconfig.lib.json"
+        }
+      }
+    }
+  }
+};
+
+
+const angularPackageDefV13 = {
+  "root": "@path@/@module.name@",
+  "sourceRoot": "@path@/@module.name@@srcRoot@",
+  "projectType": "library",
+  "prefix": "lib",
+  "architect": {
+    "build": {
+      "builder": "@angular-devkit/build-angular:ng-packagr",
+      "options": {
+        "tsConfig": "@path@/@module.name@/tsconfig.lib.json",
+        "project": "@path@/@module.name@/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "@path@/@module.name@/tsconfig.lib.prod.json"
+        }
+      }
+    },
+    "test": {
+      "builder": "@angular-devkit/build-angular:karma",
+      "options": {
+        "main": "@path@/@module.name@@srcRoot@@srcRootTesting@/test.ts",
+        "tsConfig": "@path@/@module.name@/tsconfig.spec.json",
+        "karmaConfig": "@path@/@module.name@/karma.conf.js"
+      }
+    }
+  }
+};
+
+
 const angularElementProjectDef = {
   "root": "@module.name@/",
   "sourceRoot": "@module.name@/src",
@@ -560,11 +736,40 @@ module.exports.registerAngularPackage = (pkg, isReset) => {
     pathBase = 'packages/' + pkg.parentPkg + '/packages';
   }
 
-  const projectDef = JSON.stringify(angularPackageDef);
+  let projectDef = JSON.stringify(angularPackageDef);
+
+  if (pkg.build && pkg.build.euiVersion === '13.x') {
+    projectDef = JSON.stringify(angularPackageDefV13);
+  }
+
+  let srcRoot = '/src', srcRootTesting = '';
+  if (pkg.build && typeof pkg.build.srcRootDefault === 'boolean' && pkg.build.srcRootDefault === false) {
+    srcRoot = '';
+    srcRootTesting = '/testing'
+  }
+
   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);
+  const replaceSrcRootTesting = tools.replaceAll(replaceSrcRoot, '@srcRootTesting@', srcRootTesting);
+
+  jsonFile['projects'][pkg.name] = JSON.parse(replaceSrcRootTesting);
+
+  tools.writeJsonFileSync(file, jsonFile);
+}
 
-  jsonFile['projects'][pkg.name] = JSON.parse(replacePath);
+
+module.exports.registerAngularPackageSubEntry = (subEntryName, subEntryPath) => {
+  const file = path.join(process.cwd(), 'angular.json');
+  const jsonFile = require(file);
+
+  let projectDef = JSON.stringify(angularPackageSubEntryDef);
+
+  const replacePath = tools.replaceAll(projectDef, '@subEntry.path@', subEntryPath);
+
+  jsonFile['projects'][subEntryName] = JSON.parse(replacePath);
+
+  console.log(jsonFile['projects'][subEntryName]);
 
   tools.writeJsonFileSync(file, jsonFile);
 }
@@ -626,7 +831,12 @@ module.exports.registerAngularProjectDef = (project, build = false) => {
       tools.logInfo('Processing angular config...');
       let projectDef;
       if (project.csdrFullSkeleton) {
-        projectDef = JSON.stringify(angularProjectDefFullSkeleton);
+        if (project.build && project.build.euiVersion === '13.x') {
+          projectDef = JSON.stringify(angularProjectDefFullSkeletonV13);
+        } else {
+          projectDef = JSON.stringify(angularProjectDefFullSkeleton);
+        }
+
       } else {
         projectDef = JSON.stringify(angularProjectDef);
       }

package/scripts/csdr/config/global.js

@@ -20,6 +20,14 @@ module.exports.getCsdrConfig = (full = true) => {
 
   Object.keys(appsConfig).forEach((p) => {
     config.projects[p] = appsConfig[p];
+
+    // checking if package has config override in its own folder
+    const prjCsdrConfig = path.join(process.cwd(), 'apps', p, '.csdr-config.json');
+
+    if (tools.isFileExists(prjCsdrConfig)) {
+      const prjCsdrConfigJson = require(prjCsdrConfig);
+      config.projects[p] = prjCsdrConfigJson;
+    }
   })
 
   Object.keys(packagesConfig).forEach((p) => {
@@ -96,6 +104,14 @@ const getGeneratedConfig = (euircBaseFile) => {
   // remapping projects against csdr projects config
   configContent.projects.forEach((p) => {
     genConfig.projects[p] = globalConfig.projects[p];
+
+    // checking if project has config override in its own folder
+    const prjCsdrConfig = path.join(process.cwd(), 'apps', p, '.csdr-config.json');
+
+    if (tools.isFileExists(prjCsdrConfig)) {
+      const prjCsdrConfigJson = require(prjCsdrConfig);
+      genConfig.projects[p] = prjCsdrConfigJson;
+    }
   })
 
   // remapping projects against csdr packages config

package/scripts/csdr/install/common.js

@@ -199,7 +199,9 @@ 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 {
@@ -215,17 +217,33 @@ const getLocalPackagesDeps = () => {
 }
 
 
+// const getLocalPackageCompositeDeps = (pkg) => {
+//   let pkgJsonFile;
+
+//   if (pkg.parent) {
+//     return {};
+//   } 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');
+//     }
+//   }
+
+//   return tools.getJsonFileContent(pkgJsonFile) || {};
+// }
+
 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/jira/jira-utils.js

@@ -1,169 +1,169 @@
-'use strict';
-
-// GLOBAL
-const execa = require('execa');
-const moment = require('moment');
-const axios = require('axios');
-
-// LOCAL
-const tools = require('../../utils/tools');
-
-
-const getProject = (projectKey) => {
-  return Promise.resolve()
-    .then(() => {
-      return doCall({ method: 'GET', url: `/project/${projectKey}` });
-    })
-    .then((response) => {
-      tools.logSuccess(`OK ${response.status}`);
-      return response.data;
-    })
-    .catch((e) => {
-      tools.logError(`ERROR ${e.response.status}`);
-      throw e;
-    })
-}
-
-const getIssue = (issueKey) => {
-  return Promise.resolve()
-    .then(() => {
-      return doCall({ method: 'GET', url: `/issue/${issueKey}` });
-    })
-    .then((response) => {
-      tools.logSuccess(`OK ${response.status}`);
-      return response.data;
-    })
-    .catch((e) => {
-      tools.logError(`ERROR ${e.response.status}`);
-      throw e;
-    })
-}
-
-
-const updateIssueVersion = (issueKey, version) => {
-  tools.logInfo(`Updating issue: ${issueKey} with version: ${version}`);
-
-  return Promise.resolve()
-    .then(() => {
-
-      const postData = JSON.stringify({
-        "update": {
-          "fixVersions": [
-            {
-              "add": {
-                "name": version
-              }
-            }
-          ]
-        }
-      });
-
-      return doCall({ method: 'PUT', url: `/issue/${issueKey}`, data: postData });
-    })
-    .then((response) => {
-      tools.logSuccess(`OK ${response.status}`);
-      return response.data;
-    })
-    .catch((e) => {
-      tools.logError(`ERROR ${e.response.status}`);
-      throw e;
-    })
-}
-
-
-
-
-const createVersion = (projectKey = 'MWP', version = 'PI9.IT1') => {
-  return Promise.resolve()
-
-    // get project from key
-    .then(() => {
-      return getProject(projectKey);
-    })
-
-    // check if version exists in the fetch project versions, if not create it
-    .then((project) => {
-      const versionFound = project.versions.filter((v) => {
-        return v.name === version;
-      })[0];
-
-      if (versionFound) {
-        // output the version found if exists
-        tools.logInfo(`Version ${version} exist ==> id: ${versionFound.id}`);
-        return versionFound;
-
-      } else {
-
-        // creating the version if not
-        return Promise.resolve()
-          .then(() => {
-            tools.logInfo(`Version does not exist...creating`);
-
-            const postData = JSON.stringify({
-              project: projectKey,
-              name: version,
-              released: false,
-              archived: false,
-              description: 'Version created from CSDR',
-              releaseDate: moment().format('YYYY-MM-DD')
-            });
-
-            return doCall({ method: 'POST', url: `version`, data: postData });
-          })
-          .then((response) => {
-            tools.logSuccess(`OK ${response.status}`);
-            return response;
-          })
-          .catch((e) => {
-            tools.logError(`ERROR ${e.response.status}`);
-            throw e;
-          })
-      }
-    })
-
-    .catch((e) => {
-      throw e;
-    });
-}
-
-
-
-
-
-
-const doCall = (options) => {
-  const JIRA_BASE_URL = 'https://webgate.ec.europa.eu/CITnet/jira/rest/api/2/';
-  const { jiraUser, jiraPassword } = tools.getArgs();
-
-  axios.defaults.headers.post['Content-Type'] = 'application/json';
-  axios.defaults.headers.put['Content-Type'] = 'application/json';
-
-  return Promise.resolve()
-    .then(() => {
-      return axios({
-        baseURL: JIRA_BASE_URL,
-        url: options.url,
-        method: options.method,
-        data: options.data || {},
-        auth: {
-          username: jiraUser,
-          password: jiraPassword
-        }
-      })
-        .then((response) => {
-          return response;
-        })
-        .catch((e) => {
-          throw e;
-        });
-    })
-}
-
-
-module.exports = {
-  getProject,
-  getIssue,
-  updateIssueVersion,
-  createVersion,
-}
+// 'use strict';
+
+// // GLOBAL
+// const execa = require('execa');
+// const moment = require('moment');
+// const axios = require('axios');
+
+// // LOCAL
+// const tools = require('../../utils/tools');
+
+
+// const getProject = (projectKey) => {
+//   return Promise.resolve()
+//     .then(() => {
+//       return doCall({ method: 'GET', url: `/project/${projectKey}` });
+//     })
+//     .then((response) => {
+//       tools.logSuccess(`OK ${response.status}`);
+//       return response.data;
+//     })
+//     .catch((e) => {
+//       tools.logError(`ERROR ${e.response.status}`);
+//       throw e;
+//     })
+// }
+
+// const getIssue = (issueKey) => {
+//   return Promise.resolve()
+//     .then(() => {
+//       return doCall({ method: 'GET', url: `/issue/${issueKey}` });
+//     })
+//     .then((response) => {
+//       tools.logSuccess(`OK ${response.status}`);
+//       return response.data;
+//     })
+//     .catch((e) => {
+//       tools.logError(`ERROR ${e.response.status}`);
+//       throw e;
+//     })
+// }
+
+
+// const updateIssueVersion = (issueKey, version) => {
+//   tools.logInfo(`Updating issue: ${issueKey} with version: ${version}`);
+
+//   return Promise.resolve()
+//     .then(() => {
+
+//       const postData = JSON.stringify({
+//         "update": {
+//           "fixVersions": [
+//             {
+//               "add": {
+//                 "name": version
+//               }
+//             }
+//           ]
+//         }
+//       });
+
+//       return doCall({ method: 'PUT', url: `/issue/${issueKey}`, data: postData });
+//     })
+//     .then((response) => {
+//       tools.logSuccess(`OK ${response.status}`);
+//       return response.data;
+//     })
+//     .catch((e) => {
+//       tools.logError(`ERROR ${e.response.status}`);
+//       throw e;
+//     })
+// }
+
+
+
+
+// const createVersion = (projectKey = 'MWP', version = 'PI9.IT1') => {
+//   return Promise.resolve()
+
+//     // get project from key
+//     .then(() => {
+//       return getProject(projectKey);
+//     })
+
+//     // check if version exists in the fetch project versions, if not create it
+//     .then((project) => {
+//       const versionFound = project.versions.filter((v) => {
+//         return v.name === version;
+//       })[0];
+
+//       if (versionFound) {
+//         // output the version found if exists
+//         tools.logInfo(`Version ${version} exist ==> id: ${versionFound.id}`);
+//         return versionFound;
+
+//       } else {
+
+//         // creating the version if not
+//         return Promise.resolve()
+//           .then(() => {
+//             tools.logInfo(`Version does not exist...creating`);
+
+//             const postData = JSON.stringify({
+//               project: projectKey,
+//               name: version,
+//               released: false,
+//               archived: false,
+//               description: 'Version created from CSDR',
+//               releaseDate: moment().format('YYYY-MM-DD')
+//             });
+
+//             return doCall({ method: 'POST', url: `version`, data: postData });
+//           })
+//           .then((response) => {
+//             tools.logSuccess(`OK ${response.status}`);
+//             return response;
+//           })
+//           .catch((e) => {
+//             tools.logError(`ERROR ${e.response.status}`);
+//             throw e;
+//           })
+//       }
+//     })
+
+//     .catch((e) => {
+//       throw e;
+//     });
+// }
+
+
+
+
+
+
+// const doCall = (options) => {
+//   const JIRA_BASE_URL = 'https://webgate.ec.europa.eu/CITnet/jira/rest/api/2/';
+//   const { jiraUser, jiraPassword } = tools.getArgs();
+
+//   axios.defaults.headers.post['Content-Type'] = 'application/json';
+//   axios.defaults.headers.put['Content-Type'] = 'application/json';
+
+//   return Promise.resolve()
+//     .then(() => {
+//       return axios({
+//         baseURL: JIRA_BASE_URL,
+//         url: options.url,
+//         method: options.method,
+//         data: options.data || {},
+//         auth: {
+//           username: jiraUser,
+//           password: jiraPassword
+//         }
+//       })
+//         .then((response) => {
+//           return response;
+//         })
+//         .catch((e) => {
+//           throw e;
+//         });
+//     })
+// }
+
+
+// module.exports = {
+//   getProject,
+//   getIssue,
+//   updateIssueVersion,
+//   createVersion,
+// }