@eui/tools 6.1.5 → 6.1.7

package/.version.properties

@@ -1 +1 @@
-6.1.5
+6.1.7

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.1.7 (2022-11-08)
+
+##### Bug Fixes
+
+* **other:**
+  * wrong method call - MWP-8946 [MWP-8946](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8946)  ([c0a0ab94](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c0a0ab94d6579ab44adb0eaca395e7b6fb5fe45d))
+
+* * *
+* * *
+## 6.1.6 (2022-11-08)
+
+##### Bug Fixes
+
+* **other:**
+  * external sources for existing project prevention on init phase - MWP-8946 [MWP-8946](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8946)  ([f68f03f8](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f68f03f855b5dd8501c6d34c112d3f4d5ad00721))
+
+* * *
+* * *
 ## 6.1.5 (2022-11-08)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.1.5",
+    "version": "6.1.7",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/scripts/csdr/init/init.js

@@ -97,16 +97,16 @@ module.exports.init = () => {
     // Importing external sources
     .then(() => {
       if (finalResponse.project) {
-        return initUtils.projects.importExternalSources();
+        return initUtils.projects.importExternalSources(true);
       }
     })
 
-    // Generating virtual remote - experimental
-    .then(() => {
-      if (finalResponse.pkg && finalResponse.pkgOnly) {
-        return initUtils.remotes.generateVirtualRemote(pkg);
-      }
-    })
+    // Generating virtual remote - experimental TODO
+    // .then(() => {
+    //   if (finalResponse.pkg && finalResponse.pkgOnly) {
+    //     return initUtils.remotes.generateVirtualRemote(pkg);
+    //   }
+    // })
 
     // adapt and inject particular root data/config for eUI version detected on project
     // if multiple versions of eUI are detected on the same project, an exception is thrown

package/scripts/csdr/init/packages.js

@@ -88,7 +88,7 @@ module.exports.cloneHostPackage = (projectName) => {
 
   const project = configUtils.projects.getProject(projectName);
 
-  if (!project.hostPackage) {
+  if (!project.hostPackage || project.externalSourcesOnInit === false) {
     return;
   }
 
@@ -118,22 +118,22 @@ module.exports.cloneHostPackage = (projectName) => {
 
 
 module.exports.installHostPackage = (projectName) => {
+
+  const project = configUtils.projects.getProject(projectName);
+
+  if (!project.hostPackage || project.externalSourcesOnInit === false) {
+    return;
+  }
+
   tools.logTitle('Installing host package');
 
   return Promise.resolve()
     .then(() => {
-      const project = configUtils.projects.getProject(projectName);
-
-      if (!project.hostPackage) {
-        tools.logInfo('project hostPackage not defined...skipping');
-
-      } else {
-        const pkg = configUtils.packages.getPackageByNpmPkg(project.hostPackage, true);
-        if (!pkg) {
-          throw new Error('Invalid host package provided / unknown to CSDR config');
-        }
-        return installUtils.projects.installHostPackage(project, pkg.npmPkg);
+      const pkg = configUtils.packages.getPackageByNpmPkg(project.hostPackage, true);
+      if (!pkg) {
+        throw new Error('Invalid host package provided / unknown to CSDR config');
       }
+      // return installUtils.projects.installHostPackage(project, pkg.npmPkg); // TODO
     })
 
     .catch((e) => {

package/scripts/csdr/init/projects.js

@@ -58,14 +58,14 @@ module.exports.importExternalFeatures = () => {
 }
 
 
-module.exports.importExternalSources = () => {
+module.exports.importExternalSources = (init = false) => {
   return Promise.resolve()
     .then(() => {
       tools.logTitle("Import external sources for local projects");
 
       return configUtils.projects.getProjects().reduce((promise, prj) => {
         return promise.then(() => (
-          injectionUtils.externals.injectExternalAppSources(prj)
+          injectionUtils.externals.injectExternalAppSources(prj, false, init)
         ));
       }, Promise.resolve());
     })

package/scripts/csdr/install/projects.js

@@ -145,7 +145,7 @@ module.exports.installDeps = (prj, envTarget, compositeType) => {
     })
 
     .then(() => {
-      return innerCommon.getLocalProjectFixedDeps(prj);
+      return getLocalProjectFixedDeps(prj);
     })
 
     .then((prjFixedDeps) => {

package/scripts/utils/pre-build/injection/externals.js

@@ -160,13 +160,18 @@ const injectExternalAppRootCore = (project, build = false, injectedNpmPkg, injec
 
 
 
-module.exports.injectExternalAppSources = (project, build = false) => {
+module.exports.injectExternalAppSources = (project, build = false, init = false) => {
 
   if (!project.externalSources) {
     tools.logInfo('No external app sources setup...skipping');
     return;
   }
 
+  if (project.externalSourcesOnInit === false && init) {
+    tools.logInfo('Project as not external sources pulling on init phase...skipping');
+    return;
+  }
+
   let { euiVersion } = tools.getArgs();
 
   if (!euiVersion && project.virtual) {