@eui/tools 5.0.0-rc.1 → 5.0.0-rc.13

package/scripts/utils/pre-build/translations/elements.js

@@ -51,17 +51,17 @@ module.exports.generate = (inputScopes = '', inputPkg) => {
           tools.logInfo(`Adding packages from scope "${scope}"`);
           const scopePath = path.resolve(nmPath, scope);
           if (tools.isDirExists(scopePath)) {
-            let files = fs.readdirSync(scopePath).map(pkg => path.resolve(nmPath,  `${scope}/${pkg}`))
+            let files = fs.readdirSync(scopePath).map((pkg) => {
+              return {
+                name: pkg,
+                scope: scope,
+                folder: path.resolve(nmPath,  `${scope}/${pkg}`)
+              }
+            });
             packages = [...packages, ...files];
           }
       });
 
-      // configUtils.packages.getPackages().forEach((pkg) => {
-      //   const localPath = configUtils.packages.getPackagePaths(pkg).pkgRootDirectory;
-      //   console.log(localPath);
-      //   packages.push(localPath);
-      // })
-
       tools.logInfo(`langs: ${langs}`);
       tools.logInfo(`dest folder: ${destFolder}`);
       tools.logInfo(`total packages: ${packages.length}`);
@@ -69,7 +69,7 @@ module.exports.generate = (inputScopes = '', inputPkg) => {
     })
 
     .then(() => {
-        if (!fs.existsSync(destFolder)) {
+        if (!fs.existsSync(destFolder) && !dryRun) {
           fs.mkdirSync(destFolder);
         }
 
@@ -82,9 +82,19 @@ module.exports.generate = (inputScopes = '', inputPkg) => {
 
             // Add module translations
             packages.forEach((pkg) => {
-                // console.log('...adding translation from module "' + pkg + '".');
-                file = path.join(pkg, `assets/i18n/${lang}.json`);
-                addTranslation(file, lang)
+                let baseI18nPath = 'i18n';
+                if (pkg.scope === '@eui') {
+                  baseI18nPath = 'i18n-eui';
+                }
+                file = path.join(pkg.folder, `assets/${baseI18nPath}/${lang}.json`);
+
+                tools.logInfo(`Adding translations from ${pkg.folder}`);
+                if (tools.isFileExists(file)) {
+                  tools.logInfo(`${file} found...adding`);
+                  addTranslation(file, lang)
+                } else {
+                  tools.logInfo(`${file} not found...skipping`);
+                }
             });
 
             // Write final file

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, configEnvTarget } = tools.getArgs();
 
   const prj = configUtils.projects.getProject();
 
@@ -24,18 +24,21 @@ 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(() => {
-      return preBuildUtils.projects.preBuild(prj, configuration, false);
+      return preBuildUtils.projects.preBuild(prj, configuration, false, configEnvTarget);
     })
 
 

package/scripts/utils/test/test-utils.js

@@ -9,7 +9,7 @@ const tools = require('../tools');
 const configUtils = require('../../csdr/config/config-utils');
 
 // FETCH ARGS
-const { watch, skipCoverage } = tools.getArgs();
+const { watch, skipCoverage, timeout, build } = tools.getArgs();
 
 
 
@@ -84,3 +84,41 @@ module.exports.runJest = (pkg) => {
       throw e;
     })
 }
+
+
+module.exports.runMocha = (pkg) => {
+  return Promise.resolve()
+    .then(() => {
+      tools.logTitle(`Executing Mocha test for pkg: ${pkg.name}`);
+
+      // set jest binary
+      const mocha = path.resolve(process.cwd(), 'node_modules', 'mocha', 'bin', 'mocha');
+      const nyc = path.resolve(process.cwd(), 'node_modules', 'nyc', 'bin', 'nyc');
+
+      // default arguments
+      let args;
+
+      if (!skipCoverage && !build) {
+        args = [nyc, '--reporter=text', mocha, pkg.paths.pkgFromRoot +  '/**/*.test.js'];
+      } else {
+        args = [mocha, pkg.paths.pkgFromRoot +  '/**/*.test.js'];
+      }
+      if (watch) {
+        args.push('--watch');
+      }
+      if (timeout) {
+        args.push(`--timeout ${timeout}`);
+      } else {
+        args.push('--timeout 5000');
+      }
+
+      return execa('node', args, { cwd: process.cwd(), stdio: 'inherit' });
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
+