@eui/tools 6.2.35 → 6.2.37

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.
Files changed (15) hide show
  1. package/.version.properties +1 -1
  2. package/CHANGELOG.md +18 -0
  3. package/package.json +1 -1
  4. package/scripts/csdr/cli/constants.js +1 -1
  5. package/scripts/csdr/cli/package-build-frontend.js +9 -0
  6. package/scripts/csdr/cli/package.js +5 -1
  7. package/scripts/csdr/cli/skeletons/package/frontend-eui15/.eslintrc.json +79 -0
  8. package/scripts/csdr/cli/skeletons/package/frontend-eui15/tsconfig.lib.json +32 -0
  9. package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/module.component.ts +1 -1
  10. package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/reducers/index.ts +1 -0
  11. package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/polyfills.ts +1 -0
  12. package/scripts/csdr/config/angular.js +8 -1
  13. package/scripts/csdr/config/config-skeletons.js +4 -1
  14. package/scripts/csdr/config/register.js +5 -1
  15. package/scripts/utils/pre-build/translations/elements.js +1 -1
package/.version.properties CHANGED
@@ -1 +1 @@
1
- 6.2.35
1
+ 6.2.37
package/CHANGELOG.md CHANGED
@@ -1,3 +1,21 @@
1
+ ## 6.2.37 (2022-11-21)
2
+
3
+ ##### Chores
4
+
5
+ * **other:**
6
+ * csdr cli add eslint config to new v15 frontend pkg - force cli analytics - MWP-9039 [MWP-9039](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9039) ([7d0c1563](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/7d0c15636228c1c07fd06a31981d94859bca94da))
7
+
8
+ * * *
9
+ * * *
10
+ ## 6.2.36 (2022-11-18)
11
+
12
+ ##### Bug Fixes
13
+
14
+ * **other:**
15
+ * cli - generation of normal package - translation for virtual remote compilation - MWP-9039 [MWP-9039](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9039) ([304e85ee](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/304e85ee271da0c1ef1c5f9b63a600c44097da29))
16
+
17
+ * * *
18
+ * * *
1
19
  ## 6.2.35 (2022-11-17)
2
20
 
3
21
  ##### Bug Fixes
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eui/tools",
3
- "version": "6.2.35",
3
+ "version": "6.2.37",
4
4
  "tag": "latest",
5
5
  "license": "EUPL-1.1",
6
6
  "description": "eUI common tools and scripts",
package/scripts/csdr/cli/constants.js CHANGED
@@ -36,7 +36,7 @@ module.exports.DEFAULT_CONFIG = {
36
36
  pkgScope: '@zzz',
37
37
  isRouteModule: true,
38
38
  isCsdrRepo: true,
39
- isEnvTargetRemote: true,
39
+ isEnvTargetRemote: false,
40
40
  isVirtualRemote: false,
41
41
  externalRepoName: null,
42
42
  pkgGroupId: 'eu.europa.ec.cc'
package/scripts/csdr/cli/package-build-frontend.js CHANGED
@@ -216,6 +216,15 @@ const generateDefault = ({fullName, targetPath, rootPackagePath, pkg, args = con
216
216
  }
217
217
  })
218
218
 
219
+ .then(() => {
220
+ if (
221
+ args.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.DEFAULT &&
222
+ args.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15
223
+ ) {
224
+ return tools.remove(path.join(targetPath, 'tslint.json'));
225
+ }
226
+ })
227
+
219
228
  .then(() => {
220
229
  tools.logSuccess();
221
230
  })
