@eui/tools 6.19.0 → 6.19.2

package/.version.properties

@@ -1 +1 @@
-6.19.0
+6.19.2

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 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
+
+* **other:**
+  * adapted package init and generateRemote for external portal config - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([6bbf7b3a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6bbf7b3a25677be4e7e83aacb948378f4a24e5d8))
+
+* * *
+* * *
 ## 6.19.0 (2024-07-25)
 
 ##### Chores

package/package.json

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

package/scripts/app/public/package-init.js

@@ -28,9 +28,8 @@ new Vue({
                 { label: "Frontend UI package or remote", value: "frontend" },
             ],
             frontendVersions: [
-              { label: "15.x", value: "15" },
-              { label: "16.x", value: "16" },
-              { label: "17.x", value: "17" }
+              { label: "17.x", value: "17" },
+              { label: "18.x", value: "18" }
             ],
             frontendTypes: [
                 { label: "default UI package", value: "default" },
@@ -45,7 +44,7 @@ new Vue({
         getDefaultParams() {
             return {
                 pkgType: "frontend",
-                pkgFrontendVersion: "16",
+                pkgFrontendVersion: "17",
                 pkgFrontendType: "default",
                 pkgScope: "@zzz",
                 pkgName: "my-package",

package/scripts/app/server.js

@@ -29,6 +29,7 @@ app.listen(app.get('port'), () => {
       open('http://localhost:3000/stats.html');
     } else if (packageInit) {
       open('http://localhost:3000/package-init.html');
+      console.log('open your browser at : http://localhost:3000/package-init.html');
     } else {
       open('http://localhost:3000');
     }

package/scripts/csdr/cli/constants.js

@@ -29,7 +29,8 @@ module.exports.CONFIG_OPTIONS = {
   pkgFrontendVersion: {
     EUI15: '15',
     EUI16: '16',
-    EUI17: '17'
+    EUI17: '17',
+    EUI18: '18'
   }
 }
 

package/scripts/csdr/cli/package-build-frontend.js

@@ -57,7 +57,12 @@ const generateRemote = (args = constants.DEFAULT_CONFIG) => {
 
   const configOptions = configUtils.global.getConfigOptions();
 
-  const remoteConfigTargetPath = path.join(configOptions.CSDR_REMOTES_CONFIG_PATH , 'assets', args.fullName);
+  let remoteConfigTargetPath;
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    remoteConfigTargetPath = path.join(configOptions.CSDR_REMOTES_CONFIG_PATH , args.fullName);
+  } else {
+    remoteConfigTargetPath = path.join(configOptions.CSDR_REMOTES_CONFIG_PATH , 'assets', args.fullName);
+  }
 
   return Promise.resolve()
     // INIT and cleanup

package/scripts/csdr/cli/package.js

@@ -39,6 +39,10 @@ const generateArgs = (args) => {
     } else if (args.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI17) {
       fullName += '-eui17-remote-el-ui';
       npmPkgName = `${args.pkgScope}/${args.pkgName}-eui17-remote-el`;
+
+    } else if (args.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI18) {
+      fullName += '-eui18-remote-el-ui';
+      npmPkgName = `${args.pkgScope}/${args.pkgName}-eui18-remote-el`;
     }
   }
 

package/scripts/csdr/cli/skeletons/virtual-remote/18.x/angular-config.json

@@ -0,0 +1,6 @@
+{
+    "styles": [
+        "node_modules/@eui/styles/dist/styles/eui.css",
+        "node_modules/@eui/styles/dist/styles/eui-utilities.css"
+    ]
+}

package/scripts/csdr/cli/skeletons/virtual-remote/18.x/dependencies.json

@@ -0,0 +1,21 @@
+{
+    "base": {
+    },
+    "composite": {
+        "@eui/deps-base": "^18.0.0",
+        "@module.scope@/@module.name@": "^1.0.0",
+        "@mywp/shared": "^6.0.0",
+        "@csdr/core": "^6.0.0",
+        "@csdr/integration": "^5.0.0"
+    },
+    "INT": {
+    },
+    "ACC": {
+    },
+    "DLT": {
+    },
+    "TRN": {
+    },
+    "PROD": {
+    }
+}

package/scripts/csdr/config/global.js

@@ -19,7 +19,7 @@ module.exports.getCsdrConfig = (full = true) => {
     globalConfig = require(path.join(process.cwd(), '.config', '.euirc-config.json'));
     appsConfig = require(path.join(process.cwd(), '.config', '.euirc-apps.json'));
     packagesConfig = require(path.join(process.cwd(), '.config', '.euirc-packages.json'));
-    remotesConfig = require(path.join(process.cwd(), '.config', '.euirc-remotes.json'));
+    remotesConfig = require(path.join(process.cwd(), '.config', 'remotes', '.euirc-remotes.json'));
 
   } else {
     globalConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-config.json'));

package/scripts/csdr/config/register.js

@@ -93,7 +93,7 @@ module.exports.registerCsdrPackage = (pkg, rootPkgScope, rootPkgName, euiVersion
   let file;
   if (isRemote) {
     if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
-      file = path.join(process.cwd(), '.config', '.euirc-remotes.json');
+      file = path.join(process.cwd(), '.config', 'remotes', '.euirc-remotes.json');
     } else {
       file = path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json');
     }

package/scripts/csdr/config/remotes.js

@@ -18,17 +18,19 @@ module.exports.getRemote = (remoteName) => {
     remoteName = tools.getArgs().root;
   }
 
+  const configOptions = configUtils.global.getConfigOptions();
+
   let remotesConfig;
+  let remotePath;
   if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
-    remotesConfig = require(path.join(process.cwd(), '.config', '.euirc-remotes.json'));
+    remotesConfig = require(path.join(process.cwd(), '.config', 'remotes', '.euirc-remotes.json'));
+    remotePath = path.join(configOptions.CSDR_REMOTES_CONFIG_PATH , remoteName);
   } else {
     remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+    remotePath = path.join(configOptions.CSDR_REMOTES_CONFIG_PATH , 'assets', remoteName);
   }
-  const remoteConfig = remotesConfig[remoteName];
 
-  const configOptions = configUtils.global.getConfigOptions();
-
-  const remotePath = path.join(configOptions.CSDR_REMOTES_CONFIG_PATH , 'assets', remoteName);
+  const remoteConfig = remotesConfig[remoteName];
 
   if (!tools.isDirExists(remotePath)) {
     throw new Error(`Remote ${remoteName} cannot be found in the remotes global config - check ${configOptions.CSDR_REMOTES_CONFIG_PATH} for available remotes`);
@@ -79,7 +81,7 @@ module.exports.isVirtualRemote = (remoteName) => {
   let remotesConfig;
   console.log(tools.isDirExists())
   if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
-    remotesConfig = require(path.join(process.cwd(), '.config', '.euirc-remotes.json'));
+    remotesConfig = require(path.join(process.cwd(), '.config', 'remotes', '.euirc-remotes.json'));
   } else {
     remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
   }
@@ -125,7 +127,7 @@ module.exports.getCsdrRemotes = (hostName, euiVersion) => {
 
   let remotesConfig;
   if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
-    remotesConfig = require(path.join(process.cwd(), '.config', '.euirc-remotes.json'));
+    remotesConfig = require(path.join(process.cwd(), '.config', 'remotes', '.euirc-remotes.json'));
   } else {
     remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
   }

package/scripts/csdr/init/remotes.js

@@ -14,6 +14,10 @@ const { skipReset } = tools.getArgs();
 
 
 module.exports.initRemotesConfig = () => {
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    return;
+  }
+
   return Promise.resolve()
   .then(() => {
       const pkg = configUtils.packages.getPackageByNpmPkg('@csdr/remotes-config', true);
@@ -69,7 +73,9 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
     // clone remotes config if first init
     .then(() => {
       if (cloneRemote) {
-        return cloneRemotesConfig();
+        if (tools.isDirExists(path.join(process.cwd(), '.csdr'))) {
+          return cloneRemotesConfig();
+        }
       }
     })
 

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);
+        }
       }
     })