@o3r/workspace 13.5.0-prerelease.9 → 13.6.0-prerelease.1

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/workspace",
3
- "version": "13.5.0-prerelease.9",
3
+ "version": "13.6.0-prerelease.1",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -41,10 +41,9 @@
41
41
  "@angular/common": "^20.0.0",
42
42
  "@angular/compiler-cli": "^20.0.0",
43
43
  "@angular/core": "^20.0.0",
44
- "@o3r/schematics": "~13.5.0-prerelease.9",
45
- "@o3r/telemetry": "~13.5.0-prerelease.9",
44
+ "@o3r/schematics": "~13.6.0-prerelease.1",
45
+ "@o3r/telemetry": "~13.6.0-prerelease.1",
46
46
  "@schematics/angular": "^20.0.0",
47
- "ts-node": "~10.9.2",
48
47
  "type-fest": "^4.30.1",
49
48
  "typescript": "^5.9.0"
50
49
  },
@@ -63,7 +62,7 @@
63
62
  }
64
63
  },
65
64
  "dependencies": {
66
- "@o3r/schematics": "~13.5.0-prerelease.9",
65
+ "@o3r/schematics": "~13.6.0-prerelease.1",
67
66
  "commander": "^14.0.0",
68
67
  "globby": "^11.1.0",
69
68
  "semver": "^7.5.2",
@@ -72,19 +71,19 @@
72
71
  "winston": "^3.8.2"
73
72
  },
74
73
  "devDependencies": {
75
- "@angular-devkit/architect": "~0.2003.11",
76
- "@angular-devkit/build-angular": "~20.3.11",
77
- "@angular-devkit/core": "~20.3.11",
78
- "@angular-devkit/schematics": "~20.3.11",
79
- "@angular/animations": "~20.3.13",
80
- "@angular/cli": "~20.3.11",
81
- "@angular/common": "~20.3.13",
82
- "@angular/compiler": "~20.3.13",
83
- "@angular/compiler-cli": "~20.3.13",
84
- "@angular/core": "~20.3.13",
85
- "@angular/platform-browser": "~20.3.13",
86
- "@angular/platform-browser-dynamic": "~20.3.13",
87
- "@angular/router": "~20.3.13",
74
+ "@angular-devkit/architect": "0.2003.13",
75
+ "@angular-devkit/build-angular": "~20.3.13",
76
+ "@angular-devkit/core": "~20.3.13",
77
+ "@angular-devkit/schematics": "~20.3.13",
78
+ "@angular/animations": "~20.3.15",
79
+ "@angular/cli": "~20.3.13",
80
+ "@angular/common": "~20.3.15",
81
+ "@angular/compiler": "~20.3.15",
82
+ "@angular/compiler-cli": "~20.3.15",
83
+ "@angular/core": "~20.3.15",
84
+ "@angular/platform-browser": "~20.3.15",
85
+ "@angular/platform-browser-dynamic": "~20.3.15",
86
+ "@angular/router": "~20.3.15",
88
87
  "@babel/core": "~7.28.0",
89
88
  "@babel/preset-typescript": "~7.28.0",
90
89
  "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
@@ -96,18 +95,18 @@
96
95
  "@nx/jest": "~21.6.0",
97
96
  "@nx/js": "~21.6.0",
98
97
  "@nx/workspace": "~21.6.0",
99
- "@o3r/build-helpers": "~13.5.0-prerelease.9",
100
- "@o3r/core": "~13.5.0-prerelease.9",
101
- "@o3r/eslint-plugin": "~13.5.0-prerelease.9",
102
- "@o3r/telemetry": "~13.5.0-prerelease.9",
103
- "@o3r/test-helpers": "~13.5.0-prerelease.9",
104
- "@schematics/angular": "~20.3.11",
98
+ "@o3r/build-helpers": "~13.6.0-prerelease.1",
99
+ "@o3r/core": "~13.6.0-prerelease.1",
100
+ "@o3r/eslint-plugin": "~13.6.0-prerelease.1",
101
+ "@o3r/telemetry": "~13.6.0-prerelease.1",
102
+ "@o3r/test-helpers": "~13.6.0-prerelease.1",
103
+ "@schematics/angular": "~20.3.13",
105
104
  "@stylistic/eslint-plugin": "~5.6.0",
106
- "@types/jest": "~29.5.2",
105
+ "@types/jest": "~30.0.0",
107
106
  "@types/minimist": "^1.2.2",
108
- "@types/node": "~22.18.0",
107
+ "@types/node": "~24.10.0",
109
108
  "@types/semver": "^7.3.13",
110
- "@typescript-eslint/parser": "~8.47.0",
109
+ "@typescript-eslint/parser": "~8.50.0",
111
110
  "angular-eslint": "~20.6.0",
112
111
  "cpy-cli": "^6.0.0",
113
112
  "eslint": "~9.39.0",
@@ -115,48 +114,48 @@
115
114
  "eslint-import-resolver-typescript": "~4.4.0",
116
115
  "eslint-plugin-import": "~2.32.0",
117
116
  "eslint-plugin-import-newlines": "~1.4.0",
118
- "eslint-plugin-jest": "~29.1.0",
117
+ "eslint-plugin-jest": "~29.10.0",
119
118
  "eslint-plugin-jsdoc": "~54.7.0",
120
119
  "eslint-plugin-prefer-arrow": "~1.2.3",
121
120
  "eslint-plugin-unicorn": "~60.0.0",
122
121
  "eslint-plugin-unused-imports": "~4.3.0",
123
122
  "globals": "^16.0.0",
124
- "jest": "~29.7.0",
125
- "jest-environment-jsdom": "~29.7.0",
123
+ "jest": "~30.2.0",
124
+ "jest-environment-jsdom": "~30.2.0",
126
125
  "jest-junit": "~16.0.0",
127
- "jest-preset-angular": "~14.6.0",
128
- "jest-util": "~29.7.0",
126
+ "jest-preset-angular": "~16.0.0",
127
+ "jest-util": "~30.2.0",
128
+ "jsdom": "^26.1.0",
129
129
  "jsonc-eslint-parser": "~2.4.0",
130
130
  "minimist": "^1.2.6",
131
131
  "nx": "~21.6.0",
132
132
  "rxjs": "^7.8.1",
133
133
  "ts-jest": "~29.4.0",
134
- "ts-node": "~10.9.2",
135
134
  "type-fest": "^4.30.1",
136
135
  "typescript": "~5.9.2",
137
- "typescript-eslint": "~8.47.0",
136
+ "typescript-eslint": "~8.50.0",
138
137
  "zone.js": "~0.15.0"
139
138
  },
