@eui/tools 6.18.0 → 6.19.1

package/.version.properties

@@ -1 +1 @@
-6.18.0
+6.19.1

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 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
+
+* **other:**
+  * adapted wrong path check  ([95030187](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/9503018748e091defe17bb186a740bdd9bc9d768))
+##### New Features
+
+* **other:**
+  * adapted to new config for baep standalone portal - adjusted esbuild for proxied configurations - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([cf062fc3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/cf062fc35fda5423fcf136e556779d7c4012a77d))
+
+* * *
+* * *
 ## 6.18.0 (2024-07-24)
 
 ##### New Features

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.18.0",
+    "version": "6.19.1",
     "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/angular.js

@@ -26,9 +26,11 @@ const {
   angularProjectDefFullSkeletonV17esbuild,
   angularProjectDefConfiguration,
   angularProjectDefConfigurationHost,
+  angularProjectDefConfigurationHostEsbuild,
   angularProjectDefConfigurationLight,
   angularProjectDefConfigurationOptimized,
   angularProjectDefConfigurationOptimizedHost,
+  angularProjectDefConfigurationOptimizedHostEsbuild,
   angularProjectDefConfigurationOptimizedLight,
   angularPackageDef,
   angularPackageSubEntryDef,
@@ -321,8 +323,13 @@ module.exports.registerAngularProjectDef = (project, build = false, element = fa
         } else {
           tools.logInfo('Injecting angular configuration file replacement');
           if (project.host) {
-            configurationDef = JSON.stringify(angularProjectDefConfigurationHost);
-            configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimizedHost);
+            if (packageEuiVersionNumber >= 18) {
+              configurationDef = JSON.stringify(angularProjectDefConfigurationHostEsbuild);
+              configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimizedHostEsbuild);
+            } else {
+              configurationDef = JSON.stringify(angularProjectDefConfigurationHost);
+              configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimizedHost);
+            }
           } else {
             configurationDef = JSON.stringify(angularProjectDefConfiguration);
             configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimized);
