@eui/tools 5.3.17 → 5.3.20

package/.version.properties

@@ -1 +1 @@
-5.3.17
+5.3.20

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.3.20 (2022-06-21)
+
+##### Chores
+
+* **other:**
+  * adapted pre-build to execute local project pre-build script if present - MWP-7700 [MWP-7700](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7700)  ([31675fd0](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/31675fd08502b56e6222d374a2c9d48973305df2))
+
+* * *
+* * *
+## 5.3.19 (2022-06-21)
+
+##### Bug Fixes
+
+* **other:**
+  * injection of sources from remote package race condition - MWP-7700 [MWP-7700](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7700)  ([a394124c](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a394124ca0124b8dd79004983073fa077a4d7258))
+
+* * *
+* * *
+## 5.3.18 (2022-06-20)
+
+##### Bug Fixes
+
+* **other:**
+  * set sonar scanner to false on new remote creation - MWP-8187 [MWP-8187](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8187)  ([f52a6d25](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f52a6d25e3b118a010b18fccbe0b198820b7e774))
+
+* * *
+* * *
 ## 5.3.17 (2022-06-20)
 
 ##### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "5.3.17",
+    "version": "5.3.20",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/sandbox.js

@@ -877,15 +877,6 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 
 Promise.resolve()
   .then(() => {
-    const prj = configUtils.projects.getProject('rsp-starter-kit');
+    const prj = configUtils.projects.getProject('my-workplace-host-playground');
     console.log(prj);
-
-    var { branch, dryRun, envTarget, compositeType, configEnvTarget } = tools.getArgs();
-    console.log(configEnvTarget);
-
-    if (configEnvTarget && typeof (configEnvTarget) === 'boolean') {
-      configEnvTarget = null;
-    }
-
-    console.log(configEnvTarget);
   })

package/scripts/csdr/config/global.js

@@ -487,6 +487,7 @@ module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName)
       "translationScopes": "eui,csdr,cc,mywp",
       "skipLint": true,
       "skipTest": true,
+      "sonarScanner": false,
       "envTargetActive": true
     },
     "release": {

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

@@ -110,7 +110,7 @@ module.exports.injectExternalAppSources = (project) => {
 
           return Promise.resolve()
             .then(() => {
-              return tools.rmdirFull(projectSrcPath, false);
+              return tools.rimraf(projectSrcPath);
             })
             .then(() => {
               tools.logInfo(`${appSourcesSrcPath} injecting in ${projectSrcPath}`);

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

@@ -26,6 +26,13 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
       return configUtils.angular.registerAngularProjectDef(project, build);
     })
 
+    // inject external app sources declaration
+    .then(() => {
+      if (project.appSources && project.appSources.external) {
+        return injectionUtils.externals.injectExternalAppSources(project);
+      }
+    })
+
     // inject project config if set as external config deps
     .then(() => {
       if (project.config) {
@@ -52,12 +59,6 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
       }
     })
 
-    // inject external app sources declaration
-    .then(() => {
-      if (project.appSources && project.appSources.external) {
-        return injectionUtils.externals.injectExternalAppSources(project);
-      }
-    })
 
     .then(() => {
       if (project.config && project.appSources && project.appSources.external && project.appSources.remapRoutesByEnvConfig) {
@@ -127,6 +128,19 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
       return this.injectAppConfig(project, configEnvTarget);
     })
 
+    .then(() => {
+      const prebuildScript = path.join(project.paths.rootPath, 'pre-build.js');
+
+      if (!dryRun && tools.isFileExists(prebuildScript)) {
+        tools.logInfo('Executing pre-build script');
+
+        return tools.runScript(`node ${prebuildScript}`);
+
+      } else {
+        tools.logInfo('DRY-RUN or pre-build script not found in project folder --- skipping');
+      }
+    })
+
     .catch((e) => {
       throw e;
     })