@o3r/workspace 12.1.0-prerelease.9 → 12.1.0-prerelease.91

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 (52) hide show
  1. package/migration.json +5 -0
  2. package/package.json +58 -44
  3. package/schematics/application/index.d.ts +1 -2
  4. package/schematics/application/index.d.ts.map +1 -1
  5. package/schematics/application/index.js +1 -1
  6. package/schematics/application/index.js.map +1 -1
  7. package/schematics/application/schema.json +1 -2
  8. package/schematics/library/index.d.ts +1 -2
  9. package/schematics/library/index.d.ts.map +1 -1
  10. package/schematics/library/index.js +1 -1
  11. package/schematics/library/index.js.map +1 -1
  12. package/schematics/library/schema.json +1 -2
  13. package/schematics/library/templates/jest/testing/setup-jest.ts.template +5 -1
  14. package/schematics/library/templates/ng/jest/tsconfig.spec.json.template +1 -7
  15. package/schematics/ng-add/helpers/commit-hooks/index.d.ts.map +1 -1
  16. package/schematics/ng-add/helpers/renovate/index.d.ts.map +1 -1
  17. package/schematics/ng-add/helpers/renovate/index.js +4 -0
  18. package/schematics/ng-add/helpers/renovate/index.js.map +1 -1
  19. package/schematics/ng-add/helpers/renovate/templates/__dot__renovaterc.json.template +5 -5
  20. package/schematics/ng-add/index.d.ts +1 -2
  21. package/schematics/ng-add/index.d.ts.map +1 -1
  22. package/schematics/ng-add/index.js +1 -1
  23. package/schematics/ng-add/index.js.map +1 -1
  24. package/schematics/ng-add/project-setup.d.ts.map +1 -1
  25. package/schematics/ng-add/project-setup.js +14 -14
  26. package/schematics/ng-add/project-setup.js.map +1 -1
  27. package/schematics/ng-add/schema.d.ts +4 -0
  28. package/schematics/ng-add/schema.d.ts.map +1 -1
  29. package/schematics/ng-add/schema.json +9 -2
  30. package/schematics/ng-update/index.d.ts +5 -1
  31. package/schematics/ng-update/index.d.ts.map +1 -1
  32. package/schematics/ng-update/index.js +18 -2
  33. package/schematics/ng-update/index.js.map +1 -1
  34. package/schematics/ng-update/v12.1/renovate-version.d.ts +3 -0
  35. package/schematics/ng-update/v12.1/renovate-version.d.ts.map +1 -0
  36. package/schematics/ng-update/v12.1/renovate-version.js +32 -0
  37. package/schematics/ng-update/v12.1/renovate-version.js.map +1 -0
  38. package/schematics/rule-factories/index.d.ts +0 -1
  39. package/schematics/rule-factories/index.d.ts.map +1 -1
  40. package/schematics/rule-factories/index.js +0 -1
  41. package/schematics/rule-factories/index.js.map +1 -1
  42. package/schematics/sdk/index.d.ts +1 -2
  43. package/schematics/sdk/index.d.ts.map +1 -1
  44. package/schematics/sdk/index.js +1 -1
  45. package/schematics/sdk/index.js.map +1 -1
  46. package/src/utils/jest.helpers.d.ts.map +1 -1
  47. package/src/utils/jest.helpers.js +2 -2
  48. package/src/utils/jest.helpers.js.map +1 -1
  49. package/schematics/rule-factories/linter.d.ts +0 -14
  50. package/schematics/rule-factories/linter.d.ts.map +0 -1
  51. package/schematics/rule-factories/linter.js +0 -34
  52. package/schematics/rule-factories/linter.js.map +0 -1
package/migration.json CHANGED
@@ -5,6 +5,11 @@
5
5
  "version": "10.1.0-alpha.0",
6
6
  "description": "Updates of @o3r/workspace to v10.1.*",
7
7
  "factory": "./schematics/ng-update/index#updateV10_1"
8
+ },
9
+ "migration-v12_1": {
10
+ "version": "12.1.0-prerelease.0",
11
+ "description": "Updates of @o3r/workspace to v12.1.*",
12
+ "factory": "./schematics/ng-update/index#updateV12_1"
8
13
  }
9
14
  }
10
15
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/workspace",
3
- "version": "12.1.0-prerelease.9",
3
+ "version": "12.1.0-prerelease.91",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -9,6 +9,19 @@
9
9
  "workspace",
10
10
  "otter"
11
11
  ],
12
+ "exports": {
13
+ ".": {
14
+ "types": "./src/public_api.d.ts",
15
+ "default": "./src/public_api.js"
16
+ },
17
+ "./package.json": {
18
+ "node": "./package.json"
19
+ },
20
+ "./builders/*": {
21
+ "types": "./builders/*.d.ts",
22
+ "default": "./builders/*"
23
+ }
24
+ },
12
25
  "scripts": {
13
26
  "nx": "nx",
14
27
  "ng": "yarn nx",
@@ -22,14 +35,14 @@
22
35
  "main": "./src/public_api.js",
23
36
  "types": "./src/public_api.d.ts",
24
37
  "peerDependencies": {
25
- "@angular-devkit/architect": "^0.1900.0",
38
+ "@angular-devkit/architect": ">=0.1900.0 <0.2000.0-0",
26
39
  "@angular-devkit/core": "^19.0.0",
27
40
  "@angular-devkit/schematics": "^19.0.0",
28
41
  "@angular/cli": "^19.0.0",
29
42
  "@angular/common": "^19.0.0",
30
43
  "@angular/compiler-cli": "^19.0.0",
31
44
  "@angular/core": "^19.0.0",
32
- "@o3r/telemetry": "^12.1.0-prerelease.9",
45
+ "@o3r/telemetry": "^12.1.0-prerelease.91",
33
46
  "@schematics/angular": "^19.0.0",
34
47
  "ts-node": "~10.9.2",
35
48
  "type-fest": "^4.10.2",
@@ -47,7 +60,7 @@
47
60
  }
48
61
  },
49
62
  "dependencies": {
50
- "@o3r/schematics": "^12.1.0-prerelease.9",
63
+ "@o3r/schematics": "^12.1.0-prerelease.91",
51
64
  "commander": "^13.0.0",
52
65
  "globby": "^11.1.0",
53
66
  "semver": "^7.5.2",
@@ -56,56 +69,57 @@
56
69
  "winston": "^3.8.2"
57
70
  },
