@eui/tools 5.0.0-rc.10 → 5.0.0-rc.12

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

@@ -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

@@ -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,67 @@ 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();
+
+  } else {
+
+    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 +298,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 +306,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 +322,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 +383,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

@@ -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');
@@ -19,7 +18,6 @@ const sonarUtils = require('./sonar/sonar-utils');
 
 module.exports = {
   changelog: changelogUtils,
-  confluence: confluenceUtils,
   git: gitUtils,
   maven: mavenUtils,
   pipeline: pipelineUtils,

package/scripts/utils/notification/common.js

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

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

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

@@ -0,0 +1,52 @@
+// ANGULAR & 3rd PARTIES
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { HttpClientModule } from '@angular/common/http';
+import { StoreModule } from '@ngrx/store';
+import { EffectsModule } from '@ngrx/effects';
+import { StoreDevtoolsModule } from '@ngrx/store-devtools';
+import { TranslateModule } from '@ngx-translate/core';
+
+// eUI IMPORTS
+import {
+    CoreModule, CoreModuleEffects, translateConfig, EUI_CONFIG_TOKEN,
+} from '@eui/core';
+import { EuiAllModule } from '@eui/components';
+
+import { appConfig } from '../config/index';
+import { environment } from '../environments/environment';
+
+// APP ROUTES & ROOT COMPONENTS
+import { AppRoutingModule } from '../../app/app-routing.module';
+import { AppComponent } from '../../app/app.component';
+
+import { TOKEN, reducerProvider, metaReducers } from './core/reducers/index';
+
+// APP ROOT MODULE
+@NgModule({
+    imports: [
+        BrowserModule,
+        BrowserAnimationsModule,
+        HttpClientModule,
+        StoreModule.forRoot(TOKEN, { metaReducers }),
+        StoreDevtoolsModule.instrument({ name: 'CSDR App', maxAge: 150, logOnly: environment.production }),
+        EffectsModule.forRoot([...CoreModuleEffects]),
+        TranslateModule.forRoot(translateConfig),
+        CoreModule.forRoot(),
+        AppRoutingModule,
+        EuiAllModule,
+    ],
+    declarations: [
+        AppComponent,
+    ],
+    providers: [
+        { provide: EUI_CONFIG_TOKEN, useValue: { appConfig: appConfig, environment: environment } },
+        reducerProvider,
+    ],
+    bootstrap: [
+        AppComponent,
+    ],
+})
+export class AppModule {
+}

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui13/src/_generated/app/core/reducers/index.ts

@@ -0,0 +1,40 @@
+import { InjectionToken } from '@angular/core';
+import { ActionReducer, ActionReducerMap, combineReducers, MetaReducer } from '@ngrx/store';
+import * as fromRouter from '@ngrx/router-store';
+import { storeFreeze } from 'ngrx-store-freeze';
+import { reducers as coreReducers, CoreState, localStorageSync } from '@eui/core';
+
+export interface AppState extends CoreState {
+    router: fromRouter.RouterReducerState<any>;
+}
+
+// -----------------
+// ------------ AOT
+export const TOKEN = new InjectionToken<any>('AppReducers');
+
+export function getReducers(): ActionReducerMap<AppState, any> {
+    return {
+        router: fromRouter.routerReducer,
+        ...coreReducers,
+    };
+}
+
+export const reducerProvider = [
+    { provide: TOKEN, useFactory: getReducers },
+];
+
+// console.log all actions
+export function logger(reducer: ActionReducer<AppState>): ActionReducer<AppState> {
+    return (state, action) => {
+        const result = reducer(state, action);
+        console.groupCollapsed(action.type);
+        console.log('prev state', state);
+        console.log('action', action);
+        console.log('next state', result);
+        console.groupEnd();
+
+        return result;
+    };
+}
+
+export const metaReducers: MetaReducer<AppState>[] = [logger, localStorageSync, storeFreeze];

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui13/src/_generated/config/global.ts

@@ -0,0 +1,4 @@
+import { GlobalConfig } from '@eui/core';
+
+export const GLOBAL: GlobalConfig = {
+};

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui13/src/_generated/config/index.ts

@@ -0,0 +1,8 @@
+import { EuiAppConfig } from '@eui/core';
+import { GLOBAL } from './global';
+import { MODULES } from './modules';
+
+export const appConfig: EuiAppConfig = {
+    global: GLOBAL,
+    modules: MODULES,
+};

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui13/src/_generated/config/modules.ts

@@ -0,0 +1,4 @@
+import { ModulesConfig } from '@eui/core';
+
+export const MODULES: ModulesConfig = {
+};

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui13/src/_generated/environments/environment.dev.ts

@@ -0,0 +1,9 @@
+// activated by running :
+// npm run build -- --configuration=dev
+// OR
+// npm run build-dev
+
+export const environment = {
+    production: false,
+    enableDevToolRedux: true,
+};