@eui/tools 6.3.38 → 6.3.40

package/.version.properties

@@ -1 +1 @@
-6.3.38
+6.3.40

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.3.40 (2023-02-20)
+
+##### Chores
+
+* **other:**
+  * add resolution injection at remote level - EUI-6448 [EUI-6448](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6448)  ([f38c1e67](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f38c1e67de447a3dc76972959ad1c9fecd415d7e))
+
+* * *
+* * *
+## 6.3.39 (2023-02-20)
+
+##### Bug Fixes
+
+* **other:**
+  * added shalow clone option - force caniuse-lite to all resolutions injection - EUI-6448 [EUI-6448](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6448)  ([8b43faec](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/8b43faec931c30e99f1f0114d21117d333f676c4))
+
+* * *
+* * *
 ## 6.3.38 (2023-02-19)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/init/global.js

@@ -11,6 +11,29 @@ const configUtils = require('../config/config-utils');
 const { registry } = tools.getArgs();
 
 
+const processResolutionsInjection = module.exports.processResolutionsInjection = (packageJsonPath, euiVersion) => {
+  tools.logInfo(`Processing resolutions replacement for eUI version found : ${euiVersion}`);
+
+  const packageJsonFile = path.join(packageJsonPath, 'package.json');
+  const packageJson = require(packageJsonFile);
+  const resolutionsJsonFile = path.join(__dirname, 'resources', euiVersion, 'resolutions.json');
+
+  if (tools.isFileExists(resolutionsJsonFile)) {
+    const resolutionsJson = require(resolutionsJsonFile);
+
+    tools.logInfo('Injecting resolutions content');
+    console.log(resolutionsJson);
+    packageJson.resolutions = resolutionsJson;
+
+    tools.logInfo('Updating root package.json');
+    tools.writeJsonFileSync(packageJsonFile, packageJson);
+
+  } else {
+    tools.logInfo('Not found...skipping');
+  }
+}
+
+
 
 module.exports.processLocalEuiVersions = () => {
  tools.logTitle('Processing injections for local installed eUI versions if needed');
@@ -23,25 +46,7 @@ module.exports.processLocalEuiVersions = () => {
         tools.logInfo('Default eUI version found or empty...skipping');
 
       } else {
-        tools.logInfo(`Processing resolutions replacement for eUI version found : ${euiVersion}`);
-
-        const rootPackageJsonFile = path.join(process.cwd(), 'package.json');
-        const rootPackageJson = require(rootPackageJsonFile);
-
-        const resolutionsJsonFile = path.join(__dirname, 'resources', euiVersion, 'resolutions.json');
-
-        if (tools.isFileExists(resolutionsJsonFile)) {
-          const resolutionsJson = require(resolutionsJsonFile);
-
-          tools.logInfo('Injecting resolutions content');
-          console.log(resolutionsJson);
-          rootPackageJson.resolutions = resolutionsJson;
-
-          tools.logInfo('Updating root package.json');
-          tools.writeJsonFileSync(rootPackageJsonFile, rootPackageJson);
-        } else {
-          tools.logInfo('Not found...skipping');
-        }
+        processResolutionsInjection(process.cwd(), euiVersion);
 
         tools.logInfo(`Processing .browserlistrc replacement for eUI version found : ${euiVersion}`);
 

package/scripts/csdr/init/repos.js

@@ -5,7 +5,7 @@ const gitUtils = require('../../utils/git-utils');
 
 const innerMeta = require('./meta');
 
-const { skipEuiToolsClone } = tools.getArgs();
+const { skipEuiToolsClone, shallowClone } = tools.getArgs();
 
 
 const getRepos = (project, pkg, prjOnly, pkgOnly) => {
@@ -71,7 +71,7 @@ const cloneAndCheckout = (repo, args) => {
 
   return Promise.resolve()
     .then(() => {
-      return gitUtils.cloneAndCheckout(repo.uri, repo.folder, args.branch);
+      return gitUtils.cloneAndCheckout(repo.uri, repo.folder, args.branch, false, shallowClone);
     })
 
     .catch((e) => {

package/scripts/csdr/init/resources/10.x/resolutions.json

@@ -1,4 +1,5 @@
 {
     "minimist": ">=1.2.6",
-    "xmlhttprequest-ssl": ">=1.6.1"
+    "xmlhttprequest-ssl": ">=1.6.1",
+    "caniuse-lite" : "1.0.30001450"
 }

package/scripts/csdr/init/resources/13.x/resolutions.json

@@ -5,5 +5,6 @@
     "isbinaryfile": "4.0.8",
     "postcss-preset-env": "7.6.0",
     "klaw": "3.0.0",
-    "eslint-plugin-jsdoc": "38.1.6"
+    "eslint-plugin-jsdoc": "38.1.6",
+    "caniuse-lite" : "1.0.30001450"
 }

package/scripts/csdr/init/resources/14.x/resolutions.json

@@ -3,5 +3,6 @@
     "https-proxy-agent": ">=2.2.3",
     "mem": ">=4.3.0 <=8.1.1",
     "zone.js": ">=0.11.5",
-    "nth-check": ">=2.0.1"
+    "nth-check": ">=2.0.1",
+    "caniuse-lite" : "1.0.30001450"
 }

package/scripts/csdr/init/resources/15.x/resolutions.json

@@ -1,3 +1,4 @@
 {
-    "cacheable-request": ">=10.2.7"
+    "cacheable-request": ">=10.2.7",
+    "caniuse-lite" : "1.0.30001450"
 }

package/scripts/csdr/init/resources/nodejs-10.x/resolutions.json

@@ -11,5 +11,6 @@
     "winston": "2.4.6",
     "node-fetch": "2.6.7",
     "mocha": "8.4.0",
-    "sass": "1.39.0"
+    "sass": "1.39.0",
+    "caniuse-lite" : "1.0.30001450"
 }

package/scripts/csdr/install/remotes.js

@@ -7,6 +7,7 @@ const path = require('path');
 const tools = require('../../utils/tools');
 const configUtils = require('../config/config-utils');
 const metadataUtils = require('../metadata/metadata-utils');
+const initUtils = require('../init/init-utils');
 
 // INNER MODULES
 const innerCommon = require('./common');
@@ -82,6 +83,14 @@ const pkgInstall = (pkg, envTarget, compositeType) => {
 
       pkgJson.dependencies = deps;
 
+
+      // getting package eUI version
+      const euiVersion = configUtils.packages.getPackageEuiVersion(pkg);
+
+      // checking for resolution updates according to eUI version used
+      initUtils.global.processResolutionsInjection(pkg.paths.root, euiVersion);
+
+
       if (dryRun) {
         tools.logInfo('DRY-RUN - skipping install');
 

package/scripts/csdr/metadata/common.js

@@ -12,7 +12,7 @@ const configUtils = require('../config/config-utils');
 const { dryRun, skipClone } = tools.getArgs();
 
 
-module.exports.cloneMetadataRepo = (noHistory = false) => {
+module.exports.cloneMetadataRepo = (shallow = false) => {
   const configOptions = configUtils.global.getConfigOptions();
 
   tools.logTitle('Cloning devops metadata repo');
@@ -24,7 +24,7 @@ module.exports.cloneMetadataRepo = (noHistory = false) => {
   } else {
     return Promise.resolve()
       .then(() => {
-        return gitUtils.cloneRepo(configOptions.DEVOPS_METADATA_REPOSITORY, configOptions.DEVOPS_METADATA_PATH, false, noHistory);
+        return gitUtils.cloneRepo(configOptions.DEVOPS_METADATA_REPOSITORY, configOptions.DEVOPS_METADATA_PATH, false, shallow);
       })
       .catch((e) => {
         throw e;

package/scripts/utils/git-utils.js

@@ -267,7 +267,7 @@ const getGitHost = (externalRepo) => {
 }
 
 
-const cloneRepo = (repoUri, folder, forced = false, noHistory = false, externalRepo = false) => {
+const cloneRepo = (repoUri, folder, forced = false, shallow = false, externalRepo = false) => {
   return Promise.resolve()
     .then(() => {
       if (tools.isDirExists(folder) && forced) {
@@ -283,7 +283,7 @@ const cloneRepo = (repoUri, folder, forced = false, noHistory = false, externalR
         const auth = process.env.gituser && process.env.gitpassword ? `${process.env.gituser}:${process.env.gitpassword}@` : '';
         const gitHost = getGitHost(externalRepo);
 
-        if (noHistory) {
+        if (shallow) {
           execa.shellSync(`git clone --depth 1 https://${auth}${gitHost}${repoUri} ${folder}`);
         } else {
           execa.shellSync(`git clone https://${auth}${gitHost}${repoUri} ${folder}`);
@@ -303,10 +303,25 @@ const cloneRepo = (repoUri, folder, forced = false, noHistory = false, externalR
 }
 
 
-const checkout = (branch, folder) => {
+const checkout = (branch, folder, shallow = false) => {
   tools.logInfo(`Checking out branch ${branch} in folder "${folder}"...`)
 
   return Promise.resolve()
+    .then(() => {
+      if (shallow) {
+        tools.logInfo(`As shallow cloning: set ${branch} as remote branch tracking...`)
+        return Promise.resolve()
+          .then(() => {
+            return execa.shell(`git remote set-branches --add origin ${branch}`, { cwd: folder, stdio: 'inherit' });
+          })
+          .then(() => {
+            return execa.shell(`git fetch --depth 1 origin ${branch}`, { cwd: folder, stdio: 'inherit' });
+          })
+          .catch((e) => {
+            throw e;
+          })
+      }
+    })
     .then(() => {
       return execa.shell(`git checkout ${branch}`, { cwd: folder, stdio: 'inherit' })
         .then(() => {
@@ -324,12 +339,12 @@ const checkout = (branch, folder) => {
 }
 
 
-const cloneAndCheckout = (repoUri, folder, branch) => {
+const cloneAndCheckout = (repoUri, folder, branch, forced, shallow) => {
   tools.logInfo(`cloning ${repoUri} in ${folder} on branch ${branch}`);
 
   return Promise.resolve()
     .then(() => {
-      return cloneRepo(repoUri, folder);
+      return cloneRepo(repoUri, folder, forced, shallow);
     })
 
     .then(() => {
@@ -339,7 +354,7 @@ const cloneAndCheckout = (repoUri, folder, branch) => {
 
       return Promise.resolve()
         .then(() => {
-          return checkout(branch, folder);
+          return checkout(branch, folder, shallow);
         })
         .catch((e) => {
           tools.logError(`Branch ${branch} NOT FOUND, retrying on develop`);

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

@@ -387,7 +387,7 @@ module.exports.injectExternalMock = (project) => {
         tools.logInfo('No external mock setup...skipping')
 
       } else {
-        return gitUtils.cloneRepo(project.mock.repository, project.mock.folder);
+        return gitUtils.cloneRepo(project.mock.repository, project.mock.folder, false, true);
       }
     })