@eui/tools 6.2.33 → 6.2.35

package/scripts/csdr/config/global.js

@@ -61,36 +61,11 @@ module.exports.getCsdrConfig = (full = true) => {
 }
 
 
-// const migrateConfig = (euircBaseFile) => {
-//   tools.logInfo('Upgrading local euirc config to new version');
-
-//   const actualConfig = require(euircBaseFile);
-//   const updatedConfig = {};
-
-//   updatedConfig.projects = Object.keys(actualConfig.projects);
-//   updatedConfig.packages = Object.keys(actualConfig.packages)
-//     .map(p => actualConfig.packages[p])
-//     .filter((p) => {
-//       return !p.child;
-//     })
-//     .map(p => p.name);
-
-//   tools.writeJsonFileSync(path.join(process.cwd(), '.csdr', '.euirc.json'), updatedConfig);
-
-//   return updatedConfig;
-// }
-
-
 const getGeneratedConfig = (euircBaseFile) => {
   // fetching local euirc.json config
   delete require.cache[euircBaseFile];
   let configContent = require(euircBaseFile);
 
-  // check if actual generated config file contains new version format
-  // if (!Array.isArray(configContent.projects)) {
-  //   configContent = migrateConfig(euircBaseFile);
-  // }
-
   // fetching global csdr config
   const globalConfig = this.getCsdrConfig();
 
@@ -387,148 +362,3 @@ module.exports.getNotificationMailAddress = (channelName) => {
   return channelPrefix + config.notification.mail.addressSuffix;
 }
 
-// Register only applies to non-csdr environment - for eUI default multi-modules app
-
-module.exports.registerEuiModule = (pkg) => {
-  if (!tools.isDirExists(path.join(process.cwd(), '.csdr'))) {
-    const file = path.join(process.cwd(), '.euirc.json');
-    const content = require(file);
-    content['packages'][pkg.name] = pkg;
-    tools.writeJsonFileSync(file, content);
-  }
-}
-
-
-
-
-// Register new project created
-
-module.exports.registerCsdrProject = (name, isFullSkeleton) => {
-
-  const csdrConfigProject = {
-    "name": "@app.name@",
-    "folder": "apps/@app.name@",
-    "repository": "app-@app.name@.git",
-    "build": {
-      "skipLint": true,
-      "skipTest": true,
-      "maxSpaceSize": true
-    },
-    "packages": [
-    ],
-    "csdrSkeleton": true
-  };
-
-  const csdrConfigProjectFullSkeleton = {
-    "name": "@app.name@",
-    "folder": "apps/@app.name@",
-    "repository": "app-@app.name@.git",
-    "build": {
-      "skipLint": true,
-      "skipTest": true,
-      "maxSpaceSize": true
-    },
-    "packages": [
-    ],
-    "csdrFullSkeleton": true
-  };
-
-
-  // inserting new project into root config
-  let projectDef;
-  if (isFullSkeleton) {
-    projectDef = JSON.stringify(csdrConfigProjectFullSkeleton);
-  } else {
-    projectDef = JSON.stringify(csdrConfigProject);
-  }
-  const replaceModule = tools.replaceAll(projectDef, '@app.name@', name);
-
-  let file = path.join(process.cwd(), '.csdr', '.euirc-csdr-apps.json');
-  let jsonFile = require(file);
-  jsonFile[name] = JSON.parse(replaceModule);
-  tools.writeJsonFileSync(file, jsonFile);
-
-  // inserting project entry into local config
-  this.updateConfig(name, null);
-}
-
-
-
-
-// Register newly created package
-
-module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName) => {
-
-  const csdrConfigPackage = {
-    "name": "@module.full.name@",
-    "npmPkg": "@module.npmPkg.name@",
-    "deps": [
-    ],
-    "repository": "@module.repo.name@",
-    "teams": [
-      "all-frontend"
-    ]
-  };
-
-  const csdrConfigRemotePackage = {
-    "name": "@module.full.name@",
-    "npmPkg": "@module.npmPkg.name@",
-    "deps": [
-    ],
-    "repository": "@module.repo.name@",
-    "element": true,
-    "remote": true,
-    "hostAppName": "my-workplace",
-    "teams": [
-      "all-frontend"
-    ],
-    "build": {
-      "compiledTranslations": true,
-      "translationScopes": "eui,csdr,cc,mywp",
-      "skipLint": true,
-      "skipTest": true,
-      "sonarScanner": false,
-      "envTargetActive": true
-    },
-    "release": {
-       "team": "cc-ui-rm"
-    },
-    "slack": {
-      "channel": "csdr-timeline-mwp-remotes-cc"
-    },
-    "externalSources": {
-      "npmPkg": "@module.rootPkg.scope@/@module.rootPkg.name@",
-      "folder": "assets/remote-sources"
-    }
-  }
-
-  // inserting package in root config
-  let packageDef;
-
-  if (isRemote) {
-    packageDef = JSON.stringify(csdrConfigRemotePackage);
-
-  } else {
-    packageDef = JSON.stringify(csdrConfigPackage);
-  }
-
-  let replaceModule = tools.replaceAll(packageDef, '@module.full.name@', pkg.name);
-  replaceModule = tools.replaceAll(replaceModule, '@module.repo.name@', pkg.repoName);
-  replaceModule = tools.replaceAll(replaceModule, '@module.npmPkg.name@', pkg.npmPkgName);
-  replaceModule = tools.replaceAll(replaceModule, '@module.rootPkg.scope@', rootPkgScope);
-  replaceModule = tools.replaceAll(replaceModule, '@module.rootPkg.name@', rootPkgName);
-
-  let file = path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json');
-  let jsonFile = require(file);
-  jsonFile[pkg.name] = JSON.parse(replaceModule);
-
-  tools.writeJsonFileSync(file, jsonFile);
-
-  // inserting project entry into local config
-  const packages = [];
-  packages.push(pkg.name);
-  this.updateConfig(null, packages);
-}
-
-
-