58
71
  "devDependencies": {
59
- "@angular-devkit/architect": "~0.1900.0",
60
- "@angular-devkit/build-angular": "~19.0.0",
61
- "@angular-devkit/core": "~19.0.0",
62
- "@angular-devkit/schematics": "~19.0.0",
63
- "@angular/animations": "~19.0.0",
64
- "@angular/cli": "~19.0.0",
65
- "@angular/common": "~19.0.0",
66
- "@angular/compiler": "~19.0.0",
67
- "@angular/compiler-cli": "~19.0.0",
68
- "@angular/core": "~19.0.0",
69
- "@angular/platform-browser": "~19.0.0",
70
- "@angular/platform-browser-dynamic": "~19.0.0",
71
- "@angular/router": "~19.0.0",
72
+ "@angular-devkit/architect": "~0.1902.0",
73
+ "@angular-devkit/build-angular": "~19.2.0",
74
+ "@angular-devkit/core": "~19.2.0",
75
+ "@angular-devkit/schematics": "~19.2.0",
76
+ "@angular/animations": "~19.2.0",
77
+ "@angular/cli": "~19.2.0",
78
+ "@angular/common": "~19.2.0",
79
+ "@angular/compiler": "~19.2.0",
80
+ "@angular/compiler-cli": "~19.2.0",
81
+ "@angular/core": "~19.2.0",
82
+ "@angular/platform-browser": "~19.2.0",
83
+ "@angular/platform-browser-dynamic": "~19.2.0",
84
+ "@angular/router": "~19.2.0",
72
85
  "@babel/core": "~7.26.0",
73
86
  "@babel/preset-typescript": "~7.26.0",
74
87
  "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
75
88
  "@ngrx/entity": "~19.0.0",
76
89
  "@ngrx/store": "~19.0.0",
77
- "@nx/angular": "~20.2.0",
78
- "@nx/eslint": "~20.2.0",
79
- "@nx/eslint-plugin": "~20.2.0",
80
- "@nx/jest": "~20.2.0",
81
- "@nx/js": "~20.2.0",
82
- "@nx/workspace": "~20.2.0",
83
- "@o3r/build-helpers": "^12.1.0-prerelease.9",
84
- "@o3r/core": "^12.1.0-prerelease.9",
85
- "@o3r/eslint-plugin": "^12.1.0-prerelease.9",
86
- "@o3r/schematics": "^12.1.0-prerelease.9",
87
- "@o3r/test-helpers": "^12.1.0-prerelease.9",
88
- "@schematics/angular": "~19.0.0",
89
- "@stylistic/eslint-plugin": "~3.0.0",
90
+ "@nx/angular": "~20.4.0",
91
+ "@nx/eslint": "~20.4.0",
92
+ "@nx/eslint-plugin": "~20.4.0",
93
+ "@nx/jest": "~20.4.0",
94
+ "@nx/js": "~20.4.0",
95
+ "@nx/workspace": "~20.4.0",
96
+ "@o3r/build-helpers": "^12.1.0-prerelease.91",
97
+ "@o3r/core": "^12.1.0-prerelease.91",
98
+ "@o3r/eslint-plugin": "^12.1.0-prerelease.91",
99
+ "@o3r/schematics": "^12.1.0-prerelease.91",
100
+ "@o3r/telemetry": "^12.1.0-prerelease.91",
101
+ "@o3r/test-helpers": "^12.1.0-prerelease.91",
102
+ "@schematics/angular": "~19.2.0",
103
+ "@stylistic/eslint-plugin": "~3.1.0",
90
104
  "@types/jest": "~29.5.2",
91
105
  "@types/minimist": "^1.2.2",
92
106
  "@types/node": "^20.0.0",
93
107
  "@types/pid-from-port": "^1.1.0",
94
108
  "@types/semver": "^7.3.13",
95
109
  "@types/uuid": "^10.0.0",
96
- "@typescript-eslint/parser": "~8.22.0",
97
- "angular-eslint": "~19.0.0",
110
+ "@typescript-eslint/parser": "~8.26.0",
111
+ "angular-eslint": "~19.2.0",
98
112
  "cpy-cli": "^5.0.0",
99
- "eslint": "~9.19.0",
100
- "eslint-import-resolver-node": "^0.3.9",
101
- "eslint-import-resolver-typescript": "^3.6.3",
102
- "eslint-plugin-import": "^2.31.0",
103
- "eslint-plugin-import-newlines": "^1.4.0",
113
+ "eslint": "~9.21.0",
114
+ "eslint-import-resolver-node": "~0.3.9",
115
+ "eslint-import-resolver-typescript": "~3.8.0",
116
+ "eslint-plugin-import": "~2.31.0",
117
+ "eslint-plugin-import-newlines": "~1.4.0",
104
118
  "eslint-plugin-jest": "~28.11.0",
105
119
  "eslint-plugin-jsdoc": "~50.6.0",
106
120
  "eslint-plugin-prefer-arrow": "~1.2.3",
107
- "eslint-plugin-unicorn": "^56.0.0",
108
- "eslint-plugin-unused-imports": "^4.1.4",
121
+ "eslint-plugin-unicorn": "~56.0.0",
122
+ "eslint-plugin-unused-imports": "~4.1.4",
109
123
  "globals": "^15.9.0",
110
124
  "jest": "~29.7.0",
111
125
  "jest-environment-jsdom": "~29.7.0",
@@ -113,19 +127,19 @@
113
127
  "jest-preset-angular": "~14.5.0",
114
128
  "jsonc-eslint-parser": "~2.4.0",
115
129
  "minimist": "^1.2.6",
116
- "nx": "~20.2.0",
130
+ "nx": "~20.4.0",
117
131
  "pid-from-port": "^1.1.3",
118
132
  "rxjs": "^7.8.1",
119
133
  "ts-jest": "~29.2.5",
120
134
  "ts-node": "~10.9.2",
121
135
  "type-fest": "^4.30.1",
122
- "typescript": "~5.6.2",
123
- "typescript-eslint": "~8.22.0",
136
+ "typescript": "~5.8.2",
137
+ "typescript-eslint": "~8.26.0",
124
138
  "zone.js": "~0.15.0"
125
139
  },
126
140
  "generatorDependencies": {
127
141
  "@angular-builders/jest": "~19.0.0",
128
- "@angular/material": "~19.0.0",
142
+ "@angular/material": "~19.2.0",
129
143
  "@commitlint/cli": "^19.0.0",
130
144
  "@commitlint/config-angular": "^19.0.0",
131
145
  "@commitlint/config-conventional": "^19.0.0",
@@ -139,7 +153,7 @@
139
153
  "lint-staged": "^15.0.0"
140
154
  },
141
155
  "engines": {
142
- "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
156
+ "node": "^20.11.1 || >=22.0.0"
143
157
  },
144
158
  "schematics": "./collection.json",
145
159
  "builders": "./builders.json",
@@ -1,8 +1,7 @@
1
1
  import { Rule } from '@angular-devkit/schematics';
2
- import type { NgGenerateApplicationSchema } from './schema';
3
2
  /**
4
3
  * Add an Otter application to a monorepo
5
4
  * @param options Schematic options
6
5
  */
