@o3r/workspace 11.6.0-prerelease.4 → 11.6.0-prerelease.40

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 (79) hide show
  1. package/package.json +31 -25
  2. package/schematics/application/index.d.ts.map +1 -1
  3. package/schematics/application/index.js +4 -4
  4. package/schematics/application/index.js.map +1 -1
  5. package/schematics/application/schema.d.ts.map +1 -1
  6. package/schematics/application/templates/package.json.template +14 -14
  7. package/schematics/library/index.d.ts.map +1 -1
  8. package/schematics/library/index.js +4 -5
  9. package/schematics/library/index.js.map +1 -1
  10. package/schematics/library/rules/rules.ng.d.ts +2 -2
  11. package/schematics/library/rules/rules.ng.d.ts.map +1 -1
  12. package/schematics/library/rules/rules.ng.js +19 -19
  13. package/schematics/library/rules/rules.ng.js.map +1 -1
  14. package/schematics/library/rules/rules.nx.d.ts +1 -3
  15. package/schematics/library/rules/rules.nx.d.ts.map +1 -1
  16. package/schematics/library/rules/rules.nx.js +44 -50
  17. package/schematics/library/rules/rules.nx.js.map +1 -1
  18. package/schematics/library/rules/shared.d.ts.map +1 -1
  19. package/schematics/library/rules/shared.js +30 -30
  20. package/schematics/library/rules/shared.js.map +1 -1
  21. package/schematics/library/schema.d.ts.map +1 -1
  22. package/schematics/ng-add/helpers/gitignore-update.d.ts.map +1 -1
  23. package/schematics/ng-add/helpers/gitignore-update.js +3 -3
  24. package/schematics/ng-add/helpers/gitignore-update.js.map +1 -1
  25. package/schematics/ng-add/helpers/index.d.ts +2 -3
  26. package/schematics/ng-add/helpers/index.d.ts.map +1 -1
  27. package/schematics/ng-add/helpers/index.js +2 -3
  28. package/schematics/ng-add/helpers/index.js.map +1 -1
  29. package/schematics/ng-add/helpers/linter.d.ts +8 -2
  30. package/schematics/ng-add/helpers/linter.d.ts.map +1 -1
  31. package/schematics/ng-add/helpers/linter.js +11 -4
  32. package/schematics/ng-add/helpers/linter.js.map +1 -1
  33. package/schematics/ng-add/helpers/npm-workspace.d.ts +1 -1
  34. package/schematics/ng-add/helpers/npm-workspace.d.ts.map +1 -1
  35. package/schematics/ng-add/helpers/npm-workspace.js +15 -18
  36. package/schematics/ng-add/helpers/npm-workspace.js.map +1 -1
  37. package/schematics/ng-add/helpers/renovate/index.d.ts +0 -1
  38. package/schematics/ng-add/helpers/renovate/index.d.ts.map +1 -1
  39. package/schematics/ng-add/helpers/renovate/index.js +0 -1
  40. package/schematics/ng-add/helpers/renovate/index.js.map +1 -1
  41. package/schematics/ng-add/index.d.ts.map +1 -1
  42. package/schematics/ng-add/index.js +2 -2
  43. package/schematics/ng-add/index.js.map +1 -1
  44. package/schematics/ng-add/project-setup.d.ts.map +1 -1
  45. package/schematics/ng-add/project-setup.js +6 -6
  46. package/schematics/ng-add/project-setup.js.map +1 -1
  47. package/schematics/ng-add/schema.d.ts.map +1 -1
  48. package/schematics/ng-update/index.d.ts.map +1 -1
  49. package/schematics/ng-update/index.js +2 -2
  50. package/schematics/ng-update/index.js.map +1 -1
  51. package/schematics/ng-update/v10.1/add-presets-renovate.d.ts.map +1 -1
  52. package/schematics/ng-update/v10.1/add-presets-renovate.js.map +1 -1
  53. package/schematics/rule-factories/project-configs.d.ts +5 -5
  54. package/schematics/rule-factories/project-configs.d.ts.map +1 -1
  55. package/schematics/rule-factories/project-configs.js +7 -6
  56. package/schematics/rule-factories/project-configs.js.map +1 -1
  57. package/schematics/sdk/index.d.ts.map +1 -1
  58. package/schematics/sdk/index.js +27 -23
  59. package/schematics/sdk/index.js.map +1 -1
  60. package/schematics/sdk/rules/clean-standalone.rule.d.ts.map +1 -1
  61. package/schematics/sdk/rules/clean-standalone.rule.js +1 -1
  62. package/schematics/sdk/rules/clean-standalone.rule.js.map +1 -1
  63. package/schematics/sdk/rules/rules.ng.d.ts.map +1 -1
  64. package/schematics/sdk/rules/rules.ng.js.map +1 -1
  65. package/schematics/sdk/rules/rules.nx.d.ts +0 -1
  66. package/schematics/sdk/rules/rules.nx.d.ts.map +1 -1
  67. package/schematics/sdk/rules/rules.nx.js +0 -1
  68. package/schematics/sdk/rules/rules.nx.js.map +1 -1
  69. package/schematics/sdk/rules/update-ts-paths.rule.d.ts +0 -1
  70. package/schematics/sdk/rules/update-ts-paths.rule.d.ts.map +1 -1
  71. package/schematics/sdk/rules/update-ts-paths.rule.js +0 -1
  72. package/schematics/sdk/rules/update-ts-paths.rule.js.map +1 -1
  73. package/schematics/sdk/schema.d.ts.map +1 -1
  74. package/src/cli/set-version.cjs +10 -10
  75. package/src/cli/set-version.cjs.map +1 -1
  76. package/src/utils/jest.helpers.d.ts +1 -2
  77. package/src/utils/jest.helpers.d.ts.map +1 -1
  78. package/src/utils/jest.helpers.js +3 -3
  79. package/src/utils/jest.helpers.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/workspace",
