@eui/tools 6.19.1 → 6.19.2

package/.version.properties

@@ -1 +1 @@
-6.19.1
+6.19.2

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.19.2 (2024-07-26)
+
+##### Chores
+
+* **other:**
+  * add option for injection of host sources for api config and mock - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([ec2b5075](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/ec2b50755fba6d0b4b085b0621870ba508880a2d))
+
+* * *
+* * *
 ## 6.19.1 (2024-07-26)
 
 ##### Chores

package/package.json

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

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

@@ -25,7 +25,7 @@ const configUtils = require('../../../csdr/config/config-utils');
 
 /* PRIVATE METHODS */
 
-const injectConfigCore = (project, npmPkg) => {
+const injectConfigCore = (project, npmPkg, folder = 'assets') => {
   // check if package is locally cloned
   const localPackage = configUtils.packages.getPackages().filter((p) => {
     return p.npmPkg === npmPkg
@@ -37,13 +37,13 @@ const injectConfigCore = (project, npmPkg) => {
 
   // if local package is found
   if (localPackage) {
-    pkgAssetsPath = path.join(process.cwd(), 'packages', localPackage.name, 'assets');
+    pkgAssetsPath = path.join(process.cwd(), 'packages', localPackage.name, folder);
 
   // if not sources are taken from the npm package def in node_modules
   } else {
     const npmPkgScope = npmPkg.substr(0, npmPkg.indexOf('/'));
     const npmPkgName = npmPkg.substr(npmPkg.indexOf('/') + 1);
-    pkgAssetsPath = path.join(process.cwd(), 'node_modules', npmPkgScope, npmPkgName, 'assets');
+    pkgAssetsPath = path.join(process.cwd(), 'node_modules', npmPkgScope, npmPkgName, folder);
   }
 
   if (!tools.isDirExists(pkgAssetsPath)) {
@@ -83,7 +83,8 @@ module.exports.injectConfig = (project) => {
 
       // single config/npm package defined
       } else {
-        injectConfigCore(project, project.config.npmPkg);
+        console.log(project.config.folder)
+        injectConfigCore(project, project.config.npmPkg, project.config.folder);
       }
     })
 

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

@@ -387,11 +387,23 @@ module.exports.injectExternalMock = (project) => {
 
   return Promise.resolve()
     .then(() => {
-      if (!(project.mock && project.mock.external)) {
+      if (!project.mock) {
         tools.logInfo('No external mock setup...skipping')
 
       } else {
-        return gitUtils.cloneRepo(project.mock.repository, project.mock.folder, false, true);
+        if (project.mock.npmPkg && project.mock.folder) {
+          const localPackage = configUtils.packages.getPackages().filter((p) => {
+            return p.npmPkg === project.mock.npmPkg
+          })[0];
+
+          tools.copydir(
+            path.join(process.cwd(), 'packages', localPackage.name, project.mock.folder),
+            path.join(process.cwd(), project.folder, 'mock')
+          );
+
+        } else {
+          return gitUtils.cloneRepo(project.mock.repository, project.mock.folder, false, true);
+        }
       }
     })