@eui/tools 4.15.14 → 4.16.0

package/scripts/utils/notification/slack-utils.js

@@ -24,10 +24,6 @@ const agent = PROXY ? new HttpsProxyAgent(PROXY) : void 0;
 
 const sendMessageCore = (hook, channel, attachments, text = null) => {
   return new Promise((resolve, reject) => {
-    tools.logInfo(`Sending message to Slack...`);
-    tools.logInfo(`Slack hook: ${hook}`);
-    tools.logInfo(`Slack channel: ${channel}`);
-
     const payload = {
       username: "eUI bot",
       channel
@@ -51,6 +47,8 @@ const sendMessageCore = (hook, channel, attachments, text = null) => {
     };
 
     if (dryRun || !slackFeedback) {
+      tools.logInfo('No notifications config found...skipping');
+
       if (debug) {
         console.log(JSON.stringify(payload, null, 4));
       }
@@ -58,6 +56,10 @@ const sendMessageCore = (hook, channel, attachments, text = null) => {
       resolve();
 
     } else {
+      tools.logInfo(`Sending message to Slack...`);
+      tools.logInfo(`Slack hook: ${hook}`);
+      tools.logInfo(`Slack channel: ${channel}`);
+
       if (debug) {
         console.log(JSON.stringify(payload, null, 4));
       }
@@ -94,9 +96,6 @@ const sendMessage = (hook, channel, attachments, text = null) => {
     .then(() => {
       return sendMessageCore(hook, channel, attachments, text);
     })
-    .then(() => {
-      tools.logSuccess();
-    })
     .catch((e) => {
       tools.logError('Error sending slack message');
       console.log(e); // do not rethrow

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

@@ -15,42 +15,41 @@ const injectConfig = (project) => {
   return Promise.resolve()
     .then(() => {
       if (!project.config.npmPkg) {
-        return tools.logWarning('No linked config package found in project config');
+        tools.logWarning('No linked config package found in project config');
+        return;
+      }
+      // check if package is locally cloned
+      const localPackage = configUtils.packages.getPackages().filter((p) => {
+        return p.npmPkg === project.config.npmPkg
+      })[0];
 
-      } else {
-        // check if package is locally cloned
-        const localPackage = configUtils.packages.getPackages().filter((p) => {
-          return p.npmPkg === project.config.npmPkg
-        })[0];
+      var pkgAssetsPath;
+      const projectAssetsPath = path.join(process.cwd(), project.folder, 'src', 'assets');
+      const projectEnvironmentsPath = path.join(process.cwd(), project.folder, 'src', 'environments');
 
-        var pkgAssetsPath;
-        const projectAssetsPath = path.join(process.cwd(), project.folder, 'src', 'assets');
-        const projectEnvironmentsPath = path.join(process.cwd(), project.folder, 'src', 'environments');
+      // if local package is found
+      if (localPackage) {
+        pkgAssetsPath = path.join(process.cwd(), 'packages', localPackage.name, 'assets');
 
-        // if local package is found
-        if (localPackage) {
-          pkgAssetsPath = path.join(process.cwd(), 'packages', localPackage.name, 'assets');
+      // if not sources are taken from the npm package def in node_modules
+      } else {
+        const npmPkgScope = project.config.npmPkg.substr(0, project.config.npmPkg.indexOf('/'));
+        const npmPkgName = project.config.npmPkg.substr(project.config.npmPkg.indexOf('/') + 1);
+        pkgAssetsPath = path.join(process.cwd(), 'node_modules', npmPkgScope, npmPkgName, 'assets');
+      }
 
-        // if not sources are taken from the npm package def in node_modules
-        } else {
-          const npmPkgScope = project.config.npmPkg.substr(0, project.config.npmPkg.indexOf('/'));
-          const npmPkgName = project.config.npmPkg.substr(project.config.npmPkg.indexOf('/') + 1);
-          pkgAssetsPath = path.join(process.cwd(), 'node_modules', npmPkgScope, npmPkgName, 'assets');
-        }
+      if (!tools.isDirExists(pkgAssetsPath)) {
+        tools.logWarning(`Linked config pkg : ${project.config.npmPkg} cannot be found in node_modules`);
+        return;
+      }
 
-        if (!tools.isDirExists(pkgAssetsPath)) {
-          return tools.logWarning(`Linked config pkg : ${project.config.npmPkg} cannot be found in node_modules`);
+      tools.logInfo(`${project.config.npmPkg}/assets - injecting in ${projectAssetsPath}`);
+      tools.copydir(pkgAssetsPath, projectAssetsPath);
 
-        } else {
-          tools.logInfo(`${project.config.npmPkg}/assets - injecting in ${projectAssetsPath}`);
-          tools.copydir(pkgAssetsPath, projectAssetsPath);
-
-          const pkgEnvironmentsPath = path.join(pkgAssetsPath, 'environments');
-          if (tools.isDirExists(pkgEnvironmentsPath)) {
-            tools.logInfo(`${project.config.npmPkg}/assets/environments - injecting in ${projectEnvironmentsPath}`);
-            tools.copydir(pkgEnvironmentsPath, projectEnvironmentsPath);
-          }
-        }
+      const pkgEnvironmentsPath = path.join(pkgAssetsPath, 'environments');
+      if (tools.isDirExists(pkgEnvironmentsPath)) {
+        tools.logInfo(`${project.config.npmPkg}/assets/environments - injecting in ${projectEnvironmentsPath}`);
+        tools.copydir(pkgEnvironmentsPath, projectEnvironmentsPath);
       }
     })
 

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

@@ -49,6 +49,9 @@ module.exports.injectExternalFeatures = (project) => {
           throw new Error('External features not found');
 
         } else {
+          tools.logInfo(`Removing ${projectSrcPath} content`);
+          tools.rmdirFull(projectSrcPath, false);
+
           tools.logInfo(`${featuresSrcPath} injecting in ${projectSrcPath}`);
           return tools.copydir(featuresSrcPath, projectSrcPath, true);
         }
@@ -103,6 +106,9 @@ module.exports.injectExternalAppSources = (project) => {
           throw new Error('External features not found');
 
         } else {
+          tools.logInfo(`Removing ${projectSrcPath} content`);
+          tools.rmdirFull(projectSrcPath, false);
+
           tools.logInfo(`${appSourcesSrcPath} injecting in ${projectSrcPath}`);
           return tools.copydir(appSourcesSrcPath, projectSrcPath, true);
         }

package/scripts/utils/serve/app.js

@@ -10,7 +10,7 @@ const configUtils = require('../../csdr/config/config-utils');
 
 module.exports.serve = () => {
 
-  let { configuration, baseHref, host, proxyConfig, maxSpaceSize, port, disableHostCheck, open } = tools.getArgs();
+  let { configuration, baseHref, host, proxyConfig, maxSpaceSize, port, disableHostCheck, open, debug } = tools.getArgs();
 
   const prj = configUtils.projects.getProject();
 
@@ -24,14 +24,17 @@ module.exports.serve = () => {
 
   const ng = path.resolve(process.cwd(), 'node_modules', '@angular', 'cli', 'bin', 'ng');
 
-  console.log('Provided arguments:\n');
+  tools.logInfo('Provided arguments:\n');
   console.log(`configuration=${configuration}, baseHref=${baseHref}, host=${host}`);
 
 
   return Promise.resolve()
     .then(() => {
       tools.logTitle(`Serving application : ${prj.name}...`);
-      console.log(prj);
+
+      if (debug) {
+        console.log(prj);
+      }
     })
 
     .then(() => {