package/scripts/csdr/config/packages.js

@@ -32,7 +32,7 @@ module.exports.getCsdrPackagesFull = (flattenChildren = true) => {
     try {
       outputPackages.push(this.getPackage(p, true));
     } catch (e) {
-      tools.logWarning(`Package: ${p} is in local config but not found in global... should be cleaned up`);
+      tools.logInfo(`Package: ${p} is in local config but not found in global... should be cleaned up`);
       console.log(e);
     }
   })
@@ -48,7 +48,7 @@ const getPackages = module.exports.getPackages = () => {
     try {
       outputPackages.push(this.getPackage(p));
     } catch (e) {
-      tools.logWarning(`Package: ${p} is in local config but not found in global... should be cleaned up`);
+      tools.logInfo(`Package: ${p} is in local config but not found in global... should be cleaned up`);
       console.log(e);
     }
   })
@@ -111,7 +111,7 @@ module.exports.getPackage = (pkgName, fromCsdrConfig, optional) => {
 
 
   if (!pkg && !optional) {
-    tools.logError(`Package ${pkgName} cannot be found in your local installation, mount it with:`);
+    tools.logInfo(`Package ${pkgName} cannot be found in your local installation, mount it with:`);
     tools.logInfo(`npm run init -- --pkg ${pkgName} --pkgOnly`);
     throw 'PACKAGE_NOT_FOUND';
   }

package/scripts/csdr/config/register.js

@@ -0,0 +1,166 @@
+'use strict';
+
+// GLOBAL
+const path = require('path');
+
+// LOCAL
+const tools = require('../../utils/tools');
+
+// INNER MODULES
+const innerGlobal = require('./global');
+
+
+// Register new project created
+
+module.exports.registerCsdrProject = (name, isFullSkeleton) => {
+
+  const csdrConfigProject = {
+    "name": "@app.name@",
+    "folder": "apps/@app.name@",
+    "repository": "app-@app.name@.git",
+    "build": {
+      "skipLint": true,
+      "skipTest": true,
+      "maxSpaceSize": true
+    },
+    "packages": [
+    ],
+    "csdrSkeleton": true
+  };
+
+  const csdrConfigProjectFullSkeleton = {
+    "name": "@app.name@",
+    "folder": "apps/@app.name@",
+    "repository": "app-@app.name@.git",
+    "build": {
+      "skipLint": true,
+      "skipTest": true,
+      "maxSpaceSize": true
+    },
+    "packages": [
+    ],
+    "csdrFullSkeleton": true
+  };
+
+
+  // inserting new project into root config
+  let projectDef;
+  if (isFullSkeleton) {
+    projectDef = JSON.stringify(csdrConfigProjectFullSkeleton);
+  } else {
+    projectDef = JSON.stringify(csdrConfigProject);
+  }
+  const replaceModule = tools.replaceAll(projectDef, '@app.name@', name);
+
+  let file = path.join(process.cwd(), '.csdr', '.euirc-csdr-apps.json');
+  let jsonFile = require(file);
+  jsonFile[name] = JSON.parse(replaceModule);
+  tools.writeJsonFileSync(file, jsonFile);
+
+  // inserting project entry into local config
+  innerGlobal.updateConfig(name, null);
+}
+
+
+
+
+// Register newly created package
+
+module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName, euiVersionNumber) => {
+
+  const csdrConfigPackage = {
+    "name": "@module.full.name@",
+    "npmPkg": "@module.npmPkg.name@",
+    "deps": [
+    ],
+    "repository": "@module.repo.name@",
+    "teams": [
+      "all-frontend"
+    ]
+  };
+
+  const csdrConfigRemotePackage = {
+    "name": "@module.full.name@",
+    "npmPkg": "@module.npmPkg.name@",
+    "deps": [
+    ],
+    "repository": "@module.repo.name@",
+    "element": true,
+    "remote": true,
+    "hostAppName": "my-workplace",
+    "teams": [
+      "all-frontend"
+    ],
+    "build": {
+      "compiledTranslations": true,
+      "translationScopes": "eui,csdr,cc,mywp",
+      "skipLint": true,
+      "skipTest": true,
+      "sonarScanner": false,
+      "envTargetActive": true
+    },
+    "release": {
+       "team": "cc-ui-rm"
+    },
+    "slack": {
+      "channel": "csdr-timeline-mwp-remotes-cc"
+    },
+    "externalSources": {
+      "npmPkg": "@module.rootPkg.scope@/@module.rootPkg.name@",
+      "folder": "assets/remote-sources"
+    }
+  }
+
+  const csdrConfigRemotePackageV15 = {
+    "npmPkg": "@module.npmPkg.name@",
+    "euiVersion": "15.x",
+    "build": {
+      "compiledTranslations": true,
+      "translationScopes": "eui,csdr,cc,mywp"
+    },
+    "release": {
+       "team": "cc-ui-rm"
+    },
+    "slack": {
+      "channel": "csdr-timeline-mwp-remotes-cc"
+    },
+    "externalSources": {
+      "npmPkg": "@module.rootPkg.scope@/@module.rootPkg.name@",
+      "folder": "assets/remote-sources"
+    }
+  }
+
+
+  // inserting package in root config
+  let packageDef;
+
+  if (isRemote) {
+    if (euiVersionNumber >= 15) {
+      packageDef = JSON.stringify(csdrConfigRemotePackageV15);
+    } else {
+      packageDef = JSON.stringify(csdrConfigRemotePackage);
+    }
+  } else {
+    packageDef = JSON.stringify(csdrConfigPackage);
+  }
+
+  let replaceModule = tools.replaceAll(packageDef, '@module.full.name@', pkg.name);
+  replaceModule = tools.replaceAll(replaceModule, '@module.repo.name@', pkg.repoName);
+  replaceModule = tools.replaceAll(replaceModule, '@module.npmPkg.name@', pkg.npmPkgName);
+  replaceModule = tools.replaceAll(replaceModule, '@module.rootPkg.scope@', rootPkgScope);
+  replaceModule = tools.replaceAll(replaceModule, '@module.rootPkg.name@', rootPkgName);
+
+  let file = path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json');
+  if (isRemote && euiVersionNumber >= 15) {
+    file = path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json');
+  }
+  let jsonFile = require(file);
+  jsonFile[pkg.name] = JSON.parse(replaceModule);
+
+  tools.writeJsonFileSync(file, jsonFile);
+
+  // inserting project entry into local config
+  const packages = [];
+  packages.push(pkg.name);
+  innerGlobal.updateConfig(null, packages);
+}