7
- export declare const generateApplication: (options: NgGenerateApplicationSchema) => Rule;
6
+ export declare const generateApplication: (options: any) => Rule;
8
7
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAyBpC,OAAO,KAAK,EACV,2BAA2B,EAC5B,MAAM,UAAU,CAAC;AA4GlB;;;GAGG;AACH,eAAO,MAAM,mBAAmB,gDAA+D,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAuIpC;;;GAGG;AACH,eAAO,MAAM,mBAAmB,wBAA8C,CAAC"}
@@ -103,5 +103,5 @@ function generateApplicationFn(options) {
103
103
  * Add an Otter application to a monorepo
104
104
  * @param options Schematic options
105
105
  */
106
- exports.generateApplication = (0, schematics_2.createSchematicWithMetricsIfInstalled)(generateApplicationFn);
106
+ exports.generateApplication = (0, schematics_2.createOtterSchematic)(generateApplicationFn);
107
107
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAcoC;AACpC,gDAQyB;AAIzB,mEAEgD;AAChD,2EAEkD;AAIlD,mDAEiC;AAKjC;;;;;;GAMG;AACH,SAAS,0BAA0B,CAAC,IAAU,EAAE,KAAe,EAAE,UAAkB;IACjF,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAChE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,SAAS,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED;;;GAGG;AACH,SAAS,qBAAqB,CAAC,OAAoC;IACjE,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAgB,CAAC;IACpJ,MAAM,eAAe,GAAG,oBAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAE3E,MAAM,uBAAuB,GAAG,CAAC,UAAkB,EAAE,gBAAoD,EAAE,gBAAwB,EAAE,EAAE;QACrI,OAAO,IAAA,sBAAS,EAAC,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,aAAa,CAAC,EAAE;YACzC,IAAA,qBAAQ,EAAC;gBACP,GAAG,OAAO;gBACV,gBAAgB;gBAChB,iBAAiB,EAAjB,8BAAiB;gBACjB,IAAI,EAAE,eAAe;gBACrB,gBAAgB;aACjB,CAAC;YACF,IAAA,iBAAI,EAAC,UAAU,CAAC;YAChB,IAAA,gCAAmB,GAAE;SACtB,CAAC,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC;IAC/B,CAAC,CAAC;IAEF,MAAM,WAAW,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAC1C,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;YAC9C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;QAC3F,CAAC;QAED,MAAM,MAAM,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,2FAA2F,CAAC,CAAC;QAC/G,CAAC;QACD,IAAI,IAAA,wBAAW,EAAC,IAAI,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,uGAAuG,CAAC,CAAC;QAC3H,CAAC;QAED,MAAM,WAAW,GAAG,IAAA,sCAAyB,EAAC,IAAI,EAAE,OAAO,EAAE,MAAO,EAAE,aAAa,CAAC,CAAC;QAErF,6DAA6D;QAC7D,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,WAAW,EAAE,SAAS,CAAC,CAAC;QAC5E,+DAA+D;QAC/D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QACrD,MAAM,eAAe,GAAG,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC;QAE5F,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAgB,CAAC;QAEtE,MAAM,gBAAgB,GAAG,EAAE,GAAG,eAAe,CAAC,YAAY,EAAE,GAAG,eAAe,CAAC,eAAe,EAAE,CAAC;QAEjG,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;QAE/G,MAAM,UAAU,GAAG,CAAC,MAA2B,EAAE,EAAE;YACjD,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,UAAU,IAAI,EAAE,CAAC;YACtE,OAAO,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACpC,CAAC,CAAC;QACF,MAAM,cAAc,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;QAEpD,MAAM,YAAY,GAAG;YACnB,WAAW,EAAE;gBACX,UAAU,EAAE;oBACV;wBACE,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,qBAAqB,CAAC,OAAQ,EAAE;wBAC/E,KAAK,EAAE,CAAC,iCAAkB,CAAC,OAAO,CAAC;qBACpC;iBACF;gBACD,YAAY,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE;aAC3D;SACiD,CAAC;QAErD,MAAM,gBAAgB,GAAG,0BAA0B,CAAC,IAAI,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE,UAAU,CAAC,CAAC;QAE/G,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,8BAAiB,EAA8B,qBAAqB,EAAE,aAAa,EAAE;gBACnF,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACrI,IAAI,EAAE,SAAS;gBACf,WAAW;gBACX,KAAK,EAAE,cAAK,CAAC,IAAI;aAAE,CAAC;YACtB,uBAAuB,CAAC,UAAU,EAAE,gBAAgB,EAAE,gBAAgB,CAAC;YACvE,IAAA,6BAAqB,EAAC,UAAU,EAAE,mBAAmB,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC;YAClF,IAAA,8BAAiB,EAAC;gBAChB,YAAY;gBACZ,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;gBACrC,WAAW,EAAE,SAAS;aACvB,CAAC;SACH,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;;GAGG;AACU,QAAA,mBAAmB,GAAG,IAAA,iCAAoB,EAAC,qBAAqB,CAAC,CAAC"}
@@ -49,8 +49,7 @@
49
49
  },
50
50
  "exactO3rVersion": {
51
51
  "type": "boolean",
52
- "description": "Use a pinned version for otter packages",
53
- "default": false
52
+ "description": "Use a pinned version for otter packages"
54
53
  }
55
54
  },
56
55
  "required": ["name"],
@@ -1,8 +1,7 @@
1
1
  import { Rule } from '@angular-devkit/schematics';
2
- import { NgGenerateModuleSchema } from './schema';
3
2
  /**
4
3
  * Add an Otter compatible module to a monorepo
5
4
  * @param options Schematic options
6
5
  */
7
- export declare const generateModule: (options: NgGenerateModuleSchema) => Rule;
6
+ export declare const generateModule: (options: any) => Rule;
8
7
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EAEL,MAAM,4BAA4B,CAAC;AA0BpC,OAAO,EACL,sBAAsB,EACvB,MAAM,UAAU,CAAC;AAmDlB;;;GAGG;AACH,eAAO,MAAM,cAAc,2CAA0D,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EAEL,MAAM,4BAA4B,CAAC;AA+EpC;;;GAGG;AACH,eAAO,MAAM,cAAc,wBAAyC,CAAC"}
@@ -57,5 +57,5 @@ function generateModuleFn(options) {
57
57
  * Add an Otter compatible module to a monorepo
58
58
  * @param options Schematic options
59
59
  */
60
- exports.generateModule = (0, schematics_2.createSchematicWithMetricsIfInstalled)(generateModuleFn);
60
+ exports.generateModule = (0, schematics_2.createOtterSchematic)(generateModuleFn);
61
61
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":"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"}
@@ -38,8 +38,7 @@
38
38
  },
