npm - @eui/tools - Versions diffs - 5.0.0-rc.7 → 5.1.0 - Mend

@eui/tools 5.0.0-rc.7 → 5.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (273) hide show

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

@@ -11,7 +11,7 @@ const preBuildUtils = require('../../pre-build/pre-build-utils');
 let {
   skipLint, skipTest, configuration, baseHref, watch, dryRun, maxSpaceSize, statsJson,
-  ci, sourceMap
+  ci, sourceMap, build
 } = tools.getArgs();
@@ -24,20 +24,9 @@ module.exports.build = (pkg, isMaster) => {
   .then(() => {
     tools.logTitle(`Building element : ${pkg.name}...`);
-    // getting param from project config
-    if (pkg.build) {
-      if (pkg.build.skipLint) {
-        skipLint = true;
-      }
-      if (pkg.build.skipTest) {
-        skipTest = true;
-      }
-    }
-    // if (isMaster) {
-    //   skipLint = true;
-    //   skipTest = true;
-    // }
+    // force skipLint and skipTest on element
+    skipLint = true;
+    skipTest = true;
   })
   .then(() => {
@@ -102,7 +91,7 @@ module.exports.build = (pkg, isMaster) => {
       tools.logInfo(`ng test : watching = ${watch || false}`);
-      console.log(`running Angular TEST with args: ${args} on`);
+      tools.logInfo(`running Angular TEST with args: ${args} on`);
       console.log(pkg.paths.pkgRootDirectory);
       if (!dryRun) {
@@ -141,7 +130,7 @@ module.exports.build = (pkg, isMaster) => {
     args.push(`--single-bundle=true`);
     args.push(`--output-hashing=none`);
-    if (ci) {
+    if (build) {
       args.push('--progress=false');
     }
@@ -151,7 +140,7 @@ module.exports.build = (pkg, isMaster) => {
     tools.logInfo(`ng build for configuration : ${configuration || 'production'}`);
-    console.log(`running Angular BUILD with args: ${args} on`);
+    tools.logInfo(`running Angular BUILD with args: ${args} on`);
     console.log(pkg.paths.pkgRootDirectory);
     if (!dryRun) {
@@ -190,6 +179,16 @@ module.exports.postBuild = (pkg, version) => {
       tools.logInfo('Copying package.json to dist');
       return tools.copy(path.join(pkg.paths.pkgRootDirectory, 'package.json'), path.join(pkg.paths.pkgBuild, 'package.json'));
     })
+    .then(() => {
+      try {
+        tools.logInfo('Set empty index.html');
+        const emptyIndexHtmlFile = path.join(__dirname, 'skeletons', 'elements', 'index.html');
+        const outputIndexHmtlFile = path.join(pkg.paths.pkgBuild, 'bundles', 'index.html');
+        return tools.copy(emptyIndexHtmlFile, outputIndexHmtlFile);
+      } catch(e) {
+        console.log(e);
+      }
+    })
     .catch((e) => {
       throw e;
     })

package/scripts/utils/build/package/nodeJs.js CHANGED Viewed

@@ -23,7 +23,8 @@ module.exports.build = (pkg, isMaster) => {
   return Promise.resolve()
     .then(() => {
       if (!skipTest) {
-        return testUtils.runJest(pkg);
+        // return testUtils.runJest(pkg);
+        return testUtils.runMocha(pkg);
       }
     })

package/scripts/utils/build/package/skeletons/elements/index.html ADDED Viewed

@@ -0,0 +1,9 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <base href="/">
+</head>
+<body>
+</body>
+</html>

package/scripts/utils/build/package/styles.js CHANGED Viewed

@@ -10,7 +10,87 @@ const tools = require('../../tools');
 const notificationUtils = require('../../notification/notification-utils');
 // FETCH ARGS
-let { deps, skipClean, skipLint, skipTest, skipCompile, skipDoc } = tools.getArgs();
+let { skipCompile } = tools.getArgs();
+const compileSassFileNodeSass = (folder, filename, isNodeSassTildeImporterActive) => {
+  const filePath = path.join(folder, 'styles', filename);
+  tools.logInfo(`Compiling ${filePath}.scss...`);
+  return Promise.resolve()
+    .then(() => {
+      tools.logInfo('Compiling SCSS...');
+      if (isNodeSassTildeImporterActive !== false) {
+        tools.logInfo('building with tilde importer');
+        return execa('node-sass', [
+          filePath + '.scss',
+          filePath + '.temp.css',
+          '--importer',
+          './node_modules/node-sass-tilde-importer',
+          '--output-style',
+          'compressed',
+          '--source-map',
+          true,
+          '--source-map-contents'
+        ]);
+      } else {
+        tools.logInfo('building without tilde importer');
+        return execa('node-sass', [
+          filePath + '.scss',
+          filePath + '.temp.css',
+          '--importer',
+          '--output-style',
+          'compressed',
+          '--source-map',
+          true,
+          '--source-map-contents'
+        ]);
+      }
+    })
+    .then((output) => {
+      // console.log(output);
+      console.log('Size ::: ' + fs.statSync(filePath + '.temp.css').size);
+    })
+    .then(() => {
+      tools.logInfo('Running postCss over generated css file...');
+      return execa('postcss', [
+        filePath + '.temp.css',
+        '--config',
+        path.join(__dirname, 'postcss.config.js'),
+        '--no-map',
+        '--verbose',
+        '--output',
+        filePath + '.css'
+      ]);
+    })
+    .then((output) => {
+      // console.log(output);
+      console.log('Size ::: ' + fs.statSync(filePath + '.css').size);
+      tools.logSuccess(`OK ==> generated ${filePath}.css`);
+    })
+    .then(() => {
+      tools.remove(filePath + '.temp.css');
+      tools.remove(filePath + '.temp.css.map');
+    })
+    .catch((e) => {
+      console.log(e);
+      throw e;
+    })
+}
 const compileSassFileDartSass = (folder, filename) => {
@@ -47,12 +127,6 @@ const compileSassFileDartSass = (folder, filename) => {
       plugins.push(autoprefixer({
         grid: 'no-autoplace',
-        // browsers: [
-        //   "> 0.5% in alt-eu",
-        //   "last 2 version",
-        //   "not dead",
-        //   "not op_mini all"
-        // ]
       }));
       plugins.push(cssnano({ safe: true }));
@@ -67,7 +141,7 @@ const compileSassFileDartSass = (folder, filename) => {
         fs.writeFileSync(finalDest, postcssResult.css);
         if (postcssResult.map) {
-          fs.writeFileSync(`${finalDest}.map`, postcssResult.map);
+          fs.writeFileSync(`${finalDest}.map`, postcssResult.map.toString());
         }
       });
     })
@@ -91,91 +165,15 @@ const compileSassFileDartSass = (folder, filename) => {
 }
-// const compileSassFileNodeSass = (folder, filename, isNodeSassTildeImporterActive) => {
-//   const filePath = path.join(folder, 'styles', filename);
-//   tools.logInfo(`Compiling ${filePath}.scss...`);
-//   return Promise.resolve()
-//     .then(() => {
-//       tools.logInfo('Compiling SCSS...');
-//       if (isNodeSassTildeImporterActive !== false) {
-//         tools.logInfo('building with tilde importer');
-//         return execa('node-sass', [
-//           filePath + '.scss',
-//           filePath + '.temp.css',
-//           '--importer',
-//           './node_modules/node-sass-tilde-importer',
-//           '--output-style',
-//           'compressed',
-//           '--source-map',
-//           true,
-//           '--source-map-contents'
-//         ]);
-//       } else {
-//         tools.logInfo('building without tilde importer');
-//         return execa('node-sass', [
-//           filePath + '.scss',
-//           filePath + '.temp.css',
-//           '--importer',
-//           '--output-style',
-//           'compressed',
-//           '--source-map',
-//           true,
-//           '--source-map-contents'
-//         ]);
-//       }
-//     })
-//     .then((output) => {
-//       // console.log(output);
-//       console.log('Size ::: ' + fs.statSync(filePath + '.temp.css').size);
-//     })
-//     .then(() => {
-//       tools.logInfo('Running postCss over generated css file...');
-//       return execa('postcss', [
-//         filePath + '.temp.css',
-//         '--config',
-//         path.join(__dirname, 'postcss.config.js'),
-//         '--no-map',
-//         '--verbose',
-//         '--output',
-//         filePath + '.css'
-//       ]);
-//     })
-//     .then((output) => {
-//       // console.log(output);
-//       console.log('Size ::: ' + fs.statSync(filePath + '.css').size);
-//     })
-//     .then(() => {
-//       tools.logSuccess(`OK ==> generated ${filePath}.css`);
-//       tools.remove(filePath + '.temp.css');
-//       tools.remove(filePath + '.temp.css.map');
-//     })
-//     .catch((e) => {
-//       console.log(e);
-//       throw e;
-//     })
-// }
 const compileSassFile = (pkg, folder, filename, isNodeSassTildeImporterActive) => {
   return Promise.resolve()
     .then(() => {
-      // if (pkg.build && pkg.build.dartSass) {
+      if (pkg.build && (pkg.build.euiVersion === '13.x' || pkg.build.euiVersion === '14.x')) {
         return compileSassFileDartSass(folder, filename);
-      // } else {
-      //   return compileSassFileNodeSass(folder, filename, isNodeSassTildeImporterActive);
-      // }
+      } else {
+        return compileSassFileNodeSass(folder, filename, isNodeSassTildeImporterActive);
+      }
     })
     .catch((e) => {
@@ -216,6 +214,9 @@ module.exports.build = (pkg) => {
         console.log('Sources copy succeeded.')
       })
       .then(() => Promise.resolve().then(() => {
+        tools.logInfo('Processing stylesheets entries : ');
+        console.log(pkg.stylesheets);
         return pkg.stylesheets.reduce((promise, file) => {
           return promise.then(() => (
             compileSassFile(pkg, tmpFolder, file, pkg.build && pkg.build.isNodeSassTildeImporterActive)
@@ -243,6 +244,9 @@ module.exports.build = (pkg) => {
         tools.copy(path.join(pkg.paths.pkgRootDirectory, 'README.md'), path.join(pkg.paths.pkgBuild, 'README.md'));
         tools.copy(path.join(pkg.paths.pkgRootDirectory, 'LICENSE'), path.join(pkg.paths.pkgBuild, 'LICENSE'));
       })
+      .then(() => {
+        return tools.rimraf(tmpFolder);
+      })
       .then(() => {
         return notificationUtils.package.sendPackageMessage({
           package: pkg
@@ -255,7 +259,3 @@ module.exports.build = (pkg) => {
   }
 }
-// EXPORTS
-module.exports.compileSassFile = compileSassFile;

package/scripts/utils/git-utils.js CHANGED Viewed

@@ -7,10 +7,11 @@ const semver = require('semver');
 // LOCAL
 const tools = require('./tools');
 const configUtils = require('../csdr/config/config-utils');
+const { getPackageConfig } = require('./notification/config');
 // const versionUtils = require('./version-utils');
 // FETCH ARGS
-const { dryRun, git } = tools.getArgs();
+const { dryRun, git, debug } = tools.getArgs();
 const getLastTag = (folder) => {
@@ -104,6 +105,9 @@ const commitAndPush = (branch, message, folder) => {
     } catch (e2) {
       tools.logError('ERROR');
       console.log('ERROR!!!');
+      if (debug) {
+        console.log(e2);
+      }
       try {
         tools.logInfo('Commit and push - second try - retrying pull push');
@@ -111,6 +115,9 @@ const commitAndPush = (branch, message, folder) => {
         execa.sync('git', ['push', 'origin', branch], { cwd: folder });
       } catch (e3) {
+        if (debug) {
+          console.log(e3);
+        }
         throw new Error(`Failed to push ${message} to ${folder}`);
       }
     }
@@ -139,6 +146,11 @@ const tagVersion = (version, branch, message, folder) => {
       })
       .catch((e) => {
         return Promise.resolve()
+        // .then(() => {
+        //   return new Promise((resolve) => {
+        //     setTimeout(resolve, 8000);
+        //   });
+        // })
         .then(() => {
           execa.sync('git', ['tag', '-a', `v${version}b`, '-m', message], { cwd: folder });
           execa.sync('git', ['push', '--follow-tags', 'origin', branch], { cwd: folder });
@@ -218,19 +230,74 @@ const mergeMasterToDevelop = (pkg, folder, version) => {
         })
     }
   }
+}
+const mergeSupportToSupportDevelop = (pkg, folder, supportBranch, supportSnapshotBranch) => {
+  if (!supportSnapshotBranch) {
+    tools.logWarning('supportSnapshotBranch not found in package config...skipping');
+    return Promise.resolve();
+  }
+  tools.logTitle(`Merge back on ${supportSnapshotBranch}`);
+  tools.logInfo(`Merging release changes into ${supportSnapshotBranch} branch...`);
+  if (dryRun) {
+    tools.logInfo('DRY-RUN: skipping merge support to supportDevelop');
+    return Promise.resolve();
+  }
+  const supportBranchVersion = supportBranch.split('/')[1];
+  const supportSnapshotBranchVersion = supportSnapshotBranch.split('-')[1];
+  if (supportBranchVersion !== supportSnapshotBranchVersion) {
+    tools.logInfo('skipping... support version and support snapshot versions are different');
+    tools.logInfo(`[${supportBranchVersion}] vs [${supportSnapshotBranchVersion}]`);
+    return Promise.resolve();
+  }
+  if (pkg && pkg.build && pkg.build.masterBranchOnly) {
+    tools.logInfo('Merge skipped project config set to master branch only');
+    return Promise.resolve();
+  } else {
+    return Promise.resolve()
+      .then(() => {
+        execa.shellSync(`git fetch origin`, { cwd: folder });
+        execa.shellSync(`git checkout ${supportSnapshotBranch}`, { cwd: folder });
+        execa.shellSync(`git merge origin/${supportSnapshotBranch}`, { cwd: folder });
+        execa.shellSync(`git merge -X theirs ${supportBranch}`, { cwd: folder });
+        execa.shellSync(`git push origin ${supportSnapshotBranch}`, { cwd: folder });
+        execa.shellSync(`git checkout ${supportBranch}`, { cwd: folder });
+      })
+      .then(() => {
+        tools.logSuccess();
+      })
+      .catch((e) => {
+        throw new Error(`Error trying merging ${supportBranch} to ${supportSnapshotBranch} on ${folder}`);
+      })
+  }
 }
-const getGitHost = () => {
+const getGitHost = (externalRepo) => {
   const config = configUtils.global.getConfig();
   if (config.git) {
     if (git && git === 'local') {
-      return config.git.local;
+      if (externalRepo) {
+        return config.git.externals.local;
+      } else {
+        return config.git.local;
+      }
     } else {
-      return config.git.remote;
+      if (externalRepo) {
+        return config.git.externals.remote;
+      } else {
+        return config.git.remote;
+      }
     }
   }
@@ -238,7 +305,7 @@ const getGitHost = () => {
 }
-const cloneRepo = (repoUri, folder, forced = false, noHistory = false) => {
+const cloneRepo = (repoUri, folder, forced = false, noHistory = false, externalRepo = false) => {
   return Promise.resolve()
     .then(() => {
       if (tools.isDirExists(folder) && forced) {
@@ -246,12 +313,13 @@ const cloneRepo = (repoUri, folder, forced = false, noHistory = false) => {
         return tools.rimraf(folder);
       }
     })
     .then(() => {
       if (!tools.isDirExists(folder)) {
         tools.logInfo(`Cloning ${repoUri} in folder "${folder}" ...`);
         const auth = process.env.gituser && process.env.gitpassword ? `${process.env.gituser}:${process.env.gitpassword}@` : '';
-        const gitHost = getGitHost();
+        const gitHost = getGitHost(externalRepo);
         if (noHistory) {
           execa.shellSync(`git clone --depth 1 https://${auth}${gitHost}${repoUri} ${folder}`);
@@ -261,6 +329,7 @@ const cloneRepo = (repoUri, folder, forced = false, noHistory = false) => {
         tools.logSuccess();
       }
     })
     .then(() => {
       tools.logInfo(`Pulling ${repoUri} in folder "${folder}" ...`);
       execa.shellSync(`git pull`, { cwd: folder, stdio: 'inherit' });
@@ -321,6 +390,7 @@ module.exports.hasCommitsSinceLastTag = hasCommitsSinceLastTag;
 module.exports.commitAndPush = commitAndPush;
 module.exports.tagVersion = tagVersion;
 module.exports.mergeMasterToDevelop = mergeMasterToDevelop;
+module.exports.mergeSupportToSupportDevelop = mergeSupportToSupportDevelop;
 module.exports.cloneRepo = cloneRepo;
 module.exports.checkout = checkout;
 module.exports.getLastCommitAuthor = getLastCommitAuthor;

package/scripts/utils/index.js CHANGED Viewed

@@ -1,7 +1,6 @@
 'use strict';
 const changelogUtils = require('./changelog-utils');
-const confluenceUtils = require('./confluence-utils');
 const gitUtils = require('./git-utils');
 const mavenUtils = require('./maven-utils');
 const pipelineUtils = require('./pipeline-utils');
@@ -15,11 +14,10 @@ const notificationUtils = require('./notification/notification-utils');
 const preBuildUtils = require('./pre-build/pre-build-utils');
 const publishUtils = require('./publish/publish-utils');
 const sonarUtils = require('./sonar/sonar-utils');
+const apiUtils = require('./api-utils');
 module.exports = {
   changelog: changelogUtils,
-  confluence: confluenceUtils,
   git: gitUtils,
   maven: mavenUtils,
   pipeline: pipelineUtils,
@@ -31,5 +29,6 @@ module.exports = {
   notification: notificationUtils,
   preBuild: preBuildUtils,
   publish: publishUtils,
-  sonar: sonarUtils
+  sonar: sonarUtils,
+  api: apiUtils,
 }

package/scripts/utils/notification/common.js CHANGED Viewed

@@ -64,6 +64,11 @@ module.exports.getMessage = (options) => {
         message.detailText = 'Another build has been detected for the current package being build\n Retry again this build after 30m, lock will be auto-cleared';
         break;
+      case 'MULTIPLE_LOCAL_EUI_VERSIONS_FOUND':
+        message.detailTitle = 'MULTIPLE eUI VERSIONS FOUND IN LOCAL PROJECT - ABORTING!';
+        message.detailText = 'Uncompatible version of eUI found installed in the local CSDR project, please adjust and keep same compatible versions of eUI packages and projects';
+        break;
       default:
         message.detailTitle = 'GENERAL ERROR!';
         message.detailText = options.exception;

package/scripts/utils/notification/mail-utils.js CHANGED Viewed

@@ -10,6 +10,9 @@ let { dryRun, debug} = tools.getArgs();
 const sendCore = (subject, body, recipient) => {
   tools.logInfo(`Sending mail to : ${recipient}`);
+  tools.logInfo('Message subject / body :');
+  console.log(subject);
+  console.log(body);
   if (dryRun) {
     console.log('----------------------------------------------');

package/scripts/utils/notification/mailstack.js CHANGED Viewed

@@ -33,9 +33,6 @@ module.exports.endMailStack = () => {
 }
 module.exports.bufferMessage = (message) => {
-  tools.logInfo('Buffering mail content');
-  console.log(message);
   if (message.text) {
     mailContent.buffer.push(message.text);
@@ -73,8 +70,9 @@ const sendMailStack = (config, scope, target) => {
       status = 'ERROR';
     }
-    const subject = `RELEASE <b style="color: ${statusColor};">${status}</b> - <b style="color:blue;">${scope}</b> - branch: <b styles="color: blue;">${target}</b>`;
-    let fullMessage = mailContent.buffer.join('\n');
+    // const subject = `RELEASE <b style="color: ${statusColor};">${status}</b> - <b style="color:blue;">${scope}</b> - branch: <b styles="color: blue;">${target}</b>`;
+    const subject = `Release of **${scope}**  for ${target} ---- status : ${status}`;
+    let fullMessage = `<pre>${mailContent.buffer.join('\n')}</pre>`;
     if (mailContent.exception) {
       fullMessage += mailContent.exception;

package/scripts/utils/notification/package.js CHANGED Viewed

@@ -15,8 +15,6 @@ const innerMailstack = require('./mailstack');
 module.exports.sendPackageMessage = (options) => {
-  tools.logInfo('Sending package message');
   const message = innerCommon.getMessage(options);
   // buffer message

package/scripts/utils/notification/slack-utils.js CHANGED Viewed

@@ -24,10 +24,6 @@ const agent = PROXY ? new HttpsProxyAgent(PROXY) : void 0;
 const sendMessageCore = (hook, channel, attachments, text = null) => {
   return new Promise((resolve, reject) => {
-    tools.logInfo(`Sending message to Slack...`);
-    tools.logInfo(`Slack hook: ${hook}`);
-    tools.logInfo(`Slack channel: ${channel}`);
     const payload = {
       username: "eUI bot",
       channel
@@ -51,6 +47,8 @@ const sendMessageCore = (hook, channel, attachments, text = null) => {
     };
     if (dryRun || !slackFeedback) {
+      tools.logInfo('No notifications config found...skipping');
       if (debug) {
         console.log(JSON.stringify(payload, null, 4));
       }
@@ -58,6 +56,10 @@ const sendMessageCore = (hook, channel, attachments, text = null) => {
       resolve();
     } else {
+      tools.logInfo(`Sending message to Slack...`);
+      tools.logInfo(`Slack hook: ${hook}`);
+      tools.logInfo(`Slack channel: ${channel}`);
       if (debug) {
         console.log(JSON.stringify(payload, null, 4));
       }
@@ -94,9 +96,6 @@ const sendMessage = (hook, channel, attachments, text = null) => {
     .then(() => {
       return sendMessageCore(hook, channel, attachments, text);
     })
-    .then(() => {
-      tools.logSuccess();
-    })
     .catch((e) => {
       tools.logError('Error sending slack message');
       console.log(e); // do not rethrow

package/scripts/utils/pre-build/elements.js CHANGED Viewed

@@ -6,12 +6,10 @@ const tools = require('../tools');
 const translationUtils = require('./translations/translation-utils');
 const configUtils = require('../../csdr/config/config-utils');
+const injectionUtils = require('./injection/injection-utils');
 module.exports.preBuild = (pkg, build = false) => {
   return Promise.resolve()
     .then(() => {
       tools.logTitle('PRE-BUILD : preparing the element...')
     })
@@ -21,7 +19,13 @@ module.exports.preBuild = (pkg, build = false) => {
       return configUtils.angular.registerAngularProjectDef(pkg);
     })
-    // generate compiled translation files
+    // inject external app sources declaration
+    .then(() => {
+      if (pkg.externalSources) {
+        return injectionUtils.externals.injectElementExternalSources(pkg);
+      }
+    })
     .then(() => {
       tools.logInfo('Checking compiled translations');
       if (pkg.build && pkg.build.compiledTranslations) {

package/scripts/utils/pre-build/injection/app-sources-full-skeleton/src/_generated/app/app.module.ts CHANGED Viewed

@@ -12,7 +12,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import {
     CoreModule, CoreModuleEffects, translateConfig, EUI_CONFIG_TOKEN,
 } from '@eui/core';
-import { EuiAllModule } from '@eui/components';
+import { EuiAllModule } from '@eui/components-next';
 import { appConfig } from '../config/index';
 import { environment } from '../environments/environment';

package/scripts/utils/pre-build/injection/app-sources-full-skeleton/tsconfig.app.json CHANGED Viewed

@@ -3,8 +3,7 @@
     "compilerOptions": {
       "outDir": "./dist",
       "types": [],
-      "module": "ESNext",
-      "target": "ES2016",
+      "target": "ES2015",
       "lib": ["es2020", "dom"]
     },
     "exclude": [