@eui/tools 4.21.10 → 5.0.0-rc.12

package/.version.properties

@@ -1 +1 @@
-4.21.10
+5.0.0-rc.12

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 5.0.0-rc.12 (2022-03-31)
+
+##### Chores
+
+* **other:**
+  * adapted nyc coverage not run on build  ([6687184e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6687184eca19f27b5de3cc03ebc3c449b20d73f9))
+  * update version for 5.x  ([91cbfd36](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/91cbfd362369ea1bdfc3188581b87ee3228f0578))
+  * enable remote envTarget optional through config  ([17619b0d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/17619b0dc7840c59ed8ef08f63df27baa39d583f))
+  * adapted version to 5.x - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([6e1f165e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6e1f165e3c23046a15f957a7c1b440ef85ad8edf))
+  * added api-utils for csdr-api communication - replace jest by mocha chai nyc - adjusted global tests  ([aadfc08f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/aadfc08f3458698473faccbc98b56352fa3e9ef2))
+  * cleanup - add missing global tests entries  ([5ce829bd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5ce829bdd9e7b507071271a522ec82851721cb7a))
+  * adapted version tests - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([0e642843](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0e64284307ae8e55cf5d4f79e98cc6960f05030b))
+##### New Features
+
+* **other:**
+  * added remote composite mecanism - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([15d683af](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/15d683af0fefa29211c2221dba0b48241accb5b1))
+##### Bug Fixes
+
+* **other:**
+  * wrong argument  ([f513f2c1](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f513f2c193fadd3c0ff5e3a01ea019c29e81314a))
+  * wrong function call  ([99ea107f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/99ea107fc4c6503f7845550de57dcd380c50ca32))
+  * page and app versions  ([28c19cf2](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/28c19cf2c6cbc9028765d35610b91aaa1ed46cf6))
+  * remote composite version generation adjustments - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([4656218e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/4656218e21869422215d82194e66abde16181a9d))
+
+* * *
+* * *
 ## 4.21.10 (2022-03-26)
 
 ##### Chores

package/global.test.js

