@eui/tools 4.16.3 → 4.17.0

package/.version.properties

@@ -1 +1 @@
-4.16.3
+4.17.0

package/CHANGELOG.md

@@ -1,3 +1,53 @@
+## 4.17.0 (2021-11-19)
+
+##### Chores
+
+* **other:**
+  * remove confluence-api dep  ([ac6aa1ed](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/ac6aa1eda7b0458c8dfc022d62fe302f3930ffdb))
+  * remove major bump on breaking change commit message - added hostAppName on remote cli skeleton creation - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([1e509b05](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/1e509b05d1a63bdc053df4c0502f497b8c45bea1))
+  * update assets metadata to handle remotes array  ([228328cd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/228328cd6d973843b2bd9b64475dd3a94e67fb0e))
+  * adapted remote cli script for package injection  ([935f691d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/935f691db992cdace1bcb5b9779eacfda7ed83f9))
+  * adapted remote v7 skeleton  ([6c94f676](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6c94f67694b38455cd5abf5619843dc739deaf14))
+##### New Features
+
+* **other:**
+  * element injection - refactoring - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([d0ddf7d3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d0ddf7d37273f06285ef8646b8d738196f10e8cc))
+##### Bug Fixes
+
+* **other:**
+  * tests  ([367395e6](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/367395e6e2b8248af402b1bbdf151c9b95fc817c))
+  * eui10 remote package skeleton  ([68998b13](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/68998b138cc7e79895891508e4105dc3eccedfe1))
+  * CSDR CLI for remote creation - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([746ed2ae](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/746ed2aea943a96123a553714ea15d683c9b8a6c))
+
+* * *
+* * *
+## 4.16.6 (2021-11-08)
+
+##### Chores
+
+* **other:**
+  * added browserslistrc resources patching for eui v13 csdr init - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([b9f8498f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b9f8498fa7eac879e4135f7c214925428ac81da0))
+
+* * *
+* * *
+## 4.16.5 (2021-11-08)
+
+##### Bug Fixes
+
+* **other:**
+  * enable eUI version scanning of local projects and packages - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([83112806](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/83112806b51969ed6672dbec1e2423b86983f45d))
+
+* * *
+* * *
+## 4.16.4 (2021-11-08)
+
+##### Chores
+
+* **other:**
+  * generated spec files for non-src folder - issue with sub-entries eui-components - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([d72c570a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d72c570a42f268c6b8f8118af9988ffc18ea789a))
+
+* * *
+* * *
 ## 4.16.3 (2021-11-03)
 
 ##### Bug Fixes

package/global.test.js

