@o3r/testing 12.5.0-prerelease.3 → 12.5.0-prerelease.30
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 +24 -18
- package/schematics/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +34 -27
- package/schematics/ng-add/index.js.map +1 -1
- package/schematics/ng-add/playwright/index.d.ts.map +1 -1
- package/schematics/ng-add/playwright/index.js +18 -15
- package/schematics/ng-add/playwright/index.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/testing",
|
|
3
|
-
"version": "12.5.0-prerelease.
|
|
3
|
+
"version": "12.5.0-prerelease.30",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -111,10 +111,10 @@
|
|
|
111
111
|
"@angular/platform-browser": "^19.0.0",
|
|
112
112
|
"@material/slider": "^14.0.0",
|
|
113
113
|
"@ngrx/store": "^19.0.0",
|
|
114
|
-
"@ngx-translate/core": "~16.0.4",
|
|
115
|
-
"@o3r/core": "^12.5.0-prerelease.
|
|
116
|
-
"@o3r/localization": "^12.5.0-prerelease.
|
|
117
|
-
"@o3r/schematics": "^12.5.0-prerelease.
|
|
114
|
+
"@ngx-translate/core": "^15.0.0 || ~16.0.4",
|
|
115
|
+
"@o3r/core": "^12.5.0-prerelease.30",
|
|
116
|
+
"@o3r/localization": "^12.5.0-prerelease.30",
|
|
117
|
+
"@o3r/schematics": "^12.5.0-prerelease.30",
|
|
118
118
|
"@playwright/test": "^1.49.0",
|
|
119
119
|
"@schematics/angular": "^19.0.0",
|
|
120
120
|
"pixelmatch": "^6.0.0",
|
|
@@ -123,7 +123,7 @@
|
|
|
123
123
|
"rxjs": "^7.8.1",
|
|
124
124
|
"temporal-polyfill": "^0.3.0",
|
|
125
125
|
"ts-node": "~10.9.2",
|
|
126
|
-
"type-fest": "^4.
|
|
126
|
+
"type-fest": "^4.30.1",
|
|
127
127
|
"typescript": "^5.5.4"
|
|
128
128
|
},
|
|
129
129
|
"peerDependenciesMeta": {
|
|
@@ -139,9 +139,15 @@
|
|
|
139
139
|
"@angular/cli": {
|
|
140
140
|
"optional": true
|
|
141
141
|
},
|
|
142
|
+
"@angular/forms": {
|
|
143
|
+
"optional": true
|
|
144
|
+
},
|
|
142
145
|
"@material/slider": {
|
|
143
146
|
"optional": true
|
|
144
147
|
},
|
|
148
|
+
"@ngrx/store": {
|
|
149
|
+
"optional": true
|
|
150
|
+
},
|
|
145
151
|
"@ngx-translate/core": {
|
|
146
152
|
"optional": true
|
|
147
153
|
},
|
|
@@ -177,7 +183,7 @@
|
|
|
177
183
|
}
|
|
178
184
|
},
|
|
179
185
|
"dependencies": {
|
|
180
|
-
"@o3r/schematics": "^12.5.0-prerelease.
|
|
186
|
+
"@o3r/schematics": "^12.5.0-prerelease.30",
|
|
181
187
|
"esbuild": "~0.25.1",
|
|
182
188
|
"module-from-string": "^3.2.0",
|
|
183
189
|
"tslib": "^2.6.2"
|
|
@@ -195,7 +201,7 @@
|
|
|
195
201
|
"@angular/forms": "~19.2.0",
|
|
196
202
|
"@angular/platform-browser": "~19.2.0",
|
|
197
203
|
"@angular/platform-browser-dynamic": "~19.2.0",
|
|
198
|
-
"@babel/core": "~7.
|
|
204
|
+
"@babel/core": "~7.28.0",
|
|
199
205
|
"@babel/preset-typescript": "~7.27.0",
|
|
200
206
|
"@compodoc/compodoc": "^1.1.19",
|
|
201
207
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
@@ -204,11 +210,11 @@
|
|
|
204
210
|
"@ngx-translate/core": "~16.0.4",
|
|
205
211
|
"@nx/eslint-plugin": "~20.8.0",
|
|
206
212
|
"@nx/jest": "~20.8.0",
|
|
207
|
-
"@o3r/build-helpers": "^12.5.0-prerelease.
|
|
208
|
-
"@o3r/core": "^12.5.0-prerelease.
|
|
209
|
-
"@o3r/eslint-plugin": "^12.5.0-prerelease.
|
|
210
|
-
"@o3r/localization": "^12.5.0-prerelease.
|
|
211
|
-
"@o3r/test-helpers": "^12.5.0-prerelease.
|
|
213
|
+
"@o3r/build-helpers": "^12.5.0-prerelease.30",
|
|
214
|
+
"@o3r/core": "^12.5.0-prerelease.30",
|
|
215
|
+
"@o3r/eslint-plugin": "^12.5.0-prerelease.30",
|
|
216
|
+
"@o3r/localization": "^12.5.0-prerelease.30",
|
|
217
|
+
"@o3r/test-helpers": "^12.5.0-prerelease.30",
|
|
212
218
|
"@playwright/test": "~1.51.0",
|
|
213
219
|
"@schematics/angular": "~19.2.0",
|
|
214
220
|
"@stylistic/eslint-plugin": "~3.1.0",
|
|
@@ -217,16 +223,16 @@
|
|
|
217
223
|
"@types/node": "^20.0.0",
|
|
218
224
|
"@types/pixelmatch": "^5.2.3",
|
|
219
225
|
"@types/pngjs": "^6.0.0",
|
|
220
|
-
"@typescript-eslint/parser": "~8.
|
|
226
|
+
"@typescript-eslint/parser": "~8.35.0",
|
|
221
227
|
"angular-eslint": "~19.4.0",
|
|
222
228
|
"concurrently": "^9.1.0",
|
|
223
229
|
"cpy-cli": "^5.0.0",
|
|
224
|
-
"eslint": "~9.
|
|
230
|
+
"eslint": "~9.30.0",
|
|
225
231
|
"eslint-import-resolver-node": "~0.3.9",
|
|
226
232
|
"eslint-import-resolver-typescript": "~3.10.0",
|
|
227
|
-
"eslint-plugin-import": "~2.
|
|
233
|
+
"eslint-plugin-import": "~2.32.0",
|
|
228
234
|
"eslint-plugin-import-newlines": "~1.4.0",
|
|
229
|
-
"eslint-plugin-jest": "~28.
|
|
235
|
+
"eslint-plugin-jest": "~28.14.0",
|
|
230
236
|
"eslint-plugin-jsdoc": "~50.8.0",
|
|
231
237
|
"eslint-plugin-prefer-arrow": "~1.2.3",
|
|
232
238
|
"eslint-plugin-unicorn": "~56.0.0",
|
|
@@ -250,7 +256,7 @@
|
|
|
250
256
|
"ts-node": "~10.9.2",
|
|
251
257
|
"type-fest": "^4.30.1",
|
|
252
258
|
"typescript": "~5.8.2",
|
|
253
|
-
"typescript-eslint": "~8.
|
|
259
|
+
"typescript-eslint": "~8.35.0",
|
|
254
260
|
"zone.js": "~0.15.0"
|
|
255
261
|
},
|
|
256
262
|
"generatorDependencies": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAQL,IAAI,EAKL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAQL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAiMpC;;;GAGG;AACH,eAAO,MAAM,KAAK,wBAAgC,CAAC"}
|
|
@@ -6,19 +6,21 @@ const path = require("node:path");
|
|
|
6
6
|
const prompt_1 = require("@angular/cli/src/utilities/prompt");
|
|
7
7
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
8
8
|
const schematics_2 = require("@o3r/schematics");
|
|
9
|
-
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
10
9
|
const fixture_1 = require("./fixture");
|
|
11
10
|
const playwright_1 = require("./playwright");
|
|
11
|
+
/**
|
|
12
|
+
* List of external dependencies to be added to the project as peer dependencies
|
|
13
|
+
*/
|
|
14
|
+
const dependenciesToInstall = [];
|
|
15
|
+
/**
|
|
16
|
+
* List of external dependencies to be added to the project as dev dependencies
|
|
17
|
+
*/
|
|
12
18
|
const devDependenciesToInstall = [
|
|
13
19
|
'pixelmatch',
|
|
14
20
|
'pngjs',
|
|
15
|
-
'jest',
|
|
16
|
-
'jest-environment-jsdom',
|
|
17
|
-
'jest-preset-angular',
|
|
18
|
-
'ts-jest',
|
|
19
|
-
'@angular-builders/jest',
|
|
20
21
|
'@angular-devkit/build-angular',
|
|
21
|
-
'@
|
|
22
|
+
'@angular/core',
|
|
23
|
+
'@angular/common'
|
|
22
24
|
];
|
|
23
25
|
/**
|
|
24
26
|
* Add Otter testing to an Angular Project
|
|
@@ -32,26 +34,8 @@ function ngAddFn(options) {
|
|
|
32
34
|
const depsInfo = (0, schematics_2.getO3rPeerDeps)(testPackageJsonPath);
|
|
33
35
|
const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
|
|
34
36
|
const workingDirectory = workspaceProject?.root || '.';
|
|
37
|
+
const projectPackageJson = tree.readJson(path.posix.join(workingDirectory, 'package.json'));
|
|
35
38
|
const projectType = workspaceProject?.projectType || 'application';
|
|
36
|
-
const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
|
|
37
|
-
acc[dep] = {
|
|
38
|
-
inManifest: [{
|
|
39
|
-
range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
|
|
40
|
-
types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
|
|
41
|
-
}],
|
|
42
|
-
ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
|
|
43
|
-
};
|
|
44
|
-
return acc;
|
|
45
|
-
}, (0, schematics_2.getPackageInstallConfig)(testPackageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
|
|
46
|
-
Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(devDependenciesToInstall, testPackageJsonPath, context.logger))
|
|
47
|
-
.forEach(([dep, range]) => {
|
|
48
|
-
dependencies[dep] = {
|
|
49
|
-
inManifest: [{
|
|
50
|
-
range,
|
|
51
|
-
types: [dependencies_1.NodeDependencyType.Dev]
|
|
52
|
-
}]
|
|
53
|
-
};
|
|
54
|
-
});
|
|
55
39
|
let installJest;
|
|
56
40
|
const testFramework = options.testingFramework || (0, schematics_2.getTestFramework)((0, schematics_2.getWorkspaceConfig)(tree), context);
|
|
57
41
|
switch (testFramework) {
|
|
@@ -72,6 +56,26 @@ function ngAddFn(options) {
|
|
|
72
56
|
break;
|
|
73
57
|
}
|
|
74
58
|
}
|
|
59
|
+
const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
|
|
60
|
+
acc[dep] = {
|
|
61
|
+
inManifest: [{
|
|
62
|
+
range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
|
|
63
|
+
types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
|
|
64
|
+
}],
|
|
65
|
+
ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
|
|
66
|
+
};
|
|
67
|
+
return acc;
|
|
68
|
+
}, (0, schematics_2.getPackageInstallConfig)(testPackageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
|
|
69
|
+
if (installJest) {
|
|
70
|
+
devDependenciesToInstall.push('@angular-builders/jest', '@types/jest', 'jest', 'jest-environment-jsdom', 'jest-preset-angular', 'ts-jest');
|
|
71
|
+
}
|
|
72
|
+
const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
|
|
73
|
+
devDependenciesToInstall,
|
|
74
|
+
dependenciesToInstall,
|
|
75
|
+
o3rPackageJsonPath: testPackageJsonPath,
|
|
76
|
+
projectType: workspaceProject?.projectType,
|
|
77
|
+
projectPackageJson
|
|
78
|
+
}, context.logger);
|
|
75
79
|
let installPlaywright = false;
|
|
76
80
|
if (projectType === 'application') {
|
|
77
81
|
installPlaywright = options.enablePlaywright === undefined
|
|
@@ -88,7 +92,10 @@ function ngAddFn(options) {
|
|
|
88
92
|
installPlaywright ? (0, playwright_1.updatePlaywright)(options, dependencies) : schematics_1.noop,
|
|
89
93
|
(0, schematics_2.setupDependencies)({
|
|
90
94
|
projectName: options.projectName,
|
|
91
|
-
dependencies
|
|
95
|
+
dependencies: {
|
|
96
|
+
...dependencies,
|
|
97
|
+
...externalDependenciesInfo
|
|
98
|
+
},
|
|
92
99
|
ngAddToRun: depsInfo.o3rPeerDeps
|
|
93
100
|
}),
|
|
94
101
|
(0, schematics_2.registerPackageCollectionSchematics)(packageJson),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,8DAE2C;AAC3C,2DAaoC;AACpC,gDAeyB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,8DAE2C;AAC3C,2DAaoC;AACpC,gDAeyB;AAOzB,uCAEmB;AACnB,6CAEsB;AACtB;;GAEG;AACH,MAAM,qBAAqB,GAAa,EAAE,CAAC;AAE3C;;GAEG;AACH,MAAM,wBAAwB,GAAG;IAC/B,YAAY;IACZ,OAAO;IACP,+BAA+B;IAC/B,eAAe;IACf,iBAAiB;CAClB,CAAC;AAEF;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,IAAI,CAAC;YACH,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;YAChF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAgB,CAAC;YAC1G,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,mBAAmB,CAAC,CAAC;YACrD,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACnH,MAAM,gBAAgB,GAAG,gBAAgB,EAAE,IAAI,IAAI,GAAG,CAAC;YACvD,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAgB,CAAC;YAC3G,MAAM,WAAW,GAAG,gBAAgB,EAAE,WAAW,IAAI,aAAa,CAAC;YACnE,IAAI,WAAW,CAAC;YAEhB,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,IAAI,IAAA,6BAAgB,EAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;YACtG,QAAQ,aAAa,EAAE,CAAC;gBACtB,KAAK,MAAM,CAAC,CAAC,CAAC;oBACZ,WAAW,GAAG,IAAI,CAAC;oBACnB,MAAM;gBACR,CAAC;gBACD,KAAK,SAAS,CAAC,CAAC,CAAC;oBACf,WAAW,GAAG,MAAM,IAAA,wBAAe,EAAC,2BAA2B,aAAa,uEAAuE,aAAa,YAAY,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;oBAC3L,MAAM;gBACR,CAAC;gBACD,KAAK,SAAS,CAAC,CAAC,CAAC;oBACf,WAAW,GAAG,MAAM,IAAA,wBAAe,EAAC,uEAAuE,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;oBAC1H,MAAM;gBACR,CAAC;gBACD,OAAO,CAAC,CAAC,CAAC;oBACR,WAAW,GAAG,KAAK,CAAC;oBACpB,MAAM;gBACR,CAAC;YACH,CAAC;YAED,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBAC5D,GAAG,CAAC,GAAG,CAAC,GAAG;oBACT,UAAU,EAAE,CAAC;4BACX,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,cAAc,EAAE;4BACxE,KAAK,EAAE,IAAA,2CAA8B,EAAC,gBAAgB,CAAC;yBACxD,CAAC;oBACF,YAAY,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE;iBAC3D,CAAC;gBACF,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,IAAA,oCAAuB,EAAC,mBAAmB,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;YAC7G,IAAI,WAAW,EAAE,CAAC;gBAChB,wBAAwB,CAAC,IAAI,CAC3B,wBAAwB,EACxB,aAAa,EACb,MAAM,EACN,wBAAwB,EACxB,qBAAqB,EACrB,SAAS,CACV,CAAC;YACJ,CAAC;YAED,MAAM,wBAAwB,GAAG,IAAA,wCAA2B,EAAC;gBAC3D,wBAAwB;gBACxB,qBAAqB;gBACrB,kBAAkB,EAAE,mBAAmB;gBACvC,WAAW,EAAE,gBAAgB,EAAE,WAAW;gBAC1C,kBAAkB;aACnB,EACD,OAAO,CAAC,MAAM,CACb,CAAC;YAEF,IAAI,iBAAiB,GAAG,KAAK,CAAC;YAC9B,IAAI,WAAW,KAAK,aAAa,EAAE,CAAC;gBAClC,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,KAAK,SAAS;oBACxD,CAAC,CAAC,MAAM,IAAA,wBAAe,EAAC,yDAAyD,EAAE,IAAI,CAAC;oBACxF,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAC/B,CAAC;YAED,MAAM,wBAAwB,GAAG;gBAC/B,oBAAoB,EAAE,SAAS;aAChC,CAAC;YACF,MAAM,KAAK,GAAG;gBACZ,IAAA,6BAAmB,EAAC,OAAO,CAAC;gBAC5B,IAAA,2BAAc,EAAC,CAAC,gBAAgB,CAAC,CAAC;gBAClC,IAAA,qCAAwB,EAAC,CAAC,kBAAkB,CAAC,CAAC;gBAC9C,iBAAiB,CAAC,CAAC,CAAC,IAAA,6BAAgB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,iBAAI;gBAClE,IAAA,8BAAiB,EAAC;oBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,YAAY,EAAE;wBACZ,GAAG,YAAY;wBACf,GAAG,wBAAwB;qBAC5B;oBACD,UAAU,EAAE,QAAQ,CAAC,WAAW;iBACjC,CAAC;gBACF,IAAA,gDAAmC,EAAC,WAAW,CAAC;gBAChD,IAAA,4CAA+B,EAAC;oBAC9B,qBAAqB,EAAE,wBAAwB;oBAC/C,+BAA+B,EAAE,wBAAwB;oBACzD,+BAA+B,EAAE,wBAAwB;iBAC1D,EAAE,OAAO,CAAC,WAAW,CAAC;gBACvB,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE,CAAC,CAAC,CAAC,IAAA,8BAAiB,GAAE;aAClD,CAAC;YAEF,IAAI,WAAW,EAAE,CAAC;gBAChB,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;oBACnC,MAAM,IAAI,wBAAW,CAAC,gDAAgD,OAAO,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC,CAAC;gBACrG,CAAC;qBAAM,CAAC;oBACN,IAAI,gBAAgB,EAAE,CAAC;wBACrB,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,gBAAgB,eAAe,CAAgB,CAAC;wBACzF,eAAe,CAAC,OAAO,KAAK,EAAE,CAAC;wBAC/B,eAAe,CAAC,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;wBACtC,IAAI,CAAC,SAAS,CAAC,GAAG,gBAAgB,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;wBAC7F,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;wBACpG,MAAM,yBAAyB,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAS,EAAC,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,qBAAqB,CAAC,EAAE;4BAClF,IAAA,qBAAQ,EAAC;gCACP,GAAG,OAAO;gCACV,gBAAgB;gCAChB,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;6BAC7C,CAAC;4BACF,IAAA,iBAAI,EAAC,gBAAgB,CAAC;4BACtB,IAAA,gCAAmB,GAAE;yBACtB,CAAC,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC;wBAC7B,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;oBACxC,CAAC;oBACD,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;wBACnC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;oBAC5F,CAAC;yBAAM,CAAC;wBACN,MAAM,2BAA2B,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAS,EAAC,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,uBAAuB,CAAC,EAAE;4BACtF,IAAA,qBAAQ,EAAC;gCACP,GAAG,OAAO;gCACV,YAAY,EAAE,KAAK,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,YAAY,EAAE,CAAC,CAAC,EAAE;6BACtH,CAAC;4BACF,IAAA,iBAAI,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;4BACpB,IAAA,gCAAmB,GAAE;yBACtB,CAAC,EAAE,0BAAa,CAAC,OAAO,CAAC,CAAC;wBAC3B,KAAK,CAAC,IAAI,CACR,2BAA2B,CAC5B,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YAED,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;;+GAEoF,CAAC,CAAC;YAC3G,MAAM,IAAI,wBAAW,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACU,QAAA,KAAK,GAAG,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/playwright/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/playwright/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,IAAI,EAKL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,KAAK,eAAe,EAIpB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AAWzB;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,IAAI,CA8ElH"}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updatePlaywright = updatePlaywright;
|
|
4
|
-
const fs = require("node:fs");
|
|
5
4
|
const path = require("node:path");
|
|
6
5
|
const core_1 = require("@angular-devkit/core");
|
|
7
6
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
8
7
|
const schematics_2 = require("@o3r/schematics");
|
|
9
|
-
const
|
|
8
|
+
const devDependenciesToInstall = [
|
|
9
|
+
'@playwright/test',
|
|
10
|
+
'rimraf'
|
|
11
|
+
];
|
|
12
|
+
const dependenciesToInstall = [];
|
|
10
13
|
/**
|
|
11
14
|
* Add Playwright to Otter application
|
|
12
15
|
* @param options @see RuleFactory.options
|
|
@@ -14,20 +17,20 @@ const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
|
14
17
|
*/
|
|
15
18
|
function updatePlaywright(options, dependencies) {
|
|
16
19
|
const corePackageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
|
|
17
|
-
const ownPackageJson = JSON.parse(fs.readFileSync(corePackageJsonPath, { encoding: 'utf8' }));
|
|
18
|
-
dependencies['@playwright/test'] = {
|
|
19
|
-
inManifest: [{
|
|
20
|
-
range: ownPackageJson.devDependencies['@playwright/test'],
|
|
21
|
-
types: [dependencies_1.NodeDependencyType.Dev]
|
|
22
|
-
}]
|
|
23
|
-
};
|
|
24
|
-
dependencies.rimraf = {
|
|
25
|
-
inManifest: [{
|
|
26
|
-
range: ownPackageJson.devDependencies.rimraf,
|
|
27
|
-
types: [dependencies_1.NodeDependencyType.Dev]
|
|
28
|
-
}]
|
|
29
|
-
};
|
|
30
20
|
return (tree, context) => {
|
|
21
|
+
const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
|
|
22
|
+
const projectPackageJson = tree.readJson(path.posix.join(workspaceProject?.root || '.', 'package.json'));
|
|
23
|
+
const externalDependencies = (0, schematics_2.getExternalDependenciesInfo)({
|
|
24
|
+
devDependenciesToInstall,
|
|
25
|
+
dependenciesToInstall,
|
|
26
|
+
o3rPackageJsonPath: corePackageJsonPath,
|
|
27
|
+
projectPackageJson,
|
|
28
|
+
projectType: workspaceProject?.projectType
|
|
29
|
+
}, context.logger);
|
|
30
|
+
dependencies = {
|
|
31
|
+
...dependencies,
|
|
32
|
+
...externalDependencies
|
|
33
|
+
};
|
|
31
34
|
const workingDirectory = (options?.projectName && (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root) || '.';
|
|
32
35
|
// update gitignore
|
|
33
36
|
const gitignorePath = '.gitignore';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/playwright/index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/playwright/index.ts"],"names":[],"mappings":"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"}
|