140
139
  "generatorDependencies": {
141
140
  "@angular-builders/jest": "~20.0.0",
142
- "@angular-devkit/build-angular": "~20.3.11",
143
- "@angular-devkit/core": "~20.3.11",
141
+ "@angular-devkit/build-angular": "~20.3.13",
142
+ "@angular-devkit/core": "~20.3.13",
144
143
  "@angular-eslint/eslint-plugin": "~20.0.0",
145
144
  "@commitlint/cli": "^19.0.0",
146
145
  "@commitlint/config-angular": "^19.0.0",
147
146
  "@commitlint/config-conventional": "^19.0.0",
148
147
  "@commitlint/types": "^19.0.0",
149
- "@schematics/angular": "~20.3.11",
148
+ "@schematics/angular": "~20.3.13",
150
149
  "@types/jasmine": "~5.1.0",
151
- "@types/jest": "~29.5.2",
152
- "@types/node": "~22.18.0",
150
+ "@types/jest": "~30.0.0",
151
+ "@types/node": "~24.10.0",
153
152
  "cpy-cli": "^6.0.0",
154
153
  "editorconfig-checker": "^6.0.1",
155
154
  "husky": "~9.1.0",
156
- "jest": "~29.7.0",
157
- "jest-environment-jsdom": "~29.7.0",
155
+ "jest": "~30.2.0",
156
+ "jest-environment-jsdom": "~30.2.0",
158
157
  "jest-junit": "~16.0.0",
159
- "jest-preset-angular": "~14.6.0",
158
+ "jest-preset-angular": "~16.0.0",
160
159
  "lerna": "^8.1.7",
161
160
  "lint-staged": "^16.0.0",
162
161
  "ts-jest": "~29.4.0"
@@ -1 +1 @@
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;AAOpC,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,uBAAuB,EAAE,WAAW,GAAG;IAAE,qBAAqB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EACzF,OAAO,EAAE,sBAAsB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAsDjE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAa/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;AAOpC,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,uBAAuB,EAAE,WAAW,GAAG;IAAE,qBAAqB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EACzF,OAAO,EAAE,sBAAsB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CA0DjE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAa/D"}
@@ -47,12 +47,16 @@ function updatePackageDependenciesFactory(targetPath, otterVersion, o3rWorkspace
47
47
  ...options.useJest
48
48
  ? {
49
49
  '@angular-builders/jest': o3rWorkspacePackageJson.generatorDependencies['@angular-builders/jest'],
50
- '@types/jest': o3rWorkspacePackageJson.generatorDependencies['@types/jest'],
51
- jest: o3rWorkspacePackageJson.generatorDependencies.jest,
52
- 'jest-environment-jsdom': o3rWorkspacePackageJson.generatorDependencies['jest-environment-jsdom'],
53
- 'jest-junit': o3rWorkspacePackageJson.generatorDependencies['jest-junit'],
54
- 'jest-preset-angular': o3rWorkspacePackageJson.generatorDependencies['jest-preset-angular'],
50
+ '@types/jest': o3rWorkspacePackageJson.generatorDependencies['@types/jest'] || o3rWorkspacePackageJson.devDependencies['@types/jest'],
51
+ jest: o3rWorkspacePackageJson.generatorDependencies.jest || o3rWorkspacePackageJson.devDependencies.jest,
52
+ 'jest-environment-jsdom': o3rWorkspacePackageJson.generatorDependencies['jest-environment-jsdom']
53
+ || o3rWorkspacePackageJson.generatorDependencies.jest || o3rWorkspacePackageJson.devDependencies.jest,
54
+ 'jest-junit': o3rWorkspacePackageJson.generatorDependencies['jest-junit']
55
+ || o3rWorkspacePackageJson.devDependencies['jest-junit'],
56
+ 'jest-preset-angular': o3rWorkspacePackageJson.generatorDependencies['jest-preset-angular']
57
+ || o3rWorkspacePackageJson.devDependencies['jest-preset-angular'],
55
58
  'ts-jest': o3rWorkspacePackageJson.generatorDependencies['ts-jest']
59
+ || o3rWorkspacePackageJson.devDependencies['ts-jest']
56
60
  }
57
61
  : {
58
62
  '@types/jasmine': o3rWorkspacePackageJson.generatorDependencies['@types/jasmine']
@@ -1 +1 @@
1
- {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"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"}