@@ -393,7 +400,12 @@ module.exports.registerModulePaths = (pkg, isReset) => {
   const fileDev = path.join(process.cwd(), 'tsconfig.json');
   const fileBuild = path.join(process.cwd(), 'tsconfig.build.json');
   const fileBuildSpec = path.join(process.cwd(), 'tsconfig.build.spec.json');
-  const defFile = path.join(process.cwd(), '.csdr', '.euirc-csdr-apps.json');
+  let defFile;
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    defFile = path.join(process.cwd(), '.config', '.euirc-apps.json');
+  } else {
+    defFile = path.join(process.cwd(), '.csdr', '.euirc-csdr-apps.json');
+  }
 
   if ((!tools.isFileExists(fileBuild) || isReset) && !tools.isFileExists(defFile)) {
     tools.copy(fileDev, fileBuild);

package/scripts/csdr/config/config-skeletons.js

@@ -1496,18 +1496,18 @@ module.exports.angularProjectDefFullSkeletonV17esbuild = {
       "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-              "browserTarget": "@project.name@:build"
+              "buildTarget": "@project.name@:build"
           },
           "configurations": {
               "proxy-mock": {
-                  "browserTarget": "@project.name@:build",
+                  "buildTarget": "@project.name@:build",
                   "proxyConfig": "apps/@project.name@/proxy-mock.conf.json"
               },
               "production": {
-                  "browserTarget": "@project.name@:build:production"
+                  "buildTarget": "@project.name@:build:production"
               },
               "development": {
-                "browserTarget": "@project.name@:build:development"
+                "buildTarget": "@project.name@:build:development"
               }
           },
           "defaultConfiguration": "development"
@@ -1560,6 +1560,49 @@ module.exports.angularProjectDefConfigurationHost = {
   "namedChunks": true
 };
 
+module.exports.angularProjectDefConfigurationOptimizedHost = {
+  "optimization": true,
+  "outputHashing": "all",
+  "sourceMap": false,
+  "extractCss": true,
+  "namedChunks": true,
+  "aot": true,
+  "extractLicenses": true,
+  "vendorChunk": false,
+  "buildOptimizer": true,
+  "budgets": [
+      {
+          "type": "initial",
+          "maximumWarning": "2mb",
+          "maximumError": "8mb"
+      }
+  ]
+}
+
+module.exports.angularProjectDefConfigurationHostEsbuild = {
+  "optimization": false,
+  "extractLicenses": false,
+  "sourceMap": true,
+  "namedChunks": true
+};
+
+module.exports.angularProjectDefConfigurationOptimizedHostEsbuild = {
+  "optimization": true,
+  "outputHashing": "all",
+  "sourceMap": false,
+  "extractCss": true,
+  "namedChunks": true,
+  "aot": true,
+  "extractLicenses": true,
+  "budgets": [
+      {
+          "type": "initial",
+          "maximumWarning": "2mb",
+          "maximumError": "8mb"
+      }
+  ]
+}
+
 
 module.exports.angularProjectDefConfigurationLight = {
   "buildOptimizer": false,
@@ -1618,24 +1661,7 @@ module.exports.angularProjectDefConfigurationOptimized = {
   ]
 }
 
-module.exports.angularProjectDefConfigurationOptimizedHost = {
-  "optimization": true,
-  "outputHashing": "all",
-  "sourceMap": false,
-  "extractCss": true,
-  "namedChunks": true,
-  "aot": true,
-  "extractLicenses": true,
-  "vendorChunk": false,
-  "buildOptimizer": true,
-  "budgets": [
-      {
-          "type": "initial",
-          "maximumWarning": "2mb",
-          "maximumError": "8mb"
-      }
-  ]
-}
+
 
 
 

package/scripts/csdr/config/global.js

@@ -13,10 +13,20 @@ const innerProjects = require('./projects');
 
 
 module.exports.getCsdrConfig = (full = true) => {
-  const globalConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-config.json'));
-  const appsConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-apps.json'));
-  const packagesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json'));
-  const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  let globalConfig, appsConfig, packagesConfig, remotesConfig;
+
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    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', 'remotes', '.euirc-remotes.json'));
+
+  } else {
+    globalConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-config.json'));
+    appsConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-apps.json'));
+    packagesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json'));
+    remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  }
 
   const config = globalConfig;
 
@@ -147,9 +157,13 @@ const getConfig = module.exports.getConfig = () => {
   let configFile;
   let isCsdr;
 
-  if (tools.isDirExists(path.join(process.cwd(), '.csdr'))) {
-    configFile = path.join(process.cwd(), '.csdr', '.euirc.json');
+  if (tools.isDirExists(path.join(process.cwd(), '.csdr')) || tools.isDirExists(path.join(process.cwd(), '.config'))) {
     isCsdr = true;
+    if (tools.isDirExists(path.join(process.cwd(), '.csdr'))) {
+      configFile = path.join(process.cwd(), '.csdr', '.euirc.json');
+    } else {
+      configFile = path.join(process.cwd(), '.config', '.euirc.json');
+    }
   } else {
     configFile = path.join(process.cwd(), '.euirc.json');
     isCsdr = false;
@@ -174,7 +188,13 @@ module.exports.updateConfig = (args = { project, projects, packages, packagesBra
   tools.logInfo('Updating euirc config');
   console.log(args);
 
-  const configFile = path.join(process.cwd(), '.csdr', '.euirc.json');
+  let configFile;
+
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    configFile = path.join(process.cwd(), '.config', '.euirc.json');
+  } else {
+    configFile = path.join(process.cwd(), '.csdr', '.euirc.json');
+  }
 
   let newConfig = {};
 

package/scripts/csdr/config/packages.js

@@ -244,7 +244,13 @@ module.exports.getRemotePackages = () => {
 };
 
 module.exports.isRemote = (pkgName) => {
-  const packagesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json'));
+  let packagesConfig;
+
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    packagesConfig = require(path.join(process.cwd(), '.config', '.euirc-packages.json'));
+  } else {
+    packagesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json'));
+  }
   const packageConfig = packagesConfig[pkgName];
 
   if (packageConfig) {

package/scripts/csdr/config/register.js

@@ -92,9 +92,17 @@ module.exports.registerCsdrPackage = (pkg, rootPkgScope, rootPkgName, euiVersion
 
   let file;
   if (isRemote) {
-    file = path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json');
+    if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+      file = path.join(process.cwd(), '.config', 'remotes', '.euirc-remotes.json');
+    } else {
+      file = path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json');
+    }
   } else {
-    file = path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json');
+    if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+      file = path.join(process.cwd(), '.config', '.euirc-packages.json');
+    } else {
+      file = path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json');
+    }
   }
 
   const moduleJson = JSON.parse(replaceModule);

package/scripts/csdr/config/remotes.js

@@ -18,12 +18,19 @@ module.exports.getRemote = (remoteName) => {
     remoteName = tools.getArgs().root;
   }
 
-  const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
-  const remoteConfig = remotesConfig[remoteName];
-
   const configOptions = configUtils.global.getConfigOptions();
 
-  const remotePath = path.join(configOptions.CSDR_REMOTES_CONFIG_PATH , 'assets', remoteName);
+  let remotesConfig;
+  let remotePath;
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    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];
 
   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`);
@@ -71,7 +78,14 @@ module.exports.getRemote = (remoteName) => {
 
 
 module.exports.isVirtualRemote = (remoteName) => {
-  const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  let remotesConfig;
+  console.log(tools.isDirExists())
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    remotesConfig = require(path.join(process.cwd(), '.config', 'remotes', '.euirc-remotes.json'));
+  } else {
+    remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  }
+
   const remoteConfig = remotesConfig[remoteName];
 
   return remoteConfig !== undefined;
@@ -111,7 +125,13 @@ module.exports.getCsdrRemotes = (hostName, euiVersion) => {
     tools.logInfo(`--- for euiVersion: ${euiVersion}`);
   }
 
-  const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  let remotesConfig;
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    remotesConfig = require(path.join(process.cwd(), '.config', 'remotes', '.euirc-remotes.json'));
+  } else {
+    remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  }
+
   let remotesArray = Object.keys(remotesConfig).map((r) => {
     const remote = remotesConfig[r];
     remote.name = r;

package/scripts/csdr/config/sync.js

@@ -74,6 +74,9 @@ module.exports.run = () => {
     packages: pkgFolders,
     remotes: remoteFolders
   };
-
-  tools.writeJsonFileSync(path.join(process.cwd(), '.csdr', '.euirc.json'), config);
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    tools.writeJsonFileSync(path.join(process.cwd(), '.config', '.euirc.json'), config);
+  } else {
+    tools.writeJsonFileSync(path.join(process.cwd(), '.csdr', '.euirc.json'), config);
+  }
 }

package/scripts/csdr/init/packages.js

@@ -83,6 +83,7 @@ module.exports.cloneHostPackage = (projectName) => {
 
   return Promise.resolve()
     .then(() => {
+      tools.logInfo(`Fetching host package info : ${project.hostPackage}`);
       pkg = configUtils.packages.getPackageByNpmPkg(project.hostPackage, true);
       if (!pkg) {
         throw new Error('Invalid host package provided / unknown to CSDR config');

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/csdr/metadata/package-utils.js

@@ -25,10 +25,17 @@ const getPackageVersions = (module.exports.getPackageVersions = (pkg) => {
   } catch(e) {
     npmOutput = e.stdout;
   }
-  const json = JSON.parse(npmOutput);
+  // console.log(npmOutput);
 
   let versions = [];
 
+  if (!npmOutput) {
+    tools.logWarning('Cannot find version of pkg - package is probably not published yet');
+    return versions;
+  }
+
+  const json = JSON.parse(npmOutput);
+
   if (json.error) {
     tools.logWarning('Error detected while trying to fetch the pkg version');
     console.log(json.error);

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

@@ -17,7 +17,12 @@ module.exports.sync = () => {
   return Promise.resolve()
   .then(() => {
     tools.logInfo('Resetting package.json');
-    return tools.copy(path.join(process.cwd(), '.csdr', 'package.json.reset'), path.join(process.cwd(), 'package.json'));
+
+    if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+      return tools.copy(path.join(process.cwd(), '.config', 'package.json.reset'), path.join(process.cwd(), 'package.json'));
+    } else {
+      return tools.copy(path.join(process.cwd(), '.csdr', 'package.json.reset'), path.join(process.cwd(), 'package.json'));
+    }
   })
   .then(() => {
     tools.logInfo('Removing yarn.lock');