@eui/tools 6.20.16 → 6.20.18

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

@@ -8,26 +8,17 @@
             "files": [
                 "*.ts"
             ],
-            "plugins": [
-                "prefer-arrow"
-            ],
             "extends": [
-                "eslint:recommended",
                 "plugin:@typescript-eslint/recommended",
                 "plugin:@angular-eslint/recommended",
                 "plugin:@angular-eslint/template/process-inline-templates"
             ],
+            "plugins": [
+                "prefer-arrow",
+                "jsdoc"
+            ],
             "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": [
@@ -38,7 +29,6 @@
                 ],
                 "@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",
@@ -52,7 +42,6 @@
                 "id-match": "off",
                 "no-duplicate-case": "error",
                 "no-duplicate-imports": "off",
-                "no-invalid-this": "error",
                 "no-multiple-empty-lines": [
                     "error",
                     {
@@ -77,7 +66,7 @@
                     }
                 ],
                 "@typescript-eslint/member-ordering": [
-                    "error",
+                    "warn",
                     {
                         "default": [
                             "public-static-field",
@@ -92,31 +81,38 @@
                         ]
                     }
                 ],
-                "quote-props": ["error", "as-needed"],
-                "prefer-const": "error",
-                "@typescript-eslint/no-empty-function": ["error"],
-                "prefer-arrow/prefer-arrow-functions": [
-                    "error",
+
+                "@angular-eslint/no-output-on-prefix": ["warn"],
+                "@angular-eslint/no-empty-lifecycle-method": ["warn"],
+                "@typescript-eslint/no-empty-function": ["warn"],
+                "jsdoc/newline-after-description": ["off"],
+                "@typescript-eslint/adjacent-overload-signatures": ["warn"],
+                "@typescript-eslint/ban-types": ["warn"],
+                "@typescript-eslint/no-this-alias": ["warn"],
+                "@typescript-eslint/no-empty-interface": ["warn"],
+                "no-var": ["warn"],
+                "quote-props": ["off"],
+                "jsdoc/check-alignment": ["warn"],
+                "@typescript-eslint/member-delimiter-style": [
+                    "off",
                     {
-                        "disallowPrototype": false,
-                        "singleReturnOnly": false,
-                        "classPropertiesAllowed": false,
-                        "allowStandaloneDeclarations": true
+                        "multiline": {
+                            "delimiter": "comma",
+                            "requireLast": true
+                        },
+                        "singleline": {
+                            "delimiter": "comma",
+                            "requireLast": false
+                        },
+                        "multilineDetection": "brackets"
                     }
                 ],
-                "@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"]
+                "arrow-body-style": ["off", "as-needed", { "requireReturnForObjectLiteral": true }],
+                "object-shorthand": ["off", "properties"],
+                "prefer-arrow/prefer-arrow-functions": ["warn"],
+                "@typescript-eslint/no-inferrable-types": ["warn"],
+                "@typescript-eslint/no-explicit-any": ["off"],
+                "@angular-eslint/template/no-negated-async": ["off"]
             }
         },
         {

package/scripts/csdr/install/local-dev.js

@@ -101,7 +101,12 @@ module.exports.install = (providedDeps) => {
 
       const configDeps = { ...resolvedDeps, ...fixedDeps };
 
-      return innerCommon.getResolvedCarretDeps(configDeps, false, true);
+      if (configUtils.global.isCsdr()) {
+        return innerCommon.getResolvedCarretDeps(configDeps, false, true);
+      } else {
+        return innerCommon.getResolvedCarretDepsStandalone(configDeps, false, true);
+      }
+
     })
 
 

package/scripts/csdr/install/packages.js

@@ -14,7 +14,7 @@ const innerCommon = require('./common');
 const innerProjects = require('./projects');
 
 // FETCH ARGS
-const { skipLocalPackagesDeps } = tools.getArgs();
+const { skipLocalPackagesDeps, skipInstall } = tools.getArgs();
 
 
 