3
- "version": "11.6.0-prerelease.4",
3
+ "version": "11.6.0-prerelease.40",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -22,17 +22,17 @@
22
22
  "main": "./src/public_api.js",
23
23
  "types": "./src/public_api.d.ts",
24
24
  "peerDependencies": {
25
- "@angular-devkit/architect": "~0.1802.0",
26
- "@angular-devkit/core": "~18.2.0",
27
- "@angular-devkit/schematics": "~18.2.0",
28
- "@angular/cli": "~18.2.0",
29
- "@angular/common": "~18.2.0",
30
- "@angular/compiler-cli": "~18.2.0",
31
- "@angular/core": "~18.2.0",
32
- "@o3r/telemetry": "^11.6.0-prerelease.4",
33
- "@schematics/angular": "~18.2.0",
25
+ "@angular-devkit/architect": "^0.1802.0",
26
+ "@angular-devkit/core": "^18.2.0",
27
+ "@angular-devkit/schematics": "^18.2.0",
28
+ "@angular/cli": "^18.2.0",
29
+ "@angular/common": "^18.2.0",
30
+ "@angular/compiler-cli": "^18.2.0",
31
+ "@angular/core": "^18.2.0",
32
+ "@o3r/telemetry": "^11.6.0-prerelease.40",
33
+ "@schematics/angular": "^18.2.0",
34
34
  "type-fest": "^4.10.2",
35
- "typescript": "~5.5.4"
35
+ "typescript": "^5.5.4"
36
36
  },
37
37
  "peerDependenciesMeta": {
38
38
  "@angular/cli": {
@@ -46,7 +46,7 @@
46
46
  }
47
47
  },