39
39
  "exactO3rVersion": {
40
40
  "type": "boolean",
41
- "description": "Use a pinned version for otter packages",
42
- "default": false
41
+ "description": "Use a pinned version for otter packages"
43
42
  }
44
43
  },
45
44
  "required": ["name"],
@@ -1,2 +1,6 @@
1
- import 'jest-preset-angular/setup-jest';
1
+ import {
2
+ setupZoneTestEnv,
3
+ } from 'jest-preset-angular/setup-env/zone';
4
+
5
+ setupZoneTestEnv();
2
6
 
@@ -1,17 +1,11 @@
1
1
  {
2
2
  "extends": "<%= tsconfigSpecPath %>",
3
3
  "compilerOptions": {
4
- "composite": true,
5
4
  "outDir": "test",
6
5
  "rootDir": "."
7
6
  },
8
7
  "include": [
9
8
  "./src/**/*.spec.ts"
10
9
  ],
11
- "exclude": [],
12
- "references": [
13
- {
14
- "path": "./tsconfig.build.composite.json"
15
- }
16
- ]
10
+ "exclude": []
17
11
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/commit-hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EACT,KAAK,gBAAgB,EACrB,KAAK,MAAM,EAGZ,MAAM,4BAA4B,CAAC;AAUpC,wDAAwD;AACxD,eAAO,MAAM,yBAAyB,UAQrC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,gBAAgB,cAC3C,MAAM,EAAE,UAO3B;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,EAAE,IAY7B,CAAC;AAEF;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAgB/C"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/commit-hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EACT,KAAK,gBAAgB,EACrB,KAAK,MAAM,EAGZ,MAAM,4BAA4B,CAAC;AAUpC,wDAAwD;AACxD,eAAO,MAAM,yBAAyB,UAQrC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,gBAAgB,IACrD,UAAU,MAAM,EAAE,UAO3B;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,EAAE,IAY7B,CAAC;AAEF;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAgB/C"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/renovate/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAMpC;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAgB7D"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/renovate/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AASpC;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAmB7D"}
@@ -1,6 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.generateRenovateConfig = generateRenovateConfig;
4
+ const fs = require("node:fs");
5
+ const path = require("node:path");
4
6
  const schematics_1 = require("@angular-devkit/schematics");
5
7
  const schematics_2 = require("@o3r/schematics");
6
8
  /**
@@ -8,6 +10,7 @@ const schematics_2 = require("@o3r/schematics");
8
10
  * @param rootPath @see RuleFactory.rootPath
9
11
  */