@@ -3,7 +3,6 @@ describe('eUI tools - test imports', () => {
 
     // utils
     const changelogUtils = require('./scripts/utils/changelog-utils');
-    // const confluenceUtils = require('./scripts/utils/confluence-utils');
     const gitUtils = require('./scripts/utils/git-utils');
     const mavenUtils = require('./scripts/utils/maven-utils');
     const pipelineUtils = require('./scripts/utils/pipeline-utils');
@@ -32,7 +31,6 @@ describe('eUI tools - test imports', () => {
 
     // utils -pre-build - translations
     const prebuildTranslationUtils = require('./scripts/utils/pre-build/translations/translation-utils');
-    const prebuildTranslationsCommon = require('./scripts/utils/pre-build/translations/common');
     const prebuildTranslationsElements = require('./scripts/utils/pre-build/translations/elements');
     const prebuildTranslationsProjects = require('./scripts/utils/pre-build/translations/projects');
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "4.16.3",
+    "version": "4.17.0",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -21,7 +21,6 @@
         "eol": "0.9.1",
         "rimraf": "3.0.2",
         "ncp": "2.0.0",
-        "confluence-api": "1.4.0",
         "moment": "2.29.1",
         "moment-timezone": "0.5.33",
         "npm-run-all": "4.1.5",

package/sandbox.js

@@ -591,20 +591,28 @@ const notificationUtils = require('./scripts/utils/notification/notification-uti
 
 // return Promise.resolve()
 //   .then(() => {
-//     console.log(tools.isDirEmpty(process.cwd()));
+//     const a = configUtils.packages.getCsdrRemotePackages()
+//                 .map((p) => {
+//                   return { name: p.name, npmPkg: p.npmPkg }
+//                 });
+//     console.log(tools.sortArray(a, 'name'));
 //   })
-
 return Promise.resolve()
   .then(() => {
-    tools.logBigTitle('BIG TITLE');
-    tools.logTitle('TITLE');
-    tools.logInfo('test log info');
-    tools.logInfo('test log info');
-    tools.logInfo('test log info');
-    tools.logSuccess('test log success');
-    tools.logError('test log error');
-    tools.logWarning('test log warning');
-    tools.logAccent('test log accent');
-    tools.logBanner('this is the content of the banner');
+    return metadataUtils.app.storeMetadataAssetsStandAlone();
   })
 
+// return Promise.resolve()
+//   .then(() => {
+//     tools.logBigTitle('BIG TITLE');
+//     tools.logTitle('TITLE');
+//     tools.logInfo('test log info');
+//     tools.logInfo('test log info');
+//     tools.logInfo('test log info');
+//     tools.logSuccess('test log success');
+//     tools.logError('test log error');
+//     tools.logWarning('test log warning');
+//     tools.logAccent('test log accent');
+//     tools.logBanner('this is the content of the banner');
+//   })
+

package/scripts/csdr/cli/package.js

@@ -35,6 +35,8 @@ const defaultConfig = {
     EUI10: 'eui10'
   },
   isRouteModule: true,
+  isCsdrRepo: true,
+  externalRepoName: null,
   pkgGroupId: 'eu.europa.ec.cc'
 };
 
@@ -99,7 +101,7 @@ const prompt = () => {
               return true;
             }
           }
-        },        
+        },
         {
           name: 'pkgScope',
           type: 'input',
@@ -123,7 +125,24 @@ const prompt = () => {
               answers.pkgFrontendType !== defaultConfig.pkgFrontendType.REMOTE
             );
           }
-        }
+        },
+        {
+          name: 'isCsdrRepo',
+          type: 'confirm',
+          message: 'Is the repository within CSDR git project ?',
+          default: defaultConfig.isCsdrRepo
+        },
+        {
+          name: 'externalRepoName',
+          type: 'input',
+          message: 'Enter the project CITnet project name where the repository is located :',
+          default: defaultConfig.externalRepoName,
+          when: function (answers) {
+            return (
+              answers.isCsdrRepo === false
+            );
+          }
+        },
       ]);
     })
 
