@eui/tools 5.3.86 → 5.3.88

package/.version.properties

@@ -1 +1 @@
-5.3.86
+5.3.88

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 5.3.88 (2022-10-31)
+
+##### Bug Fixes
+
+* **other:**
+  * prevent injection when externalSources not setup - MWP-8915 [MWP-8915](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8915)  ([6094059c](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6094059ca5094c4a363fc49cde083e348e00c7ee))
+
+* * *
+* * *
+## 5.3.87 (2022-10-28)
+
+##### Chores
+
+* **other:**
+  * enabled externalRootFiles injection for making the mywp-host app fully eUI abstracted - MWP-8946 [MWP-8946](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8946)  ([6cae464c](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6cae464c6081818111597d1c05d7d3432b702981))
+
+* * *
+* * *
 ## 5.3.86 (2022-10-28)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/init/init-utils.js

@@ -137,6 +137,24 @@ module.exports.importExternalFeatures = () => {
 }
 
 
+module.exports.importExternalSources = () => {
+  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)
+        ));
+      }, Promise.resolve());
+    })
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
+
 module.exports.importExternalMock = () => {
   return Promise.resolve()
     .then(() => {

package/scripts/csdr/sync/sync-utils.js

@@ -47,6 +47,9 @@ module.exports.sync = () => {
   .then(() => {
     return initUtils.importExternalFeatures();
   })
+  .then(() => {
+    return initUtils.importExternalSources();
+  })
   .then(() => {
     return initUtils.importExternalMock();
   })

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

@@ -65,9 +65,9 @@ module.exports.injectExternalFeatures = (project) => {
 
 
 
-const injectExternalAppSourcesCore = (project, build = false, injectedNpmPkg, injectedFolder, hasAngularConfig) => {
+const injectExternalAppSourcesCore = (project, build = false, injectedNpmPkg, injectedFolder) => {
 
-  tools.logInfo(`Injecting : ${injectedNpmPkg} / ${injectedFolder}`);
+  tools.logInfo(`Injecting app sources : ${injectedNpmPkg} / ${injectedFolder}`);
 
   return Promise.resolve()
   .then(() => {
@@ -83,11 +83,13 @@ const injectExternalAppSourcesCore = (project, build = false, injectedNpmPkg, in
     // if local package is found
     if (localPackage) {
       tools.logInfo('local project found, copying from local');
+
       appSourcesSrcPath = path.join(process.cwd(), 'packages', localPackage.name, injectedFolder);
 
     // if not sources are taken from the npm package def in node_modules
     } else {
       tools.logInfo('remote project found, copying from remote');
+
       const npmPkgScope = injectedNpmPkg.substr(0, injectedNpmPkg.indexOf('/'));
       const npmPkgName = injectedNpmPkg.substr(injectedNpmPkg.indexOf('/') + 1);
 
@@ -107,20 +109,59 @@ const injectExternalAppSourcesCore = (project, build = false, injectedNpmPkg, in
           return tools.copydir(appSourcesSrcPath, projectSrcPath, true);
         })
 
-        // inject angular-config.json if param known in config
+        .catch((e) => {
+          throw e;
+        })
+    }
+  })
+
+  .catch((e) => {
+    throw e;
+  })
+}
+
+
+const injectExternalAppRootCore = (project, build = false, injectedNpmPkg, injectedFolder) => {
+
+  tools.logInfo(`Injecting app root files : ${injectedNpmPkg} / ${injectedFolder}`);
+
+  return Promise.resolve()
+  .then(() => {
+    // check if package is locally cloned
+    const localPackage = configUtils.packages.getPackages().filter((p) => {
+      return p.npmPkg === injectedNpmPkg
+    })[0];
+
+    let appRootSrcPath;
+    const projectRootPath = path.join(process.cwd(), project.folder);
+
+    // if local package is found
+    if (localPackage) {
+      tools.logInfo('local project found, copying from local');
+
+      appRootSrcPath = path.join(process.cwd(), 'packages', localPackage.name, injectedFolder);
+
+    // if not sources are taken from the npm package def in node_modules
+    } else {
+      tools.logInfo('remote project found, copying from remote');
+
+      const npmPkgScope = injectedNpmPkg.substr(0, injectedNpmPkg.indexOf('/'));
+      const npmPkgName = injectedNpmPkg.substr(injectedNpmPkg.indexOf('/') + 1);
+
+      appRootSrcPath = path.join(process.cwd(), 'node_modules', npmPkgScope, npmPkgName, injectedFolder);
+    }
+
+    if (!tools.isDirExists(appRootSrcPath)) {
+      tools.logWarning(`External sources location : ${appRootSrcPath} cannot be found in node_modules`);
+      throw new Error('External sources not found');
+
+    } else {
+
+      return Promise.resolve()
         .then(() => {
-          if (!hasAngularConfig) {
-            tools.logInfo('Angular config injection flag not detected...skipping');
-
-          } else {
-            tools.logInfo('Angular config injection flag detected...injecting to app root');
-            const angularConfigSrcPath = path.join(projectSrcPath, 'angular-config.json');
-            if (!tools.isFileExists(angularConfigSrcPath)) {
-              tools.logWarning('angular-config.json not found...skipping');
-            } else {
-              tools.move(projectSrcPath, projectRootPath);
-            }
-          }
+          tools.logInfo('Injecting app root files...');
+
+          return tools.copydirFiles(appRootSrcPath, projectRootPath, true);
         })
 
         .catch((e) => {
@@ -136,11 +177,20 @@ const injectExternalAppSourcesCore = (project, build = false, injectedNpmPkg, in
 
 
 
+
+
 module.exports.injectExternalAppSources = (project, build = false) => {
 
   tools.logTitle(`Injecting project external application sources for : ${project.name}`);
 
   return Promise.resolve()
+    .then(() => {
+      if (!project.externalSources) {
+        tools.logInfo('No external app sources setup...skipping');
+        return;
+      }
+    })
+
     .then(() => {
       if (!build) {
         // removing previously injected content, except assets
@@ -168,17 +218,12 @@ module.exports.injectExternalAppSources = (project, build = false) => {
       }
     })
     .then(() => {
-      if (!project.externalSources) {
-        tools.logInfo('No external app sources setup...skipping');
-        return;
-      }
-
       // in case of multiple injection are defined, we promise loop on each injection
       if (Array.isArray(project.externalSources)) {
         return Promise.resolve().then(() => {
           return project.externalSources.reduce((promise, appSource) => {
             return promise.then(() => (
-              injectExternalAppSourcesCore(project, build, appSource.npmPkg, appSource.folder, appSource.angularConfig)
+              injectExternalAppSourcesCore(project, build, appSource.npmPkg, appSource.folder, appSource.injectRootFiles)
             ));
           }, Promise.resolve());
         })
@@ -192,11 +237,29 @@ module.exports.injectExternalAppSources = (project, build = false) => {
           return injectExternalAppSourcesCore(
             project, build,
             project.externalSources.npmPkg, project.externalSources.folder,
-            project.externalSources.angularConfig,
           );
         }
       }
     })
+
+
+    // inject external root files
+    .then(() => {
+      if (!project.externalRootFiles) {
+        tools.logInfo('No external app root files setup...skipping');
+        return;
+      }
+
+      if (!project.externalRootFiles.npmPkg || !project.externalRootFiles.folder) {
+        return tools.logWarning('External externalRootFiles use requires a source [npmPkg] and a [folder] declared');
+
+      } else {
+        return injectExternalAppRootCore(
+          project, build,
+          project.externalRootFiles.npmPkg, project.externalRootFiles.folder,
+        );
+      }
+    })
     .catch((e) => {
       throw e;
     })

package/scripts/utils/tools.js

@@ -135,6 +135,16 @@ function copydir(from, to, overwrite = true, globPattern = '**/*') {
   });
 }
 
+function copydirFiles(from, to, overwrite = true, globPattern = '**/*') {
+  logInfo('----->copydir files from : ' + from + ' ====> to : ' + to );
+  var files = glob.sync(globPattern, { cwd: from, nodir: true, follow: true, dot: true });
+  files.forEach(file => {
+      const origin = path.join(from, file);
+      const dest = path.join(to, file);
+      fse.copySync(origin, dest, { overwrite: overwrite });
+  });
+}
+
 function rmdir(path) {
   logInfo('----> remiving ' + path);
   try {
@@ -742,6 +752,7 @@ module.exports.isFileExists = isFileExists;
 module.exports.mkdir = mkdir;
 module.exports.mkdirRecursive = mkdirRecursive;
 module.exports.copydir = copydir;
+module.exports.copydirFiles = copydirFiles;
 module.exports.rmdir = rmdir;
 module.exports.rmdirFull = rmdirFull;
 module.exports.rimraf = rimraf;