@o3r/schematics 8.4.0-alpha.9 → 9.0.0-next.1
Sign up to get free protection for your applications and to get access to all the features.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/schematics",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "9.0.0-next.1",
|
|
4
4
|
"description": "Schematics module of the Otter framework",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"keywords": [
|
|
@@ -17,11 +17,11 @@
|
|
|
17
17
|
"build:builders": "tsc -b tsconfig.builders.json --pretty"
|
|
18
18
|
},
|
|
19
19
|
"peerDependencies": {
|
|
20
|
-
"@angular-devkit/architect": "~0.
|
|
21
|
-
"@angular-devkit/core": "~
|
|
22
|
-
"@angular-devkit/schematics": "~
|
|
23
|
-
"@angular/cli": "~
|
|
24
|
-
"@schematics/angular": "~
|
|
20
|
+
"@angular-devkit/architect": "~0.1600.5",
|
|
21
|
+
"@angular-devkit/core": "~16.0.5",
|
|
22
|
+
"@angular-devkit/schematics": "~16.0.5",
|
|
23
|
+
"@angular/cli": "~16.0.5",
|
|
24
|
+
"@schematics/angular": "~16.0.5"
|
|
25
25
|
},
|
|
26
26
|
"peerDependenciesMeta": {
|
|
27
27
|
"@angular-devkit/architect": {
|
|
@@ -37,55 +37,54 @@
|
|
|
37
37
|
"globby": "^11.1.0",
|
|
38
38
|
"minimatch": "^6.1.6",
|
|
39
39
|
"semver": "^7.5.2",
|
|
40
|
-
"tslib": "^2.
|
|
40
|
+
"tslib": "^2.5.3"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@angular-devkit/build-angular": "~
|
|
44
|
-
"@angular-devkit/core": "~
|
|
45
|
-
"@angular-devkit/schematics": "~
|
|
46
|
-
"@angular-eslint/eslint-plugin": "~
|
|
47
|
-
"@angular/cli": "~
|
|
48
|
-
"@angular/common": "~
|
|
49
|
-
"@angular/compiler": "~
|
|
50
|
-
"@angular/compiler-cli": "~
|
|
51
|
-
"@angular/core": "~
|
|
52
|
-
"@angular/platform-browser": "~
|
|
53
|
-
"@angular/platform-browser-dynamic": "~
|
|
43
|
+
"@angular-devkit/build-angular": "~16.0.5",
|
|
44
|
+
"@angular-devkit/core": "~16.0.5",
|
|
45
|
+
"@angular-devkit/schematics": "~16.0.5",
|
|
46
|
+
"@angular-eslint/eslint-plugin": "~16.0.3",
|
|
47
|
+
"@angular/cli": "~16.0.5",
|
|
48
|
+
"@angular/common": "~16.0.5",
|
|
49
|
+
"@angular/compiler": "~16.0.5",
|
|
50
|
+
"@angular/compiler-cli": "~16.0.5",
|
|
51
|
+
"@angular/core": "~16.0.5",
|
|
52
|
+
"@angular/platform-browser": "~16.0.5",
|
|
53
|
+
"@angular/platform-browser-dynamic": "~16.0.5",
|
|
54
54
|
"@babel/core": "~7.22.0",
|
|
55
55
|
"@babel/preset-typescript": "~7.22.0",
|
|
56
56
|
"@compodoc/compodoc": "^1.1.19",
|
|
57
|
-
"@
|
|
58
|
-
"@
|
|
59
|
-
"@
|
|
60
|
-
"@
|
|
61
|
-
"@o3r/
|
|
62
|
-
"@o3r/
|
|
63
|
-
"@
|
|
64
|
-
"@
|
|
65
|
-
"@types/jest": "~28.1.2",
|
|
57
|
+
"@nx/jest": "~16.3.2",
|
|
58
|
+
"@nx/js": "~16.3.2",
|
|
59
|
+
"@nx/linter": "~16.3.2",
|
|
60
|
+
"@o3r/build-helpers": "^9.0.0-next.1",
|
|
61
|
+
"@o3r/dev-tools": "^9.0.0-next.1",
|
|
62
|
+
"@o3r/eslint-plugin": "^9.0.0-next.1",
|
|
63
|
+
"@schematics/angular": "~16.0.5",
|
|
64
|
+
"@types/jest": "~29.5.2",
|
|
66
65
|
"@types/node": "^17.0.45",
|
|
67
66
|
"@types/semver": "^7.3.13",
|
|
68
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
69
|
-
"@typescript-eslint/parser": "^5.
|
|
67
|
+
"@typescript-eslint/eslint-plugin": "^5.59.9",
|
|
68
|
+
"@typescript-eslint/parser": "^5.59.9",
|
|
70
69
|
"cpy-cli": "^4.2.0",
|
|
71
|
-
"eslint": "^8.
|
|
70
|
+
"eslint": "^8.42.0",
|
|
72
71
|
"eslint-import-resolver-node": "^0.3.4",
|
|
73
|
-
"eslint-plugin-jest": "^
|
|
72
|
+
"eslint-plugin-jest": "^27.2.1",
|
|
74
73
|
"eslint-plugin-jsdoc": "^39.3.6",
|
|
75
74
|
"eslint-plugin-prefer-arrow": "^1.2.3",
|
|
76
75
|
"eslint-plugin-unicorn": "^45.0.2",
|
|
77
|
-
"jest": "~
|
|
76
|
+
"jest": "~29.5.0",
|
|
78
77
|
"jest-junit": "^14.0.0",
|
|
79
78
|
"jsonschema": "~1.4.1",
|
|
80
|
-
"nx": "~
|
|
81
|
-
"rxjs": "^7.
|
|
82
|
-
"ts-jest": "^
|
|
79
|
+
"nx": "~16.3.2",
|
|
80
|
+
"rxjs": "^7.8.1",
|
|
81
|
+
"ts-jest": "^29.1.0",
|
|
83
82
|
"type-fest": "^3.6.1",
|
|
84
|
-
"typescript": "~
|
|
85
|
-
"zone.js": "
|
|
83
|
+
"typescript": "~5.0.2",
|
|
84
|
+
"zone.js": "~0.13.1"
|
|
86
85
|
},
|
|
87
86
|
"engines": {
|
|
88
|
-
"node": ">=
|
|
87
|
+
"node": ">=16.0.0"
|
|
89
88
|
},
|
|
90
89
|
"schematics": "./collection.json",
|
|
91
90
|
"types": "./src/public_api.d.ts",
|
|
@@ -15,9 +15,8 @@ const index_1 = require("../../utility/index");
|
|
|
15
15
|
*/
|
|
16
16
|
function ngAddPackages(packages, options, packageJsonPath = '/package.json') {
|
|
17
17
|
const getInstalledVersion = async (packageName) => {
|
|
18
|
-
var _a;
|
|
19
18
|
try {
|
|
20
|
-
return (await (
|
|
19
|
+
return (await Promise.resolve(`${`${packageName}/package.json`}`).then(s => require(s))).version;
|
|
21
20
|
}
|
|
22
21
|
catch (e) {
|
|
23
22
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAA4H;AAC5H,4DAA0E;AAE1E,2EAA8E;AAC9E,+BAAqC;AAGrC,+CAAqL;AAErL;;;;;;GAMG;AACH,SAAgB,aAAa,CAAC,QAAkB,EAAE,OAA6B,EAAE,eAAe,GAAG,eAAe;IAChH,MAAM,mBAAmB,GAAG,KAAK,EAAE,WAAmB,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"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"}
|
package/src/utility/loaders.js
CHANGED
|
@@ -59,7 +59,7 @@ exports.readPackageJson = readPackageJson;
|
|
|
59
59
|
*/
|
|
60
60
|
function getProjectFromTree(tree, projectName, projectType) {
|
|
61
61
|
const workspace = readAngularJson(tree);
|
|
62
|
-
const projectGuessedName = projectName || workspace.
|
|
62
|
+
const projectGuessedName = projectName || Object.keys(workspace.projects)[0];
|
|
63
63
|
// eslint-disable-next-line max-len
|
|
64
64
|
let workspaceProject = projectGuessedName && workspace.projects[projectGuessedName] && (!projectType || workspace.projects[projectGuessedName]?.projectType === projectType) ?
|
|
65
65
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AACvE,2EAA8E;AAC9E,4CAA4C;AAC5C,mCAA4C;AAC5C,yCAAsC;AACtC,kCAAkC;AAIlC;;;;;;GAMG;AACH,SAAgB,eAAe,CAAC,IAAU,EAAE,eAAe,GAAG,eAAe;IAC3E,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACnD,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,gCAAmB,CAAC,gDAAgD,CAAC,CAAC;KACjF;IAED,OAAO,WAAW,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAQ,CAAC;AAC9D,CAAC;AAPD,0CAOC;AAED;;;;;;GAMG;AACH,SAAgB,gBAAgB,CAAC,IAAU,EAAE,SAA0B,EAAE,eAAe,GAAG,eAAe;IACxG,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,WAAW,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3E,OAAO,IAAI,CAAC;AACd,CAAC;AAHD,4CAGC;AAED;;;;;;GAMG;AACH,SAAgB,eAAe,CAAC,IAAU,EAAE,gBAAkC;IAC5E,4EAA4E;IAC5E,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,IAAI,eAAe,CAAC,CAAC;IAC3E,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,gCAAmB,CAAC,4BAA4B,CAAC,CAAC;KAC7D;IAED,OAAO,WAAW,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAgB,CAAC;AACtE,CAAC;AARD,0CAQC;AAED;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAAC,IAAU,EAAE,WAA2B,EAAE,WAAuC;IACjH,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,kBAAkB,GAAG,WAAW,IAAI,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"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"}
|