@eui/tools 6.20.0 → 6.20.2

package/.version.properties

@@ -1 +1 @@
-6.20.0
+6.20.2

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 6.20.2 (2024-08-07)
+
+##### Chores
+
+* **other:**
+  * adapted branch-name fetch for standalone pkg builds - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([5059e861](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5059e86141128602044f41059ff6ff6578659bad))
+
+* * *
+* * *
+## 6.20.1 (2024-08-07)
+
+##### Chores
+
+* **other:**
+  * adapted skip CI for pipeline git operations - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([d0656022](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d0656022faa10fce931787be951e53bcbb2e7bd5))
+  * adapted injection for standalone pkg build - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([197e954e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/197e954e0b53f602775e60aec5fab261bd32eb63))
+  * adapted pipeline release for standalone package - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([83e9779d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/83e9779d7c1d2201e32dbfebfa8e20c8ec6ed3ef))
+
+* * *
+* * *
 ## 6.20.0 (2024-08-06)
 
 ##### New Features

package/init.js

@@ -8,6 +8,8 @@ console.log('Init tools package symlink...');
 console.log('----------------------------------------------');
 
 const nmSrcPath = path.join(process.cwd(), 'node_modules');
+// for testing purpose standalone mode locally
+// const nmSrcPath = path.join('d:/gitlab/zzz-test-package-ui', 'node_modules');
 
 const euiNmToolsPath = path.join(nmSrcPath, '@eui', 'tools');
 const eUIToolsPath = path.join(process.cwd(), 'packages', 'eui-tools');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.20.0",
+    "version": "6.20.2",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/scripts/csdr/audit/yarn.js

