@eui/tools 4.15.11 → 4.16.0

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/config/packages.js

@@ -6,6 +6,7 @@ const fs = require('fs');
 
 // LOCAL
 const tools = require('../../utils/tools');
+const configUtils = require('./config-utils');
 
 // INNER MODULES
 const innerGlobal = require('./global');
@@ -233,3 +234,30 @@ module.exports.getDepGraph = () => {
 
   return graph;
 }
+
+
+module.exports.getLocalPackagesEuiVersion = () => {
+  tools.logInfo('getting local installed eUI version...');
+
+  const pkgs = configUtils.packages.getPackages();
+  let versionsFound = [];
+
+  pkgs.forEach((p) => {
+    if (p.parent !== true && p.tsPackage !== false) {
+
+      let version = 'DEFAULT';
+
+      if (p.build) {
+        if (p.build.euiVersion) {
+          version = p.build.euiVersion;
+        }
+      }
+      tools.logInfo(`checking ${p.name} - version found : ${version}`);
+      versionsFound.push(version);
+    }
+  })
+
+  versionsFound = tools.removeArrayDuplicates(versionsFound);
+
+  return versionsFound;
+}

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

@@ -171,3 +171,40 @@ module.exports.importExtraTsConfig = () => {
       throw e;
     })
 }
+
+
+module.exports.processLocalEuiVersions = () => {
+ tools.logTitle('Processing injections for local installed eUI versions if needed');
+
+  return Promise.resolve()
+    .then(() => {
+      const euiVersionsLocal = configUtils.packages.getLocalPackagesEuiVersion();
+
+      if (euiVersionsLocal.length > 1) {
+        throw new Error('MULTIPLE_LOCAL_EUI_VERSIONS_FOUND');
+      }
+
+      const euiVersion = euiVersionsLocal[0];
+
+      if (euiVersion === 'DEFAULT') {
+        tools.logInfo('Default eUI version found, taking default resolutions..skipping');
+
+      } else {
+        const rootPackageJsonFile = path.join(process.cwd(), 'package.json');
+        const rootPackageJson = require(rootPackageJsonFile);
+
+        const resolutionsJsonFile = path.join(__dirname, 'resources', euiVersion, 'resolutions.json');
+        const resolutionsJson = require(resolutionsJsonFile);
+
+        tools.logInfo('Injecting resolutions content');
+        console.log(resolutionsJson);
+        rootPackageJson.resolutions = resolutionsJson;
+
+        tools.logInfo('Updating root package.json');
+        tools.writeJsonFileSync(rootPackageJsonFile, rootPackageJson);
+      }
+    })
+    .catch((e) => {
+      throw e;
+    })
+}

package/scripts/csdr/init/init.js

@@ -77,6 +77,12 @@ module.exports.init = () => {
       return initUtils.importPackages(finalResponse);
     })
 
+    // adapt and inject particular root data/config for eUI version detected on project
+    // if multiple versions of eUI are detected on the same project, an exception is thrown
+    .then(() => {
+      return initUtils.processLocalEuiVersions();
+    })
+
     // Install deps based on current config generated => take last know snapshots
     .then(() => {
       // this is only executed for local dev installation,

package/scripts/csdr/init/resources/13.x/resolutions.json

@@ -0,0 +1,15 @@
+{
+    "lodash": ">=4.17.21",
+    "handlebars": ">=4.5.3",
+    "mem": ">=4.3.0 <=8.1.1",
+    "https-proxy-agent": ">=2.2.3",
+    "minimatch": ">=3.0.4",
+    "acorn-globals": ">=6.0.0",
+    "open": ">=7.0.3",
+    "dot-prop": ">=5.2.0",
+    "serialize-javascript": ">=3.1.0",
+    "socket.io": ">=2.4.0",
+    "ssri": ">=8.0.1",
+    "@types/node": ">=14.14.10",
+    "hosted-git-info": ">=3.0.8"
+}

package/scripts/csdr/install/build-package.js

@@ -100,87 +100,3 @@ module.exports.install = (prj, pkg, isMaster) => {
       throw e;
     })
 }
-
-
-
-
-
-
-module.exports.checkDeps = (pkg) => {
-  tools.logTitle('Checking package internal dependencies');
-
-  return Promise.resolve()
-   .then(() => {
-     var depsFound = [];
-     var files = glob.sync('**/*.ts', { cwd: pkg.paths.pkgLibFolder, nodir: true, follow: true, dot: true });
-     files.forEach(file => {
-       const filePath = path.join(pkg.paths.pkgLibFolder, file);
-       const fileContent = tools.getFileContent(filePath);
-       var regex = /@cc\/|@mywp\/|@opsys\/|@sfc\//gi, result, indices = [];
-       while ( (result = regex.exec(fileContent)) ) {
-           indices.push(result.index);
-       }
-       if (indices.length !== 0) {
-         // tools.logInfo(`Number of occurences found : ${indices.length}`);
-         indices.forEach((i) => {
-           const endPos = fileContent.substr(i, 40).indexOf("'");
-           const dep = fileContent.substr(i, endPos);
-           if (endPos > -1) {
-             // tools.logInfo(`dep found on : ${dep}`);
-             depsFound.push(dep);
-
-           } else {
-             tools.logInfo(`Potential wrong import detected on file : ${file}`);
-             const subContent = fileContent.substr(i, 40);
-             const detectMultiSlashes = subContent.match(/\//g);
-             if (detectMultiSlashes.length > 0) {
-               tools.logError('Multislashes on import : ');
-               console.log(subContent);
-             }
-           }
-         })
-       }
-     });
-     depsFound = tools.removeArrayDuplicates(depsFound);
-     tools.logWarning(`Dependencies found : ${depsFound.length}`);
-     console.log(depsFound);
-
-     return depsFound;
-   })
-
-   .then((depsFound) => {
-     var depsLevel;
-
-     switch(true) {
-         case (depsFound.length === 1):
-           depsLevel = 'LOW (1)';
-           break;
-         case (depsFound.length > 1 && depsFound.length <= 3):
-           depsLevel = 'MEDIUM (between 1 and 3)';
-           break;
-         case (depsFound.length > 3 && depsFound.length <= 5):
-           depsLevel = 'HIGH (between 3 and 5)';
-           break;
-         case (depsFound.length > 5):
-           depsLevel = 'VERY HIGH (>5)';
-           break;
-         default:
-           depsLevel = 'NONE';
-     }
-
-     var message = `Internal dependencies detected : ${depsFound.length} - deps level: ${depsLevel}\n`;
-     message += depsFound.join('\n');
-
-
-     return notificationUtils.package.sendPackageMessage({
-      package: pkg,
-      text: message
-     });
-   })
-
-   .catch((e) => {
-     console.log(e);
-   })
-
- }
-

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 {
@@ -218,14 +220,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) || {};