@o3r/workspace 14.0.0-next.9 → 14.0.0-prerelease.2
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 +53 -53
- package/schematics/application/index.d.ts.map +1 -1
- package/schematics/application/index.js +2 -1
- package/schematics/application/index.js.map +1 -1
- package/schematics/application/templates/package.json.template +9 -7
- package/schematics/library/rules/rules-ng.d.ts.map +1 -1
- package/schematics/library/rules/rules-ng.js +3 -2
- package/schematics/library/rules/rules-ng.js.map +1 -1
- package/schematics/library/rules/shared.d.ts +1 -0
- package/schematics/library/rules/shared.d.ts.map +1 -1
- package/schematics/library/rules/shared.js +8 -3
- package/schematics/library/rules/shared.js.map +1 -1
- package/schematics/library/templates/jest/testing/setup-jest.ts.template +3 -4
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "14.0.0-
|
|
3
|
+
"version": "14.0.0-prerelease.2",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -34,16 +34,16 @@
|
|
|
34
34
|
"main": "./src/public_api.js",
|
|
35
35
|
"types": "./src/public_api.d.ts",
|
|
36
36
|
"peerDependencies": {
|
|
37
|
-
"@angular-devkit/architect": ">=0.
|
|
38
|
-
"@angular-devkit/core": "^
|
|
39
|
-
"@angular-devkit/schematics": "^
|
|
40
|
-
"@angular/cli": "^
|
|
41
|
-
"@angular/common": "^
|
|
42
|
-
"@angular/compiler-cli": "^
|
|
43
|
-
"@angular/core": "^
|
|
44
|
-
"@o3r/schematics": "~14.0.0-
|
|
45
|
-
"@o3r/telemetry": "~14.0.0-
|
|
46
|
-
"@schematics/angular": "^
|
|
37
|
+
"@angular-devkit/architect": ">=0.2100.0 <0.2200.0-0",
|
|
38
|
+
"@angular-devkit/core": "^21.0.0",
|
|
39
|
+
"@angular-devkit/schematics": "^21.0.0",
|
|
40
|
+
"@angular/cli": "^21.0.0",
|
|
41
|
+
"@angular/common": "^21.0.0",
|
|
42
|
+
"@angular/compiler-cli": "^21.0.0",
|
|
43
|
+
"@angular/core": "^21.0.0",
|
|
44
|
+
"@o3r/schematics": "~14.0.0-prerelease.2",
|
|
45
|
+
"@o3r/telemetry": "~14.0.0-prerelease.2",
|
|
46
|
+
"@schematics/angular": "^21.0.0",
|
|
47
47
|
"type-fest": "^5.3.1",
|
|
48
48
|
"typescript": "^5.9.0"
|
|
49
49
|
},
|
|
@@ -62,59 +62,59 @@
|
|
|
62
62
|
}
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@o3r/schematics": "~14.0.0-
|
|
65
|
+
"@o3r/schematics": "~14.0.0-prerelease.2",
|
|
66
66
|
"commander": "^14.0.0",
|
|
67
67
|
"globby": "^11.1.0",
|
|
68
68
|
"semver": "^7.5.2",
|
|
69
69
|
"tslib": "^2.6.2",
|
|
70
|
-
"uuid": "
|
|
70
|
+
"uuid": "~13.0.0",
|
|
71
71
|
"winston": "^3.8.2"
|
|
72
72
|
},
|
|
73
73
|
"devDependencies": {
|
|
74
|
-
"@angular-devkit/architect": "0.
|
|
75
|
-
"@angular-devkit/build-angular": "~
|
|
76
|
-
"@angular-devkit/core": "~
|
|
77
|
-
"@angular-devkit/schematics": "~
|
|
78
|
-
"@angular/animations": "~
|
|
79
|
-
"@angular/cli": "~
|
|
80
|
-
"@angular/common": "~
|
|
81
|
-
"@angular/compiler": "~
|
|
82
|
-
"@angular/compiler-cli": "~
|
|
83
|
-
"@angular/core": "~
|
|
84
|
-
"@angular/platform-browser": "~
|
|
85
|
-
"@angular/platform-browser-dynamic": "~
|
|
86
|
-
"@angular/router": "~
|
|
74
|
+
"@angular-devkit/architect": "~0.2100.2",
|
|
75
|
+
"@angular-devkit/build-angular": "~21.0.2",
|
|
76
|
+
"@angular-devkit/core": "~21.0.2",
|
|
77
|
+
"@angular-devkit/schematics": "~21.0.2",
|
|
78
|
+
"@angular/animations": "~21.0.3",
|
|
79
|
+
"@angular/cli": "~21.0.2",
|
|
80
|
+
"@angular/common": "~21.0.3",
|
|
81
|
+
"@angular/compiler": "~21.0.3",
|
|
82
|
+
"@angular/compiler-cli": "~21.0.3",
|
|
83
|
+
"@angular/core": "~21.0.3",
|
|
84
|
+
"@angular/platform-browser": "~21.0.3",
|
|
85
|
+
"@angular/platform-browser-dynamic": "~21.0.3",
|
|
86
|
+
"@angular/router": "~21.0.3",
|
|
87
87
|
"@babel/core": "~7.28.0",
|
|
88
88
|
"@babel/preset-typescript": "~7.28.0",
|
|
89
89
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
90
|
-
"@ngrx/entity": "~
|
|
91
|
-
"@ngrx/store": "~
|
|
92
|
-
"@nx/angular": "~
|
|
93
|
-
"@nx/eslint": "~
|
|
94
|
-
"@nx/eslint-plugin": "~
|
|
95
|
-
"@nx/jest": "~
|
|
96
|
-
"@nx/js": "~
|
|
97
|
-
"@nx/workspace": "~
|
|
98
|
-
"@o3r/build-helpers": "~14.0.0-
|
|
99
|
-
"@o3r/core": "~14.0.0-
|
|
100
|
-
"@o3r/eslint-plugin": "~14.0.0-
|
|
101
|
-
"@o3r/telemetry": "~14.0.0-
|
|
102
|
-
"@o3r/test-helpers": "~14.0.0-
|
|
103
|
-
"@schematics/angular": "~
|
|
90
|
+
"@ngrx/entity": "~21.0.0",
|
|
91
|
+
"@ngrx/store": "~21.0.0",
|
|
92
|
+
"@nx/angular": "~22.3.3",
|
|
93
|
+
"@nx/eslint": "~22.3.3",
|
|
94
|
+
"@nx/eslint-plugin": "~22.3.3",
|
|
95
|
+
"@nx/jest": "~22.3.3",
|
|
96
|
+
"@nx/js": "~22.3.3",
|
|
97
|
+
"@nx/workspace": "~22.3.3",
|
|
98
|
+
"@o3r/build-helpers": "~14.0.0-prerelease.2",
|
|
99
|
+
"@o3r/core": "~14.0.0-prerelease.2",
|
|
100
|
+
"@o3r/eslint-plugin": "~14.0.0-prerelease.2",
|
|
101
|
+
"@o3r/telemetry": "~14.0.0-prerelease.2",
|
|
102
|
+
"@o3r/test-helpers": "~14.0.0-prerelease.2",
|
|
103
|
+
"@schematics/angular": "~21.0.2",
|
|
104
104
|
"@stylistic/eslint-plugin": "~5.6.0",
|
|
105
105
|
"@types/jest": "~30.0.0",
|
|
106
106
|
"@types/minimist": "^1.2.2",
|
|
107
107
|
"@types/node": "~24.10.0",
|
|
108
108
|
"@types/semver": "^7.3.13",
|
|
109
|
-
"@typescript-eslint/parser": "~8.
|
|
110
|
-
"angular-eslint": "~
|
|
109
|
+
"@typescript-eslint/parser": "~8.52.0",
|
|
110
|
+
"angular-eslint": "~21.0.1",
|
|
111
111
|
"cpy-cli": "^6.0.0",
|
|
112
112
|
"eslint": "~9.39.0",
|
|
113
113
|
"eslint-import-resolver-node": "~0.3.9",
|
|
114
114
|
"eslint-import-resolver-typescript": "~4.4.0",
|
|
115
115
|
"eslint-plugin-import": "~2.32.0",
|
|
116
116
|
"eslint-plugin-import-newlines": "~1.4.0",
|
|
117
|
-
"eslint-plugin-jest": "~29.
|
|
117
|
+
"eslint-plugin-jest": "~29.12.0",
|
|
118
118
|
"eslint-plugin-jsdoc": "~61.5.0",
|
|
119
119
|
"eslint-plugin-prefer-arrow": "~1.2.3",
|
|
120
120
|
"eslint-plugin-unicorn": "~62.0.0",
|
|
@@ -125,27 +125,26 @@
|
|
|
125
125
|
"jest-junit": "~16.0.0",
|
|
126
126
|
"jest-preset-angular": "~16.0.0",
|
|
127
127
|
"jest-util": "~30.2.0",
|
|
128
|
-
"jsdom": "
|
|
128
|
+
"jsdom": "~27.3.0",
|
|
129
129
|
"jsonc-eslint-parser": "~2.4.0",
|
|
130
130
|
"minimist": "^1.2.6",
|
|
131
|
-
"nx": "~
|
|
131
|
+
"nx": "~22.3.3",
|
|
132
132
|
"rxjs": "^7.8.1",
|
|
133
133
|
"ts-jest": "~29.4.0",
|
|
134
134
|
"type-fest": "^5.3.1",
|
|
135
135
|
"typescript": "~5.9.2",
|
|
136
|
-
"typescript-eslint": "~8.
|
|
137
|
-
"zone.js": "~0.15.0"
|
|
136
|
+
"typescript-eslint": "~8.52.0"
|
|
138
137
|
},
|
|
139
138
|
"generatorDependencies": {
|
|
140
|
-
"@angular-builders/jest": "~
|
|
141
|
-
"@angular-devkit/build-angular": "~
|
|
142
|
-
"@angular-devkit/core": "~
|
|
143
|
-
"@angular-eslint/eslint-plugin": "~
|
|
139
|
+
"@angular-builders/jest": "~21.0.0-beta.1",
|
|
140
|
+
"@angular-devkit/build-angular": "~21.0.2",
|
|
141
|
+
"@angular-devkit/core": "~21.0.2",
|
|
142
|
+
"@angular-eslint/eslint-plugin": "~21.1.0",
|
|
144
143
|
"@commitlint/cli": "^20.2.0",
|
|
145
144
|
"@commitlint/config-angular": "^20.2.0",
|
|
146
145
|
"@commitlint/config-conventional": "^20.2.0",
|
|
147
146
|
"@commitlint/types": "^20.2.0",
|
|
148
|
-
"@schematics/angular": "~
|
|
147
|
+
"@schematics/angular": "~21.0.2",
|
|
149
148
|
"@types/jasmine": "~5.1.0",
|
|
150
149
|
"@types/jest": "~30.0.0",
|
|
151
150
|
"@types/node": "~24.10.0",
|
|
@@ -158,7 +157,8 @@
|
|
|
158
157
|
"jest-preset-angular": "~16.0.0",
|
|
159
158
|
"lerna": "^8.1.7",
|
|
160
159
|
"lint-staged": "^16.0.0",
|
|
161
|
-
"ts-jest": "~29.4.0"
|
|
160
|
+
"ts-jest": "~29.4.0",
|
|
161
|
+
"vitest": "~4.0.0"
|
|
162
162
|
},
|
|
163
163
|
"engines": {
|
|
164
164
|
"node": "^20.19.0 || ^22.17.0 || ^24.0.0"
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAwIpC;;;GAGG;AACH,eAAO,MAAM,mBAAmB,wBAA8C,CAAC"}
|
|
@@ -37,7 +37,8 @@ function generateApplicationFn(options) {
|
|
|
37
37
|
tsconfigBasePath,
|
|
38
38
|
enforceTildeRange: schematics_2.enforceTildeRange,
|
|
39
39
|
name: packageJsonName,
|
|
40
|
-
rootDependencies
|
|
40
|
+
rootDependencies,
|
|
41
|
+
testingFramework: rootDependencies.vitest ? 'vitest' : (rootDependencies.jest ? 'jest' : 'jasmine')
|
|
41
42
|
}),
|
|
42
43
|
(0, schematics_1.move)(targetPath),
|
|
43
44
|
(0, schematics_1.renameTemplateFiles)()
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,10 @@
|
|
|
3
3
|
"version": "0.0.0-placeholder",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"ng": "ng",
|
|
6
|
-
"start": "ng serve",
|
|
7
|
-
"build": "ng build",
|
|
8
|
-
"watch": "ng build --watch --configuration development"
|
|
6
|
+
"start": "ng serve <%= name %>",
|
|
7
|
+
"build": "ng build <%= name %>",
|
|
8
|
+
"watch": "ng build <%= name %> --watch --configuration development"<% if (testingFramework !== 'jest') { %>,
|
|
9
|
+
"test": "ng test <%= name %>"<% } %>
|
|
9
10
|
},
|
|
10
11
|
"private": true,
|
|
11
12
|
"dependencies": {
|
|
@@ -18,13 +19,14 @@
|
|
|
18
19
|
"@angular/platform-browser-dynamic": "<%= rootDependencies['@angular/platform-browser-dynamic'] || rootDependencies['@angular/core'] || 'latest' %>",
|
|
19
20
|
"@angular/router": "<%= rootDependencies['@angular/router'] || rootDependencies['@angular/core'] || 'latest' %>",
|
|
20
21
|
"rxjs": "<%= rootDependencies['rxjs'] || 'latest' %>",
|
|
21
|
-
"tslib": "<%= rootDependencies['tslib'] || 'latest' %>"
|
|
22
|
-
"zone.js": "<%= rootDependencies['zone.js'] || 'latest' %>"
|
|
22
|
+
"tslib": "<%= rootDependencies['tslib'] || 'latest' %>"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"@angular/cli": "<%= rootDependencies['@angular/cli'] || 'latest' %>",
|
|
26
26
|
"@angular/compiler-cli": "<%= rootDependencies['@angular/compiler-cli'] || rootDependencies['@angular/cli'] || 'latest' %>",
|
|
27
|
-
<% if (
|
|
28
|
-
<% } %>"typescript": "<%= enforceTildeRange(rootDependencies['typescript'] || 'latest') %>"
|
|
27
|
+
<% if (testingFramework === 'jasmine') { %>"@types/jasmine": "<%= rootDependencies['@types/jasmine'] %>",
|
|
28
|
+
<% } %>"typescript": "<%= enforceTildeRange(rootDependencies['typescript'] || 'latest') %>"<% if (testingFramework === 'vitest') { %>,
|
|
29
|
+
"jsdom": "<%= rootDependencies['jsdom'] %>",
|
|
30
|
+
"vitest": "<%= rootDependencies['vitest'] %>"<% } %>
|
|
29
31
|
}
|
|
30
32
|
}
|
|
@@ -1 +1 @@
|
|
|
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;AAcpC,OAAO,KAAK,EACV,sBAAsB,EACvB,MAAM,WAAW,CAAC;AA4CnB;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,
|
|
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;AAcpC,OAAO,KAAK,EACV,sBAAsB,EACvB,MAAM,WAAW,CAAC;AA4CnB;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAsIxH"}
|
|
@@ -85,7 +85,8 @@ function ngGenerateModule(options) {
|
|
|
85
85
|
(0, schematics_1.move)(options.targetPath)
|
|
86
86
|
]);
|
|
87
87
|
const packageJsonContent = tree.readText('/package.json');
|
|
88
|
-
const hasJestInstalled = options.testingFramework === 'jest' ||
|
|
88
|
+
const hasJestInstalled = options.testingFramework === 'jest' || /"jest"/.test(packageJsonContent);
|
|
89
|
+
const hasVitestInstalled = options.testingFramework === 'vitest' || /"vitest"/.test(packageJsonContent);
|
|
89
90
|
return (0, schematics_1.chain)([
|
|
90
91
|
(0, schematics_1.mergeWith)(templateNg, schematics_1.MergeStrategy.Overwrite),
|
|
91
92
|
...hasJestInstalled
|
|
@@ -98,7 +99,7 @@ function ngGenerateModule(options) {
|
|
|
98
99
|
: [
|
|
99
100
|
setUpAngularTestPackageJson(options)
|
|
100
101
|
],
|
|
101
|
-
(0, shared_1.updatePackageDependenciesFactory)(options.targetPath, otterVersion, o3rWorkspacePackageJson, { ...options, useJest: !!hasJestInstalled }),
|
|
102
|
+
(0, shared_1.updatePackageDependenciesFactory)(options.targetPath, otterVersion, o3rWorkspacePackageJson, { ...options, useJest: !!hasJestInstalled, useVitest: !!hasVitestInstalled }),
|
|
102
103
|
(0, shared_1.updateNgPackagrFactory)(options.targetPath),
|
|
103
104
|
(t) => {
|
|
104
105
|
const genPackageJsonPath = path.posix.join(options.targetPath, 'package.json');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules-ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules-ng.ts"],"names":[],"mappings":";;AAgFA,
|
|
1
|
+
{"version":3,"file":"rules-ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules-ng.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ export declare function updatePackageDependenciesFactory(targetPath: string, ott
|
|
|
12
12
|
generatorDependencies?: Record<string, string>;
|
|
13
13
|
}, options: NgGenerateModuleSchema & {
|
|
14
14
|
useJest?: boolean;
|
|
15
|
+
useVitest?: boolean;
|
|
15
16
|
}): Rule;
|
|
16
17
|
/**
|
|
17
18
|
* Generate rule to update generated ng-packagr.json file
|
|
@@ -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,
|
|
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,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CA+DtF;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAa/D"}
|
|
@@ -58,9 +58,14 @@ function updatePackageDependenciesFactory(targetPath, otterVersion, o3rWorkspace
|
|
|
58
58
|
'ts-jest': o3rWorkspacePackageJson.generatorDependencies['ts-jest']
|
|
59
59
|
|| o3rWorkspacePackageJson.devDependencies['ts-jest']
|
|
60
60
|
}
|
|
61
|
-
:
|
|
62
|
-
|
|
63
|
-
|
|
61
|
+
: (options.useVitest
|
|
62
|
+
? {
|
|
63
|
+
jsdom: o3rWorkspacePackageJson.generatorDependencies.jsdom || o3rWorkspacePackageJson.devDependencies.jsdom,
|
|
64
|
+
vitest: o3rWorkspacePackageJson.generatorDependencies.vitest
|
|
65
|
+
}
|
|
66
|
+
: {
|
|
67
|
+
'@types/jasmine': o3rWorkspacePackageJson.generatorDependencies['@types/jasmine']
|
|
68
|
+
}),
|
|
64
69
|
rxjs: o3rWorkspacePackageJson.peerDependencies.rxjs,
|
|
65
70
|
typescript: o3rWorkspacePackageJson.peerDependencies.typescript,
|
|
66
71
|
'zone.js': o3rWorkspacePackageJson.generatorDependencies['zone.js']
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":";;AAwBA,
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"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"}
|