package/scripts/csdr/cli/package.js CHANGED
@@ -33,7 +33,7 @@ module.exports.generate = () => {
33
33
  // merging with defaults
34
34
  answers = { ...constants.DEFAULT_CONFIG, ...answers};
35
35
 
36
- // forcing config default if v15 virtual remote only generation
36
+ // forcing config default for remotes
37
37
  if (
38
38
  answers.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15 &&
39
39
  answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE
@@ -41,6 +41,10 @@ module.exports.generate = () => {
41
41
  answers.isVirtualRemote = true;
42
42
  }
43
43
 
44
+ if (answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE) {
45
+ answers.isEnvTargetRemote = true;
46
+ }
47
+
44
48
  tools.logInfo('Provided options :');
45
49
  console.log(answers);
46
50
 
package/scripts/csdr/cli/skeletons/package/frontend-eui15/.eslintrc.json ADDED
@@ -0,0 +1,79 @@
1
+ {
2
+ "extends": "../../.eslintrc.json",
3
+ "ignorePatterns": [
4
+ "!**/*",
5
+ "**/*.d.ts",
6
+ "dist"
7
+ ],
8
+ "overrides": [
9
+ {
10
+ "files": [
11
+ "*.ts"
12
+ ],
13
+ "parserOptions": {
14
+ "createDefaultProgram": true
15
+ },
16
+ "rules": {
17
+ "@angular-eslint/component-selector": [
18
+ "error",
19
+ {
20
+ "type": "element",
21
+ "prefix": "@module.scope.string@",
22
+ "style": "kebab-case"
23
+ }
24
+ ],
25
+ "@angular-eslint/directive-selector": [
26
+ "error",
27
+ {
28
+ "type": "attribute",
29
+ "prefix": "@module.scope.string@",
30
+ "style": "camelCase"
31
+ }
32
+ ],
33
+ "@typescript-eslint/ban-ts-comment": "off",
34
+ "@typescript-eslint/ban-types": "error",
35
+ "@typescript-eslint/consistent-type-definitions": "off",
36
+ "@typescript-eslint/dot-notation": "off",
37
+ "@typescript-eslint/explicit-member-accessibility": [
38
+ "off",
39
+ {
40
+ "accessibility": "explicit"
41
+ }
42
+ ],
43
+ "@typescript-eslint/no-inferrable-types": "off",
44
+ "@typescript-eslint/no-unused-vars": "off",
45
+ "@typescript-eslint/no-var-requires": "error",
46
+ "@typescript-eslint/require-await": "error",
47
+ "id-blacklist": "off",
48
+ "id-match": "off",
49
+ "max-len": [
50
+ "error",
51
+ {
52
+ "code": 160
53
+ }
54
+ ],
55
+ "no-duplicate-case": "error",
56
+ "no-duplicate-imports": "off",
57
+ "no-invalid-this": "error",
58
+ "no-multiple-empty-lines": [
59
+ "error",
60
+ {
61
+ "max": 1
62
+ }
63
+ ],
64
+ "no-new-func": "error",
65
+ "no-template-curly-in-string": "error",
66
+ "no-underscore-dangle": "off",
67
+ "no-var": "off",
68
+ "prefer-const": "off",
69
+ "comma-dangle": "off"
70
+ }
71
+ },
72
+ {
73
+ "files": [
74
+ "*.html"
75
+ ],
76
+ "rules": {}
77
+ }
78
+ ]
79
+ }
package/scripts/csdr/cli/skeletons/package/frontend-eui15/tsconfig.lib.json ADDED
@@ -0,0 +1,32 @@
1
+ {
2
+ "extends": "../../tsconfig.build.json",
3
+ "compilerOptions": {
4
+ "outDir": "./out-tsc/lib",
5
+ "target": "ES2022",
6
+ "module": "ES2022",
7
+ "moduleResolution": "node",
8
+ "declaration": true,
9
+ "sourceMap": true,
10
+ "inlineSources": true,
11
+ "emitDecoratorMetadata": true,
12
+ "experimentalDecorators": true,
13
+ "importHelpers": true,
14
+ "types": [],
15
+ "lib": [
16
+ "ES2022",
17
+ "dom"
18
+ ]
19
+ },
20
+ "angularCompilerOptions": {
21
+ "annotateForClosureCompiler": true,
22
+ "skipTemplateCodegen": true,
23
+ "strictMetadataEmit": true,
24
+ "fullTemplateTypeCheck": true,
25
+ "strictInjectionParameters": true,
26
+ "enableResourceInlining": true
27
+ },
28
+ "exclude": [
29
+ "src/test.ts",
30
+ "**/*.spec.ts"
31
+ ]
32
+ }
package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/module.component.ts CHANGED
@@ -71,7 +71,7 @@ export class ModuleComponent implements OnInit, OnDestroy {
71
71
  try {
72
72
  this.elementSetupService.init()
73
73
  .pipe(take(1))
74
- .subscribe((loadStatus: { success: boolean, error?: string }) => {
74
+ .subscribe((loadStatus: { success: boolean; error?: string }) => {
75
75
  if (!loadStatus.success) {
76
76
  this.setStatus(ElementStatus.Error);
77
77
  console.error(`[ELEMENT: ${this.config.global.elementName}] `, loadStatus.error);
package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/reducers/index.ts CHANGED
@@ -1,3 +1,4 @@
1
+ /* eslint-disable */
1
2
  import { InjectionToken } from '@angular/core';
2
3
  import { ActionReducer, ActionReducerMap, MetaReducer } from '@ngrx/store';
3
4
  import * as fromRouter from '@ngrx/router-store';
package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/polyfills.ts CHANGED
@@ -1,3 +1,4 @@
1
+ /* eslint-disable */
1
2
  /**
2
3
  * This file includes polyfills needed by Angular and is loaded before the app.
3
4
  * You can add your own extra polyfills to this file.
package/scripts/csdr/config/angular.js CHANGED
@@ -216,22 +216,29 @@ module.exports.registerAngularProjectDef = (project, build = false, element = fa
216
216
  if (project.csdrFullSkeleton) {
217
217
  if (euiVersion === '13.x') {
218
218
  projectDef = JSON.stringify(angularProjectDefFullSkeletonV13);
219
+ tools.logInfo(`----using angularProjectDefFullSkeletonV13`);
219
220
  } else if (euiVersion === '14.x' || euiVersion === '15.x') {
220
221
  projectDef = JSON.stringify(angularProjectDefFullSkeletonV14);
222
+ tools.logInfo(`----using angularProjectDefFullSkeletonV14`);
221
223
  } else {
222
224
  projectDef = JSON.stringify(angularProjectDefFullSkeleton);
225
+ tools.logInfo(`----using angularProjectDefFullSkeleton`);
223
226
  }
224
227
 
225
228
  } else {
226
229
  if (euiVersion === '13.x') {
227
230
  projectDef = JSON.stringify(angularProjectDefV13);
231
+ tools.logInfo(`----using angularProjectDefV13`);
228
232
  } else if (euiVersion === '14.x' || euiVersion === '15.x') {
229
- projectDef = JSON.stringify(angularProjectDefV14);
233
+ projectDef = JSON.stringify(angularProjectDefV14);
234
+ tools.logInfo(`----using angularProjectDefV14`);
230
235
  } else {
231
236
  if (project.build && project.build.csdrFileReplacement === true) {
232
237
  projectDef = JSON.stringify(angularProjectLightDef);
238
+ tools.logInfo(`----using angularProjectLightDef`);
233
239
  } else {
234
240
  projectDef = JSON.stringify(angularProjectDef);
241
+ tools.logInfo(`----using angularProjectDef`);
235
242
  }
236
243
  }
237
244
  }
package/scripts/csdr/config/config-skeletons.js CHANGED
@@ -4,7 +4,10 @@ module.exports.angularConfigDef = {
4
4
  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
5
5
  "version": 1,
6
6
  "newProjectRoot": "apps",
7
- "projects": {}
7
+ "projects": {},
8
+ "cli": {
9
+ "analytics": false
10
+ }
8
11
  };
9
12
 
10
13
 
package/scripts/csdr/config/register.js CHANGED
@@ -116,7 +116,11 @@ module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName,
116
116
  "euiVersion": "15.x",
117
117
  "build": {
118
118
  "compiledTranslations": true,
119
- "translationScopes": "eui,csdr,cc,mywp"
119
+ "translationScopes": "eui,csdr,cc,mywp",
120
+ "envTargetActive": true,
121
+ "skipLint": true,
122
+ "skipTest": true,
123
+ "sonarScanner": false
120
124
  },
121
125
  "release": {
122
126
  "team": "cc-ui-rm"
package/scripts/utils/pre-build/translations/elements.js CHANGED
@@ -22,7 +22,7 @@ module.exports.generate = (inputScopes = '', inputPkg) => {
22
22
  pkg = configUtils.packages.getPackage();
23
23
  }
24
24
 
25
- const rootFolder = pkg.paths.pkgRootDirectory;
25
+ const rootFolder = pkg.paths.root;
26
26
  const rootSrcFolder = path.join(rootFolder,'src');
27
27
  const destFolder = path.join(rootSrcFolder, 'assets/i18n-compiled');
28
28
  const globalTranslationsFolder = path.join(rootSrcFolder, 'assets/i18n-global');