@@ -291,6 +291,11 @@ module.exports.installDeps = (prj, pkg, isMaster) => {
 module.exports.installDepsStandalone = (pkg, isMaster) => {
   let localPkgDeps, localPkgCompositeDeps, remappedDeps, localPkgBaseDeps;
 
+  if (skipInstall) {
+    tools.logInfo('skipInstall active...skipiing');
+    return {};
+  }
+
   return Promise.resolve()
     // fetching depedencies composite deps
     .then(() => {

package/scripts/csdr/release/package/release-package-standalone.js

@@ -16,8 +16,8 @@ const innerCommon = require('./common');
 // LOCAL TEST :
 // - symlink eUI tools sources to node_modules of standalone pkg folder node_modules to test
 // - execute this command on the standalone pkg folder :
-// npx @eui/tools release-package-standalone --dryRun --pkgName zzz-test-package-ui --branch develop --debug --debugNotification --skipCommitsCheck --skipPublish --skipGitUpdates --skipLint --skipTest
-
+// npx @eui/tools release-package-standalone --pkgName zzz-test-package-ui --branch develop --debug --debugNotification --skipCommitsCheck --skipPublish --skipGitUpdates
+// npx @eui/tools release-package-standalone --pkgName baep-sample-host-shell-ui --branch develop --debug --debugNotification --skipCommitsCheck --skipPublish --skipGitUpdates --skipInstall
 
 module.exports.run = () => {
   const { dryRun } = utils.tools.getArgs();

package/scripts/csdr/release/package/release-remote-standalone.js

@@ -11,7 +11,6 @@ const initUtils = require('../../init/init-utils');
 const configUtils = require('../../config/config-utils');
 const metadataUtils = require('../../metadata/metadata-utils');
 const installUtils = require('../../install/install-utils');
-const versionUtils = require('../../version/version-utils');
 
 
 // INNER MODULES
@@ -20,8 +19,7 @@ const innerCommon = require('./common');
 // LOCAL TEST :
 // - symlink eUI tools sources to node_modules of standalone pkg folder node_modules to test
 // - execute this command on the standalone pkg folder :
-// npx @eui/tools release-remote-standalone --remoteName zzz-test-remote-eui18 --envTarget DEV --dryRun --debug --debugNotification --debugGitUpdates --skipPublish
-
+// npx @eui/tools release-remote-standalone --remoteName zzz-test-remote-eui18 --envTarget DEV --debug --debugNotification --debugGitUpdates --skipPublish --skipGitUpdates --skipNotification
 
 
 module.exports.run = () => {
@@ -52,7 +50,7 @@ module.exports.run = () => {
 
       // CLONE CONFIG REPOSITORY - for gathering central remotes config
       .then(() => {
-        return initUtils.remotes.cloneRemotesConfigStandalone();
+        return configUtils.global.cloneConfig();
       })
 
       // GET REMOTE OBJECT

package/scripts/utils/build/package/angular.js

@@ -21,6 +21,27 @@ module.exports.build = (pkg, isMaster) => {
 
   let auditStylesReport;
 
+  // standalone switch of eslint / temp solution, as angular.json eslintconfig file is not taken into account
+  const swapEslintStandalone = (reset = false) => {
+    const eslintStandalone = path.join(pkg.paths.root, '.eslintrc.standalone.json');
+    const eslint = path.join(pkg.paths.root, '.eslintrc.json');
+    const eslinttemp = path.join(pkg.paths.root, '.eslintrc.temp.json');
+
+    tools.logInfo('Swap eslint config for standalone release of pkg');
+
+    if (reset) {
+      tools.logInfo(`copy : ${eslinttemp} tp ${eslint}`);
+      tools.copy(eslinttemp, eslint);
+      tools.logInfo(`delete : ${eslinttemp}`);
+      tools.remove(eslinttemp);
+    } else {
+      tools.logInfo(`copy : ${eslint} tp ${eslinttemp}`);
+      tools.copy(eslint, eslinttemp);
+      tools.logInfo(`move : ${eslintStandalone} tp ${eslint}`);
+      tools.copy(eslintStandalone, eslint);
+    }
+  }
+
   return Promise.resolve()
     .then(() => {
       if (deps === true) {
@@ -52,13 +73,37 @@ module.exports.build = (pkg, isMaster) => {
           // the project path information are located inside the .eslintrc.json
           tools.logInfo(`running ng lint ${pkg.name}`);
 
-          if (build && pkg.msteamsActive) {
-            let args = ['--max_old_space_size=8096', ng, 'lint', pkg.name];
-            return tools.runNodeScriptProcessOutput(args, pkg.paths.root);
+          return Promise.resolve()
+            .then(() => {
+              if (pkg.standalone) {
+                swapEslintStandalone();
+              }
+            })
+            .then(() => {
+              if (build && pkg.msteamsActive) {
+                let args = ['--max_old_space_size=8096', ng, 'lint', pkg.name];
+                return tools.runNodeScriptProcessOutput(args, pkg.paths.root);
+
+              } else {
+                return tools.runScript(`ng lint ${pkg.name}`);
+              }
+            })
+
+            .then(() => {
+              if (!skipLint) {
+                tools.logSuccess();
+                if (pkg.standalone) {
+                  swapEslintStandalone(true);
+                }
+              }
+            })
 
-          } else {
-            return tools.runScript(`ng lint ${pkg.name}`);
-          }
+            .catch((e) => {
+              if (pkg.standalone) {
+                swapEslintStandalone(true);
+              }
+              throw e;
+            })
 
         } else {
           tools.logError(`No ESLint or TSLint configuration found for the project`);
@@ -66,9 +111,6 @@ module.exports.build = (pkg, isMaster) => {
       }
     })
     .then(() => {
-      if (!skipLint) {
-        tools.logSuccess();
-      }
       if (!skipAudit) {
         return auditUtils.styles.audit(pkg);
       }

package/scripts/utils/build/package/element.js

@@ -118,7 +118,11 @@ module.exports.postBuild = (pkg, version) => {
       tools.logTitle('ELEMENT POST build');
       tools.logInfo('Copying dist to bundles folder');
       tools.mkdir(path.join(pkg.paths.dist, 'bundles'));
-      return tools.copydir(path.join(pkg.paths.dist), path.join(pkg.paths.dist, 'bundles'));
+      if (euiVersionNumber >= 18) {
+        tools.copydirFiles(path.join(pkg.paths.dist, 'browser'), path.join(pkg.paths.dist));
+        tools.remove(path.join(pkg.paths.dist, 'browser'));
+      }
+      tools.copydir(path.join(pkg.paths.dist), path.join(pkg.paths.dist, 'bundles'));
     })
 
     .then(() => {

package/scripts/utils/notification/teams-utils.js

@@ -6,7 +6,7 @@ const apiUtils = require('../api-utils');
 const configUtils = require('../../csdr/config/config-utils');
 
 // ARGS
-const { dryRun, debug, debugNotification } = tools.getArgs();
+const { dryRun, debug, debugNotification, skipNotification } = tools.getArgs();
 
 
 const getChannelHook = module.exports.getChannelHook = (channelName) => {
@@ -206,7 +206,13 @@ module.exports.sendMessage = (config, messageContent, standalone = false) => {
         host = configUtils.global.getConfigOptions().MSTEAMS_HOST;
       }
 
-      return apiUtils.post(host, channelHook, JSON.parse(JSON.stringify(payload, null, 2)));
+      if (dryRun || skipNotification) {
+        tools.logInfo('DRY-RUN or skipNotification active...skipping');
+        return Promise.resolve();
+      } else {
+        return apiUtils.post(host, channelHook, JSON.parse(JSON.stringify(payload, null, 2)));
+      }
+
     })
     .then((response) => {
       console.log(response);

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

@@ -1,44 +0,0 @@
-{
-    "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"
-                    }
-                ]
-            }
-        }
-    ]
-}