48
48
  "dependencies": {
49
- "@o3r/schematics": "^11.6.0-prerelease.4",
49
+ "@o3r/schematics": "^11.6.0-prerelease.40",
50
50
  "commander": "^12.0.0",
51
51
  "globby": "^11.1.0",
52
52
  "semver": "^7.5.2",
@@ -59,7 +59,6 @@
59
59
  "@angular-devkit/build-angular": "~18.2.0",
60
60
  "@angular-devkit/core": "~18.2.0",
61
61
  "@angular-devkit/schematics": "~18.2.0",
62
- "@angular-eslint/eslint-plugin": "~18.3.0",
63
62
  "@angular/animations": "~18.2.0",
64
63
  "@angular/cli": "~18.2.0",
65
64
  "@angular/common": "~18.2.0",
@@ -71,6 +70,7 @@
71
70
  "@angular/router": "~18.2.0",
72
71
  "@babel/core": "~7.26.0",
73
72
  "@babel/preset-typescript": "~7.26.0",
73
+ "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
74
74
  "@ngrx/entity": "~18.0.0",
75
75
  "@ngrx/store": "~18.0.0",
76
76
  "@nx/angular": "~19.5.0",
@@ -79,33 +79,38 @@
79
79
  "@nx/jest": "~19.5.0",
80
80
  "@nx/js": "~19.5.0",
81
81
  "@nx/workspace": "~19.5.0",
82
- "@o3r/build-helpers": "^11.6.0-prerelease.4",
83
- "@o3r/core": "^11.6.0-prerelease.4",
84
- "@o3r/eslint-plugin": "^11.6.0-prerelease.4",
85
- "@o3r/schematics": "^11.6.0-prerelease.4",
86
- "@o3r/test-helpers": "^11.6.0-prerelease.4",
82
+ "@o3r/build-helpers": "^11.6.0-prerelease.40",
83
+ "@o3r/core": "^11.6.0-prerelease.40",
84
+ "@o3r/eslint-plugin": "^11.6.0-prerelease.40",
85
+ "@o3r/schematics": "^11.6.0-prerelease.40",
86
+ "@o3r/test-helpers": "^11.6.0-prerelease.40",
87
87
  "@schematics/angular": "~18.2.0",
88
- "@stylistic/eslint-plugin-ts": "~2.4.0",
88
+ "@stylistic/eslint-plugin": "~2.7.0",
89
89
  "@types/jest": "~29.5.2",
90
90
  "@types/minimist": "^1.2.2",
91
91
  "@types/node": "^20.0.0",
92
92
  "@types/pid-from-port": "^1.1.0",
93
93
  "@types/semver": "^7.3.13",
94
94
  "@types/uuid": "^9.0.0",
95
- "@typescript-eslint/eslint-plugin": "^7.14.1",
96
- "@typescript-eslint/parser": "^7.14.1",
97
- "@typescript-eslint/utils": "^7.14.1",
95
+ "@typescript-eslint/parser": "~8.17.0",
96
+ "angular-eslint": "~18.4.0",
98
97
  "cpy-cli": "^5.0.0",
99
- "eslint": "^8.57.0",
98
+ "eslint": "~9.14.0",
100
99
  "eslint-import-resolver-node": "^0.3.9",
100
+ "eslint-import-resolver-typescript": "^3.6.3",
101
+ "eslint-plugin-import": "^2.31.0",
102
+ "eslint-plugin-import-newlines": "^1.4.0",
101
103
  "eslint-plugin-jest": "~28.8.0",
102
- "eslint-plugin-jsdoc": "~48.11.0",
104
+ "eslint-plugin-jsdoc": "~50.2.0",
103
105
  "eslint-plugin-prefer-arrow": "~1.2.3",
104
- "eslint-plugin-unicorn": "^54.0.0",
106
+ "eslint-plugin-unicorn": "^56.0.0",
107
+ "eslint-plugin-unused-imports": "^4.1.4",
108
+ "globals": "^15.9.0",
105
109
  "jest": "~29.7.0",
106
110
  "jest-environment-jsdom": "~29.7.0",
107
111
  "jest-junit": "~16.0.0",
108
112
  "jest-preset-angular": "~14.2.0",
113
+ "jsonc-eslint-parser": "~2.4.0",
109
114
  "minimist": "^1.2.6",
110
115
  "nx": "~19.5.0",
111
116
  "pid-from-port": "^1.1.3",
@@ -114,6 +119,7 @@
114
119
  "ts-node": "~10.9.2",
115
120
  "type-fest": "^4.10.2",
116
121
  "typescript": "~5.5.4",
122
+ "typescript-eslint": "~8.17.0",
117
123
  "zone.js": "~0.14.2"
118
124
  },
