@eui/tools 6.3.39 → 6.3.41

package/.version.properties

@@ -1 +1 @@
-6.3.39
+6.3.41

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.3.41 (2023-02-20)
+
+##### Bug Fixes
+
+* **other:**
+  * remotes injection issue when no options set - add skipReset not regenerating remote locally for debugging - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([b15687c9](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b15687c9bd33c8e6762ca77eefecd40f9f734bbb))
+
+* * *
+* * *
+## 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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.3.39",
+    "version": "6.3.41",
     "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/remotes/15.x/full/options/definitions/dynamic-forms.json

@@ -1,4 +1,4 @@
 {
-    "imports": "import { DynamicFormsModule } from '@eui/dynamic-forms';",
-    "definitions": "DynamicFormsModule.forRoot({ componentMap: {}, rulesMap: {}, validationsMap: {}, valMessagesMap: {}, })"
+    "imports": "import { DynamicFormsModule } from '@eui/dynamic-forms'; import { dynMapConfig } from '@root.npm.pkg@'; ",
+    "definitions": "DynamicFormsModule.forRoot(dynMapConfig)"
 }

package/scripts/csdr/init/remotes.js

@@ -8,6 +8,9 @@ const tools = require('../../utils/tools');
 const configUtils = require('../config/config-utils');
 const gitUtils = require('../../utils/git-utils');
 
+// ARGS
+const { skipReset } = tools.getArgs();
+
 
 
 const cloneRemotesConfig = module.exports.cloneRemotesConfig = () => {
@@ -41,6 +44,11 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
 
   let remote, remotePath, remoteSrcPath, remoteSkeletonRootPath, remoteSkeletonPath;
 
+  // checking if reset has to bypassed, in that case no-regeneration occurs
+  if (skipReset) {
+    return;
+  }
+
   return Promise.resolve()
     // clone remotes config if first init
     .then(() => {
@@ -151,14 +159,23 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
         tools.logInfo(`copying full sources skeleton : ${fullCommonPath} ==> ${remoteSrcPath}`);
         tools.copy(fullCommonPath, remoteSrcPath);
 
+        // initializing dynamic contents, filled based on options provided in config metadata
+        let importsContent = [];
+        let definitionsContent = [];
+        let declarationsContent = [];
+        let providersContent = [];
+        let constructorDeclarationsContent = [];
+
         // checking options
-        if (remote.skeletonConfig.options) {
-          let importsContent = [];
-          let definitionsContent = [];
-          let declarationsContent = [];
-          let providersContent = [];
-          let constructorDeclarationsContent = [];
 
+        // if no options found, we inject default modules defs
+        if (!remote.skeletonConfig.options) {
+          definitionsContent.push('StoreModule.forRoot(TOKEN, { metaReducers })');
+          definitionsContent.push(`StoreRouterConnectingModule.forRoot({ stateKey: 'router', serializer: CustomSerializer })`);
+
+
+        // if options, all options are checked and default modules defs are injected following certain conditions
+        } else {
           const pushContent = (obj) => {
             if (obj.imports) importsContent.push(obj.imports);
             if (obj.definitions) definitionsContent.push(obj.definitions);
@@ -199,19 +216,19 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
             definitionsContent.push(`StoreRouterConnectingModule.forRoot({ stateKey: 'router', serializer: CustomSerializer })`);
           }
 
-          // replace option in module.ts placeholders
-          const moduleTsPath = path.join(remoteSrcPath, 'app', 'module.ts');
-          tools.replaceInFileSync(moduleTsPath, '// IMPORTS', importsContent.join('\n'));
-          tools.replaceInFileSync(moduleTsPath, '// DEFINITIONS', definitionsContent.join(',\n'));
-          tools.replaceInFileSync(moduleTsPath, '// DECLARATIONS', declarationsContent.join('\n'));
-          tools.replaceInFileSync(moduleTsPath, '// PROVIDERS', providersContent.join(',\n'));
-          tools.replaceInFileSync(moduleTsPath, '// CONSTRUCTOR DECLARATIONS', constructorDeclarationsContent.join('\n'));
-
           if (remote.skeletonConfig.options.participant) {
             tools.replaceInPath(remoteSrcPath, '@block.container.name@', remote.skeletonConfig.blockContainerName);
           }
         }
 
+        // replace option in module.ts placeholders
+        const moduleTsPath = path.join(remoteSrcPath, 'app', 'module.ts');
+        tools.replaceInFileSync(moduleTsPath, '// IMPORTS', importsContent.join('\n'));
+        tools.replaceInFileSync(moduleTsPath, '// DEFINITIONS', definitionsContent.join(',\n'));
+        tools.replaceInFileSync(moduleTsPath, '// DECLARATIONS', declarationsContent.join('\n'));
+        tools.replaceInFileSync(moduleTsPath, '// PROVIDERS', providersContent.join(',\n'));
+        tools.replaceInFileSync(moduleTsPath, '// CONSTRUCTOR DECLARATIONS', constructorDeclarationsContent.join('\n'));
+
         tools.logInfo('Replacing skeleton config tokens');
         tools.replaceInPath(remoteSrcPath, '@remote.name@', remote.name);
         tools.replaceInPath(remoteSrcPath, '@base.url@', remote.skeletonConfig.baseUrl);

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');