10
12
  function generateRenovateConfig(rootPath) {
13
+ const ownPackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', '..', '..', 'package.json'), { encoding: 'utf8' }));
11
14
  return (tree, context) => {
12
15
  if (tree.exists('.renovaterc.json')) {
13
16
  return tree;
@@ -15,6 +18,7 @@ function generateRenovateConfig(rootPath) {
15
18
  const templateSource = (0, schematics_1.apply)((0, schematics_1.url)((0, schematics_2.getTemplateFolder)(rootPath, __dirname)), [
16
19
  (0, schematics_1.template)({
17
20
  dot: '.',
21
+ version: ownPackageJsonContent.version,
18
22
  packageManager: (0, schematics_2.getPackageManager)()
19
23
  }),
20
24
  (0, schematics_1.renameTemplateFiles)()
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/renovate/index.ts"],"names":[],"mappings":";;AAoBA,wDAgBC;AApCD,2DAUoC;AACpC,gDAGyB;AAEzB;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,QAAgB;IACrD,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,cAAc,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,IAAA,8BAAiB,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,EAAE;YACxE,IAAA,qBAAQ,EAAC;gBACP,GAAG,EAAE,GAAG;gBACR,cAAc,EAAE,IAAA,8BAAiB,GAAE;aACpC,CAAC;YACF,IAAA,gCAAmB,GAAE;SACtB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAC,cAAc,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/renovate/index.ts"],"names":[],"mappings":";;AAyBA,wDAmBC;AA5CD,8BAA8B;AAC9B,kCAAkC;AAClC,2DAUoC;AACpC,gDAGyB;AAKzB;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,QAAgB;IACrD,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAgB,CAAC;IAEhK,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,cAAc,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,IAAA,8BAAiB,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,EAAE;YACxE,IAAA,qBAAQ,EAAC;gBACP,GAAG,EAAE,GAAG;gBACR,OAAO,EAAE,qBAAqB,CAAC,OAAO;gBACtC,cAAc,EAAE,IAAA,8BAAiB,GAAE;aACpC,CAAC;YACF,IAAA,gCAAmB,GAAE;SACtB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAC,cAAc,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC,CAAC;AACJ,CAAC"}
@@ -1,10 +1,10 @@
1
1
  {
2
2
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
3
3
  "extends": [
4
- "github>AmadeusITGroup/otter//tools/renovate/base",<% if (packageManager == 'yarn') { %>
5
- "github>AmadeusITGroup/otter//tools/renovate/otter-project"<% } else { %>
6
- "github>AmadeusITGroup/otter//tools/renovate/group/otter",
7
- "github>AmadeusITGroup/otter//tools/renovate/tasks/base",
8
- "github>AmadeusITGroup/otter//tools/renovate/tasks/otter-ng-update(npm)"<% } %>
4
+ "github>AmadeusITGroup/otter//tools/renovate/base#<%= version %>",<% if (packageManager == 'yarn') { %>
5
+ "github>AmadeusITGroup/otter//tools/renovate/otter-project#<%= version %>"<% } else { %>
6
+ "github>AmadeusITGroup/otter//tools/renovate/group/otter#<%= version %>",
7
+ "github>AmadeusITGroup/otter//tools/renovate/tasks/base#<%= version %>",
8
+ "github>AmadeusITGroup/otter//tools/renovate/tasks/otter-ng-update(npm)#<%= version %>"<% } %>
9
9
  ]
10
10
  }
@@ -1,8 +1,7 @@
1
1
  import { Rule } from '@angular-devkit/schematics';
2
- import type { NgAddSchematicsSchema } from './schema';
3
2
  /**
4
3
  * Add Otter library to an Angular Project
5
4
  * @param options
6
5
  */
7
- export declare const ngAdd: (options: NgAddSchematicsSchema) => Rule;
6
+ export declare const ngAdd: (options: any) => Rule;
8
7
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAgBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAwClB;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AA0DpC;;;GAGG;AACH,eAAO,MAAM,KAAK,wBAAgC,CAAC"}
@@ -44,5 +44,5 @@ function ngAddFn(options) {
44
44
  * Add Otter library to an Angular Project
45
45
  * @param options
46
46
  */
47
- exports.ngAdd = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngAddFn);
47
+ exports.ngAdd = (0, schematics_2.createOtterSchematic)(ngAddFn);
48
48
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAKoC;AACpC,4DAE0C;AAC1C,gDAKyB;AAIzB,mDAEyB;AAKzB;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAgB,CAAC;QAEpJ,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAK,EAAC;YACjB,sCAAsC;YACtC,IAAA,gDAAmC,EAAC,qBAAqB,CAAC;YAE1D,8BAA8B;YAC9B,IAAA,8BAAc,EAAC,OAAO,CAAC;YAEvB,qBAAqB;YACrB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACP,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;oBAC/D,MAAM,MAAM,GAAwD,OAAO,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC5H,MAAM,CAAC,OAAO,GAAG,0BAA0B,CAAC;oBAC5C,CAAC,CAAC,OAAO,CAAC,IAAI,iCAAyB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;YAED,yBAAyB;YACzB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACP,MAAM,eAAe,GAAG,IAAA,+BAAkB,EAAC,CAAC,CAAC,CAAC;gBAC9C,MAAM,QAAQ,GAAG,IAAA,sCAAyB,EAAC,eAAe,CAAC,CAAC;gBAC5D,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,8GAA8G,CAAC,CAAC;gBAC9H,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,mBAAmB,CAAC,CAAC;gBAChD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,WAAW,CAAC,CAAC;gBACxC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,eAAe,CAAC,CAAC;gBAC5C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,QAAQ,SAAS,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;YACvI,CAAC;SACF,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACU,QAAA,KAAK,GAAG,IAAA,kDAAqC,EAAC,OAAO,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAKoC;AACpC,4DAE0C;AAC1C,gDAKyB;AAIzB,mDAEyB;AAKzB;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAgB,CAAC;QAEpJ,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAK,EAAC;YACjB,sCAAsC;YACtC,IAAA,gDAAmC,EAAC,qBAAqB,CAAC;YAE1D,8BAA8B;YAC9B,IAAA,8BAAc,EAAC,OAAO,CAAC;YAEvB,qBAAqB;YACrB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACP,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;oBAC/D,MAAM,MAAM,GAAwD,OAAO,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC5H,MAAM,CAAC,OAAO,GAAG,0BAA0B,CAAC;oBAC5C,CAAC,CAAC,OAAO,CAAC,IAAI,iCAAyB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;YAED,yBAAyB;YACzB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACP,MAAM,eAAe,GAAG,IAAA,+BAAkB,EAAC,CAAC,CAAC,CAAC;gBAC9C,MAAM,QAAQ,GAAG,IAAA,sCAAyB,EAAC,eAAe,CAAC,CAAC;gBAC5D,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,8GAA8G,CAAC,CAAC;gBAC9H,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,mBAAmB,CAAC,CAAC;gBAChD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,WAAW,CAAC,CAAC;gBACxC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,eAAe,CAAC,CAAC;gBAC5C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,QAAQ,SAAS,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;YACvI,CAAC;SACF,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACU,QAAA,KAAK,GAAG,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAmCpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAelB;;;;GAIG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,KAAG,IAiF/D,CAAC"}
1
+ {"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AA+BpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAelB;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,SAAS,qBAAqB,KAAG,IAgF/D,CAAC"}
@@ -6,7 +6,6 @@ const path = require("node:path");
6
6
  const schematics_1 = require("@angular-devkit/schematics");
7
7
  const schematics_2 = require("@o3r/schematics");
8
8
  const dependencies_1 = require("@schematics/angular/utility/dependencies");
9
- const linter_1 = require("../rule-factories/linter");
10
9
  const commit_hooks_1 = require("./helpers/commit-hooks");
11
10
  const gitignore_update_1 = require("./helpers/gitignore-update");
12
11
  const npm_workspace_1 = require("./helpers/npm-workspace");
@@ -29,10 +28,18 @@ const updateEditorConfig = (tree) => {
29
28
  * @param options installation options to pass to the all the other packages' installation
30
29
  */
31
30
  const prepareProject = (options) => {
31
+ let hasEslint = false;
32
+ try {
33
+ const eslintPackage = 'eslint';
34
+ require.resolve(eslintPackage);
35
+ hasEslint = true;
36
+ }
37
+ catch { }
32
38
  const vsCodeExtensions = [
33
39
  'AmadeusITGroup.otter-devtools',
34
40
  'EditorConfig.EditorConfig',
35
- 'angular.ng-template'
41
+ 'angular.ng-template',
42
+ ...hasEslint ? ['dbaeumer.vscode-eslint'] : []
36
43
  ];
37
44
  const otterDependencies = [
38
45
  '@ama-sdk/core',
@@ -45,15 +52,11 @@ const prepareProject = (options) => {
45
52
  const ownPackageJsonPath = path.resolve(ownSchematicsFolder, '..', 'package.json');
46
53
  const depsInfo = (0, schematics_2.getO3rPeerDeps)(ownPackageJsonPath);
47
54
  const ownPackageJsonContent = JSON.parse(fs.readFileSync(ownPackageJsonPath, { encoding: 'utf8' }));
48
- return async (tree, context) => {
55
+ return (tree, context) => {
49
56
  if (!ownPackageJsonContent) {
50
57
  context.logger.error('Could not find @o3r/workspace package. Are you sure it is installed?');
51
58
  }
52
- const installOtterLinter = await (0, linter_1.shouldOtterLinterBeInstalled)(context, tree);
53
- const internalPackagesToInstallWithNgAdd = Array.from(new Set([
54
- ...(installOtterLinter ? [`@o3r/eslint-config${(0, linter_1.isUsingFlatConfig)(tree) ? '' : '-otter'}`] : []),
55
- ...depsInfo.o3rPeerDeps
56
- ]));
59
+ const internalPackagesToInstallWithNgAdd = depsInfo.o3rPeerDeps;
57
60
  const dependencies = [...internalPackagesToInstallWithNgAdd, ...otterDependencies].reduce((acc, dep) => {
58
61
  acc[dep] = {
59
62
  inManifest: [{
@@ -73,15 +76,12 @@ const prepareProject = (options) => {
73
76
  requireInstall: !options.skipPreCommitChecks && dep === 'husky'
74
77
  };
75
78
  });
76
- if (installOtterLinter) {
77
- vsCodeExtensions.push('dbaeumer.vscode-eslint');
78
- }
79
79
  const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
80
80
  return () => (0, schematics_1.chain)([
81
- (0, renovate_1.generateRenovateConfig)(__dirname),
81
+ options.skipRenovate ? (0, schematics_1.noop)() : (0, renovate_1.generateRenovateConfig)(__dirname),
82
82
  ...(options.skipPreCommitChecks ? [] : [(0, commit_hooks_1.generateCommitLintConfig)()]),
83
83
  updateEditorConfig,
84
- (0, schematics_2.addVsCodeRecommendations)(vsCodeExtensions),
84
+ options.skipVscodeTools ? (0, schematics_1.noop)() : (0, schematics_2.addVsCodeRecommendations)(vsCodeExtensions),
85
85
  (0, gitignore_update_1.updateGitIgnore)(workspaceConfig),
86
86
  npm_workspace_1.filterPackageJsonScripts,
87
87
  (0, schematics_2.setupDependencies)({
@@ -99,7 +99,7 @@ const prepareProject = (options) => {
99
99
  }
100
100
  }
101
101
  }),
102
- !options.skipLinter && installOtterLinter ? (0, schematics_2.applyEsLintFix)() : (0, schematics_1.noop)(),
102
+ !options.skipLinter && hasEslint ? (0, schematics_2.applyEsLintFix)() : (0, schematics_1.noop)(),
103
103
  (0, npm_workspace_1.addWorkspacesToProject)(),
104
104
  (0, npm_workspace_1.addMonorepoManager)(ownPackageJsonContent, options.monorepoManager)
105
105
  ])(tree, context);
@@ -1 +1 @@
1
- {"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}
@@ -19,5 +19,9 @@ export interface NgAddSchematicsSchema extends SchematicOptionObject {
19
19
  exactO3rVersion?: boolean;
20
20
  /** Monorepo manager to use */
21
21
  monorepoManager: MonorepoManager;
22
+ /** Skip adding VSCode tools */
23
+ skipVscodeTools?: boolean;
24
+ /** Skip adding Renovate config */
25
+ skipRenovate?: boolean;
22
26
  }
23
27
  //# sourceMappingURL=schema.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,8BAA8B;AAC9B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,MAAM,CAAC;AAE/C,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,uFAAuF;IACvF,mBAAmB,EAAE,OAAO,CAAC;IAE7B,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,8BAA8B;IAC9B,eAAe,EAAE,eAAe,CAAC;CAClC"}
1
+ {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,8BAA8B;AAC9B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,MAAM,CAAC;AAE/C,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,uFAAuF;IACvF,mBAAmB,EAAE,OAAO,CAAC;IAE7B,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,8BAA8B;IAC9B,eAAe,EAAE,eAAe,CAAC;IAEjC,+BAA+B;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,kCAAkC;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB"}
@@ -52,8 +52,7 @@
52
52
  },
53
53
  "exactO3rVersion": {
54
54
  "type": "boolean",
55
- "description": "Use a pinned version for otter packages",
56
- "default": false
55
+ "description": "Use a pinned version for otter packages"
57
56
  },
58
57
  "monorepoManager": {
59
58
  "description": "Which monorepo manager to use",
@@ -63,6 +62,14 @@
63
62
  "lerna",
64
63
  "none"
65
64
  ]
65
+ },
66
+ "skipVscodeTools": {
67
+ "type": "boolean",
68
+ "description": "Skip adding VSCode tools"
69
+ },
70
+ "skipRenovate": {
71
+ "type": "boolean",
72
+ "description": "Skip adding Renovate config"
66
73
  }
67
74
  },
68
75
  "additionalProperties": true,
@@ -2,5 +2,9 @@ import { type Rule } from '@angular-devkit/schematics';
2
2
  /**
3
3
  * Update of Otter Workspace V10.1
4
4
  */
5
- export declare const updateV10_1: (options: unknown) => Rule;
5
+ export declare const updateV10_1: (options: any) => Rule;
6
+ /**
7
+ * Update of Otter Workspace V12.1
8
+ */
9
+ export declare const updateV12_1: (options: any) => Rule;
6
10
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAmBpC;;GAEG;AAEH,eAAO,MAAM,WAAW,4BAAuD,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAsBpC;;GAEG;AAEH,eAAO,MAAM,WAAW,wBAAsC,CAAC;AAa/D;;GAEG;AAEH,eAAO,MAAM,WAAW,wBAAsC,CAAC"}
@@ -1,9 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.updateV10_1 = void 0;
3
+ exports.updateV12_1 = exports.updateV10_1 = void 0;
4
4
  const schematics_1 = require("@angular-devkit/schematics");
5
5
  const schematics_2 = require("@o3r/schematics");
6
6
  const add_presets_renovate_1 = require("./v10.1/add-presets-renovate");
7
+ const renovate_version_1 = require("./v12.1/renovate-version");
7
8
  /**
8
9
  * Update of Otter Workspace V10.1
9
10
  */
@@ -18,5 +19,20 @@ function updateV10_1Fn() {
18
19
  * Update of Otter Workspace V10.1
19
20
  */
20
21
  // eslint-disable-next-line @typescript-eslint/naming-convention -- function name contains the version number
21
- exports.updateV10_1 = (0, schematics_2.createSchematicWithMetricsIfInstalled)(updateV10_1Fn);
22
+ exports.updateV10_1 = (0, schematics_2.createOtterSchematic)(updateV10_1Fn);
23
+ /**
24
+ * Update of Otter Workspace V12.1
25
+ */
26
+ // eslint-disable-next-line @typescript-eslint/naming-convention -- function name contains the version number
27
+ function updateV12_1Fn() {
28
+ const updateRules = [
29
+ (0, renovate_version_1.updateRenovateVersion)()
30
+ ];
31
+ return (0, schematics_1.chain)(updateRules);
32
+ }
33
+ /**
34
+ * Update of Otter Workspace V12.1
35
+ */
36
+ // eslint-disable-next-line @typescript-eslint/naming-convention -- function name contains the version number
37
+ exports.updateV12_1 = (0, schematics_2.createOtterSchematic)(updateV12_1Fn);
22
38
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":";;;AAAA,2DAGoC;AACpC,gDAEyB;AACzB,uEAEsC;AAEtC;;GAEG;AACH,6GAA6G;AAC7G,SAAS,aAAa;IACpB,MAAM,WAAW,GAAW;QAC1B,IAAA,yCAAkB,GAAE;KACrB,CAAC;IACF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC;AAC5B,CAAC;AAED;;GAEG;AACH,6GAA6G;AAChG,QAAA,WAAW,GAAG,IAAA,kDAAqC,EAAC,aAAa,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":";;;AAAA,2DAGoC;AACpC,gDAEyB;AACzB,uEAEsC;AACtC,+DAEkC;AAElC;;GAEG;AACH,6GAA6G;AAC7G,SAAS,aAAa;IACpB,MAAM,WAAW,GAAW;QAC1B,IAAA,yCAAkB,GAAE;KACrB,CAAC;IACF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC;AAC5B,CAAC;AAED;;GAEG;AACH,6GAA6G;AAChG,QAAA,WAAW,GAAG,IAAA,iCAAoB,EAAC,aAAa,CAAC,CAAC;AAE/D;;GAEG;AACH,6GAA6G;AAC7G,SAAS,aAAa;IACpB,MAAM,WAAW,GAAW;QAC1B,IAAA,wCAAqB,GAAE;KACxB,CAAC;IACF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC;AAC5B,CAAC;AAED;;GAEG;AACH,6GAA6G;AAChG,QAAA,WAAW,GAAG,IAAA,iCAAoB,EAAC,aAAa,CAAC,CAAC"}
@@ -0,0 +1,3 @@
1
+ import type { Rule } from '@angular-devkit/schematics';
2
+ export declare const updateRenovateVersion: () => Rule;
3
+ //# sourceMappingURL=renovate-version.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"renovate-version.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/v12.1/renovate-version.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAMpC,eAAO,MAAM,qBAAqB,QAAO,IAsBxC,CAAC"}
@@ -0,0 +1,32 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.updateRenovateVersion = void 0;
4
+ const node_fs_1 = require("node:fs");
5
+ const node_path_1 = require("node:path");
6
+ const otterRenovatePathPrefix = 'github>AmadeusITGroup/otter//';
7
+ const withVersionPattern = /#[0-9.]+(?:-.+)?$/;
8
+ const supportedRenovateFiles = ['.renovaterc.json', 'renovaterc.json', 'renovate.json'];
9
+ const updateRenovateVersion = () => {
10
+ const version = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(__dirname, '..', '..', '..', 'package.json'), { encoding: 'utf8' })).version;
11
+ return (tree, context) => {
12
+ if (!version) {
13
+ context.logger.warn('No Otter version detected');
14
+ return tree;
15
+ }
16
+ supportedRenovateFiles
17
+ .filter((renovateFile) => tree.exists(renovateFile))
18
+ .forEach((renovateFile) => {
19
+ const renovateConfig = tree.readJson(renovateFile);
20
+ renovateConfig.extends = renovateConfig.extends?.map((extensionPath) => {
21
+ if (!extensionPath.startsWith(otterRenovatePathPrefix) || withVersionPattern.test(extensionPath)) {
22
+ return extensionPath;
23
+ }
24
+ return `${extensionPath}#${version}`;
25
+ });
26
+ tree.overwrite(renovateFile, JSON.stringify(renovateConfig, null, 2));
27
+ });
28
+ return tree;
29
+ };
30
+ };
31
+ exports.updateRenovateVersion = updateRenovateVersion;
32
+ //# sourceMappingURL=renovate-version.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"renovate-version.js","sourceRoot":"","sources":["../../../../schematics/ng-update/v12.1/renovate-version.ts"],"names":[],"mappings":";;;AAAA,qCAEiB;AACjB,yCAEmB;AAKnB,MAAM,uBAAuB,GAAG,+BAA+B,CAAC;AAChE,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;AAC/C,MAAM,sBAAsB,GAAG,CAAC,kBAAkB,EAAE,iBAAiB,EAAE,eAAe,CAAC,CAAC;AAEjF,MAAM,qBAAqB,GAAG,GAAS,EAAE;IAC9C,MAAM,OAAO,GAAuB,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAA,mBAAO,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;IACjJ,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,sBAAsB;aACnB,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;aACnD,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YACxB,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAQ,CAAC;YAC1D,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,aAAqB,EAAE,EAAE;gBAC7E,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;oBACjG,OAAO,aAAa,CAAC;gBACvB,CAAC;gBAED,OAAO,GAAG,aAAa,IAAI,OAAO,EAAE,CAAC;YACvC,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;QACL,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,qBAAqB,yBAsBhC"}
@@ -1,3 +1,2 @@
1
1
  export * from './project-configs';
2
- export * from './linter';
3
2
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC"}
@@ -2,5 +2,4 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const tslib_1 = require("tslib");
4
4
  tslib_1.__exportStar(require("./project-configs"), exports);
5
- tslib_1.__exportStar(require("./linter"), exports);
6
5
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,4DAAkC;AAClC,mDAAyB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,4DAAkC"}
@@ -1,8 +1,7 @@
1
1
  import { Rule } from '@angular-devkit/schematics';
2
- import { NgGenerateSdkSchema } from './schema';
3
2
  /**
4
3
  * Add an Otter compatible SDK to a monorepo
5
4
  * @param options Schematic options
6
5
  */
7
- export declare const generateSdk: (options: NgGenerateSdkSchema) => Rule;
6
+ export declare const generateSdk: (options: any) => Rule;
8
7
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,IAAI,EAML,MAAM,4BAA4B,CAAC;AA0BpC,OAAO,EACL,mBAAmB,EACpB,MAAM,UAAU,CAAC;AAkFlB;;;GAGG;AACH,eAAO,MAAM,WAAW,wCAAuD,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,IAAI,EAML,MAAM,4BAA4B,CAAC;AA8GpC;;;GAGG;AACH,eAAO,MAAM,WAAW,wBAAsC,CAAC"}
@@ -89,5 +89,5 @@ function generateSdkFn(options) {
89
89
  * Add an Otter compatible SDK to a monorepo
90
90
  * @param options Schematic options
91
91
  */
92
- exports.generateSdk = (0, schematics_2.createSchematicWithMetricsIfInstalled)(generateSdkFn);
92
+ exports.generateSdk = (0, schematics_2.createOtterSchematic)(generateSdkFn);
93
93
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"jest.helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/jest.helpers.ts"],"names":[],"mappings":"AAYA;;;;;GAKG;AACH,eAAO,MAAM,eAAe,wEAY3B,CAAC"}
1
+ {"version":3,"file":"jest.helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/jest.helpers.ts"],"names":[],"mappings":"AAYA;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAI,gBAAuB,EAAE,0BAA8C,yBAYtG,CAAC"}
@@ -10,7 +10,7 @@ const globby_1 = require("globby");
10
10
  * @param jestConfigPattern Pattern to the jest config files
11
11
  * @returns list of Jest projects
12
12
  */
13
- const getJestProjects = (rootDir = process.cwd(), jestConfigPattern = 'jest.config.{j,t}s') => {
13
+ const getJestProjects = (rootDir = process.cwd(), jestConfigPattern = 'jest.config.{c,m,}{j,t}s') => {
14
14
  const rootPackageJson = (0, node_path_1.resolve)(rootDir, 'package.json');
15
15
  if (!(0, node_fs_1.existsSync)(rootPackageJson)) {
16
16
  // eslint-disable-next-line no-console -- no other logger available
@@ -21,7 +21,7 @@ const getJestProjects = (rootDir = process.cwd(), jestConfigPattern = 'jest.conf
21
21
  const jestConfigFileLists = jestConfigPatterns?.map((pattern) => (0, globby_1.sync)(pattern, { cwd: rootDir }));
22
22
  return jestConfigFileLists
23
23
  ?.flat()
24
- .map((jestConfigFile) => node_path_1.posix.join('<rootDir>', jestConfigFile.replace(/jest\.config\.[jt]s$/, '')).replace(/\\+/g, '/'));
24
+ .map((jestConfigFile) => node_path_1.posix.join('<rootDir>', jestConfigFile.replace(/jest\.config\.[cm]?[jt]s$/, '')).replace(/\\+/g, '/'));
25
25
  };
26
26
  exports.getJestProjects = getJestProjects;
27
27
  //# sourceMappingURL=jest.helpers.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"jest.helpers.js","sourceRoot":"","sources":["../../../src/utils/jest.helpers.ts"],"names":[],"mappings":";;;AAAA,qCAGiB;AACjB,yCAGmB;AACnB,mCAEgB;AAEhB;;;;;GAKG;AACI,MAAM,eAAe,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,GAAG,oBAAoB,EAAE,EAAE;IACnG,MAAM,eAAe,GAAG,IAAA,mBAAO,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IACzD,IAAI,CAAC,IAAA,oBAAU,EAAC,eAAe,CAAC,EAAE,CAAC;QACjC,mEAAmE;QACnE,OAAO,CAAC,IAAI,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAC;QACpD,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,kBAAkB,GAAyB,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,WAAmB,EAAE,EAAE,CAAC,iBAAK,CAAC,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC;IACtM,MAAM,mBAAmB,GAAG,kBAAkB,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,aAAU,EAAC,OAAO,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IACxG,OAAO,mBAAmB;QACxB,EAAE,IAAI,EAAE;SACP,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,iBAAK,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;AAC/H,CAAC,CAAC;AAZW,QAAA,eAAe,mBAY1B"}
1
+ {"version":3,"file":"jest.helpers.js","sourceRoot":"","sources":["../../../src/utils/jest.helpers.ts"],"names":[],"mappings":";;;AAAA,qCAGiB;AACjB,yCAGmB;AACnB,mCAEgB;AAEhB;;;;;GAKG;AACI,MAAM,eAAe,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,GAAG,0BAA0B,EAAE,EAAE;IACzG,MAAM,eAAe,GAAG,IAAA,mBAAO,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IACzD,IAAI,CAAC,IAAA,oBAAU,EAAC,eAAe,CAAC,EAAE,CAAC;QACjC,mEAAmE;QACnE,OAAO,CAAC,IAAI,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAC;QACpD,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,kBAAkB,GAAyB,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,WAAmB,EAAE,EAAE,CAAC,iBAAK,CAAC,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC;IACtM,MAAM,mBAAmB,GAAG,kBAAkB,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,aAAU,EAAC,OAAO,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IACxG,OAAO,mBAAmB;QACxB,EAAE,IAAI,EAAE;SACP,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,iBAAK,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,OAAO,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;AACpI,CAAC,CAAC;AAZW,QAAA,eAAe,mBAY1B"}
@@ -1,14 +0,0 @@
1
- import type { SchematicContext, Tree } from '@angular-devkit/schematics';
2
- /**
3
- * If the ESLint FlatConfig is used in the repository
4
- * @param tree
5
- */
6
- export declare const isUsingFlatConfig: (tree: Tree) => import("@angular-devkit/core").PathFragment | undefined;
7
- /**
8
- * Checks if `eslint` package is installed. If so, ask the user for otter linter rules install.
9
- * Otherwise displays a message to inform the user that otter linter rules can be added later.
10
- * @param context Schematics context
11
- * @param tree
12
- */
13
- export declare const shouldOtterLinterBeInstalled: (context: SchematicContext, tree: Tree) => Promise<boolean>;
14
- //# sourceMappingURL=linter.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"linter.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/linter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,gBAAgB,EAChB,IAAI,EACL,MAAM,4BAA4B,CAAC;AAEpC;;;GAGG;AACH,eAAO,MAAM,iBAAiB,SAAU,IAAI,4DAAgF,CAAC;AAE7H;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,YAAmB,gBAAgB,QAAQ,IAAI,KAAG,OAAO,CAAC,OAAO,CAezG,CAAC"}
@@ -1,34 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.shouldOtterLinterBeInstalled = exports.isUsingFlatConfig = void 0;
4
- const prompt_1 = require("@angular/cli/src/utilities/prompt");
5
- /**
6
- * If the ESLint FlatConfig is used in the repository
7
- * @param tree
8
- */
9
- const isUsingFlatConfig = (tree) => tree.root.subfiles.find((file) => /eslint\.config\.{m,c,}[jt]s/.test(file));
10
- exports.isUsingFlatConfig = isUsingFlatConfig;
11
- /**
12
- * Checks if `eslint` package is installed. If so, ask the user for otter linter rules install.
13
- * Otherwise displays a message to inform the user that otter linter rules can be added later.
14
- * @param context Schematics context
15
- * @param tree
16
- */
17
- const shouldOtterLinterBeInstalled = async (context, tree) => {
18
- const linterPackageName = 'eslint';
19
- let useOtterLinter = false;
20
- try {
21
- require.resolve(`${linterPackageName}/package.json`);
22
- if (context.interactive) {
23
- useOtterLinter = await (0, prompt_1.askConfirmation)(`You already have ESLint installed. Would you like to add Otter config rules for ESLint?
24
- Otherwise, you can add them later via this command: ng add @o3r/eslint-config${(0, exports.isUsingFlatConfig)(tree) ? '' : '-otter'}`, true);
25
- }
26
- }
27
- catch {
28
- context.logger.info(`ESLint package not installed. Skipping otter linter phase!
29
- You can add Otter linter config rules later to the project via this command: ng add @o3r/eslint-config`);
30
- }
31
- return useOtterLinter;
32
- };
33
- exports.shouldOtterLinterBeInstalled = shouldOtterLinterBeInstalled;
34
- //# sourceMappingURL=linter.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"linter.js","sourceRoot":"","sources":["../../../schematics/rule-factories/linter.ts"],"names":[],"mappings":";;;AAAA,8DAE2C;AAM3C;;;GAGG;AACI,MAAM,iBAAiB,GAAG,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAAhH,QAAA,iBAAiB,qBAA+F;AAE7H;;;;;GAKG;AACI,MAAM,4BAA4B,GAAG,KAAK,EAAE,OAAyB,EAAE,IAAU,EAAoB,EAAE;IAC5G,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACnC,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,GAAG,iBAAiB,eAAe,CAAC,CAAC;QACrD,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,cAAc,GAAG,MAAM,IAAA,wBAAe,EAAC;+EACkC,IAAA,yBAAiB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;QAC5H,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;uGAC+E,CAAC,CAAC;IACvG,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAfW,QAAA,4BAA4B,gCAevC"}