package/scripts/csdr/init/remotes.js

@@ -36,14 +36,16 @@ const cloneRemotesConfig = module.exports.cloneRemotesConfig = () => {
 
 
 
-module.exports.generateVirtualRemote = (remoteName) => {
+module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
   tools.logTitle('Generating virtual remote');
 
   return Promise.resolve()
 
     // clone remotes config if first init
     .then(() => {
-      return cloneRemotesConfig();
+      if (cloneRemote) {
+        return cloneRemotesConfig();
+      }
     })
 
     .then(() => {

package/scripts/index.js

@@ -81,6 +81,10 @@ module.exports.auditUtils = require('./csdr/audit/audit-utils');
 module.exports.cliUtils = require('./csdr/cli/cli-utils');
 module.exports.cliApp = require('./csdr/cli/app');
 module.exports.cliPackage = require('./csdr/cli/package');
+module.exports.cliPackageBackend = require('./csdr/cli/package-build-backend');
+module.exports.cliPackageFrontend = require('./csdr/cli/package-build-frontend');
+module.exports.cliPackagePrompt = require('./csdr/cli/package-prompt');
+module.exports.cliPackageConstants = require('./csdr/cli/constants');
 
 // csdr - config
 module.exports.configAngular = require('./csdr/config/angular');
@@ -89,6 +93,7 @@ module.exports.configGlobal = require('./csdr/config/global');
 module.exports.configInit = require('./csdr/config/init');
 module.exports.configPackages = require('./csdr/config/packages');
 module.exports.configProjects = require('./csdr/config/projects');
+module.exports.configRegister = require('./csdr/config/register');
 module.exports.configSync = require('./csdr/config/sync');
 
 // csdr -init

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

@@ -115,6 +115,11 @@ module.exports.build = (pkg, isMaster) => {
     // specific for element
     const versionNumber = remoteEuiVersion.split('.')[0];
 
+    // checking configuration
+    if (!configuration) {
+      configuration = 'production';
+    }
+
     let args;
 
     if (versionNumber <= 10) {
@@ -127,9 +132,7 @@ module.exports.build = (pkg, isMaster) => {
       args.push(`--stats-json`);
     }
 
-    if (configuration) {
-      args.push(`--configuration=${configuration || 'production'}`);
-    }
+    args.push(`--configuration=${configuration}`);
 
     if (baseHref) {
       args.push(`--base-href=${baseHref}`);
@@ -156,7 +159,7 @@ module.exports.build = (pkg, isMaster) => {
       args.push('--source-map');
     }
 
-    tools.logInfo(`ng build for configuration : ${configuration || 'production'}`);
+    tools.logInfo(`ng build for configuration : ${configuration}`);
 
     tools.logInfo(`running Angular BUILD with args: ${args} on`);
     console.log(pkg.paths.root);

package/scripts/utils/pre-build/injection/routes-replacement.js

@@ -293,8 +293,28 @@ const replaceRoutes = (project, envTarget, build, routesFileContent, euiVersion)
       // merging content of base + env
       tools.logInfo(`Merging ${baseRouteDefsPath} with ${envRouteDefsPath}`);
 
-      const mergedRouteDefs = _.merge(_.keyBy(baseRouteDefsJSON, 'path'), _.keyBy(envRouteDefsJSON, 'path'));
-      const finalRouteDefs = _.values(mergedRouteDefs);
+      let mergedRouteDefs = _.merge(_.keyBy(baseRouteDefsJSON, 'path'), _.keyBy(envRouteDefsJSON, 'path'));
+      let finalRouteDefs = _.values(mergedRouteDefs);
+
+      // checking if overrides needs to be applied specific to env + version
+      let euiVersionNumber;
+      if (euiVersion === 'DEFAULT') {
+        euiVersionNumber = '7'
+      } else {
+        euiVersionNumber = euiVersion.split('.')[0];
+      };
+
+      const envRouteVersionOverridesPath = path.join(projectAssetsPath, 'route-defs.' + envTargetFinal + '-overrides-v' + euiVersionNumber + '.json');
+
+      if (!tools.isFileExists(envRouteVersionOverridesPath)) {
+        tools.logInfo('Routes file overrides not found for ' + envTargetFinal + ' ' + euiVersionNumber + '...skipping');
+
+      } else {
+        const euiRoutesOVerridesJSON = require(envRouteVersionOverridesPath);
+        tools.logInfo(`Merging ${envRouteVersionOverridesPath}`);
+        mergedRouteDefs = _.merge(_.keyBy(mergedRouteDefs, 'path'), _.keyBy(euiRoutesOVerridesJSON, 'path'));
+        finalRouteDefs = _.values(mergedRouteDefs);
+      }
 
       // processing routes
       let placeHolderContent = '';

package/scripts/csdr/cli/skeletons/package/frontend/assets/i18n/en.json

@@ -1,3 +0,0 @@
-{
-    "@module.name@.KEY": "english text"
-}

package/scripts/csdr/cli/skeletons/package/frontend/assets/i18n/fr.json

@@ -1,3 +0,0 @@
-{
-    "@module.name@.KEY": "texte en français"
-}

package/scripts/csdr/cli/skeletons/package/frontend/gitignore_TO_REPLACE

@@ -1,46 +0,0 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
-# compiled output
-**/node_modules
-**/target
-**/build
-**/dist
-**/out-tsc
-**/tmp
-**/test/reports
-
-# IDEs and editors
-/.idea
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# IDE - VSCode
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-# misc
-/.sass-cache
-/connect.lock
-/coverage
-/libpeerconnection.log
-npm-debug.log
-testem.log
-/typings
-yarn-error.log
-
-# e2e
-/e2e/*.js
-/e2e/*.map
-**/src/**/*.js
-**/src/**/*.map
-
-# System Files
-.DS_Store
-Thumbs.db

package/scripts/csdr/cli/skeletons/package/frontend/karma.conf.js

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

package/scripts/csdr/cli/skeletons/package/frontend/ng-package.json

@@ -1,7 +0,0 @@
-{
-  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
-  "dest": "./dist",
-  "lib": {
-    "entryFile": "src/index.ts"
-  }
-}

package/scripts/csdr/cli/skeletons/package/frontend/package.json

@@ -1,4 +0,0 @@
-{
-  "name": "@module.scope@/@module.name@",
-  "version": "1.0.0"
-}

package/scripts/csdr/cli/skeletons/package/frontend/src/index.ts

@@ -1,7 +0,0 @@
-/*
- * Public API Surface of module
- */
-
-export * from './lib/core/module.service';
-export * from './lib/components/cmp1/cmp1.component';
-export * from './lib/module.module';

package/scripts/csdr/cli/skeletons/package/frontend/src/lib/components/cmp1/cmp1.component.html

@@ -1 +0,0 @@
-Hello from <strong>@module.name@-cmp1</strong>

package/scripts/csdr/cli/skeletons/package/frontend/src/lib/components/cmp1/cmp1.component.spec.ts.TO_REPLACE

@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { Cmp1Component } from './cmp1.component';
-
-describe('ModuleComponent', () => {
-    let component: Cmp1Component;
-    let fixture: ComponentFixture<Cmp1Component>;
-
-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            declarations: [Cmp1Component],
-        })
-        .compileComponents();
-    }));
-
-    beforeEach(() => {
-        fixture = TestBed.createComponent(Cmp1Component);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-    });
-
-    it('should create', () => {
-        expect(component).toBeTruthy();
-    });
-});

package/scripts/csdr/cli/skeletons/package/frontend/src/lib/components/cmp1/cmp1.component.ts

@@ -1,14 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-    selector: '@module.scope.string@-cmp1-component',
-    templateUrl: './cmp1.component.html',
-})
-export class Cmp1Component implements OnInit {
-
-    constructor() { }
-
-    ngOnInit() {
-    }
-
-}