@@ -134,26 +153,40 @@ const prompt = () => {
 
 
 
-const buildFrontend = (name, scope, frontendType, frontendVersion, isRouteModule) => {
+const buildFrontend = (name, scope, frontendType, frontendVersion, isRouteModule, isCsdrRepo, externalRepoName) => {
   tools.logTitle('Generating package');
 
   let fullName = scope.substr(1) + '-' + name;
+  let npmPkgName, repoName;
+
   if (frontendType === defaultConfig.pkgFrontendType.DEFAULT) {
     fullName += '-ui';
+    npmPkgName = `${scope}/${name}`;
+
   } else if (frontendType === defaultConfig.pkgFrontendType.REMOTE) {
     if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI10) {
       fullName += '-eui10-remote-el-ui';
+      npmPkgName = `${scope}/${name}-eui10-remote-el`;
+
     } else {
       fullName += '-remote-el-ui';
+      npmPkgName = `${scope}/${name}-remote-el`;
     }
   }
 
+  if (isCsdrRepo) {
+    repoName = `${fullName}.git`;
+
+  } else {
+    repoName = `${externalRepoName}/${fullName}.git`;
+  }
+
   const targetPath = path.join(TARGET_ROOT_PATH, fullName);
 
   const pkg = {
     name: fullName,
-    npmPkgScope: scope,
-    npmPkgName: name
+    repoName: repoName,
+    npmPkgName: npmPkgName
   };
 
   return Promise.resolve()
@@ -207,6 +240,9 @@ const buildFrontend = (name, scope, frontendType, frontendVersion, isRouteModule
         .then(() => {
           return tools.replaceInPath(targetPath, '@module.scope@', scope);
         })
+        .then(() => {
+          return tools.replaceInPath(targetPath, '@module.scope-name@', `${scope.substr(1)}-${name}`);
+        })
         .then(() => {
           return tools.replaceInPath(targetPath, '@module.scope.string@', scope.substr(1));
         })
@@ -338,10 +374,22 @@ module.exports.generate = () => {
       console.log(answers);
 
       if (answers.pkgType === defaultConfig.pkgType.FRONTEND) {
-        return buildFrontend(answers.pkgName, answers.pkgScope, answers.pkgFrontendType, answers.pkgFrontendVersion, answers.isRouteModule);
+        return buildFrontend(
+          answers.pkgName,
+          answers.pkgScope,
+          answers.pkgFrontendType,
+          answers.pkgFrontendVersion,
+          answers.isRouteModule,
+          answers.isCsdrRepo,
+          answers.externalRepoName,
+        );
 
       } else if (answers.pkgType === defaultConfig.pkgType.BACKEND) {
-        return buildBackend(answers.pkgName, answers.pkgScope, answers.pkgGroupId);
+        return buildBackend(
+          answers.pkgName,
+          answers.pkgScope,
+          answers.pkgGroupId,
+        );
       }
     })
 

package/scripts/csdr/cli/skeletons/package/frontend-remote/src/app/module.ts

@@ -35,7 +35,8 @@ import {
     UxService,
 } from '@eui/core';
 import { LanguageInterceptor, PushNotificationsService, BreadcrumbsService } from '@csdr/core';
-import { TRACE_LOCAL_SERVICE_NAME, ZipkinHttpInterceptor, ZipkinTraceManager } from '@csdr/zipkin-tracing';
+// TODO[REMOTE-SETUP] uncomment if zipkin is used
+// import { TRACE_LOCAL_SERVICE_NAME, ZipkinHttpInterceptor, ZipkinTraceManager } from '@csdr/zipkin-tracing';
 
 import { TOKEN, reducerProvider, metaReducers } from './reducers/index';
 import { CustomSerializer } from './reducers/custom-route-serializer';
@@ -108,12 +109,13 @@ export function openidConnectInterceptorFactory(config) {
             deps: [CONFIG_TOKEN],
             multi: true,
         },
-        {
-            provide: HTTP_INTERCEPTORS,
-            useClass: ZipkinHttpInterceptor,
-            deps: [TRACE_LOCAL_SERVICE_NAME, ZipkinTraceManager],
-            multi: true,
-        },
+        // TODO[REMOTE-SETUP] uncomment if zipkin is used
+        // {
+        //     provide: HTTP_INTERCEPTORS,
+        //     useClass: ZipkinHttpInterceptor,
+        //     deps: [TRACE_LOCAL_SERVICE_NAME, ZipkinTraceManager],
+        //     multi: true,
+        // },
         { provide: CONFIG_TOKEN, useFactory: () => window['PROVIDERS']['CONFIG_TOKEN'], deps: [] },
         {
             provide: UxService,
@@ -142,8 +144,9 @@ export function openidConnectInterceptorFactory(config) {
         },
         { provide: BreadcrumbsService, useFactory: () => window['PROVIDERS']['BreadcrumbsService'], deps: [] },
         { provide: ELEMENT_ROUTER_TOKEN, useFactory: () => window['PROVIDERS']['ELEMENT_ROUTER_TOKEN'], deps: [] },
-        { provide: TRACE_LOCAL_SERVICE_NAME, useFactory: () => window['PROVIDERS']['TRACE_LOCAL_SERVICE_NAME'], deps: [] },
-        { provide: ZipkinTraceManager, useFactory: () => window['PROVIDERS']['ZipkinTraceManager'], deps: [] },
+        // TODO[REMOTE-SETUP] uncomment if zipkin is used
+        // { provide: TRACE_LOCAL_SERVICE_NAME, useFactory: () => window['PROVIDERS']['TRACE_LOCAL_SERVICE_NAME'], deps: [] },
+        // { provide: ZipkinTraceManager, useFactory: () => window['PROVIDERS']['ZipkinTraceManager'], deps: [] },
     ],
 })
 export class AppModule {

package/scripts/csdr/cli/skeletons/package/frontend-remote/src/app/routing.module.ts

@@ -5,14 +5,16 @@ import { filter, distinctUntilChanged } from 'rxjs/operators';
 
 import { CCRoute, ELEMENT_ROUTER_TOKEN, IRouterService } from '@csdr/integration';
 
-// import { routes } from '@cc/task-manager'; // TODO import from package
+// TODO[REMOTE-SETUP] adapt to wrapped package import
+// import { routes } from '@cc/task-manager';
 import { appConfig } from '../config/index';
 import { ModuleComponent } from './module.component';
 
 const prefixedRoutes: Routes = [
     {
         path: appConfig.global.baseUrl,
-        // children: routes, // TODO import from package
+        // TODO[REMOTE-SETUP] adapt to wrapped package import
+        // children: routes,
     },
     { path: '**', component: ModuleComponent },
 ];

package/scripts/csdr/cli/skeletons/package/frontend-remote/src/config/global.ts

@@ -1,10 +1,8 @@
 export const GLOBAL = {
     /* URL that needs to be used in the appRouting of the MWP */
     baseUrl: '@module.name@',
-    /* the path/s where translation resources will be loaded */
-    i18nResources: ['elements/@module.full.name@/bundles/assets/i18n-compiled'],
     /* Element tag name that needs to be unique - make sure it doesn't collide with any other MWP element */
-    elementName: '@module.scope@-@module.name@-v7',
+    elementName: '@module.scope-name@-v7',
     /* in case you are using NgRx give it a unique name (mostly for debugging) */
-    storeName: '@module.scope@ @module.name@',
+    storeName: '@module.scope-name@'
 };

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/package.json_TO_REPLACE

@@ -1,5 +1,5 @@
 {
-    "name": "@module.scope@/@module.name@-remote-el",
+    "name": "@module.scope@/@module.name@-eui10-remote-el",
     "version": "1.0.0",
     "files": [
         "bundles"

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/module.ts

@@ -13,7 +13,6 @@ import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 
 import { TranslateModule } from '@ngx-translate/core';
 
-// CSDR CORE - Babel defs & core reducers
 import {
     CachePreventionInterceptor,
     CONFIG_TOKEN,
@@ -30,7 +29,8 @@ import {
     UxAppShellService,
 } from '@eui/core';
 import { PushNotificationsService } from '@csdr/core';
-import { TRACE_LOCAL_SERVICE_NAME, ZipkinHttpInterceptor, ZipkinTraceManager } from '@csdr/zipkin-tracing';
+// TODO[REMOTE-SETUP] uncomment if zipkin is used
+// import { TRACE_LOCAL_SERVICE_NAME, ZipkinHttpInterceptor, ZipkinTraceManager } from '@csdr/zipkin-tracing';
 
 import { TOKEN, reducerProvider, metaReducers } from './reducers/index';
 import { CustomSerializer } from './reducers/custom-route-serializer';
@@ -38,7 +38,8 @@ import { CustomSerializer } from './reducers/custom-route-serializer';
 import { environment } from '../environments/environment';
 import { appConfig } from '../config';
 
-// import { TaskMgrCommonModule } from '@cc/task-manager'; // TODO adapt to central package import
+// TODO[REMOTE-SETUP] adapt to wrapped package import
+// import { TaskMgrCommonModule } from '@cc/task-manager';
 import {
     ELEMENT_ROUTER_TOKEN,
     PushNotificationMapping,
@@ -68,7 +69,8 @@ export function openidConnectInterceptorFactory(config) {
 
         CoreModule.forRoot(),
 
-        // TaskMgrCommonModule, // TODO adapt to central package import
+        // TODO[REMOTE-SETUP] adapt to wrapped package import
+        // TaskMgrCommonModule,
         RoutingModule,
     ],
     declarations: [
@@ -110,12 +112,13 @@ export function openidConnectInterceptorFactory(config) {
             deps: [CONFIG_TOKEN],
             multi: true,
         },
-        {
-            provide: HTTP_INTERCEPTORS,
-            useClass: ZipkinHttpInterceptor,
-            deps: [TRACE_LOCAL_SERVICE_NAME, ZipkinTraceManager],
-            multi: true,
-        },
+        // TODO[REMOTE-SETUP] uncomment if zipkin is used
+        // {
+        //     provide: HTTP_INTERCEPTORS,
+        //     useClass: ZipkinHttpInterceptor,
+        //     deps: [TRACE_LOCAL_SERVICE_NAME, ZipkinTraceManager],
+        //     multi: true,
+        // },
 
         // used in the el-mappers
         { provide: USER_SERVICE_HOST_TOKEN, useFactory: () => window['PROVIDERS']['UserService'] },
@@ -145,8 +148,9 @@ export function openidConnectInterceptorFactory(config) {
             deps: [CONFIG_TOKEN, HttpClient, PLATFORM_ID, Router, StoreService, I18nService, UX_SERVICE_HOST_TOKEN],
         },
         { provide: ELEMENT_ROUTER_TOKEN, useFactory: () => window['PROVIDERS']['ELEMENT_ROUTER_TOKEN'], deps: [] },
-        { provide: TRACE_LOCAL_SERVICE_NAME, useFactory: () => window['PROVIDERS']['TRACE_LOCAL_SERVICE_NAME'], deps: [] },
-        { provide: ZipkinTraceManager, useFactory: () => window['PROVIDERS']['ZipkinTraceManager'], deps: [] },
+        // TODO[REMOTE-SETUP] uncomment if zipkin is used
+        // { provide: TRACE_LOCAL_SERVICE_NAME, useFactory: () => window['PROVIDERS']['TRACE_LOCAL_SERVICE_NAME'], deps: [] },
+        // { provide: ZipkinTraceManager, useFactory: () => window['PROVIDERS']['ZipkinTraceManager'], deps: [] },
     ],
 })
 export class AppModule {

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/routing.module.ts

@@ -5,14 +5,16 @@ import { filter, distinctUntilChanged } from 'rxjs/operators';
 
 import { CCRoute, ELEMENT_ROUTER_TOKEN, IRouterService } from '@csdr/integration';
 
-// import { routes } from '@cc/task-manager'; // TODO adapt to central package import
+// TODO[REMOTE-SETUP] adapt to wrapped package import
+// import { routes } from '@cc/task-manager';
 import { appConfig } from '../config/index';
 import { ModuleComponent } from './module.component';
 
 const prefixedRoutes: Routes = [
     {
         path: appConfig.global.baseUrl,
-        // children: routes, // TODO adapt to central package routes
+        // TODO[REMOTE-SETUP] adapt to wrapped package import
+        // children: routes,
     },
     { path: '**', component: ModuleComponent },
 ];

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/config/global.ts

@@ -24,8 +24,8 @@ export const GLOBAL: GlobalConfig = {
     /* URL that needs to be used in the appRouting of the MWP */
     baseUrl: '@module.name@-v10',
     /* Element tag name that needs to be unique - make sure it doesn't collide with any other MWP element */
-    elementName: '@module.scope@-@module.name@-v10',
+    elementName: '@module.scope-name@-v10',
     /* in case you are using NgRx give it a unique name (mostly for debugging) */
-    storeName: '@module.scope@ @module.name@',
+    storeName: '@module.scope-name@',
     i18n: i18nConfig,
 };

package/scripts/csdr/config/angular.js

@@ -775,30 +775,7 @@ module.exports.registerAngularPackageSubEntry = (subEntryName, subEntryPath) =>
 }
 
 
-module.exports.generateTsConfigLibProd = (pkg) => {
-  var pathBase = path.join('packages', pkg.name);
-  if (pkg.child) {
-    pathBase = path.join('packages', pkg.parentPkg, 'packages', pkg.folder);
-  }
 
-  const filePath = path.join(process.cwd(), pathBase, 'tsconfig.lib.prod.json');
-  tools.logInfo(`Generating ${filePath}`);
-  if (!tools.isFileExists(filePath)) {
-    tools.writeJsonFileSync(filePath, tsConfigProdDef);
-    tools.logSuccess();
-
-  } else {
-    tools.logSuccess('OK - file already exists');
-    // const fileContent = tools.getJsonFileContent(filePath);
-    // console.log(fileContent);
-    // if (JSON.stringify(fileContent) !== JSON.stringify(tsConfigProdDef)) {
-    //   tools.writeJsonFileSync(filePath, tsConfigProdDef);
-    //   tools.logSuccess('OK - file exists and updated');
-    // } else {
-    //   tools.logSuccess('OK - file already exists and unchanged');
-    // }
-  }
-}
 
 
 module.exports.registerAngularProjectDef = (project, build = false) => {
@@ -975,8 +952,8 @@ module.exports.registerModulePaths = (pkg, isReset) => {
     jsonFileDev['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}/*`] = [`${pathBase}/${pkg.folder || pkg.name}/*`];
     jsonFileBuild['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}`] = [`${pathBase}/${pkg.folder || pkg.name}/dist`];
     jsonFileBuild['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}/*`] = [`${pathBase}/${pkg.folder || pkg.name}/dist/*`];
-    jsonFileBuildSpec['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}`] = [`${pathBase}/${pkg.folder || pkg.name}/dist`];
-    jsonFileBuildSpec['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}/*`] = [`${pathBase}/${pkg.folder || pkg.name}/dist/*`];
+    jsonFileBuildSpec['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}`] = [`${pathBase}/${pkg.folder || pkg.name}`];
+    jsonFileBuildSpec['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}/*`] = [`${pathBase}/${pkg.folder || pkg.name}/*`];
   }
 
 

package/scripts/csdr/config/global.js

@@ -444,10 +444,10 @@ module.exports.registerCsdrPackage = (pkg, isRemote) => {
 
   const csdrConfigPackage = {
     "name": "@module.full.name@",
-    "npmPkg": "@module.scope@/@module.name@",
+    "npmPkg": "@module.npmPkg.name@",
     "deps": [
     ],
-    "repository": "@module.full.name@.git",
+    "repository": "@module.repo.name@",
     "teams": [
       "all-frontend"
     ]
@@ -455,12 +455,13 @@ module.exports.registerCsdrPackage = (pkg, isRemote) => {
 
   const csdrConfigRemotePackage = {
     "name": "@module.full.name@",
-    "npmPkg": "@module.scope@/@module.name@-remote-el",
+    "npmPkg": "@module.npmPkg.name@",
     "deps": [
     ],
-    "repository": "@module.full.name@.git",
+    "repository": "@module.repo.name@",
     "element": true,
     "remote": true,
+    "hostAppName": "my-workplace",
     "teams": [
       "all-frontend"
     ],
@@ -475,14 +476,17 @@ module.exports.registerCsdrPackage = (pkg, isRemote) => {
 
   // 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.scope@', pkg.npmPkgScope);
-  replaceModule = tools.replaceAll(replaceModule, '@module.name@', pkg.npmPkgName);
+  replaceModule = tools.replaceAll(replaceModule, '@module.repo.name@', pkg.repoName);
+  replaceModule = tools.replaceAll(replaceModule, '@module.npmPkg.name@', pkg.npmPkgName);
 
   let file = path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json');
   let jsonFile = require(file);

package/scripts/csdr/config/packages.js

@@ -6,7 +6,6 @@ const fs = require('fs');
 
 // LOCAL
 const tools = require('../../utils/tools');
-const configUtils = require('./config-utils');
 
 // INNER MODULES
 const innerGlobal = require('./global');
@@ -32,7 +31,7 @@ module.exports.getCsdrPackagesFull = (flattenChildren = true) => {
   return outputPackages;
 }
 
-module.exports.getPackages = () => {
+const getPackages = module.exports.getPackages = () => {
   const packages = innerGlobal.getConfig().packages;
   const packagesKeys = Object.keys(packages);
 
@@ -203,6 +202,12 @@ module.exports.getRemotePackages = () => {
   })
 }
 
+module.exports.getCsdrRemotePackages = () => {
+  return this.getCsdrPackagesFull().filter(pkg => {
+    return pkg.remote;
+  })
+}
+
 module.exports.getBuildablePackagesWithDeps = () => {
   return this.getDepGraph().overallOrder().filter(pkg => {
     if (!pkg.build) {
@@ -237,9 +242,9 @@ module.exports.getDepGraph = () => {
 
 
 module.exports.getLocalPackagesEuiVersion = () => {
-  tools.logInfo('getting local installed eUI version...');
+  tools.logInfo('getting local packages installed eUI version...');
 
-  const pkgs = configUtils.packages.getPackages();
+  const pkgs = getPackages();
   let versionsFound = [];
 
   pkgs.forEach((p) => {

package/scripts/csdr/config/projects.js

@@ -5,7 +5,6 @@ const path = require('path');
 
 // LOCAL
 const tools = require('../../utils/tools');
-const versionUtils = require('../version/version-utils');
 
 // INNER MODULES
 const innerGlobal = require('./global');
@@ -36,12 +35,8 @@ const getProjectOptions = (prj) => {
   return { options: options };
 }
 
-const getProjectPaths = (prj) => {
 
-
-}
-
-module.exports.getProjects = () => {
+const getProjects = module.exports.getProjects = () => {
   const projects = innerGlobal.getConfig().projects;
   return Object.keys(projects).map(p => this.getProject(p));
 }
@@ -214,3 +209,26 @@ module.exports.getBaseHref = (prj, version, providedBaseHref) => {
   return null;
 }
 
+
+module.exports.getLocalProjectsEuiVersion = () => {
+  tools.logInfo('getting local projects installed eUI version...');
+
+  const prjs = getProjects();
+  let versionsFound = [];
+
+  prjs.forEach((p) => {
+    let version = 'DEFAULT';
+
+    if (p.build) {
+      if (p.build.euiVersion) {
+        version = p.build.euiVersion;
+      }
+    }
+    tools.logInfo(`checking ${p.name} - version found : ${version}`);
+    versionsFound.push(version);
+  })
+
+  versionsFound = tools.removeArrayDuplicates(versionsFound);
+
+  return versionsFound;
+}

package/scripts/csdr/config/sync.js

@@ -13,6 +13,12 @@ const innerPackages = require('./packages');
 const innerProjects = require('./projects');
 
 
+// -------------------------------------------------------------------------------------
+// Updates the .csdr/.euirc.json, storing locally installed projects and packages names
+// --
+// Called by "sync" - csdr/sync/sync-utils
+// -------------------------------------------------------------------------------------
+
 module.exports.run = () => {
   tools.logInfo('Synching packages and local config');
 
@@ -52,7 +58,4 @@ module.exports.run = () => {
   };
 
   tools.writeJsonFileSync(path.join(process.cwd(), '.csdr', '.euirc.json'), config);
-
-  // update extra config files
-
 }