@eui/cli 17.3.0 → 17.3.1-snapshot-1711320784876

package/.version.properties

@@ -1 +1 @@
-17.3.0
+17.3.1-snapshot-1711320784876

package/lib/build.js

@@ -1,9 +1,11 @@
-const tools = require('@eui/tools/scripts/utils/tools');
+const fileSystem = require('fs');
+const { rimrafSync } = require('rimraf')
 const path = require('path');
 const utils = require('./utils');
 const config = require('./config');
 const childProcess = require('child_process');
 const execa = require('execa');
+const chalk = require('chalk');
 const execSync = childProcess.execSync;
 
 module.exports.start = (options) => {
@@ -27,11 +29,11 @@ const build = (cliConfig, targetPath) => {
       let target = targetPath;
       console.log(`--cleaning target : ${target}`);
 
-      if (!tools.isDirEmpty(target)) {
-        tools.logError(`Target directory : ${target} is not empty, execute eUI CLI in a blank directory... quitting`);
+      if (fileSystem.readdirSync(target).length > 0) {
+        printErrorLog(`Target directory : ${target} is not empty, execute eUI CLI in a blank directory... quitting`);
         throw new Error('DIR_NOT_EMPTY');
       } else {
-        return tools.rimraf(`${target}/**/*`);
+        return rimrafSync(`${target}/**/*`);
       }
     })
 
@@ -56,7 +58,7 @@ const build = (cliConfig, targetPath) => {
         return Promise.resolve()
           .then(() => {
             console.log('--building web-maven');
-            return tools.copydir(config.webMavenPath, targetPath);
+            return copyDirectory(config.webMavenPath, targetPath, true);
           })
           .then(() => {
             const angularPath = utils.getAngularPath(targetPath, appName, appType);
@@ -107,7 +109,7 @@ const build = (cliConfig, targetPath) => {
             throw e;
           })
           .finally(() => {
-            return tools.rimraf(`${targetPath}/.git`);
+            return rimrafSync(`${targetPath}/.git`);
           })
       }
 
@@ -127,11 +129,11 @@ const copyAngular = (targetPath, cliConfig, overwrite = true) => {
       const {angularBasePath} = config;
       const sourcePath = angularBasePath;
 
-      return tools.copydir(sourcePath, targetPath, overwrite);
+      return copyDirectory(sourcePath, targetPath, overwrite);
     })
     .then(() => {
       if (cliConfig.appType === 'mobile') {
-        return tools.copydir(config.angularBaseMobilePath, targetPath, overwrite);
+        return copyDirectory(config.angularBaseMobilePath, targetPath, overwrite);
       }
     })
     .then(() => {
@@ -139,20 +141,20 @@ const copyAngular = (targetPath, cliConfig, overwrite = true) => {
         cliConfig.appOptions.forEach((item) => {
           if (item !== 'ecl') {
             console.log('Applying option : ' + item);
-            tools.copydir(config.optionsPath[item], targetPath, true);
+            copyDirectory(config.optionsPath[item], targetPath, true);
           }
         })
         if (cliConfig.appOptions.includes('ecl') && cliConfig.appOptionsEclTheme) {
           console.log(`eUI ECL theme selected : ` + cliConfig.appOptionsEclTheme);
-          tools.copydir(config.optionsPath[cliConfig.appOptionsEclTheme], targetPath, true);
+          copyDirectory(config.optionsPath[cliConfig.appOptionsEclTheme], targetPath, true);
         }
       }
       return Promise.resolve();
     })
     .then(() => {
-        const allAvaiableOptionsCount = Object.keys(config.optionsPath).length - 1;
+        const allAvailableOptionsCount = Object.keys(config.optionsPath).length - 1;
         if (cliConfig.appOptions && cliConfig.appOptions.length === allAvaiableOptionsCount) {
-            tools.copydir(config.optionsPath["ecl-openid-jwt"], targetPath, true);
+          copyDirectory(config.optionsPath["ecl-openid-jwt"], targetPath, true);
             console.log('Applying options merge : ecl-openid-jwt');
           }
           return Promise.resolve();
@@ -161,3 +163,42 @@ const copyAngular = (targetPath, cliConfig, overwrite = true) => {
       throw e;
     })
 }
+
+const printErrorLog = (msg) => {
+  const now = new Date();
+  const currentDateTime = now.getHours().toString().padStart(2, '0') + ':' +
+    now.getMinutes().toString().padStart(2, '0') + ':' +
+    now.getSeconds().toString().padStart(2, '0');
+  console.info(chalk.red(`${currentDateTime} - ${'❯'.repeat(6)} ${msg}`));
+}
+
+const copyDirectory = (source, destination, overwrite = false) => {
+  // Create destination directory if it doesn't exist
+  if (!fileSystem.existsSync(destination)) {
+    fileSystem.mkdirSync(destination);
+  }
+
+  // Get list of files and directories in the source directory
+  const files = fileSystem.readdirSync(source);
+
+  // Iterate through each file/directory
+  files.forEach((file) => {
+    const sourcePath = path.join(source, file);
+    const destinationPath = path.join(destination, file);
+
+    // Check if it's a directory
+    if (fileSystem.lstatSync(sourcePath).isDirectory()) {
+      // Recursively copy subdirectory
+      copyDirectory(sourcePath, destinationPath, overwrite);
+    } else {
+      // Check if the file already exists in the destination directory
+      if (fileSystem.existsSync(destinationPath) && overwrite) {
+        // Overwrite existing file
+        fileSystem.copyFileSync(sourcePath, destinationPath);
+      } else if (!fileSystem.existsSync(destinationPath)) {
+        // Copy file if it doesn't exist in the destination or if overwrite is true
+        fileSystem.copyFileSync(sourcePath, destinationPath);
+      }
+    }
+  });
+}

package/lib/install.js

@@ -1,7 +1,7 @@
 const childProcess = require('child_process');
 const execSync = childProcess.execSync;
 const path = require('path');
-const tools = require('@eui/tools/scripts/utils/tools');
+const fileSystem = require('fs');
 const utils = require('./utils');
 const chalk = require('chalk');
 
@@ -27,13 +27,13 @@ const install = (cliConfig, targetPath) => {
 
   console.log('');
   console.log('');
-  console.log('*****************************************************');
+  console.log('*'.repeat(65));
   console.log(chalk.cyan(' Installing app dependencies... PLEASE WAIT....'));
-  console.log('*****************************************************');
+  console.log('*'.repeat(65));
 
   return Promise.resolve()
     .then(() => {
-      return tools.remove(path.join(wd, 'yarn.lock'));
+      return fileSystem.unlinkSync(path.join(wd, 'yarn.lock'));
     })
     .then(() => {
       return execSync("yarn", { cwd: wd, stdio: "inherit" });
@@ -41,9 +41,9 @@ const install = (cliConfig, targetPath) => {
     .then(() => {
       console.log('');
       console.log('');
-      console.log('*****************************************************************');
+      console.log('*'.repeat(65));
       console.log(chalk.cyan(' Starting eUI app... browser will open soon on localhost:4200'));
-      console.log('*****************************************************************');
+      console.log('*'.repeat(65));
 
       return execSync("npm start", { cwd: wd, stdio: "inherit" });
     })

package/lib/post-build.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const tools = require('@eui/tools/scripts/utils/tools');
+const fileSystem = require('fs');
 
 const utils = require('./utils');
 
@@ -24,7 +24,13 @@ const postBuild = (cliConfig, targetPath) => {
     .then(() => {
       console.log('--renaming .gitignore');
       const angularPath = utils.getAngularPath(targetPath, appName, appType, artifactId);
-      return tools.move(path.join(angularPath, 'gitignore_TO_REPLACE'), path.join(angularPath, '.gitignore'));
+      // With flag 'w' should create the file if it doesn't exist.
+      // If the file already exists, it will be replaced with the new content.
+      return fileSystem.writeFileSync(
+        path.join(angularPath, '.gitignore'),
+        fileSystem.readFileSync(path.join(angularPath, 'gitignore_TO_REPLACE')),
+        { flag: 'w' }
+      )
     })
 
     .catch((e) => {

package/lib/skeletons/_angular/base/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "17.3.0",
+    "version": "17.3.1-snapshot-1711320784876",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -20,6 +20,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "17.3.0"
+        "@eui/deps-base": "17.3.1-snapshot-1711320784876"
     }
 }

package/lib/skeletons/_angular/base-mobile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "17.3.0",
+    "version": "17.3.1-snapshot-1711320784876",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -21,7 +21,7 @@
     "private": true,
     "dependencies": {
         "@eui/deps-base": "16.2.15",
-        "@eui/mobile-core": "16.7.0",
-        "@eui/mobile-styles": "16.7.0"
+        "@eui/mobile-core": "16.8.0",
+        "@eui/mobile-styles": "16.8.0"
     }
 }

package/lib/skeletons/_angular/options/merged-ecl-openid-jwt/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "17.3.0",
+    "version": "17.3.1-snapshot-1711320784876",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -21,6 +21,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "17.3.0"
+        "@eui/deps-base": "17.3.1-snapshot-1711320784876"
     }
 }

package/lib/skeletons/_angular/options/openid-jwt/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "17.3.0",
+    "version": "17.3.1-snapshot-1711320784876",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -18,6 +18,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "17.3.0"
+        "@eui/deps-base": "17.3.1-snapshot-1711320784876"
     }
 }

package/lib/skeletons/web-symfony/myapp-web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "17.3.0",
+    "version": "17.3.1-snapshot-1711320784876",
     "license": "EUPL-1.1",
     "description": "eUI JEE Symfony app scripts",
     "scripts": {
@@ -19,6 +19,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "17.3.0"
+        "@eui/deps-base": "17.3.1-snapshot-1711320784876"
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@eui/cli",
-    "version": "17.3.0",
-    "tag": "latest",
+    "version": "17.3.1-snapshot-1711320784876",
+    "tag": "snapshot",
     "license": "EUPL-1.1",
     "description": "eUI CLI app generator",
     "bin": {
@@ -13,15 +13,13 @@
         "url": "https://citnet.tech.ec.europa.eu/CITnet/stash/projects/CSDR/repos/eui"
     },
     "dependencies": {
-        "@eui/tools": "6.16.1"
-    },
-    "peerDependencies": {
-        "@eui/tools": "^6.0.0",
         "chalk": "^4.1.0",
         "figlet": "^1.7.0",
         "replace-in-file": "^7.1.0",
         "execa": "^5.1.1",
-        "inquirer": "^8.1.0"
+        "inquirer": "^8.1.0",
+        "rimraf": "^5.0.5",
+        "@eui/tools": "6.16.3"
     },
     "preferGlobal": true,
     "homepage": "https://eui.ecdevops.eu",