@@ -1,3 +1,5 @@
+const { expect, assert } = require('chai');
+
 describe('eUI tools - test imports', () => {
   it('should not fail', () => {
 
@@ -6,7 +8,30 @@ describe('eUI tools - test imports', () => {
     const gitUtils = require('./scripts/utils/git-utils');
     const mavenUtils = require('./scripts/utils/maven-utils');
     const pipelineUtils = require('./scripts/utils/pipeline-utils');
-    const sonarUtils = require('./scripts/utils/sonar/sonar-utils');
+    const tools = require('./scripts/utils/tools');
+
+    // utils - a11y
+    const a11yUtils = require('./scripts/utils/a11y/app');
+
+    // utils - build - app
+    const buildAppUtils = require('./scripts/utils/build/app/build-app-utils');
+
+    // utils - build - package
+    const csdrBuildPackageAngular = require('./scripts/utils/build/package/angular')
+    const csdrBuildPackageBuildAll = require('./scripts/utils/build/package/build-all')
+    const buildPackageUtils = require('./scripts/utils/build/package/build-package-utils');
+    const csdrBuildPackageUtils = require('./scripts/utils/build/package/build-package-utils')
+    const csdrBuildPackageElement = require('./scripts/utils/build/package/element')
+    const csdrBuildPackageMaven = require('./scripts/utils/build/package/maven')
+    const csdrBuildPackageNestJs = require('./scripts/utils/build/package/nestJs')
+    const csdrBuildPackageNodeJs = require('./scripts/utils/build/package/nodeJs')
+    const csdrBuildPackagePostCssConfig = require('./scripts/utils/build/package/postcss.config')
+    const csdrBuildPackageStencil = require('./scripts/utils/build/package/stencil')
+    const csdrBuildPackageStyles = require('./scripts/utils/build/package/styles')
+
+    // utils - clean
+    const cleanAll = require('./scripts/utils/clean/clean-all');
+    const cleanUtils = require('./scripts/utils/clean/clean-utils');
 
     // utils - notification
     const notificationCommon = require('./scripts/utils/notification/common');
@@ -35,49 +60,30 @@ describe('eUI tools - test imports', () => {
     const prebuildTranslationsElements = require('./scripts/utils/pre-build/translations/elements');
     const prebuildTranslationsProjects = require('./scripts/utils/pre-build/translations/projects');
 
-    // utils - build
-    const buildAppUtils = require('./scripts/utils/build/app/build-app-utils');
-
-    // utils - build - package
-    const buildPackageUtils = require('./scripts/utils/build/package/build-package-utils');
-    const csdrBuildPackageAngular = require('./scripts/utils/build/package/angular')
-    const csdrBuildPackageBuildAll = require('./scripts/utils/build/package/build-all')
-    const csdrBuildPackageUtils = require('./scripts/utils/build/package/build-package-utils')
-    const csdrBuildPackageElement = require('./scripts/utils/build/package/element')
-    const csdrBuildPackageMaven = require('./scripts/utils/build/package/maven')
-    const csdrBuildPackageNestJs = require('./scripts/utils/build/package/nestJs')
-    const csdrBuildPackageNodeJs = require('./scripts/utils/build/package/nodeJs')
-    const csdrBuildPackagePostCssConfig = require('./scripts/utils/build/package/postcss.config')
-    const csdrBuildPackageStencil = require('./scripts/utils/build/package/stencil')
-    const csdrBuildPackageStyles = require('./scripts/utils/build/package/styles')
 
-    // utils - clean
-    const cleanAll = require('./scripts/utils/clean/clean-all');
-    const cleanUtils = require('./scripts/utils/clean/clean-utils');
+    // utils - publish
+    const publishMaven = require('./scripts/utils/publish/maven');
+    const publishNpm = require('./scripts/utils/publish/npm');
+    const publishAll = require('./scripts/utils/publish/publish-all');
+    const publishUtils = require('./scripts/utils/publish/publish-utils');
 
     // utils - serve - test
     const serveApp = require('./scripts/utils/serve/app');
     const serveElement = require('./scripts/utils/serve/element');
     const testUtils = require('./scripts/utils/test/test-utils');
 
-    // utils - publish
-    const publishMaven = require('./scripts/utils/publish/maven');
-    const publishNpm = require('./scripts/utils/publish/npm');
-    const publishAll = require('./scripts/utils/publish/publish-all');
-    const publishUtils = require('./scripts/utils/publish/publish-utils');
+    // utils - sonar
+    const sonarUtils = require('./scripts/utils/sonar/sonar-utils');
+
+
+    // csdr - audit
+    const csdrAuditUtils = require('./scripts/csdr/audit/audit-utils');
 
     // csdr - cli
     const csdrCliUtils = require('./scripts/csdr/cli/cli-utils');
     const csdrCliApp = require('./scripts/csdr/cli/app');
     const csdrCliPackage = require('./scripts/csdr/cli/package');
 
-    // csdr -init
-    const csdrInit = require('./scripts/csdr/init/init');
-    const csdrInitUtils = require('./scripts/csdr/init/init-utils');
-    const csdrInitMeta = require('./scripts/csdr/init/meta');
-    const csdrInitPrompt = require('./scripts/csdr/init/prompt');
-    const csdrInitRepos = require('./scripts/csdr/init/repos');
-
     // csdr - config
     const csdrConfigAngular = require('./scripts/csdr/config/angular');
     const csdrConfigUtils = require('./scripts/csdr/config/config-utils');
@@ -87,13 +93,23 @@ describe('eUI tools - test imports', () => {
     const csdrConfigProjects = require('./scripts/csdr/config/projects');
     const csdrConfigSync = require('./scripts/csdr/config/sync');
 
+    // csdr -init
+    const csdrInit = require('./scripts/csdr/init/init');
+    const csdrInitUtils = require('./scripts/csdr/init/init-utils');
+    const csdrInitMeta = require('./scripts/csdr/init/meta');
+    const csdrInitPrompt = require('./scripts/csdr/init/prompt');
+    const csdrInitRepos = require('./scripts/csdr/init/repos');
+
     // csdr - install
     const csdrInstallBuildApp = require('./scripts/csdr/install/build-app');
     const csdrInstallBuildPackage = require('./scripts/csdr/install/build-package');
     const csdrInstallCommon = require('./scripts/csdr/install/common');
-    const csdrInstallComposite = require('./scripts/csdr/install/composite-utils');
+    const csdrInstallCompositeCore = require('./scripts/csdr/install/composite-core');
     const csdrInstallUtils = require('./scripts/csdr/install/install-utils');
     const csdrInstallLocalDev = require('./scripts/csdr/install/local-dev');
+    const csdrInstallPackages = require('./scripts/csdr/install/packages');
+    const csdrInstallProjects = require('./scripts/csdr/install/projects');
+    const csdrInstallRemotes = require('./scripts/csdr/install/remotes');
 
     // csdr - metadata
     const csdrMetadataAppEnvs = require('./scripts/csdr/metadata/app-envs');
@@ -103,16 +119,22 @@ describe('eUI tools - test imports', () => {
     const csdrMetadataCommit = require('./scripts/csdr/metadata/commit');
     const csdrMetadataCommon = require('./scripts/csdr/metadata/common');
     const csdrMetadataUtils = require('./scripts/csdr/metadata/metadata-utils');
-    const csdrMetadataPackage = require('./scripts/csdr/metadata/package');
+    const csdrMetadataPackageEnvs = require('./scripts/csdr/metadata/package-envs');
     const csdrMetadataPackageHistory = require('./scripts/csdr/metadata/package-history');
+    const csdrMetadataPackageVersions = require('./scripts/csdr/metadata/package-versions');
+    const csdrMetadataPackage = require('./scripts/csdr/metadata/package');
+    const csdrMetadataStats = require('./scripts/csdr/metadata/stats');
 
     // csdr - release
     const csdrRealeaseApp = require('./scripts/csdr/release/app/release-app');
-    const csdrReleasePackage = require('./scripts/csdr/release/package/release-package');
+    const csdrReleasePackageBackend = require('./scripts/csdr/release/package/backend');
     const csdrReleasePackageCommon = require('./scripts/csdr/release/package/common');
+    const csdrReleasePackage = require('./scripts/csdr/release/package/release-package');
     const csdrReleasePackageRemote = require('./scripts/csdr/release/package/remote');
     const csdrReleasePackageUi = require('./scripts/csdr/release/package/ui');
-    const csdrReleasePackageBackend = require('./scripts/csdr/release/package/backend');
+
+    // csdr - sync
+    const csdrSyncUtils = require('./scripts/csdr/sync/sync-utils');
 
     // csdr - template
     const csdrTemplateUtils = require('./scripts/csdr/templates/template-utils');
@@ -121,12 +143,10 @@ describe('eUI tools - test imports', () => {
     const csdrVersionAppDefault = require('./scripts/csdr/version/app-default');
     const csdrVersionAppEnvTarget = require('./scripts/csdr/version/app-env-target');
     const csdrVersionApp = require('./scripts/csdr/version/app');
+    const csdrVersionCommon = require('./scripts/csdr/version/common');
+    const csdrVersionPackageDefault = require('./scripts/csdr/version/package-default');
+    const csdrVersionPackageRemote = require('./scripts/csdr/version/package-remote');
     const csdrVersionPackage = require('./scripts/csdr/version/package');
     const csdrVersionUtils = require('./scripts/csdr/version/version-utils');
-
-    // csdr - audit
-    const csdrAuditUtils = require('./scripts/csdr/audit/audit-utils');
-
-    expect(true).toBe(true);
   })
 })

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@eui/tools",
-    "version": "4.21.10",
-    "tag": "latest",
+    "version": "5.0.0-rc.12",
+    "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
     "main": "index.js",
@@ -27,19 +27,19 @@
         "figures": "3.2.0",
         "xml2js": "0.4.23",
         "https-proxy-agent": "2.2.3",
-        "jest": "26.6.3",
-        "supertest": "4.0.2",
-        "memfs": "3.2.4",
         "json-server": "0.16.3",
         "faker": "5.5.3",
         "nodemon": "2.0.12",
         "lowdb": "1.0.0",
         "event-stream": "3.3.4",
         "empty-module": "0.0.2",
-        "sendmail": "1.6.1",
         "autoprefixer": "9.6.1",
         "sass": "1.39.0",
         "postcss": "7.0.36",
-        "cssnano": "4.1.11"
+        "cssnano": "4.1.11",
+        "mocha": "9.2.2",
+        "chai": "4.3.6",
+        "nyc": "15.1.0",
+        "node-fetch": "2.6.7"
     }
 }

package/sandbox.js

@@ -1,6 +1,7 @@
 'use strict';
 const path = require('path');
 const fs = require('fs');
+const glob = require('glob');
 const tools = require('./scripts/utils/tools');
 const semver = require('semver');
 const gitUtils = require('./scripts/utils/git-utils');
@@ -11,10 +12,10 @@ const initUtils = require('./scripts/csdr/init/init-utils');
 const buildAppUtils = require('./scripts/utils/build/app/build-app-utils');
 const buildPackageUtils = require('./scripts/utils/build/package/build-package-utils');
 const injectionUtils = require('./scripts/utils/pre-build/injection/injection-utils');
-const compositeUtils = require('./scripts/csdr/install/composite-utils');
 const installUtils = require('./scripts/csdr/install/install-utils');
 const notificationUtils = require('./scripts/utils/notification/notification-utils');
 const translationUtils = require('./scripts/utils/pre-build/translations/translation-utils');
+const apiUtils = require('./scripts/utils/api-utils');
 
 // console.log(configUtils.packages.getPackages());
 // console.log(configUtils.packages.getPackage('eui-tools'));
@@ -694,11 +695,35 @@ const translationUtils = require('./scripts/utils/pre-build/translations/transla
 //     console.log(configOptions);
 //   })
 
-return Promise.resolve()
-  .then(() => {
-    const versions = configUtils.packages.getLocalPackagesEuiVersion();
-    console.log(versions);
-  })
+// return Promise.resolve()
+//   .then(() => {
+//     const versions = configUtils.packages.getLocalPackagesEuiVersion();
+//     console.log(versions);
+//     const prj = configUtils.projects.getProject();
+//     console.log(prj);
+//   })
+
+  // return Promise.resolve()
+  // .then(() => {
+  //   const pkg = configUtils.packages.getPackage('cc-task-centre-eui10-remote-el-ui', true);
+  //   return installUtils.remotes.installDeps(pkg);
+  // })
+  // .then((deps) => {
+  //   console.log(deps);
+  // })
+  // .catch((e) => {
+  //   console.log(e);
+  //   process.exit(1);
+  // })
+
+
+  // return Promise.resolve()
+  // .then(() => {
+  //   var from = path.join(process.cwd(), 'node_modules', '@mywp', 'config');
+  //   var globPattern = '**/*';
+  //   var files = glob.sync(globPattern, { cwd: from, nodir: true, follow: true, dot: true });
+
+  // })
 
 // return Promise.resolve()
 //   .then(() => {
@@ -709,3 +734,22 @@ return Promise.resolve()
 //     })
 //     tools.writeFileContent(path.join(process.cwd(), 'extract.txt'), out);
 //   })
+
+
+Promise.resolve()
+  .then(() => {
+    return apiUtils.login();
+  })
+  .then((response) => {
+    console.log(response);
+  })
+  .then(() => {
+    return apiUtils.getDevopsMetadata();
+  })
+  .then((response) => {
+    console.log(response);
+  })
+  .catch((e) => {
+    console.log(e);
+  })
+

package/scripts/csdr/config/global.js

@@ -224,6 +224,7 @@ module.exports.getConfigOptions = () => {
     SLACK_CHANNEL_FRONTEND: null,
     SLACK_CHANNEL_BACKEND: null,
     SLACK_CHANNEL_PROJECT: null,
+    API_HOST: null,
   }
 
   // getting devops metadata options
@@ -352,6 +353,14 @@ module.exports.getConfigOptions = () => {
     }
   }
 
+  // api options
+  const api = config && config.api;
+  if (api) {
+    if (api.host) {
+      configOptions.API_HOST = api.host;
+    }
+  }
+
   return configOptions;
 }
 

package/scripts/csdr/config/packages.js

@@ -113,10 +113,12 @@ module.exports.getPackage = (pkgName, fromCsdrConfig, optional) => {
     pkg.devopsMetadataFile = `${pkg.parentPkg}-build-metadata.json`;
     pkg.devopsVersionsMetadataFile = `${pkg.parentPkg}-versions-metadata.json`;
     pkg.devopsHistoryMetadataFile = `${pkg.parentPkg}-history-metadata.json`;
+    pkg.devopsEnvsMetadataFile = `${pkg.parentPkg}-envs-metadata.json`;
   } else {
     pkg.devopsMetadataFile = `${pkg.name}-build-metadata.json`;
     pkg.devopsVersionsMetadataFile = `${pkg.name}-versions-metadata.json`;
     pkg.devopsHistoryMetadataFile = `${pkg.name}-history-metadata.json`;
+    pkg.devopsEnvsMetadataFile = `${pkg.name}-envs-metadata.json`;
   }
 
   // specific to frontend package

package/scripts/csdr/config/projects.test.js

@@ -1,22 +1,24 @@
 'use strict';
 
+const { expect, assert } = require('chai');
+
 const projects = require('./projects');
 
 describe('[csdr/config/config-utils] - getCsdrProject()', () => {
 
-  test('should return null if project does not exist', () => {
+  it('should return null if project does not exist', () => {
     const prj = projects.getCsdrProject('UNKNOWN_PROJECT');
-    expect(prj).toBeNull;
+    expect(prj).to.be.undefined;
   })
 
 
-  test('should return valid project details if project exists', () => {
+  it('should return valid project details if project exists', () => {
     const prj = projects.getCsdrProject('my-workplace');
-    expect(prj).not.toBeNull;
-    expect(prj.name).toEqual('my-workplace');
-    expect(prj.devopsMetadataFile).toEqual('app-my-workplace-build-metadata.json');
-    expect(prj.devopsEnvsMetadataFile).toEqual('app-my-workplace-envs-metadata.json');
-    expect(prj.devopsVersionsMetadataFile).toEqual('app-my-workplace-versions-metadata.json');
-    expect(prj.devopsHistoryMetadataFile).toEqual('app-my-workplace-history-metadata.json');
+    expect(prj).not.to.be.null;
+    expect(prj.name).to.equal('my-workplace');
+    expect(prj.devopsMetadataFile).to.equal('app-my-workplace-build-metadata.json');
+    expect(prj.devopsEnvsMetadataFile).to.equal('app-my-workplace-envs-metadata.json');
+    expect(prj.devopsVersionsMetadataFile).to.equal('app-my-workplace-versions-metadata.json');
+    expect(prj.devopsHistoryMetadataFile).to.equal('app-my-workplace-history-metadata.json');
   })
 });

package/scripts/csdr/install/build-app.js

@@ -1,57 +1,25 @@
 'use strict';
 
-// GLOBAL
-const execa = require('execa');
-const path = require('path');
-
 // LOCAL
 const tools = require('../../utils/tools');
-const configUtils = require('../config/config-utils');
-const compositeUtils = require('./composite-utils');
-const metadataUtils = require('../metadata/metadata-utils');
 
 // INNER MODULES
-const innerCommon = require('./common');
-
-// FETCH ARGS
-const { dryRun, skipInstall } = tools.getArgs();
+const innerProjects = require('./projects');
 
 
 module.exports.install = (prj, envTarget, compositeType) => {
-  let finalDeps, compositeDeps;
-
   return Promise.resolve()
+    // checking remotes
     .then(() => {
-      return compositeUtils.getDeps(prj, envTarget, compositeType);
-    })
-    .then((deps) => {
-      // storing compositeDeps
-      compositeDeps = deps;
-    })
-
-    .then(() => {
-      return innerCommon.getLocalProjectFixedDeps(prj);
+      return innerProjects.installDeps(prj, envTarget, compositeType);
     })
 
-    .then((prjFixedDeps) => {
-      // storing for archiving
-      finalDeps = { ...compositeDeps, ...prjFixedDeps };
-
-      // fetching extra dependencies on project
-      const prjBaseJsonFile = path.join(process.cwd(), prj.folder, 'dependencies-base.json');
-      const prjBaseDeps = tools.getJsonFileContent(prjBaseJsonFile) || {};
-      const fixedDeps = configUtils.global.getConfig().npm.fixedDependencies;
-
-      return innerCommon.installDeps({ ...prjBaseDeps, ...compositeDeps, ...prjFixedDeps, ...fixedDeps });
-    })
-
-    .then(() => {
-      // returning only the composite deps found, only those will be stored in the metadata
-      return finalDeps;
+    // returning metadata dependencies
+    .then((deps) => {
+      return deps;
     })
 
     .catch((e) => {
       throw e;
     })
 }
-

package/scripts/csdr/install/build-package.js

@@ -1,88 +1,25 @@
 'use strict';
 
-// GLOBAL
-const path = require('path');
-const glob = require('glob');
-
 // LOCAL
 const tools = require('../../utils/tools');
-const configUtils = require('../config/config-utils');
-const compositeUtils = require('./composite-utils');
-const metadataUtils = require('../metadata/metadata-utils');
 
 // INNER MODULES
-const innerCommon = require('./common');
-const innerRemote = require('./remote');
+const innerPackages = require('./packages');
+const innerRemotes = require('./remotes');
+
 
 
-module.exports.install = (prj, pkg, isMaster) => {
-  let compositeDeps, localPkgDeps, localPkgCompositeDeps;
 
+module.exports.installPackage = (prj, pkg) => {
   return Promise.resolve()
+    // checking remotes
     .then(() => {
-      // when package is built against an app (depends on this app deps defined)
-      // the composite deps of that app is returned (default to DEV target)
-      if (prj) {
-        return compositeUtils.getDeps(prj);
-
-      // when package is stand-alone, then we take only the deps from within the package.json
-      } else {
-        return {};
-      }
+      return innerPackages.installDeps(prj, pkg);
     })
 
+    // returning metadata dependencies
     .then((deps) => {
-      // storing
-      compositeDeps = deps;
-
-      tools.logInfo(`Found composite deps : `);
-      console.log(JSON.stringify(compositeDeps, null, 2));
-
-      // fetching package own deps
-      return innerCommon.getLocalPackagesDeps();
-    })
-
-
-    .then((localPkgDepsIn) => {
-      // storing
-      localPkgDeps = localPkgDepsIn;
-
-      tools.logInfo(`Found local packages deps : `);
-      console.log(JSON.stringify(localPkgDeps, null, 2));
-
-      // fetching local package composite
-      return innerCommon.getLocalPackagesCompositeDeps();
-    })
-
-    // Get last known working build dependencies from DEVOPS metadata, including snapshot releases
-    .then((localPkgCompositeDepsIn) => {
-      // storing
-      localPkgCompositeDeps = localPkgCompositeDepsIn;
-
-      return metadataUtils.package.getPackagesDeps('packages');
-    })
-
-    .then((depsMetadata) => {
-      return innerCommon.getRemappedDeps(depsMetadata, localPkgCompositeDeps, false);
-    })
-
-    .then((remappedLocalPkgCompositeDeps) => {
-      // fetching extra dependencies on project if any
-      let prjDeps = {};
-
-      if (prj) {
-        const prjJsonFile = path.join(process.cwd(), prj.folder, 'dependencies-base.json');
-        prjDeps = tools.getJsonFileContent(prjJsonFile) || {};
-      }
-
-      const fixedDeps = configUtils.global.getConfig().npm.fixedDependencies;
-
-      if (pkg.build && pkg.build.ownDepsOnly) {
-        return innerCommon.installDeps({ ...remappedLocalPkgCompositeDeps, ...localPkgDeps, ...fixedDeps});
-
-      } else {
-        return innerCommon.installDeps({ ...remappedLocalPkgCompositeDeps, ...localPkgDeps, ...prjDeps, ...compositeDeps, ...fixedDeps });
-      }
+      return deps;
     })
 
     .catch((e) => {
@@ -90,18 +27,16 @@ module.exports.install = (prj, pkg, isMaster) => {
     })
 }
 
-
-
-module.exports.installRemote = (pkg, isMaster, envTarget) => {
+module.exports.installRemote = (pkg, envTarget, compositeType) => {
   return Promise.resolve()
     // checking remotes
     .then(() => {
-      return innerRemote.installDeps(pkg, isMaster, envTarget);
+      return innerRemotes.installDeps(pkg, envTarget, compositeType);
     })
 
     // returning metadata dependencies
-    .then((remoteDeps) => {
-      return remoteDeps;
+    .then((deps) => {
+      return deps;
     })
 
     .catch((e) => {