@@ -137,7 +137,7 @@ module.exports.audit = (pkg) => {
 
       if (pkg.standalone) {
         // TODO proceed to gates checks if needed
-        // configOptions = configUtils.standalone.getConfigOptions();
+        // configOptions = configUtils.global.getConfigOptionsStandalone();
         return;
       } else {
         configOptions = configUtils.global.getConfigOptions();

package/scripts/csdr/config/config-skeletons.js

@@ -1926,12 +1926,12 @@ module.exports.angularPackageDefV15Standalone = {
     "build": {
       "builder": "@angular-devkit/build-angular:ng-packagr",
       "options": {
-        "tsConfig": "tsconfig.lib.json",
+        "tsConfig": "tsconfig.lib.standalone.json",
         "project": "ng-package.json"
       },
       "configurations": {
         "production": {
-          "tsConfig": "tsconfig.lib.prod.json"
+          "tsConfig": "tsconfig.lib.standalone.json"
         }
       }
     },
@@ -1942,8 +1942,8 @@ module.exports.angularPackageDefV15Standalone = {
           "zone.js",
           "zone.js/testing"
         ],
-        "tsConfig": "tsconfig.spec.json",
-        "karmaConfig": "karma.conf.js",
+        "tsConfig": "tsconfig.spec.standalone.json",
+        "karmaConfig": "karma.conf.standalone.js",
         "scripts": [
           "node_modules/quill/dist/quill.js",
           "node_modules/quill-better-table/dist/quill-better-table.min.js"

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

@@ -9,4 +9,3 @@ module.exports.init = require('./init');
 module.exports.sync = require('./sync');
 module.exports.remotes = require('./remotes');
 module.exports.register = require('./register');
-module.exports.standalone = require('./standalone');

package/scripts/csdr/config/global.js

@@ -253,9 +253,7 @@ module.exports.updateConfig = (args = { project, projects, packages, packagesBra
 
 
 
-module.exports.getConfigOptions = () => {
-  const config = this.getConfig();
-
+const getConvertedOptions = (config) => {
   let configOptions = {
     DEVOPS_METADATA_REPOSITORY: null,
     DEVOPS_METADATA_LOCKS_REPOSITORY: null,
@@ -459,11 +457,25 @@ module.exports.getConfigOptions = () => {
     }
   }
 
-
   return configOptions;
 }
 
 
+
+module.exports.getConfigOptions = () => {
+  const config = this.getConfig();
+
+  return getConvertedOptions(config);
+}
+
+
+module.exports.getConfigOptionsStandalone = () => {
+  const config = require(path.join(process.cwd(), '.euirc-config.json'));
+
+  return getConvertedOptions(config);
+}
+
+
 module.exports.getLocalEuiVersion = () => {
   let euiVersionsLocal = [
     ...innerPackages.getLocalPackagesEuiVersion(),

package/scripts/csdr/init/global.js

@@ -70,12 +70,18 @@ const processResolutionsInjection = module.exports.processResolutionsInjection =
 }
 
 
-module.exports.initRootFilesAndResolutions = () => {
+module.exports.initRootFilesAndResolutions = (euiVersionInput) => {
  tools.logTitle('Processing injections for local installed eUI versions if needed');
 
   return Promise.resolve()
     .then(() => {
-      const euiVersion = configUtils.global.getLocalEuiVersion();
+      let euiVersion;
+
+      if (euiVersionInput) {
+        euiVersion = euiVersionInput;
+      } else {
+        euiVersion = configUtils.global.getLocalEuiVersion();
+      }
 
       processResolutionsInjection(process.cwd(), euiVersion);
 

package/scripts/csdr/init/packages.js

@@ -154,3 +154,11 @@ module.exports.importScripts = () => {
       throw e;
     })
 }
+
+
+module.exports.injectStandaloneResources = (pkg) => {
+  const euiVersion = configUtils.packages.getPackageEuiVersion(pkg);
+  const skeletonPath = path.join(__dirname, 'standalone', euiVersion);
+
+  tools.copy(skeletonPath, pkg.paths.root);
+}

package/scripts/csdr/init/standalone/18.x/.eslintrc.eui18.standalone.json

@@ -0,0 +1,133 @@
+{
+    "root": true,
+    "ignorePatterns": [
+        "projects/**/*"
+    ],
+    "overrides": [
+        {
+            "files": [
+                "*.ts"
+            ],
+            "plugins": [
+                "prefer-arrow"
+            ],
+            "extends": [
+                "eslint:recommended",
+                "plugin:@typescript-eslint/recommended",
+                "plugin:@angular-eslint/recommended",
+                "plugin:@angular-eslint/template/process-inline-templates"
+            ],
+            "rules": {
+                "@typescript-eslint/ban-ts-comment": "off",
+                "@typescript-eslint/ban-types": [
+                    "error",
+                    {
+                        "types": {
+                            "Function": false
+                        },
+                        "extendDefaults": true
+                    }
+                ],
+                "@typescript-eslint/consistent-type-definitions": "off",
+                "@typescript-eslint/dot-notation": "off",
+                "@typescript-eslint/explicit-member-accessibility": [
+                    "off",
+                    {
+                        "accessibility": "explicit"
+                    }
+                ],
+                "@typescript-eslint/no-require-imports": "error",
+                "@typescript-eslint/no-unused-vars": "off",
+                "@typescript-eslint/no-var-requires": "error",
+                "@typescript-eslint/require-await": "error",
+                "brace-style": [
+                    "error",
+                    "1tbs"
+                ],
+                "comma-dangle": [
+                    "error",
+                    "always-multiline"
+                ],
+                "id-blacklist": "off",
+                "id-match": "off",
+                "no-duplicate-case": "error",
+                "no-duplicate-imports": "off",
+                "no-invalid-this": "error",
+                "no-multiple-empty-lines": [
+                    "error",
+                    {
+                        "max": 1
+                    }
+                ],
+                "no-new-func": "error",
+                "no-redeclare": "off",
+                "@typescript-eslint/no-redeclare": [
+                    "error"
+                ],
+                "no-template-curly-in-string": "error",
+                "no-underscore-dangle": "off",
+                "@typescript-eslint/naming-convention": [
+                    "error",
+                    {
+                        "selector": "enum",
+                        "format": [
+                            "PascalCase",
+                            "UPPER_CASE"
+                        ]
+                    }
+                ],
+                "@typescript-eslint/member-ordering": [
+                    "error",
+                    {
+                        "default": [
+                            "public-static-field",
+                            "public-instance-field",
+                            "private-static-field",
+                            "private-instance-field",
+                            "public-constructor",
+                            "private-constructor",
+                            "public-instance-method",
+                            "protected-instance-method",
+                            "private-instance-method"
+                        ]
+                    }
+                ],
+                "quote-props": ["error", "as-needed"],
+                "prefer-const": "error",
+                "@typescript-eslint/no-empty-function": ["error"],
+                "prefer-arrow/prefer-arrow-functions": [
+                    "error",
+                    {
+                        "disallowPrototype": false,
+                        "singleReturnOnly": false,
+                        "classPropertiesAllowed": false,
+                        "allowStandaloneDeclarations": true
+                    }
+                ],
+                "@typescript-eslint/no-inferrable-types": ["error"],
+                "@typescript-eslint/explicit-function-return-type": "error",
+                "@angular-eslint/no-output-on-prefix": ["error"],
+                "@angular-eslint/no-output-native": ["error"],
+                "@angular-eslint/no-outputs-metadata-property": ["error"],
+                "@typescript-eslint/prefer-for-of": ["error"],
+                "@angular-eslint/no-empty-lifecycle-method": ["error"],
+                "@typescript-eslint/no-explicit-any": ["error"],
+                "@typescript-eslint/no-unsafe-declaration-merging": ["error"],
+                "no-empty": "error",
+                "object-curly-spacing": ["error", "always"],
+                "quotes": ["error", "single"],
+                "@angular-eslint/use-lifecycle-interface": ["error"]
+            }
+        },
+        {
+            "files": [
+                "*.html"
+            ],
+            "extends": [
+                "plugin:@angular-eslint/template/recommended"
+            ],
+            "rules": {
+            }
+        }
+    ]
+}

package/scripts/csdr/init/standalone/18.x/.eslintrc.json

@@ -0,0 +1,44 @@
+{
+    "extends": ".eslintrc.eui18.standalone.json",
+    "ignorePatterns": [
+        "!**/*",
+        "**/*.d.ts",
+        "dist",
+        "test",
+        "coverage",
+        "externals",
+        "legacy",
+        "node_modules"
+    ],
+    "overrides": [
+        {
+            "files": [
+                "*.ts"
+            ],
+            "parserOptions": {
+                "project": [
+                    "tsconfig.lib.standalone.json",
+                    "tsconfig.spec.standalone.json"
+                ]
+            },
+            "rules": {
+                "@angular-eslint/component-selector": [
+                    "error",
+                    {
+                        "type": "element",
+                        "prefix": ["zzz"],
+                        "style": "kebab-case"
+                    }
+                ],
+                "@angular-eslint/directive-selector": [
+                    "error",
+                    {
+                        "type": "attribute",
+                        "prefix": ["zzz"],
+                        "style": "camelCase"
+                    }
+                ]
+            }
+        }
+    ]
+}

package/scripts/csdr/init/standalone/18.x/karma.conf.standalone.js

@@ -0,0 +1,7 @@
+const karmaConfig = require('@eui/tools/karma/karma.conf.pkg');
+
+module.exports = function (config) {
+    config.set(
+        karmaConfig.get(config, 'zzz-test-package-ui', {})
+    );
+};

package/scripts/csdr/init/standalone/18.x/tsconfig.lib.standalone.json

@@ -0,0 +1,34 @@
+{
+  "extends": "./tsconfig.standalone.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/lib",
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "node",
+    "declaration": true,
+    "sourceMap": true,
+    "inlineSources": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "importHelpers": true,
+    "types": [],
+    "lib": [
+      "ES2022",
+      "dom"
+    ]
+  },
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true,
+    "enableResourceInlining": true,
+    "compilationMode": "partial"
+  },
+  "exclude": [
+    "src/test.ts",
+    "**/*.spec.ts"
+  ]
+}

package/scripts/csdr/init/standalone/18.x/tsconfig.spec.standalone.json

@@ -0,0 +1,17 @@
+{
+  "extends": "./tsconfig.standalone.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/spec",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "src/test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}

package/scripts/csdr/init/standalone/18.x/tsconfig.standalone.json

@@ -0,0 +1,17 @@
+{
+    "compileOnSave": false,
+    "compilerOptions": {
+        "baseUrl": ".",
+        "sourceMap": true,
+        "declaration": false,
+        "module": "ES2022",
+        "moduleResolution": "node",
+        "allowSyntheticDefaultImports": true,
+        "emitDecoratorMetadata": true,
+        "experimentalDecorators": true,
+        "target": "ES2022",
+        "typeRoots": [
+            "node_modules/@types"
+        ]
+    }
+}

package/scripts/csdr/install/common.js

@@ -72,6 +72,59 @@ module.exports.installDeps = (deps) => {
   );
 };
 
+
+module.exports.installDepsStandalone = (pkg, deps) => {
+  const rootFolder = process.cwd();
+  const pkgJsonFile = path.resolve(rootFolder, 'package.json');
+  const pkgJson = require(pkgJsonFile);
+
+  return (
+    Promise.resolve()
+      // parse eUI deps and explode the sub-packages (v17 issues)
+      .then(() => {
+        const euiVersion = configUtils.packages.getPackageEuiVersion(pkg);
+        const euiVersionNumber = parseInt(euiVersion);
+
+        if (euiVersionNumber >= 17) {
+          Object.keys(deps).forEach((dep) => {
+            if (dep === '@eui/deps-base') {
+              deps['@eui/components'] = deps[dep];
+              deps['@eui/showcase'] = deps[dep];
+              deps['@eui/styles'] = deps[dep];
+            }
+          });
+        }
+      })
+
+      // Install dependencies
+      .then(() => {
+        tools.logTitle('Package dependencies to install : ');
+        pkgJson.dependencies = deps;
+
+        // Updating file and installing
+        if (Object.keys(pkgJson.dependencies).length !== 0) {
+          tools.writeJsonFileSync(pkgJsonFile, pkgJson);
+          tools.logInfo('installing dependencies');
+          console.log(pkgJson.dependencies);
+
+          return executeInstall(rootFolder, configUtils.global.getConfigOptionsStandalone().NPM_REGISTRY_INSTALL);
+        }
+      })
+
+      .then(() => {
+        pkgJson.dependencies = {}
+        pkgJson.resolutions = {}
+        tools.writeJsonFileSync(pkgJsonFile, pkgJson);
+      })
+
+      .catch((e) => {
+        throw e;
+      })
+  );
+};
+
+
+
 const executeInstall = (module.exports.executeInstall = (cwdPath, npmRegistry) => {
   return Promise.resolve()
     .then(() => {
@@ -165,3 +218,50 @@ module.exports.getResolvedCarretDeps = (deps, isMaster, isDevEnvTarget) => {
       })
   );
 };
+
+
+module.exports.getResolvedCarretDepsStandalone = (deps, isMaster, isDevEnvTarget) => {
+  tools.logTitle('Resolving carret versions of detected packages');
+
+  tools.logInfo('processing dependencies : ');
+  console.log(deps);
+
+  return (
+    Promise.resolve()
+      .then(() => {
+        const dependencies = Object.keys(deps).reduce((acc, k) => {
+          if (deps[k] && deps[k].substr(0, 1) === '^') {
+            const npmPkg = k;
+            const version = deps[k];
+
+            tools.logInfo(`\nProcessing ${npmPkg}:${version}`);
+
+            // getting last major version from metadata history for pkg found
+            const lastMajorVersion = metadataUtils.packageUtils.getLastMajorVersionByNpmPkg(
+              npmPkg,
+              version.substr(1).split('.')[0],
+              isMaster,
+              isDevEnvTarget
+            );
+
+            if (lastMajorVersion) {
+              tools.logInfo(`--version found : ${lastMajorVersion}`);
+              acc[k] = lastMajorVersion;
+            } else {
+              tools.logWarning(`WARNING : Can't resolve carret version from history for pkg: ${npmPkg} for version ${version}`);
+            }
+          }
+          return acc;
+        }, {});
+
+        return { ...deps, ...dependencies };
+      })
+
+      // don't rethrow in case of error, just log the exception
+      .catch((e) => {
+        tools.logError('Unable to resolve deps');
+        console.log(e);
+        return deps;
+      })
+  );
+};

package/scripts/csdr/install/packages.js

@@ -72,10 +72,15 @@ const getLocalPackageCompositeDeps = (pkg) => {
   let pkgJsonFile;
 
   if (!skipLocalPackagesDeps) {
-    if (pkg.child) {
-      pkgJsonFile = path.join(process.cwd(), 'packages', pkg.parentPkg, 'packages', pkg.folder || pkg.name, 'dependencies-composite.json');
+
+    if (pkg.standalone) {
+      pkgJsonFile = path.join(process.cwd(), 'dependencies-composite.json');
     } else {
-      pkgJsonFile = path.join(process.cwd(), 'packages', pkg.name, 'dependencies-composite.json');
+      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');
+      }
     }
 
     if (tools.isFileExists(pkgJsonFile)) {
@@ -122,10 +127,14 @@ const getLocalPackageBaseDeps = (pkg) => {
   let pkgJsonFile;
 
   if (!skipLocalPackagesDeps) {
-    if (pkg.child) {
-      pkgJsonFile = path.join(process.cwd(), 'packages', pkg.parentPkg, 'packages', pkg.folder || pkg.name, 'dependencies-base.json');
+    if (pkg.standalone) {
+      pkgJsonFile = path.join(process.cwd(), 'dependencies-base.json');
     } else {
-      pkgJsonFile = path.join(process.cwd(), 'packages', pkg.name, 'dependencies-base.json');
+      if (pkg.child) {
+        pkgJsonFile = path.join(process.cwd(), 'packages', pkg.parentPkg, 'packages', pkg.folder || pkg.name, 'dependencies-base.json');
+      } else {
+        pkgJsonFile = path.join(process.cwd(), 'packages', pkg.name, 'dependencies-base.json');
+      }
     }
 
     if (tools.isFileExists(pkgJsonFile)) {
@@ -277,3 +286,47 @@ module.exports.installDeps = (prj, pkg, isMaster) => {
       throw e;
     })
 }
+
+
+module.exports.installDepsStandalone = (pkg, isMaster) => {
+  let localPkgDeps, localPkgCompositeDeps, remappedDeps, localPkgBaseDeps;
+
+  return Promise.resolve()
+    // fetching depedencies composite deps
+    .then(() => {
+      return getLocalPackageCompositeDeps(pkg);
+    })
+    // storing
+    .then((localPkgCompositeDepsIn) => {
+      localPkgCompositeDeps = localPkgCompositeDepsIn;
+    })
+
+    // remapping from registry
+    .then(() => {
+      return innerCommon.getResolvedCarretDepsStandalone(localPkgCompositeDeps, isMaster, !isMaster);
+    })
+    // storing
+    .then((remappedDepsIn) => {
+      remappedDeps = remappedDepsIn;
+    })
+
+    // fetch dependencies-base deps
+    .then(() => {
+      return getLocalPackageBaseDeps(pkg);
+    })
+
+    .then((localPkgBaseDepsIn) => {
+      localPkgBaseDeps = localPkgBaseDepsIn;
+
+      const fixedDeps = configUtils.global.getConfigOptionsStandalone().NPM_FIXED_DEPENDENCIES;
+
+      return innerCommon.installDepsStandalone(pkg, { ...localPkgBaseDeps, ...remappedDeps, ...localPkgDeps, ...fixedDeps});
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
+