package/scripts/csdr/cli/skeletons/package/frontend/src/lib/core/module.service.spec.ts.TO_REPLACE

@@ -1,12 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { ModuleService } from './module.service';
-
-describe('ModuleService', () => {
-    beforeEach(() => TestBed.configureTestingModule({}));
-
-    it('should be created', () => {
-        const service: ModuleService = TestBed.get(ModuleService);
-        expect(service).toBeTruthy();
-    });
-});

package/scripts/csdr/cli/skeletons/package/frontend/src/lib/core/module.service.ts

@@ -1,8 +0,0 @@
-import { Injectable } from '@angular/core';
-
-@Injectable({
-    providedIn: 'root',
-})
-export class ModuleService {
-    constructor() { }
-}

package/scripts/csdr/cli/skeletons/package/frontend/src/lib/module.module.ts

@@ -1,14 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Cmp1Component } from './components/cmp1/cmp1.component';
-
-@NgModule({
-    declarations: [
-        Cmp1Component,
-    ],
-    imports: [
-    ],
-    exports: [
-        Cmp1Component,
-    ],
-})
-export class ModuleModule { }

package/scripts/csdr/cli/skeletons/package/frontend/src/test.ts.TO_REPLACE

@@ -1,22 +0,0 @@
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
-import 'core-js/es7/reflect';
-import 'zone.js/dist/zone';
-import 'zone.js/dist/zone-testing';
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
-} from '@angular/platform-browser-dynamic/testing';
-
-declare const require: any;
-
-// First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
-);
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);