@eui/tools 6.2.11 → 6.2.12

package/scripts/utils/build/package/build-package-utils.js

@@ -134,7 +134,7 @@ module.exports.preBuild = (pkg) => {
 
   return Promise.resolve()
     .then(() => {
-      const prebuildScript = path.join(pkg.paths.pkgDirectory, 'pre-build.js');
+      const prebuildScript = path.join(pkg.paths.root, 'pre-build.js');
       if (!dryRun && tools.isFileExists(prebuildScript)) {
         return tools.runScript(`node ${prebuildScript}`);
       } else {
@@ -159,7 +159,7 @@ module.exports.postBuild = (pkg) => {
   return Promise.resolve()
     .then(() => {
       tools.logInfo('Executing post-build.js script if present in package');
-      const postbuildScript = path.join(pkg.paths.pkgDirectory, 'post-build.js');
+      const postbuildScript = path.join(pkg.paths.root, 'post-build.js');
       if (!dryRun && tools.isFileExists(postbuildScript)) {
         return tools.runScript(`node ${postbuildScript}`);
       } else {
@@ -170,7 +170,7 @@ module.exports.postBuild = (pkg) => {
     // Clean up temporary sonar generated folder and files
     .then(() => {
       tools.logInfo('Cleaning sonar temporary assets if exist');
-      const sonarTempPath = path.join(pkg.paths.pkgDirectory, '.scannerwork');
+      const sonarTempPath = path.join(pkg.paths.root, '.scannerwork');
       if (tools.isDirExists(sonarTempPath)) {
         return tools.rimraf(sonarTempPath);
       }
@@ -190,7 +190,7 @@ module.exports.buildSubEntry = (pkg, subEntry) => {
     .then(() => {
       tools.logInfo(`Building sub-entry : ${subEntry} of package : ${pkg.name}`);
       // console.log(pkg);
-      return tools.getFilesGlob(pkg.paths.pkgRootDirectory, `**/package.json`);
+      return tools.getFilesGlob(pkg.paths.root, `**/package.json`);
     })
 
     .then((files) => {
@@ -227,8 +227,8 @@ module.exports.buildSubEntry = (pkg, subEntry) => {
           tools.logInfo('Testing...');
           const ng = path.resolve(process.cwd(), 'node_modules', '@angular', 'cli', 'bin', 'ng');
           let args = ['--max_old_space_size=8096', ng, 'test', subEntry, '--code-coverage', '--watch=false'];
-          tools.logInfo(`running ng test : with args: ${args} on folder : ${pkg.paths.pkgRootDirectory}`);
-          return execa('node', args, { cwd: pkg.paths.pkgRootDirectory, stdio: 'inherit' });
+          tools.logInfo(`running ng test : with args: ${args} on folder : ${pkg.paths.root}`);
+          return execa('node', args, { cwd: pkg.paths.root, stdio: 'inherit' });
         }
       }
     })
@@ -237,7 +237,7 @@ module.exports.buildSubEntry = (pkg, subEntry) => {
 
       let args = ['--max_old_space_size=8096', ng, 'build', subEntry];
 
-      return execa('node', args, { cwd: pkg.paths.pkgRootDirectory, stdio: 'inherit' });
+      return execa('node', args, { cwd: pkg.paths.root, stdio: 'inherit' });
     })
 
     .then(() => {

package/scripts/utils/publish/npm.js

@@ -15,7 +15,7 @@ const { dryRun, registry } = tools.getArgs();
 
 
 const getPkgVersion = (pkg) => {
-  const pathPkgJson = path.resolve(pkg.paths.pkgPublish, 'package.json');
+  const pathPkgJson = path.resolve(pkg.paths.publish, 'package.json');
   delete require.cache[pathPkgJson];
   require(pathPkgJson);
   const { version } = require(pathPkgJson);
@@ -23,9 +23,9 @@ const getPkgVersion = (pkg) => {
 }
 
 const publishCore = (pkg, registry, isPublicAccess) => {
-  tools.logInfo(`Publishing package "${pkg.name}" from "${pkg.paths.pkgPublish}" on ${registry}`);
+  tools.logInfo(`Publishing package "${pkg.name}" from "${pkg.paths.publish}" on ${registry}`);
 
-  let command = `npm publish ${pkg.paths.pkgPublish} --registry ${registry}`;
+  let command = `npm publish ${pkg.paths.publish} --registry ${registry}`;
 
   if (isPublicAccess) {
     command += ' --access public';
@@ -59,7 +59,7 @@ const publishCore = (pkg, registry, isPublicAccess) => {
       .then(() => {
         tools.logInfo('Write version properties file');
 
-        const versionFile = path.resolve(pkg.paths.pkgDirectory, '.version.properties');
+        const versionFile = path.resolve(pkg.paths.root, '.version.properties');
         tools.writeFileContent(versionFile, version);
       })
 
@@ -164,9 +164,14 @@ module.exports.publish = (pkg) => {
     .then(() => {
 
       if (!pkg.parent) {
-        // building normal package without linked children
-        const pkgFull = configUtils.packages.getPackage(pkg.name);  // TO CHECK
-        return publishPackage(pkgFull);
+        if (pkg.remote && pkg.virtual) {
+          return publishPackage(pkg);
+
+        } else {
+          // building normal package without linked children
+          const pkgFull = configUtils.packages.getPackage(pkg.name);  // TO CHECK
+          return publishPackage(pkgFull);
+        }
 
       } else {
 

package/scripts/utils/publish/publish-utils.js

@@ -25,7 +25,7 @@ module.exports.publish = (pkg) => {
 }
 
 module.exports.postPublish = (pkg) => {
-  const postpublishScript = path.join(pkg.paths.pkgDirectory, 'post-publish.js');
+  const postpublishScript = path.join(pkg.paths.root, 'post-publish.js');
   if (!dryRun && tools.isFileExists(postpublishScript)) {
     return tools.runScript(`node ${postpublishScript}`);
   } else {

package/scripts/utils/tools.js

@@ -81,6 +81,29 @@ function getArgs() {
 }
 
 
+function convertBooleanArg(arg) {
+  if (arg && typeof(arg) === 'boolean') {
+    return false;
+  } else {
+    if (arg) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+}
+
+function convertStringArg(arg, defaultValue = null) {
+  if (arg && typeof(arg) === 'boolean') {
+    return defaultValue
+  } else {
+    if (arg) {
+      return arg;
+    } else {
+      return defaultValue;
+    }
+  }
+}
 
 
 /* -------------------------------------------------------------------------------------------
@@ -796,6 +819,8 @@ module.exports.sortArray = sortArray;
 module.exports.removeArrayDuplicates = removeArrayDuplicates;
 module.exports.getArraySum = getArraySum;
 module.exports.getArgs = getArgs;
+module.exports.convertBooleanArg = convertBooleanArg;
+module.exports.convertStringArg = convertStringArg;
 module.exports.getXMLJsContent = getXMLJsContent;
 module.exports.getFolders = getFolders;
 module.exports.getFiles = getFiles;