@eui/tools 6.21.11 → 6.21.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- 6.21.11
1
+ 6.21.13
package/CHANGELOG.md CHANGED
@@ -1,3 +1,21 @@
1
+ ## 6.21.13 (2024-12-12)
2
+
3
+ ##### Chores
4
+
5
+ * **other:**
6
+ * adapt eslint to use mjs file format - EUI-10289 [EUI-10289](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-10289) ([0d7f5659](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0d7f5659a898c126a9d6b7d39ad0d87538800cfe))
7
+
8
+ * * *
9
+ * * *
10
+ ## 6.21.12 (2024-12-11)
11
+
12
+ ##### Chores
13
+
14
+ * **other:**
15
+ * adapted pwa serviceWorker injection for v18 - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121) ([1f510a8a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/1f510a8a86a34f44f1524f836bdf20d78a672583))
16
+
17
+ * * *
18
+ * * *
1
19
  ## 6.21.11 (2024-12-02)
2
20
 
3
21
  ##### Chores
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eui/tools",
3
- "version": "6.21.11",
3
+ "version": "6.21.13",
4
4
  "tag": "latest",
5
5
  "license": "EUPL-1.1",
6
6
  "description": "eUI common tools and scripts",
@@ -388,7 +388,11 @@ module.exports.registerAngularProjectDef = (project, build = false, element = fa
388
388
  // checking pwa additional injection
389
389
  if (project.build && project.build.pwa) {
390
390
  jsonFile['projects'][project.name].architect.build.options.serviceWorker = true;
391
- jsonFile['projects'][project.name].architect.build.options.ngswConfigPath = `${project.folder}/ngsw-config.json`;
391
+ if (packageEuiVersionNumber >= 18) {
392
+ jsonFile['projects'][project.name].architect.build.options.serviceWorker = `${project.folder}/ngsw-config.json`;
393
+ } else {
394
+ jsonFile['projects'][project.name].architect.build.options.ngswConfigPath = `${project.folder}/ngsw-config.json`;
395
+ }
392
396
  jsonFile['projects'][project.name].architect.build.options.assets.push(`apps/${project.name}/src/manifest.webmanifest`);
393
397
  }
394
398
  }
@@ -68,6 +68,8 @@ const getProjectPaths = (prj) => {
68
68
  paths.tslintPath = path.join(rootPath, '.tslint.json');
69
69
  } else if (tools.isFileExists(path.join(rootPath, 'src', '.eslintrc.json'))) {
70
70
  paths.eslintPath = path.join(rootPath, 'src', '.eslintrc.json');
71
+ } else if (tools.isFileExists(path.join(rootPath, 'src', 'eslint.config.mjs'))) {
72
+ paths.eslintPath = path.join(rootPath, 'src', 'eslint.config.mjs');
71
73
  }
72
74
 
73
75
  return { paths: paths };
@@ -61,6 +61,7 @@ module.exports.build = (pkg, isMaster) => {
61
61
 
62
62
  const tsLintPath = path.join(pkg.paths.root, 'tslint.json');
63
63
  const esLintPath = path.join(pkg.paths.root, '.eslintrc.json');
64
+ const esLintPathMjs = path.join(pkg.paths.root, 'eslint.config.mjs');
64
65
 
65
66
  if (tools.isFileExists(tsLintPath)) {
66
67
  // TODO: remove TSLint since it's deprecated and should not be used by projects in the future
@@ -69,7 +70,7 @@ module.exports.build = (pkg, isMaster) => {
69
70
  tools.logInfo(`running ${script}`);
70
71
  return tools.runScript(script);
71
72
 
72
- } else if(tools.isFileExists(esLintPath)) {
73
+ } else if(tools.isFileExists(esLintPath) || tools.isFileExists(esLintPathMjs)) {
73
74
  // the project path information are located inside the .eslintrc.json
74
75
  tools.logInfo(`running ng lint ${pkg.name}`);
75
76