@eui/tools 6.1.4 → 6.1.6

package/.version.properties

@@ -1 +1 @@
-6.1.4
+6.1.6

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.1.6 (2022-11-08)
+
+##### Bug Fixes
+
+* **other:**
+  * external sources for existing project prevention on init phase - MWP-8946 [MWP-8946](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8946)  ([f68f03f8](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f68f03f855b5dd8501c6d34c112d3f4d5ad00721))
+
+* * *
+* * *
+## 6.1.5 (2022-11-08)
+
+##### Chores
+
+* **other:**
+  * rebase from 5.x - adapted element build - fix last error over current MWP - EUI-6448 [EUI-6448](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6448)  ([27db36c5](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/27db36c506e2cf30d8a69371cd7cf5d94c2a8519))
+
+* * *
+* * *
 ## 6.1.4 (2022-11-08)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.1.4",
+    "version": "6.1.6",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -46,6 +46,7 @@
         "svg-sprite": "2.0.0",
         "imagemin": "7.0.1",
         "imagemin-svgo": "9.0.0",
-        "lunr": "2.3.9"
+        "lunr": "2.3.9",
+        "concat": "1.0.3"
     }
 }

package/scripts/csdr/init/init.js

@@ -97,16 +97,16 @@ module.exports.init = () => {
     // Importing external sources
     .then(() => {
       if (finalResponse.project) {
-        return initUtils.projects.importExternalSources();
+        return initUtils.projects.importExternalSources(true);
       }
     })
 
-    // Generating virtual remote - experimental
-    .then(() => {
-      if (finalResponse.pkg && finalResponse.pkgOnly) {
-        return initUtils.remotes.generateVirtualRemote(pkg);
-      }
-    })
+    // Generating virtual remote - experimental TODO
+    // .then(() => {
+    //   if (finalResponse.pkg && finalResponse.pkgOnly) {
+    //     return initUtils.remotes.generateVirtualRemote(pkg);
+    //   }
+    // })
 
     // adapt and inject particular root data/config for eUI version detected on project
     // if multiple versions of eUI are detected on the same project, an exception is thrown

package/scripts/csdr/init/packages.js

@@ -88,7 +88,7 @@ module.exports.cloneHostPackage = (projectName) => {
 
   const project = configUtils.projects.getProject(projectName);
 
-  if (!project.hostPackage) {
+  if (!project.hostPackage || project.externalSourcesOnInit === false) {
     return;
   }
 
@@ -118,22 +118,22 @@ module.exports.cloneHostPackage = (projectName) => {
 
 
 module.exports.installHostPackage = (projectName) => {
+
+  const project = configUtils.projects.getProject(projectName);
+
+  if (!project.hostPackage || project.externalSourcesOnInit === false) {
+    return;
+  }
+
   tools.logTitle('Installing host package');
 
   return Promise.resolve()
     .then(() => {
-      const project = configUtils.projects.getProject(projectName);
-
-      if (!project.hostPackage) {
-        tools.logInfo('project hostPackage not defined...skipping');
-
-      } else {
-        const pkg = configUtils.packages.getPackageByNpmPkg(project.hostPackage, true);
-        if (!pkg) {
-          throw new Error('Invalid host package provided / unknown to CSDR config');
-        }
-        return installUtils.projects.installHostPackage(project, pkg.npmPkg);
+      const pkg = configUtils.packages.getPackageByNpmPkg(project.hostPackage, true);
+      if (!pkg) {
+        throw new Error('Invalid host package provided / unknown to CSDR config');
       }
+      // return installUtils.projects.installHostPackage(project, pkg.npmPkg); // TODO
     })
 
     .catch((e) => {

package/scripts/csdr/init/projects.js

@@ -58,14 +58,14 @@ module.exports.importExternalFeatures = () => {
 }
 
 
-module.exports.importExternalSources = () => {
+module.exports.importExternalSources = (init = false) => {
   return Promise.resolve()
     .then(() => {
       tools.logTitle("Import external sources for local projects");
 
       return configUtils.projects.getProjects().reduce((promise, prj) => {
         return promise.then(() => (
-          injectionUtils.externals.injectExternalAppSources(prj)
+          injectionUtils.externals.injectExternalAppSources(prj, false, init)
         ));
       }, Promise.resolve());
     })

package/scripts/csdr/install/common.js

@@ -100,7 +100,7 @@ module.exports.getRemappedDeps = (pkgDeps, pkgDefaultDeps, isMaster) => {
         .reduce((acc, k) => {
 
           // if the package is being part of CSDR
-          if (pkgDeps[k]) {
+          if (pkgDeps[k] && typeof(pkgDeps[k]) !== 'function') {
 
             const latestTagMajor = pkgDeps[k].split('.')[0];
 

package/scripts/csdr/metadata/package.js

@@ -476,14 +476,8 @@ module.exports.getPackageVersionsByMajor = (pkg, major, isMaster) => {
       tools.logInfo(`----> ${versions.length} metadata versions found excluding snapshots`);
 
     } else {
-      versions = versions.filter(v => v.version.indexOf('snapshot') !== -1);
-      tools.logInfo(`----> ${versions.length} metadata versions found including snapshots`);
-
-      if (versions.length === 0) {
-        versions = pkgVersions.filter(v => v.version.split('.')[0] === major);
-        versions = versions.filter(v => v.version.indexOf('snapshot') === -1);
-        tools.logInfo(`----> ${versions.length} metadata versions non-master release for major`);
-      }
+      versions = pkgVersions.filter(v => v.version.split('.')[0] === major);
+      tools.logInfo(`----> ${versions.length} metadata versions non-master release for major`);
     }
 
     return versions;

package/scripts/utils/git-utils.js

@@ -111,7 +111,7 @@ const commitAndPush = (branch, message, folder) => {
 
       try {
         tools.logInfo('Commit and push - second try - retrying pull & push');
-        execa.sync('git', ['pull', 'origin', branch], { cwd: folder });
+        execa.sync('git', ['pull', 'origin', branch, '--rebase'], { cwd: folder });
         execa.sync('git', ['push', 'origin', branch], { cwd: folder });
 
       } catch (e3) {
@@ -146,11 +146,6 @@ const tagVersion = (version, branch, message, folder) => {
       })
       .catch((e) => {
         return Promise.resolve()
-        // .then(() => {
-        //   return new Promise((resolve) => {
-        //     setTimeout(resolve, 8000);
-        //   });
-        // })
         .then(() => {
           execa.sync('git', ['tag', '-a', `v${version}b`, '-m', message], { cwd: folder });
           execa.sync('git', ['push', '--follow-tags', 'origin', branch], { cwd: folder });
@@ -165,33 +160,6 @@ const tagVersion = (version, branch, message, folder) => {
   }
 }
 
-
-
-// const forceSnapshot = (pkg, folder, version) => {
-//   return Promise.resolve()
-//     .then(() => {
-//       tools.logInfo('Setting back snapshot in develop');
-//       const newVersion = semver.inc(version, 'patch') + '-SNAPSHOT';
-//       tools.logInfo('new snapshot version increment : ' + newVersion);
-
-//       tools.logInfo('Checkout develop');
-//       execa.shellSync('git checkout develop', { cwd: folder });
-
-//       return versionUtils.writePomXml(pkg, newVersion, false, false);
-//     })
-//     .then(() => {
-//       return commitAndPush(
-//         'develop',
-//         `chore(release): forced next increment snapshot version ${newVersion} - from CI server`,
-//         folder
-//         );
-//     })
-//     .catch((e) => {
-//       throw e;
-//     })
-// }
-
-
 const mergeMasterToDevelop = (pkg, folder, version) => {
   tools.logTitle('Merge back on develop');
   tools.logInfo(`Merging release changes into "develop" branch...`);
@@ -216,12 +184,6 @@ const mergeMasterToDevelop = (pkg, folder, version) => {
           execa.shellSync('git push origin develop', { cwd: folder });
           execa.shellSync('git checkout master', { cwd: folder });
         })
-        // TODO test in on local backend service before activation
-        // .then(() => {
-        //   if (version && pkg.backend) {
-        //     return forceSnapshot(pkg, inputPath, version);
-        //   }
-        // })
         .then(() => {
           tools.logSuccess();
         })

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

@@ -160,13 +160,18 @@ const injectExternalAppRootCore = (project, build = false, injectedNpmPkg, injec
 
 
 
-module.exports.injectExternalAppSources = (project, build = false) => {
+module.exports.injectExternalAppSources = (project, build = false, init = false) => {
 
   if (!project.externalSources) {
     tools.logInfo('No external app sources setup...skipping');
     return;
   }
 
+  if (project.externalSourcesOnInit === false && init) {
+    tools.logInfo('Project as not external sources pulling on init phase...skipping');
+    return;
+  }
+
   let { euiVersion } = tools.getArgs();
 
   if (!euiVersion && project.virtual) {

package/scripts/utils/serve/element.js

@@ -2,11 +2,14 @@
 
 const path = require('path');
 const execa = require('execa');
+const concat = require('concat');
 
 const tools = require('../tools');
+
 const preBuildUtils = require('../pre-build/pre-build-utils');
 const configUtils = require('../../csdr/config/config-utils');
 
+
 module.exports.serve = () => {
 
   let { project, configuration, baseHref, host, proxyConfig, maxSpaceSize, port } = tools.getArgs();
@@ -17,6 +20,13 @@ module.exports.serve = () => {
 
   const ng = path.resolve(pkg.paths.repoNodeModules, '@angular', 'cli', 'bin', 'ng');
 
+  let destPath;
+
+  if (!project) {
+    tools.logInfo('Project paramater must be specified...stopping');
+    return;
+  }
+
 
   return Promise.resolve()
     .then(() => {
@@ -30,95 +40,69 @@ module.exports.serve = () => {
     .then(() => {
       var args;
 
-      if (project) {
-
-        if (maxSpaceSize) {
-          args = ['--max_old_space_size=4096', ng, 'build', pkg.name];
-        } else {
-          args = [ng, 'build', pkg.name];
-        }
-
-        const projectConfig = configUtils.projects.getProject(project);
-
-        let destPath;
-        if (projectConfig.host && projectConfig.virtual) {
-          destPath = path.join(process.cwd(), 'hosts', project, 'src', 'assets', 'elements', pkg.name, 'bundles');
-        } else {
-          destPath = path.join(process.cwd(), 'apps', project, 'src', 'assets', 'elements', pkg.name, 'bundles');
-        }
-
-        const versionNumber = remoteEuiVersion.split('.')[0];
-
-        if (versionNumber <= 10) {
-          args.push(`--outputPath=${destPath}`);
-          args.push(`--single-bundle=true`);
-        } else {
-          args.push(`--output-path=${destPath}`);
-        }
-
-        args.push('--watch=true');
-        args.push(`--output-hashing=none`);
-
-        if (configuration) {
-          args.push(`--configuration=${configuration || 'production'}`);
-        }
-
-        const webpackExtraFile = path.join(pkg.paths.pkgRootDirectory, 'webpack.extra.js');
-        if (tools.isFileExists(webpackExtraFile)) {
-          args.push(`--extra-webpack-config=${webpackExtraFile}`);
-        }
-
-        tools.logInfo(`ng build with args ${args}`);
-
-
-
+      if (maxSpaceSize) {
+        args = ['--max_old_space_size=4096', ng, 'build', pkg.name];
       } else {
+        args = [ng, 'build', pkg.name];
+      }
 
-        if (maxSpaceSize) {
-          args = ['--max_old_space_size=4096', ng, 'serve', pkg.name];
-        } else {
-          args = [ng, 'serve', pkg.name];
-        }
-
-        if (configuration) {
-          args.push(`--configuration=${configuration}`);
-        }
-
-        if (proxyConfig) {
-          args.push(`--proxy-config=${proxyConfig}`);
-        }
-
-        if (baseHref) {
-          args.push(`--base-href=${baseHref}`);
-        }
+      const projectConfig = configUtils.projects.getProject(project);
 
-        if (host) {
-          args.push(`--host=${host}`);
-        }
+      if (projectConfig.host && projectConfig.virtual) {
+        destPath = path.join(process.cwd(), 'hosts', project, 'src', 'assets', 'elements', pkg.name, 'bundles');
+      } else {
+        destPath = path.join(process.cwd(), 'apps', project, 'src', 'assets', 'elements', pkg.name, 'bundles');
+      }
 
-        if (port) {
-          args.push(`--port=${port}`);
-        } else {
-          args.push(`--port=4202`);
-        }
+      const versionNumber = remoteEuiVersion.split('.')[0];
 
-        args.push('--open=true');
+      if (versionNumber <= 10) {
+        args.push(`--outputPath=${destPath}`);
+        args.push(`--single-bundle=true`);
+      } else {
+        args.push(`--output-path=${destPath}`);
+      }
 
+      args.push('--watch=true');
+      args.push(`--output-hashing=none`);
 
-        tools.logInfo(`ng serve with args ${args}`);
+      if (configuration) {
+        args.push(`--configuration=${configuration || 'production'}`);
+      }
 
+      const webpackExtraFile = path.join(pkg.paths.pkgRootDirectory, 'webpack.extra.js');
+      if (tools.isFileExists(webpackExtraFile)) {
+        args.push(`--extra-webpack-config=${webpackExtraFile}`);
       }
 
+      tools.logInfo(`ng build with args ${args}`);
+
       const spawnSync = require('child_process').spawnSync;
       const output = spawnSync('node', args, { cwd: pkg.paths.pkgRootDirectory, stdio: 'inherit' });
 
       if (output.error) {
         throw new Error(JSON.stringify(output));
       }
-
-      // breaking on MacOS for unknown reasons...
-      // return execa('node', args, { cwd: pkg.paths.pkgRootDirectory, stdio: 'inherit' });
     })
+
+    // activate in case concat is needed
+    // .then(() => {
+    //   const destPath = path.join(process.cwd(), 'hosts', project, 'src', 'assets', 'elements', pkg.name, 'bundles');
+
+    //   tools.move(path.join(destPath, 'main.js'), path.join(destPath, 'main-old.js'));
+
+    //   const files = [
+    //     'runtime.js',
+    //     'polyfills.js',
+    //     'scripts.js',
+    //     'main-old.js'
+    //   ].map(f => path.join(destPath, f));
+
+    //   const outFilePath = path.join(destPath, 'main.js');
+
+    //   return concat(files, outFilePath);
+    // })
+
     .catch((e) => {
       throw e;
     });