119
125
  "generatorDependencies": {
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwF,IAAI,EAAqC,MAAM,4BAA4B,CAAC;AAG3K,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAmG5D;;;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,EAKL,MAAM,4BAA4B,CAAC;AAyBpC,OAAO,KAAK,EACV,2BAA2B,EAC5B,MAAM,UAAU,CAAC;AAyFlB;;;GAGG;AACH,eAAO,MAAM,mBAAmB,gDAA+D,CAAC"}
@@ -1,13 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.generateApplication = void 0;
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
- const path = require("node:path");
7
8
  const schema_1 = require("@schematics/angular/application/schema");
8
- const index_1 = require("../rule-factories/index");
9
9
  const dependencies_1 = require("@schematics/angular/utility/dependencies");
10
- const fs = require("node:fs");
10
+ const index_1 = require("../rule-factories/index");
11
11
  /**
12
12
  * Add an Otter application to a monorepo
13
13
  * @param options Schematic options
@@ -20,6 +20,7 @@ function generateApplicationFn(options) {
20
20
  return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates'), [
21
21
  (0, schematics_1.template)({
22
22
  ...options,
23
+ enforceTildeRange: schematics_2.enforceTildeRange,
23
24
  name: packageJsonName,
24
25
  rootDependencies
25
26
  }),
@@ -53,7 +54,6 @@ function generateApplicationFn(options) {
53
54
  };
54
55
  const angularOptions = getOptions(angularAppSchema);
55
56
  const dependencies = {
56
- // eslint-disable-next-line @typescript-eslint/naming-convention
57
57
  '@o3r/core': {
58
58
  inManifest: [
59
59
  {
@@ -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":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/application/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,2BAA4B,SAAQ,qBAAqB;IACxE,uBAAuB;IACvB,IAAI,EAAE,MAAM,CAAC;IAEb,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,yCAAyC;IACzC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,0CAA0C;IAC1C,WAAW,EAAE,OAAO,CAAC;IAErB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
1
+ {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/application/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,2BAA4B,SAAQ,qBAAqB;IACxE,uBAAuB;IACvB,IAAI,EAAE,MAAM,CAAC;IAEb,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,yCAAyC;IACzC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,0CAA0C;IAC1C,WAAW,EAAE,OAAO,CAAC;IAErB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
@@ -9,21 +9,21 @@
9
9
  },
10
10
  "private": true,
11
11
  "dependencies": {
12
- "@angular/animations": "<%= rootDependencies['@angular/animations'] || rootDependencies['@angular/core'] || 'latest' %>",
13
- "@angular/common": "<%= rootDependencies['@angular/common'] || rootDependencies['@angular/core'] || 'latest' %>",
14
- "@angular/compiler": "<%= rootDependencies['@angular/compiler'] || rootDependencies['@angular/core'] || 'latest' %>",
15
- "@angular/core": "<%= rootDependencies['@angular/core'] || 'latest' %>",
16
- "@angular/forms": "<%= rootDependencies['@angular/forms'] || rootDependencies['@angular/core'] || 'latest' %>",
17
- "@angular/platform-browser": "<%= rootDependencies['@angular/platform-browser'] || rootDependencies['@angular/core'] || 'latest' %>",
18
- "@angular/platform-browser-dynamic": "<%= rootDependencies['@angular/platform-browser-dynamic'] || rootDependencies['@angular/core'] || 'latest' %>",
19
- "@angular/router": "<%= rootDependencies['@angular/router'] || rootDependencies['@angular/core'] || 'latest' %>",
20
- "rxjs": "<%= rootDependencies['rxjs'] || 'latest' %>",
21
- "tslib": "<%= rootDependencies['tslib'] || 'latest' %>",
22
- "zone.js": "<%= rootDependencies['zone.js'] || 'latest' %>"
12
+ "@angular/animations": "<%= enforceTildeRange(rootDependencies['@angular/animations'] || rootDependencies['@angular/core'] || 'latest') %>",
13
+ "@angular/common": "<%= enforceTildeRange(rootDependencies['@angular/common'] || rootDependencies['@angular/core'] || 'latest') %>",
14
+ "@angular/compiler": "<%= enforceTildeRange(rootDependencies['@angular/compiler'] || rootDependencies['@angular/core'] || 'latest') %>",
15
+ "@angular/core": "<%= enforceTildeRange(rootDependencies['@angular/core'] || 'latest') %>",
16
+ "@angular/forms": "<%= enforceTildeRange(rootDependencies['@angular/forms'] || rootDependencies['@angular/core'] || 'latest') %>",
17
+ "@angular/platform-browser": "<%= enforceTildeRange(rootDependencies['@angular/platform-browser'] || rootDependencies['@angular/core'] || 'latest') %>",
18
+ "@angular/platform-browser-dynamic": "<%= enforceTildeRange(rootDependencies['@angular/platform-browser-dynamic'] || rootDependencies['@angular/core'] || 'latest') %>",
19
+ "@angular/router": "<%= enforceTildeRange(rootDependencies['@angular/router'] || rootDependencies['@angular/core'] || 'latest') %>",
20
+ "rxjs": "<%= enforceTildeRange(rootDependencies['rxjs'] || 'latest') %>",
21
+ "tslib": "<%= enforceTildeRange(rootDependencies['tslib'] || 'latest') %>",
22
+ "zone.js": "<%= enforceTildeRange(rootDependencies['zone.js'] || 'latest') %>"
23
23
  },
24
24
  "devDependencies": {
25
- "@angular/cli": "<%= rootDependencies['@angular/cli'] || 'latest' %>",
26
- "@angular/compiler-cli": "<%= rootDependencies['@angular/compiler-cli'] || rootDependencies['@angular/cli'] || 'latest' %>",
27
- "typescript": "<%= rootDependencies['typescript'] || 'latest' %>"
25
+ "@angular/cli": "<%= enforceTildeRange(rootDependencies['@angular/cli'] || 'latest') %>",
26
+ "@angular/compiler-cli": "<%= enforceTildeRange(rootDependencies['@angular/compiler-cli'] || rootDependencies['@angular/cli'] || 'latest') %>",
27
+ "typescript": "<%= enforceTildeRange(rootDependencies['typescript'] || 'latest') %>"
28
28
  }
29
29
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAW,MAAM,4BAA4B,CAAC;AAaxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AA0DlD;;;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;AA0BpC,OAAO,EACL,sBAAsB,EACvB,MAAM,UAAU,CAAC;AAmDlB;;;GAGG;AACH,eAAO,MAAM,cAAc,2CAA0D,CAAC"}
@@ -1,14 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.generateModule = void 0;
4
+ const fs = require("node:fs");
5
+ const path = require("node:path");
4
6
  const schematics_1 = require("@angular-devkit/schematics");
5
7
  const tasks_1 = require("@angular-devkit/schematics/tasks");
6
- const path = require("node:path");
7
8
  const schematics_2 = require("@o3r/schematics");
8
- const rules_nx_1 = require("./rules/rules.nx");
9
- const rules_ng_1 = require("./rules/rules.ng");
10
9
  const dependencies_1 = require("@schematics/angular/utility/dependencies");
11
- const fs = require("node:fs");
10
+ const rules_ng_1 = require("./rules/rules.ng");
11
+ const rules_nx_1 = require("./rules/rules.nx");
12
12
  /**
13
13
  * Add an Otter compatible module to a monorepo
14
14
  * @param options Schematic options
@@ -28,7 +28,6 @@ function generateModuleFn(options) {
28
28
  const targetPath = path.posix.resolve('/', options.path || defaultRoot, cleanName);
29
29
  const extendedOptions = { ...options, targetPath, name: cleanName, packageJsonName: packageJsonName };
30
30
  const dependencies = {
31
- // eslint-disable-next-line @typescript-eslint/naming-convention
32
31
  '@o3r/core': {
33
32
  inManifest: [
34
33
  {
@@ -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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"}
@@ -1,9 +1,9 @@
1
- import type { NgGenerateModuleSchema } from '../schema';
2
1
  import { Rule } from '@angular-devkit/schematics';
2
+ import type { NgGenerateModuleSchema } from '../schema';
3
3
  /**
4
4
  * generate the rules to adapt the library generated by ng cli
5
- * @param options.targetPath Path where the library has been generated
6
5
  * @param options Schematic options
6
+ * @param options.targetPath Path where the library has been generated
7
7
  */
8
8
  export declare function ngGenerateModule(options: NgGenerateModuleSchema & {
9
9
  targetPath: string;
@@ -1 +1 @@
1
- {"version":3,"file":"rules.ng.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAExD,OAAO,EAAwF,IAAI,EAAiB,MAAM,4BAA4B,CAAC;AAMvJ;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAqFxH"}
1
+ {"version":3,"file":"rules.ng.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"AAIA,OAAO,EAQL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAWpC,OAAO,KAAK,EACV,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAMnB;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAoFxH"}
@@ -1,16 +1,16 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ngGenerateModule = ngGenerateModule;
4
- const schematics_1 = require("@o3r/schematics");
5
- const schematics_2 = require("@angular-devkit/schematics");
6
- const path = require("node:path");
7
4
  const node_fs_1 = require("node:fs");
8
- const shared_1 = require("./shared");
5
+ const path = require("node:path");
6
+ const schematics_1 = require("@angular-devkit/schematics");
7
+ const schematics_2 = require("@o3r/schematics");
9
8
  const index_1 = require("../../rule-factories/index");
9
+ const shared_1 = require("./shared");
10
10
  /**
11
11
  * generate the rules to adapt the library generated by ng cli
12
- * @param options.targetPath Path where the library has been generated
13
12
  * @param options Schematic options
13
+ * @param options.targetPath Path where the library has been generated
14
14
  */
15
15
  function ngGenerateModule(options) {
16
16
  const relativeTargetPath = options.targetPath.replace(/^\//, '');
@@ -23,18 +23,18 @@ function ngGenerateModule(options) {
23
23
  const o3rCorePackageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
24
24
  const o3rCorePackageJson = JSON.parse((0, node_fs_1.readFileSync)(o3rCorePackageJsonPath).toString());
25
25
  const otterVersion = o3rCorePackageJson.dependencies['@o3r/schematics'];
26
- const templateNg = (0, schematics_2.apply)((0, schematics_2.url)('./templates/ng'), [
27
- (0, schematics_2.template)({
26
+ const templateNg = (0, schematics_1.apply)((0, schematics_1.url)('./templates/ng'), [
27
+ (0, schematics_1.template)({
28
28
  ...options,
29
- tsconfigSpecPath: (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.test.json', 'tsconfig.spec.json', 'tsconfig.jest.json', 'tsconfig.jasmine.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath),
30
- tsconfigBasePath: (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], options.targetPath),
31
- tsconfigBuildPath: (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.build.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath)
29
+ tsconfigSpecPath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.test.json', 'tsconfig.spec.json', 'tsconfig.jest.json', 'tsconfig.jasmine.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath),
30
+ tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], options.targetPath),
31
+ tsconfigBuildPath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.build.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath)
32
32
  }),
33
- (0, schematics_2.renameTemplateFiles)(),
34
- (0, schematics_2.move)(options.targetPath)
33
+ (0, schematics_1.renameTemplateFiles)(),
34
+ (0, schematics_1.move)(options.targetPath)
35
35
  ]);
36
- return (0, schematics_2.chain)([
37
- (0, schematics_2.mergeWith)(templateNg, schematics_2.MergeStrategy.Overwrite),
36
+ return (0, schematics_1.chain)([
37
+ (0, schematics_1.mergeWith)(templateNg, schematics_1.MergeStrategy.Overwrite),
38
38
  (0, shared_1.updatePackageDependenciesFactory)(options.targetPath, otterVersion, o3rCorePackageJson, options),
39
39
  (0, shared_1.updateNgPackagrFactory)(options.targetPath),
40
40
  (t) => {
@@ -54,9 +54,9 @@ function ngGenerateModule(options) {
54
54
  * @param context Context of the schematics
55
55
  */
56
56
  const updateTsConfigFiles = (tree, context) => {
57
- const tsconfigBase = (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], '/');
58
- const tsconfigBuild = (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.build.json'], '/');
59
- [tsconfigBase, tsconfigBuild].forEach(tsconfigPath => {
57
+ const tsconfigBase = (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], '/');
58
+ const tsconfigBuild = (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.build.json'], '/');
59
+ [tsconfigBase, tsconfigBuild].forEach((tsconfigPath) => {
60
60
  if (tsconfigPath) {
61
61
  const configFile = tree.readJson(tsconfigPath);
62
62
  if (configFile?.compilerOptions?.paths) {
@@ -78,8 +78,8 @@ function ngGenerateModule(options) {
78
78
  });
79
79
  };
80
80
  const ngCliUpdate = (tree, context) => {
81
- return (0, schematics_2.chain)([
82
- (t, c) => (0, schematics_2.externalSchematic)('@schematics/angular', 'library', {
81
+ return (0, schematics_1.chain)([
82
+ (t, c) => (0, schematics_1.externalSchematic)('@schematics/angular', 'library', {
83
83
  name: options.name,
84
84
  projectRoot: relativeTargetPath,
85
85
  prefix: options.prefix
@@ -1 +1 @@
1
- {"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,8 @@
1
- import type { NgGenerateModuleSchema } from '../schema';
2
1
  import { Rule } from '@angular-devkit/schematics';
2
+ import type { NgGenerateModuleSchema } from '../schema';
3
3
  /**
4
4
  * generate the rules to adapt the library generated by nx cli
5
- *
6
5
  * @param options
7
- * @param rootPath
8
6
  */
9
7
  export declare function nxGenerateModule(options: NgGenerateModuleSchema & {
10
8
  packageJsonName: string;
@@ -1 +1 @@
1
- {"version":3,"file":"rules.nx.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.nx.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAAwF,IAAI,EAAuB,MAAM,4BAA4B,CAAC;AAM7J;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAC,eAAe,EAAE,MAAM,CAAA;CAAC,GAAG,IAAI,CAyHlG"}
1
+ {"version":3,"file":"rules.nx.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.nx.ts"],"names":[],"mappings":"AAIA,OAAO,EAQL,IAAI,EAIL,MAAM,4BAA4B,CAAC;AASpC,OAAO,KAAK,EACV,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAiDnB;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAyEpG"}
@@ -1,73 +1,67 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.nxGenerateModule = nxGenerateModule;
4
- const schematics_1 = require("@angular-devkit/schematics");
5
- const path = require("node:path");
6
4
  const node_fs_1 = require("node:fs");
7
- const shared_1 = require("./shared");
5
+ const path = require("node:path");
6
+ const schematics_1 = require("@angular-devkit/schematics");
8
7
  const schematics_2 = require("@o3r/schematics");
8
+ const shared_1 = require("./shared");
9
+ /**
10
+ * Save the content of files before the process of Nx generation
11
+ * @param tree
12
+ */
13
+ const savePreCommandContent = (tree) => {
14
+ const files = [
15
+ '/.vscode/extensions.json',
16
+ '.gitignore',
17
+ '.prettierignore',
18
+ '.prettierrc',
19
+ 'jest.preset.js',
20
+ 'nx.json',
21
+ 'package.json'
22
+ ];
23
+ return files.reduce((acc, file) => {
24
+ if (!tree.exists(file)) {
25
+ acc[file] = null;
26
+ return acc;
27
+ }
28
+ acc[file] = tree.read(file);
29
+ return acc;
30
+ }, {});
31
+ };
32
+ /**
33
+ * Restore the file saved
34
+ * @param mem
35
+ */
36
+ const restoreFiles = (mem) => (tree) => {
37
+ Object.entries(mem)
38
+ .forEach(([file, content]) => {
39
+ if (content === null) {
40
+ if (tree.exists(file)) {
41
+ tree.delete(file);
42
+ }
43
+ }
44
+ else {
45
+ tree.overwrite(file, content);
46
+ }
47
+ });
48
+ return tree;
49
+ };
9
50
  /**
10
51
  * generate the rules to adapt the library generated by nx cli
11
- *
12
52
  * @param options
13
- * @param rootPath
14
53
  */
15
54
  function nxGenerateModule(options) {
16
55
  /**
17
56
  * Determine the path where NX schematic will generate the package
18
- *
19
57
  * @param tree
20
58
  */
21
59
  const determineNxTargetFolder = (tree) => {
22
60
  const { workspaceLayout } = tree.readJson('/nx.json');
23
61
  return path.posix.join(workspaceLayout.libsDir, options.name);
24
62
  };
25
- /**
26
- * Save the content of files before the process of Nx generation
27
- *
28
- * @param tree
29
- */
30
- const savePreCommandContent = (tree) => {
31
- const files = [
32
- '/.vscode/extensions.json',
33
- '.gitignore',
34
- '.prettierignore',
35
- '.prettierrc',
36
- 'jest.preset.js',
37
- 'nx.json',
38
- 'package.json'
39
- ];
40
- return files.reduce((acc, file) => {
41
- if (!tree.exists(file)) {
42
- acc[file] = null;
43
- return acc;
44
- }
45
- acc[file] = tree.read(file);
46
- return acc;
47
- }, {});
48
- };
49
- /**
50
- * Restore the file saved
51
- *
52
- * @param mem
53
- */
54
- const restoreFiles = (mem) => (tree) => {
55
- Object.entries(mem)
56
- .forEach(([file, content]) => {
57
- if (content === null) {
58
- if (tree.exists(file)) {
59
- tree.delete(file);
60
- }
61
- }
62
- else {
63
- tree.overwrite(file, content);
64
- }
65
- });
66
- return tree;
67
- };
68
63
  /**
69
64
  * Update Nx templates
70
- *
71
65
  * @param tree File tree
72
66
  * @param context Context of the schematics
73
67
  */
@@ -1 +1 @@
1
- {"version":3,"file":"rules.nx.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.nx.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rules.nx.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.nx.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAGnD;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC5C,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,WAAW,GAAG;IAAE,qBAAqB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAC,EACnF,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAqDzC;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAQ/D"}
1
+ {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAMpC,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAEnB;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC5C,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,WAAW,GAAG;IAAE,qBAAqB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EACpF,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAqDzC;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAQ/D"}