@o3r/schematics 9.3.0-alpha.5 → 9.3.0-alpha.50
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 +18 -16
- package/src/interfaces/angular-workspace.d.ts +1 -0
- package/src/interfaces/angular-workspace.d.ts.map +1 -1
- package/src/rule-factories/ng-add/index.d.ts +1 -5
- package/src/rule-factories/ng-add/index.d.ts.map +1 -1
- package/src/rule-factories/ng-add/index.js +97 -80
- package/src/rule-factories/ng-add/index.js.map +1 -1
- package/src/utility/generation.d.ts +0 -1
- package/src/utility/generation.d.ts.map +1 -1
- package/src/utility/generation.js +3 -3
- package/src/utility/generation.js.map +1 -1
- package/src/utility/loaders.d.ts +10 -17
- package/src/utility/loaders.d.ts.map +1 -1
- package/src/utility/loaders.js +14 -18
- package/src/utility/loaders.js.map +1 -1
- package/src/utility/modules.d.ts +2 -7
- package/src/utility/modules.d.ts.map +1 -1
- package/src/utility/modules.js +5 -10
- package/src/utility/modules.js.map +1 -1
- package/src/utility/monorepo.d.ts +6 -0
- package/src/utility/monorepo.d.ts.map +1 -1
- package/src/utility/monorepo.js +12 -1
- package/src/utility/monorepo.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/schematics",
|
|
3
|
-
"version": "9.3.0-alpha.
|
|
3
|
+
"version": "9.3.0-alpha.50",
|
|
4
4
|
"description": "Schematics module of the Otter framework",
|
|
5
5
|
"main": "./src/public_api.js",
|
|
6
6
|
"keywords": [
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"chalk": "^4.1.2",
|
|
38
38
|
"globby": "^11.1.0",
|
|
39
|
-
"minimatch": "
|
|
39
|
+
"minimatch": "~9.0.3",
|
|
40
40
|
"semver": "^7.5.2",
|
|
41
41
|
"tslib": "^2.5.3"
|
|
42
42
|
},
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"@angular-devkit/build-angular": "~16.2.0",
|
|
45
45
|
"@angular-devkit/core": "~16.2.0",
|
|
46
46
|
"@angular-devkit/schematics": "~16.2.0",
|
|
47
|
-
"@angular-eslint/eslint-plugin": "~16.
|
|
47
|
+
"@angular-eslint/eslint-plugin": "~16.2.0",
|
|
48
48
|
"@angular/cli": "~16.2.0",
|
|
49
49
|
"@angular/common": "~16.2.0",
|
|
50
50
|
"@angular/compiler": "~16.2.0",
|
|
@@ -55,29 +55,31 @@
|
|
|
55
55
|
"@babel/core": "~7.22.0",
|
|
56
56
|
"@babel/preset-typescript": "~7.22.0",
|
|
57
57
|
"@compodoc/compodoc": "^1.1.19",
|
|
58
|
-
"@nx/
|
|
59
|
-
"@nx/
|
|
60
|
-
"@nx/
|
|
61
|
-
"@
|
|
62
|
-
"@o3r/
|
|
63
|
-
"@o3r/
|
|
58
|
+
"@nx/eslint-plugin": "~16.8.0",
|
|
59
|
+
"@nx/jest": "~16.8.0",
|
|
60
|
+
"@nx/js": "~16.8.0",
|
|
61
|
+
"@nx/linter": "~16.8.0",
|
|
62
|
+
"@o3r/build-helpers": "^9.3.0-alpha.50",
|
|
63
|
+
"@o3r/dev-tools": "^9.3.0-alpha.50",
|
|
64
|
+
"@o3r/eslint-plugin": "^9.3.0-alpha.50",
|
|
64
65
|
"@schematics/angular": "~16.2.0",
|
|
65
66
|
"@types/jest": "~29.5.2",
|
|
66
67
|
"@types/node": "^18.0.0",
|
|
67
68
|
"@types/semver": "^7.3.13",
|
|
68
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
69
|
-
"@typescript-eslint/parser": "^5.
|
|
69
|
+
"@typescript-eslint/eslint-plugin": "^5.60.1",
|
|
70
|
+
"@typescript-eslint/parser": "^5.60.1",
|
|
70
71
|
"cpy-cli": "^4.2.0",
|
|
71
72
|
"eslint": "^8.42.0",
|
|
72
73
|
"eslint-import-resolver-node": "^0.3.4",
|
|
73
|
-
"eslint-plugin-jest": "~27.
|
|
74
|
-
"eslint-plugin-jsdoc": "~46.
|
|
74
|
+
"eslint-plugin-jest": "~27.4.0",
|
|
75
|
+
"eslint-plugin-jsdoc": "~46.8.0",
|
|
75
76
|
"eslint-plugin-prefer-arrow": "~1.2.3",
|
|
76
77
|
"eslint-plugin-unicorn": "^47.0.0",
|
|
77
|
-
"jest": "~29.
|
|
78
|
+
"jest": "~29.7.0",
|
|
78
79
|
"jest-junit": "~16.0.0",
|
|
80
|
+
"jsonc-eslint-parser": "~2.3.0",
|
|
79
81
|
"jsonschema": "~1.4.1",
|
|
80
|
-
"nx": "~16.
|
|
82
|
+
"nx": "~16.8.0",
|
|
81
83
|
"rxjs": "^7.8.1",
|
|
82
84
|
"ts-jest": "~29.1.1",
|
|
83
85
|
"type-fest": "^3.12.0",
|
|
@@ -85,7 +87,7 @@
|
|
|
85
87
|
"zone.js": "~0.13.1"
|
|
86
88
|
},
|
|
87
89
|
"engines": {
|
|
88
|
-
"node": ">=
|
|
90
|
+
"node": ">=18.0.0"
|
|
89
91
|
},
|
|
90
92
|
"schematics": "./collection.json",
|
|
91
93
|
"type": "commonjs",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-workspace.d.ts","sourceRoot":"","sources":["../../../src/interfaces/angular-workspace.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,QAAQ,IAAI,kBAAkB,EAC9B,MAAM,IAAI,iBAAiB,EAC3B,gBAAgB,EACjB,MAAM,0CAA0C,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,MAAM,GAAG,SAAS,CAAC;AAEzD,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AACD,MAAM,WAAW,aAAa;IAC5B,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,8EAA8E;AAC9E,MAAM,WAAW,eAAe;IAC9B,+BAA+B;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,kCAAkC;IAClC,OAAO,EAAE,MAAM,CAAC;CACjB;AAGD,MAAM,WAAW,mBAAoB,SAAQ,gBAAgB;IAC3D,kBAAkB;IAClB,6BAA6B,CAAC,EAAE;QAC9B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,2BAA2B,CAAC,EAAE;QAC5B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,yBAAyB,CAAC,EAAE;QAC1B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,uBAAuB,CAAC,EAAE;QACxB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,4BAA4B,CAAC,EAAE;QAC7B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAEF,2BAA2B,CAAC,EAAE;QAC5B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,uBAAuB,CAAC,EAAE;QACxB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB,CAAC,EAAE;QACnB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,sBAAsB,CAAC,EAAE;QACvB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,UAAU,CAAC,EAAE;QACX,qBAAqB,CAAC,EAAE,OAAO,CAAC;KACjC,CAAC;IACF,KAAK,CAAC,EAAE,eAAe,GAAG;QACxB,0FAA0F;QAC1F,aAAa,CAAC,EAAE,uBAAuB,CAAC;KACzC,CAAC;CACH;AACD,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,IAAI,CAAC,EAAE,oBAAoB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACxD,QAAQ,EAAE;QACN,CAAC,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;KACjC,CAAC;IACF,UAAU,CAAC,EAAE,mBAAmB,CAAC;CAClC"}
|
|
1
|
+
{"version":3,"file":"angular-workspace.d.ts","sourceRoot":"","sources":["../../../src/interfaces/angular-workspace.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,QAAQ,IAAI,kBAAkB,EAC9B,MAAM,IAAI,iBAAiB,EAC3B,gBAAgB,EACjB,MAAM,0CAA0C,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,MAAM,GAAG,SAAS,CAAC;AAEzD,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AACD,MAAM,WAAW,aAAa;IAC5B,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,8EAA8E;AAC9E,MAAM,WAAW,eAAe;IAC9B,+BAA+B;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,kCAAkC;IAClC,OAAO,EAAE,MAAM,CAAC;CACjB;AAGD,MAAM,WAAW,mBAAoB,SAAQ,gBAAgB;IAC3D,kBAAkB;IAClB,6BAA6B,CAAC,EAAE;QAC9B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,2BAA2B,CAAC,EAAE;QAC5B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,yBAAyB,CAAC,EAAE;QAC1B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,uBAAuB,CAAC,EAAE;QACxB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,4BAA4B,CAAC,EAAE;QAC7B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAEF,2BAA2B,CAAC,EAAE;QAC5B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,uBAAuB,CAAC,EAAE;QACxB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB,CAAC,EAAE;QACnB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,sBAAsB,CAAC,EAAE;QACvB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,UAAU,CAAC,EAAE;QACX,qBAAqB,CAAC,EAAE,OAAO,CAAC;KACjC,CAAC;IACF,KAAK,CAAC,EAAE,eAAe,GAAG;QACxB,0FAA0F;QAC1F,aAAa,CAAC,EAAE,uBAAuB,CAAC;KACzC,CAAC;CACH;AACD,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,IAAI,CAAC,EAAE,oBAAoB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACxD,QAAQ,EAAE;QACN,CAAC,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;KACjC,CAAC;IACF,UAAU,CAAC,EAAE,mBAAmB,CAAC;CAClC"}
|
|
@@ -5,17 +5,15 @@ import { SchematicOptionObject } from '../../interfaces';
|
|
|
5
5
|
import type { NgAddPackageOptions } from '../../tasks/index';
|
|
6
6
|
/**
|
|
7
7
|
* Install via `ng add` a list of npm packages.
|
|
8
|
-
*
|
|
9
8
|
* @param packages List of packages to be installed via `ng add`
|
|
10
9
|
* @param options install options
|
|
11
10
|
* @param packageJsonPath path of the package json of the project where they will be installed
|
|
12
11
|
*/
|
|
13
12
|
export declare function ngAddPackages(packages: string[], options?: Omit<NgAddPackageOptions, 'version'> & {
|
|
14
|
-
version?: string | string[];
|
|
13
|
+
version?: string | (string | undefined)[];
|
|
15
14
|
}, packageJsonPath?: string): Rule;
|
|
16
15
|
/**
|
|
17
16
|
* Look for the peer dependencies and run ng add on the package requested version
|
|
18
|
-
*
|
|
19
17
|
* @param packages list of the name of the packages needed
|
|
20
18
|
* @param packageJsonPath path to package json that needs the peer to be resolved
|
|
21
19
|
* @param type how to install the dependency (dev, peer for a library or default for an application)
|
|
@@ -25,14 +23,12 @@ export declare function ngAddPackages(packages: string[], options?: Omit<NgAddPa
|
|
|
25
23
|
export declare function ngAddPeerDependencyPackages(packages: string[], packageJsonPath: string, type: NodeDependencyType | undefined, options: NgAddPackageOptions, parentPackageInfo?: string): Rule;
|
|
26
24
|
/**
|
|
27
25
|
* Register the given package in the Angular CLI schematics
|
|
28
|
-
*
|
|
29
26
|
* @param packageJson PackageJson of the project containing the collection to add to the project
|
|
30
27
|
* @param angularJsonFile Path to the Angular.json file. Will use the workspace root's angular.json if not specified
|
|
31
28
|
*/
|
|
32
29
|
export declare function registerPackageCollectionSchematics(packageJson: PackageJson, angularJsonFile?: string): Rule;
|
|
33
30
|
/**
|
|
34
31
|
* Setup schematics default params in angular.json
|
|
35
|
-
*
|
|
36
32
|
* @param schematicsDefaultParams default params to setup by schematic
|
|
37
33
|
* @param angularJsonFile Path to the Angular.json file. Will use the workspace root's angular.json if not specified
|
|
38
34
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,IAAI,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,IAAI,EAA+B,MAAM,4BAA4B,CAAC;AAG/G,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAI9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAG7D;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAA;CAAE,EAAE,eAAe,SAAkB,GAAG,IAAI,CA0HzL;AAED;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,gCAAiD,EAC5I,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,EAAE,MAAM,QAgBzD;AAED;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAY5G;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,uBAAuB,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CA0B3I"}
|
|
@@ -4,13 +4,12 @@ exports.setupSchematicsDefaultParams = exports.registerPackageCollectionSchemati
|
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
6
6
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
7
|
-
const rxjs_1 = require("rxjs");
|
|
8
|
-
const index_1 = require("../../utility/index");
|
|
9
7
|
const node_fs_1 = require("node:fs");
|
|
10
8
|
const path = require("node:path");
|
|
9
|
+
const rxjs_1 = require("rxjs");
|
|
10
|
+
const index_1 = require("../../utility/index");
|
|
11
11
|
/**
|
|
12
12
|
* Install via `ng add` a list of npm packages.
|
|
13
|
-
*
|
|
14
13
|
* @param packages List of packages to be installed via `ng add`
|
|
15
14
|
* @param options install options
|
|
16
15
|
* @param packageJsonPath path of the package json of the project where they will be installed
|
|
@@ -20,28 +19,38 @@ function ngAddPackages(packages, options, packageJsonPath = '/package.json') {
|
|
|
20
19
|
return schematics_1.noop;
|
|
21
20
|
}
|
|
22
21
|
const cwd = process.cwd().replace(/[\\/]+/g, '/');
|
|
23
|
-
// FileSystem working directory might be different
|
|
22
|
+
// FileSystem working directory might be different from Tree working directory (when using `yarn workspace` for example)
|
|
24
23
|
const fsWorkingDirectory = (options?.workingDirectory && !cwd.endsWith(options.workingDirectory)) ? options.workingDirectory : '.';
|
|
25
24
|
const versions = Object.fromEntries(packages.map((packageName, index) => [packageName, typeof options?.version === 'object' ? options.version[index] : options?.version]));
|
|
26
25
|
if (options?.workingDirectory && !packageJsonPath.startsWith(options.workingDirectory)) {
|
|
27
26
|
packageJsonPath = path.join(options.workingDirectory, packageJsonPath);
|
|
28
27
|
}
|
|
29
28
|
const getInstalledVersion = (packageName) => {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
29
|
+
let versionFound;
|
|
30
|
+
for (const workingDirectory of new Set([fsWorkingDirectory, '.'])) {
|
|
31
|
+
try {
|
|
32
|
+
const fileSystemPackageJson = JSON.parse((0, node_fs_1.readFileSync)(path.join(workingDirectory, 'package.json'), { encoding: 'utf8' }));
|
|
33
|
+
let version;
|
|
34
|
+
if (options?.dependencyType === dependencies_1.NodeDependencyType.Dev) {
|
|
35
|
+
version = fileSystemPackageJson.devDependencies[packageName];
|
|
36
|
+
}
|
|
37
|
+
else if (options?.dependencyType === dependencies_1.NodeDependencyType.Peer) {
|
|
38
|
+
version = fileSystemPackageJson.peerDependencies[packageName];
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
version = fileSystemPackageJson.dependencies[packageName];
|
|
42
|
+
}
|
|
43
|
+
if (versionFound && version !== versionFound) {
|
|
44
|
+
// In case of conflict between package.json files, we consider the package as not installed to force its update
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
versionFound = version;
|
|
37
48
|
}
|
|
38
|
-
|
|
39
|
-
return
|
|
49
|
+
catch (e) {
|
|
50
|
+
return;
|
|
40
51
|
}
|
|
41
52
|
}
|
|
42
|
-
|
|
43
|
-
return;
|
|
44
|
-
}
|
|
53
|
+
return versionFound;
|
|
45
54
|
};
|
|
46
55
|
const getNgAddSchema = (packageName, context) => {
|
|
47
56
|
try {
|
|
@@ -62,71 +71,73 @@ function ngAddPackages(packages, options, packageJsonPath = '/package.json') {
|
|
|
62
71
|
return accOptions;
|
|
63
72
|
}, {});
|
|
64
73
|
};
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
latestInstalledVersions.forEach(([packageName, latestInstalledVersion]) => {
|
|
98
|
-
if (options?.dependencyType === dependencies_1.NodeDependencyType.Dev) {
|
|
99
|
-
packageJson.devDependencies = { ...packageJson.devDependencies, [packageName]: latestInstalledVersion };
|
|
100
|
-
}
|
|
101
|
-
else if (options?.dependencyType === dependencies_1.NodeDependencyType.Peer) {
|
|
102
|
-
packageJson.peerDependencies = { ...packageJson.peerDependencies, [packageName]: latestInstalledVersion };
|
|
74
|
+
const installedVersions = packages.map((packageName) => getInstalledVersion(packageName));
|
|
75
|
+
const packageManager = (0, index_1.getPackageManager)();
|
|
76
|
+
const packagesToInstall = packages.filter((packageName, index) => !installedVersions[index] || installedVersions[index] !== versions[packageName]);
|
|
77
|
+
if (packagesToInstall.length < 1) {
|
|
78
|
+
return schematics_1.noop;
|
|
79
|
+
}
|
|
80
|
+
return (0, schematics_1.chain)([
|
|
81
|
+
// Update package.json in tree
|
|
82
|
+
(tree) => {
|
|
83
|
+
const sortDependencies = (packageJson, depType) => {
|
|
84
|
+
packageJson[depType] = packageJson[depType] ?
|
|
85
|
+
Object.fromEntries(Object.entries(packageJson[depType]).sort(([key1, _val1], [key2, _val2]) => key1.localeCompare(key2))) :
|
|
86
|
+
undefined;
|
|
87
|
+
};
|
|
88
|
+
for (const filePath of new Set([packageJsonPath, './package.json'])) {
|
|
89
|
+
const packageJson = tree.readJson(filePath);
|
|
90
|
+
packages.forEach((packageName) => {
|
|
91
|
+
const version = versions[packageName] || 'latest';
|
|
92
|
+
if (options?.dependencyType === dependencies_1.NodeDependencyType.Dev) {
|
|
93
|
+
packageJson.devDependencies = { ...packageJson.devDependencies, [packageName]: version };
|
|
94
|
+
}
|
|
95
|
+
else if (options?.dependencyType === dependencies_1.NodeDependencyType.Peer) {
|
|
96
|
+
packageJson.peerDependencies = { ...packageJson.peerDependencies, [packageName]: version };
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
packageJson.dependencies = { ...packageJson.dependencies, [packageName]: version };
|
|
100
|
+
}
|
|
101
|
+
});
|
|
102
|
+
['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {
|
|
103
|
+
sortDependencies(packageJson, depType);
|
|
104
|
+
});
|
|
105
|
+
tree.overwrite(filePath, JSON.stringify(packageJson, null, 2));
|
|
103
106
|
}
|
|
104
|
-
|
|
105
|
-
|
|
107
|
+
},
|
|
108
|
+
// Run ng-adds
|
|
109
|
+
async (tree, context) => {
|
|
110
|
+
if (options?.skipNgAddSchematicRun) {
|
|
111
|
+
context.logger.info(`Package(s) '${packagesToInstall.join(', ')}' was(were) installed.
|
|
112
|
+
The run of 'ng-add' schematics for the package(s) is intentionally skipped. You can do the run standalone, later.`);
|
|
113
|
+
return schematics_1.noop;
|
|
106
114
|
}
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
115
|
+
new Set([packageJsonPath, './package.json']).forEach((filePath) => {
|
|
116
|
+
(0, node_fs_1.mkdirSync)(path.join(process.cwd(), path.dirname(filePath)), { recursive: true });
|
|
117
|
+
(0, node_fs_1.writeFileSync)(path.join(process.cwd(), filePath), tree.readText(filePath));
|
|
118
|
+
});
|
|
119
|
+
context.addTask(new tasks_1.NodePackageInstallTask({
|
|
120
|
+
packageManager: packageManager,
|
|
121
|
+
hideOutput: false,
|
|
122
|
+
quiet: false
|
|
123
|
+
}));
|
|
124
|
+
await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
|
|
125
|
+
const ngAddsToApply = packagesToInstall
|
|
126
|
+
.map((packageName) => ({ packageName, ngAddCollection: getNgAddSchema(packageName, context) }))
|
|
127
|
+
.filter(({ packageName, ngAddCollection }) => {
|
|
128
|
+
if (!ngAddCollection) {
|
|
129
|
+
context.logger.info(`No ng-add schematic found for: '${packageName}'. Skipping ng add for: ${packageName}${versions[packageName] ? ' with version: ' + versions[packageName] : ''}`);
|
|
130
|
+
}
|
|
131
|
+
return !!ngAddCollection;
|
|
132
|
+
})
|
|
133
|
+
.map(({ packageName, ngAddCollection }) => (0, schematics_1.externalSchematic)(packageName, 'ng-add', getOptions(ngAddCollection)));
|
|
134
|
+
return (0, schematics_1.chain)(ngAddsToApply);
|
|
113
135
|
}
|
|
114
|
-
|
|
115
|
-
.map((packageName) => ({ packageName, ngAddCollection: getNgAddSchema(packageName, context) }))
|
|
116
|
-
.filter(({ packageName, ngAddCollection }) => {
|
|
117
|
-
if (!ngAddCollection) {
|
|
118
|
-
context.logger.info(`No ng-add schematic found for: '${packageName}'. Skipping ng add for: ${packageName}${versions[packageName] ? ' with version: ' + versions[packageName] : ''}`);
|
|
119
|
-
}
|
|
120
|
-
return !!ngAddCollection;
|
|
121
|
-
})
|
|
122
|
-
.map(({ packageName, ngAddCollection }) => (0, schematics_1.externalSchematic)(packageName, 'ng-add', getOptions(ngAddCollection)));
|
|
123
|
-
return (0, schematics_1.chain)(ngAddsToApply);
|
|
124
|
-
};
|
|
136
|
+
]);
|
|
125
137
|
}
|
|
126
138
|
exports.ngAddPackages = ngAddPackages;
|
|
127
139
|
/**
|
|
128
140
|
* Look for the peer dependencies and run ng add on the package requested version
|
|
129
|
-
*
|
|
130
141
|
* @param packages list of the name of the packages needed
|
|
131
142
|
* @param packageJsonPath path to package json that needs the peer to be resolved
|
|
132
143
|
* @param type how to install the dependency (dev, peer for a library or default for an application)
|
|
@@ -150,29 +161,35 @@ function ngAddPeerDependencyPackages(packages, packageJsonPath, type = dependenc
|
|
|
150
161
|
exports.ngAddPeerDependencyPackages = ngAddPeerDependencyPackages;
|
|
151
162
|
/**
|
|
152
163
|
* Register the given package in the Angular CLI schematics
|
|
153
|
-
*
|
|
154
164
|
* @param packageJson PackageJson of the project containing the collection to add to the project
|
|
155
165
|
* @param angularJsonFile Path to the Angular.json file. Will use the workspace root's angular.json if not specified
|
|
156
166
|
*/
|
|
157
167
|
function registerPackageCollectionSchematics(packageJson, angularJsonFile) {
|
|
158
|
-
return (tree) => {
|
|
168
|
+
return (tree, context) => {
|
|
159
169
|
if (!packageJson.name) {
|
|
160
170
|
return tree;
|
|
161
171
|
}
|
|
162
|
-
const workspace = (0, index_1.
|
|
172
|
+
const workspace = (0, index_1.getWorkspaceConfig)(tree, angularJsonFile);
|
|
173
|
+
if (!workspace) {
|
|
174
|
+
context.logger.error('No workspace found');
|
|
175
|
+
return tree;
|
|
176
|
+
}
|
|
163
177
|
return (0, index_1.writeAngularJson)(tree, (0, index_1.registerCollectionSchematics)(workspace, packageJson.name), angularJsonFile);
|
|
164
178
|
};
|
|
165
179
|
}
|
|
166
180
|
exports.registerPackageCollectionSchematics = registerPackageCollectionSchematics;
|
|
167
181
|
/**
|
|
168
182
|
* Setup schematics default params in angular.json
|
|
169
|
-
*
|
|
170
183
|
* @param schematicsDefaultParams default params to setup by schematic
|
|
171
184
|
* @param angularJsonFile Path to the Angular.json file. Will use the workspace root's angular.json if not specified
|
|
172
185
|
*/
|
|
173
186
|
function setupSchematicsDefaultParams(schematicsDefaultParams, angularJsonFile) {
|
|
174
|
-
return (tree) => {
|
|
175
|
-
const workspace = (0, index_1.
|
|
187
|
+
return (tree, context) => {
|
|
188
|
+
const workspace = (0, index_1.getWorkspaceConfig)(tree, angularJsonFile);
|
|
189
|
+
if (!workspace) {
|
|
190
|
+
context.logger.error('No workspace found');
|
|
191
|
+
return tree;
|
|
192
|
+
}
|
|
176
193
|
workspace.schematics ||= {};
|
|
177
194
|
Object.entries(schematicsDefaultParams).forEach(([schematicName, defaultParams]) => {
|
|
178
195
|
workspace.schematics[schematicName] = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generation.d.ts","sourceRoot":"","sources":["../../../src/utility/generation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAIlD,6BAA6B;AAC7B,MAAM,MAAM,iBAAiB,GAC3B,qBAAqB,GACrB,gBAAgB,GAChB,mBAAmB,GACnB,iBAAiB,GACjB,6BAA6B,GAC7B,kCAAkC,GAClC,gCAAgC,CAAC;AAEnC,gCAAgC;AAChC,eAAO,MAAM,gBAAgB,EAAE,iBAAiB,EAQ/C,CAAC;AAEF,sEAAsE;AACtE,eAAO,MAAM,oBAAoB,EAAE;KAAG,GAAG,IAAI,iBAAiB,GAAI;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAC;CAe7F,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"generation.d.ts","sourceRoot":"","sources":["../../../src/utility/generation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAIlD,6BAA6B;AAC7B,MAAM,MAAM,iBAAiB,GAC3B,qBAAqB,GACrB,gBAAgB,GAChB,mBAAmB,GACnB,iBAAiB,GACjB,6BAA6B,GAC7B,kCAAkC,GAClC,gCAAgC,CAAC;AAEnC,gCAAgC;AAChC,eAAO,MAAM,gBAAgB,EAAE,iBAAiB,EAQ/C,CAAC;AAEF,sEAAsE;AACtE,eAAO,MAAM,oBAAoB,EAAE;KAAG,GAAG,IAAI,iBAAiB,GAAI;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAC;CAe7F,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAgCnJ"}
|
|
@@ -31,7 +31,6 @@ exports.TYPES_DEFAULT_FOLDER = {
|
|
|
31
31
|
};
|
|
32
32
|
/**
|
|
33
33
|
* Get destination path for a generated item
|
|
34
|
-
*
|
|
35
34
|
* @param typeOfItem
|
|
36
35
|
* @param directory
|
|
37
36
|
* @param tree
|
|
@@ -54,8 +53,9 @@ function getDestinationPath(typeOfItem, directory, tree, project) {
|
|
|
54
53
|
* @param propProject
|
|
55
54
|
*/
|
|
56
55
|
const getSchematicsProperty = (generatorName, propTree, propProject) => {
|
|
57
|
-
const
|
|
58
|
-
|
|
56
|
+
const workspace = (0, loaders_1.getWorkspaceConfig)(propTree);
|
|
57
|
+
const workspaceProject = propProject ? workspace?.projects[propProject] : undefined;
|
|
58
|
+
return workspaceProject ? getSchematicsPropertyFrom(workspaceProject, generatorName) || getSchematicsPropertyFrom(workspace, generatorName) : null;
|
|
59
59
|
};
|
|
60
60
|
const config = getSchematicsProperty(typeOfItem, tree, project);
|
|
61
61
|
if (config && config.path) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generation.js","sourceRoot":"","sources":["../../../src/utility/generation.ts"],"names":[],"mappings":";;;AAGA,
|
|
1
|
+
{"version":3,"file":"generation.js","sourceRoot":"","sources":["../../../src/utility/generation.ts"],"names":[],"mappings":";;;AAGA,uCAA+C;AAY/C,gCAAgC;AACnB,QAAA,gBAAgB,GAAwB;IACnD,qBAAqB;IACrB,gBAAgB;IAChB,mBAAmB;IACnB,iBAAiB;IACjB,6BAA6B;IAC7B,kCAAkC;IAClC,gCAAgC;CACjC,CAAC;AAEF,sEAAsE;AACzD,QAAA,oBAAoB,GAAkE;IACjG,gEAAgE;IAChE,qBAAqB,EAAE,EAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,gBAAgB,EAAC;IACrE,gEAAgE;IAChE,gBAAgB,EAAE,EAAC,GAAG,EAAE,SAAS,EAAC;IAClC,gEAAgE;IAChE,mBAAmB,EAAE,EAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc,EAAC;IAC/D,gEAAgE;IAChE,iBAAiB,EAAE,EAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,WAAW,EAAC;IACvD,gEAAgE;IAChE,6BAA6B,EAAE,EAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,gBAAgB,EAAC;IAC7E,gEAAgE;IAChE,kCAAkC,EAAE,EAAE,GAAG,EAAE,0BAA0B,EAAE;IACvE,gEAAgE;IAChE,gCAAgC,EAAE,EAAE,GAAG,EAAE,uBAAuB,EAAE;CACnE,CAAC;AAEF;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAAC,UAA6B,EAAE,SAAoC,EAAE,IAAU,EAAE,OAAuB;IACzI,IAAI,SAAS,EAAE;QACb,OAAO,SAAS,CAAC;KAClB;IAED;;;OAGG;IACH,MAAM,yBAAyB,GAAG,CAChC,SAA6C,EAC7C,aAAgC,EAAY,EAAE;QAC9C,OAAO,SAAS,CAAC,UAAU,EAAE,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC;IACvD,CAAC,CAAC;IAEF;;;;OAIG;IACH,MAAM,qBAAqB,GAAG,CAAoE,aAAgC,EAAE,QAAc,EAAE,WAA2B,EAAY,EAAE;QAC3L,MAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,QAAQ,CAAC,CAAC;QAC/C,MAAM,gBAAgB,GAAG,WAAW,CAAC,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACpF,OAAO,gBAAgB,CAAC,CAAC,CAAC,yBAAyB,CAAC,gBAAgB,EAAE,aAAa,CAAC,IAAI,yBAAyB,CAAC,SAAU,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACtJ,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,qBAAqB,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAChE,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE;QACzB,OAAO,MAAM,CAAC,IAAc,CAAC;KAC9B;IAED,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;AAC1D,CAAC;AAhCD,gDAgCC"}
|
package/src/utility/loaders.d.ts
CHANGED
|
@@ -4,7 +4,6 @@ import type { PackageJson } from 'type-fest';
|
|
|
4
4
|
import type { WorkspaceProject, WorkspaceSchema } from '../interfaces/index';
|
|
5
5
|
/**
|
|
6
6
|
* Load the angular.json file
|
|
7
|
-
*
|
|
8
7
|
* @param tree File tree
|
|
9
8
|
* @param angularJsonFile Angular.json file path
|
|
10
9
|
* @throws Angular JSON invalid or non exist
|
|
@@ -13,7 +12,6 @@ import type { WorkspaceProject, WorkspaceSchema } from '../interfaces/index';
|
|
|
13
12
|
export declare function readAngularJson(tree: Tree, angularJsonFile?: string): WorkspaceSchema;
|
|
14
13
|
/**
|
|
15
14
|
* Load the Workspace configuration object
|
|
16
|
-
*
|
|
17
15
|
* @param tree File tree
|
|
18
16
|
* @param workspaceConfigFile Workspace config file path, /angular.json in an Angular project
|
|
19
17
|
* @returns null if the given config file does not exist
|
|
@@ -21,7 +19,6 @@ export declare function readAngularJson(tree: Tree, angularJsonFile?: string): W
|
|
|
21
19
|
export declare function getWorkspaceConfig<T extends WorkspaceSchema = WorkspaceSchema>(tree: Tree, workspaceConfigFile?: string): WorkspaceSchema | null;
|
|
22
20
|
/**
|
|
23
21
|
* Update angular.json file
|
|
24
|
-
*
|
|
25
22
|
* @param tree File tree
|
|
26
23
|
* @param workspace Angular workspace
|
|
27
24
|
* @param angularJsonFile Angular.json file path
|
|
@@ -29,7 +26,6 @@ export declare function getWorkspaceConfig<T extends WorkspaceSchema = Workspace
|
|
|
29
26
|
export declare function writeAngularJson(tree: Tree, workspace: WorkspaceSchema, angularJsonFile?: string): import("@angular-devkit/schematics/src/tree/interface").Tree;
|
|
30
27
|
/**
|
|
31
28
|
* Load the target's package.json file
|
|
32
|
-
*
|
|
33
29
|
* @param tree File tree
|
|
34
30
|
* @param workspaceProject Angular workspace project
|
|
35
31
|
* @throws Package JSON invalid or non exist
|
|
@@ -37,38 +33,42 @@ export declare function writeAngularJson(tree: Tree, workspace: WorkspaceSchema,
|
|
|
37
33
|
export declare function readPackageJson(tree: Tree, workspaceProject: WorkspaceProject): PackageJson;
|
|
38
34
|
/**
|
|
39
35
|
* Get the workspace project
|
|
40
|
-
*
|
|
41
36
|
* @param tree File tree
|
|
42
37
|
* @param projectName Name of the Angular project
|
|
43
38
|
* @param projectType
|
|
39
|
+
* @deprecated please use {@link getWorkspaceConfig} instead. Will be removed in v10
|
|
44
40
|
*/
|
|
45
41
|
export declare function getProjectFromTree(tree: Tree, projectName?: string | null, projectType?: 'application' | 'library'): WorkspaceProject & {
|
|
46
42
|
name: string;
|
|
47
43
|
} | undefined;
|
|
48
44
|
/**
|
|
49
45
|
* Returns the root directory of a project with the given name ( a relative path from the project root)
|
|
50
|
-
*
|
|
51
46
|
* @param tree Files tree
|
|
52
47
|
* @param projectName Name of the project inside the workspace
|
|
48
|
+
* @deprecated please use {@link getWorkspaceConfig} instead. Will be removed in v10
|
|
53
49
|
*/
|
|
54
50
|
export declare function getProjectRootDir(tree: Tree, projectName?: string | null): string | undefined;
|
|
55
51
|
/**
|
|
56
52
|
* Return the type of install to run depending on the project type (Peer or default)
|
|
57
|
-
*
|
|
53
|
+
* @deprecated please use {@link getProjectNewDependenciesType} instead. Will be removed in v10
|
|
58
54
|
* @param tree
|
|
59
55
|
*/
|
|
60
56
|
export declare function getProjectDepType(tree: Tree): NodeDependencyType.Default | NodeDependencyType.Peer;
|
|
57
|
+
/**
|
|
58
|
+
* Return the type of install to run depending on the project type (Peer or default)
|
|
59
|
+
* @param project
|
|
60
|
+
* @param tree
|
|
61
|
+
*/
|
|
62
|
+
export declare function getProjectNewDependenciesType(project?: WorkspaceProject): NodeDependencyType.Default | NodeDependencyType.Peer;
|
|
61
63
|
/**
|
|
62
64
|
* Get the default project name
|
|
63
|
-
*
|
|
64
|
-
* @deprecated use {@link getProjectFromTree} function instead, will be removed in Otter V10
|
|
65
|
+
* @deprecated use {@link getWorkspaceConfig} function instead, will be removed in Otter V10
|
|
65
66
|
* @param projectType
|
|
66
67
|
* @param tree File tree
|
|
67
68
|
*/
|
|
68
69
|
export declare function getDefaultProjectName(tree: Tree, projectType?: 'application' | 'library'): string | undefined;
|
|
69
70
|
/**
|
|
70
71
|
* Get the folder of the templates for a specific sub-schematics
|
|
71
|
-
*
|
|
72
72
|
* @param rootPath Root directory of the schematics ran
|
|
73
73
|
* @param currentPath Directory of the current sub-schematics ran
|
|
74
74
|
* @param templateFolder Folder containing the templates
|
|
@@ -76,7 +76,6 @@ export declare function getDefaultProjectName(tree: Tree, projectType?: 'applica
|
|
|
76
76
|
export declare function getTemplateFolder(rootPath: string, currentPath: string, templateFolder?: string): string;
|
|
77
77
|
/**
|
|
78
78
|
* Get the path of all the files in the Tree
|
|
79
|
-
*
|
|
80
79
|
* @param basePath Base path from which starting the list
|
|
81
80
|
* @param tree Schematics file tree
|
|
82
81
|
* @param excludes Array of globs to be ignored
|
|
@@ -85,7 +84,6 @@ export declare function getTemplateFolder(rootPath: string, currentPath: string,
|
|
|
85
84
|
export declare function getAllFilesInTree(tree: Tree, basePath?: string, excludes?: string[], recursive?: boolean): string[];
|
|
86
85
|
/**
|
|
87
86
|
* Get all files with specific extension from the specified folder for all the projects described in the workspace
|
|
88
|
-
*
|
|
89
87
|
* @deprecated please use {@link getFilesInFolderFromWorkspaceProjectsInTree}, will be removed in v9
|
|
90
88
|
* @param tree
|
|
91
89
|
* @param folderInProject
|
|
@@ -94,7 +92,6 @@ export declare function getAllFilesInTree(tree: Tree, basePath?: string, exclude
|
|
|
94
92
|
export declare function getFilesInFolderFromWorkspaceProjects(tree: Tree, folderInProject: string, extension: string): string[];
|
|
95
93
|
/**
|
|
96
94
|
* Get all files with specific extension from the specified folder for all the projects described in the workspace
|
|
97
|
-
*
|
|
98
95
|
* @param tree
|
|
99
96
|
* @param folderInProject
|
|
100
97
|
* @param extension
|
|
@@ -102,28 +99,24 @@ export declare function getFilesInFolderFromWorkspaceProjects(tree: Tree, folder
|
|
|
102
99
|
export declare function getFilesInFolderFromWorkspaceProjectsInTree(tree: Tree, folderInProject: string, extension: string): string[];
|
|
103
100
|
/**
|
|
104
101
|
* Get all files with specific extension from the tree
|
|
105
|
-
*
|
|
106
102
|
* @param tree
|
|
107
103
|
* @param extension
|
|
108
104
|
*/
|
|
109
105
|
export declare function getFilesWithExtensionFromTree(tree: Tree, extension: string): string[];
|
|
110
106
|
/**
|
|
111
107
|
* Get all files with specific extension from the root of all the projects described in the workspace
|
|
112
|
-
*
|
|
113
108
|
* @param tree
|
|
114
109
|
* @param extension
|
|
115
110
|
*/
|
|
116
111
|
export declare function getFilesFromRootOfWorkspaceProjects(tree: Tree, extension: string): string[];
|
|
117
112
|
/**
|
|
118
113
|
* Get all files with specific extension from the src folder for all the projects described in the workspace
|
|
119
|
-
*
|
|
120
114
|
* @param tree
|
|
121
115
|
* @param extension
|
|
122
116
|
*/
|
|
123
117
|
export declare function getFilesFromWorkspaceProjects(tree: Tree, extension: string): string[];
|
|
124
118
|
/**
|
|
125
119
|
* Get all the typescript files from the src folder for all the projects described in the workspace
|
|
126
|
-
*
|
|
127
120
|
* @param tree
|
|
128
121
|
*/
|
|
129
122
|
export declare function getSourceFilesFromWorkspaceProjects(tree: Tree): string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loaders.d.ts","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAI9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE7E
|
|
1
|
+
{"version":3,"file":"loaders.d.ts","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAI9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE7E;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,SAAkB,GAAG,eAAe,CAM9F;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,mBAAmB,SAAkB,GAAG,eAAe,GAAG,IAAI,CAKzJ;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,SAAkB,gEAGzG;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,gBAAgB,eAQ7E;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,CAAC,EAAE,aAAa,GAAG,SAAS,GAAG,gBAAgB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAuBpK;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,sBAExE;AAGD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,wDAI3C;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,CAAC,EAAE,gBAAgB,wDAEvE;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAE7G;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,SAAc,UAGpG;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,SAAM,EAAE,QAAQ,GAAE,MAAM,EAAO,EAAE,SAAS,UAAO,GAAG,MAAM,EAAE,CAQjH;AAED;;;;;;GAMG;AACH,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,YAS3G;AAED;;;;;GAKG;AACH,wBAAgB,2CAA2C,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,YAOjH;AAGD;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAK1E;AAED;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAEhF;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAE1E;AAGD;;;GAGG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,YAE7D"}
|
package/src/utility/loaders.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getSourceFilesFromWorkspaceProjects = exports.getFilesFromWorkspaceProjects = exports.getFilesFromRootOfWorkspaceProjects = exports.getFilesWithExtensionFromTree = exports.getFilesInFolderFromWorkspaceProjectsInTree = exports.getFilesInFolderFromWorkspaceProjects = exports.getAllFilesInTree = exports.getTemplateFolder = exports.getDefaultProjectName = exports.getProjectDepType = exports.getProjectRootDir = exports.getProjectFromTree = exports.readPackageJson = exports.writeAngularJson = exports.getWorkspaceConfig = exports.readAngularJson = void 0;
|
|
3
|
+
exports.getSourceFilesFromWorkspaceProjects = exports.getFilesFromWorkspaceProjects = exports.getFilesFromRootOfWorkspaceProjects = exports.getFilesWithExtensionFromTree = exports.getFilesInFolderFromWorkspaceProjectsInTree = exports.getFilesInFolderFromWorkspaceProjects = exports.getAllFilesInTree = exports.getTemplateFolder = exports.getDefaultProjectName = exports.getProjectNewDependenciesType = exports.getProjectDepType = exports.getProjectRootDir = exports.getProjectFromTree = exports.readPackageJson = exports.writeAngularJson = exports.getWorkspaceConfig = exports.readAngularJson = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
6
6
|
const globby_1 = require("globby");
|
|
@@ -8,7 +8,6 @@ const minimatch_1 = require("minimatch");
|
|
|
8
8
|
const path = require("node:path");
|
|
9
9
|
/**
|
|
10
10
|
* Load the angular.json file
|
|
11
|
-
*
|
|
12
11
|
* @param tree File tree
|
|
13
12
|
* @param angularJsonFile Angular.json file path
|
|
14
13
|
* @throws Angular JSON invalid or non exist
|
|
@@ -24,7 +23,6 @@ function readAngularJson(tree, angularJsonFile = '/angular.json') {
|
|
|
24
23
|
exports.readAngularJson = readAngularJson;
|
|
25
24
|
/**
|
|
26
25
|
* Load the Workspace configuration object
|
|
27
|
-
*
|
|
28
26
|
* @param tree File tree
|
|
29
27
|
* @param workspaceConfigFile Workspace config file path, /angular.json in an Angular project
|
|
30
28
|
* @returns null if the given config file does not exist
|
|
@@ -38,7 +36,6 @@ function getWorkspaceConfig(tree, workspaceConfigFile = '/angular.json') {
|
|
|
38
36
|
exports.getWorkspaceConfig = getWorkspaceConfig;
|
|
39
37
|
/**
|
|
40
38
|
* Update angular.json file
|
|
41
|
-
*
|
|
42
39
|
* @param tree File tree
|
|
43
40
|
* @param workspace Angular workspace
|
|
44
41
|
* @param angularJsonFile Angular.json file path
|
|
@@ -50,7 +47,6 @@ function writeAngularJson(tree, workspace, angularJsonFile = '/angular.json') {
|
|
|
50
47
|
exports.writeAngularJson = writeAngularJson;
|
|
51
48
|
/**
|
|
52
49
|
* Load the target's package.json file
|
|
53
|
-
*
|
|
54
50
|
* @param tree File tree
|
|
55
51
|
* @param workspaceProject Angular workspace project
|
|
56
52
|
* @throws Package JSON invalid or non exist
|
|
@@ -66,10 +62,10 @@ function readPackageJson(tree, workspaceProject) {
|
|
|
66
62
|
exports.readPackageJson = readPackageJson;
|
|
67
63
|
/**
|
|
68
64
|
* Get the workspace project
|
|
69
|
-
*
|
|
70
65
|
* @param tree File tree
|
|
71
66
|
* @param projectName Name of the Angular project
|
|
72
67
|
* @param projectType
|
|
68
|
+
* @deprecated please use {@link getWorkspaceConfig} instead. Will be removed in v10
|
|
73
69
|
*/
|
|
74
70
|
function getProjectFromTree(tree, projectName, projectType) {
|
|
75
71
|
const workspace = getWorkspaceConfig(tree);
|
|
@@ -95,9 +91,9 @@ function getProjectFromTree(tree, projectName, projectType) {
|
|
|
95
91
|
exports.getProjectFromTree = getProjectFromTree;
|
|
96
92
|
/**
|
|
97
93
|
* Returns the root directory of a project with the given name ( a relative path from the project root)
|
|
98
|
-
*
|
|
99
94
|
* @param tree Files tree
|
|
100
95
|
* @param projectName Name of the project inside the workspace
|
|
96
|
+
* @deprecated please use {@link getWorkspaceConfig} instead. Will be removed in v10
|
|
101
97
|
*/
|
|
102
98
|
function getProjectRootDir(tree, projectName) {
|
|
103
99
|
return getProjectFromTree(tree, projectName)?.root;
|
|
@@ -105,7 +101,7 @@ function getProjectRootDir(tree, projectName) {
|
|
|
105
101
|
exports.getProjectRootDir = getProjectRootDir;
|
|
106
102
|
/**
|
|
107
103
|
* Return the type of install to run depending on the project type (Peer or default)
|
|
108
|
-
*
|
|
104
|
+
* @deprecated please use {@link getProjectNewDependenciesType} instead. Will be removed in v10
|
|
109
105
|
* @param tree
|
|
110
106
|
*/
|
|
111
107
|
function getProjectDepType(tree) {
|
|
@@ -114,10 +110,18 @@ function getProjectDepType(tree) {
|
|
|
114
110
|
return projectType === 'application' ? dependencies_1.NodeDependencyType.Default : dependencies_1.NodeDependencyType.Peer;
|
|
115
111
|
}
|
|
116
112
|
exports.getProjectDepType = getProjectDepType;
|
|
113
|
+
/**
|
|
114
|
+
* Return the type of install to run depending on the project type (Peer or default)
|
|
115
|
+
* @param project
|
|
116
|
+
* @param tree
|
|
117
|
+
*/
|
|
118
|
+
function getProjectNewDependenciesType(project) {
|
|
119
|
+
return project?.projectType === 'library' ? dependencies_1.NodeDependencyType.Peer : dependencies_1.NodeDependencyType.Default;
|
|
120
|
+
}
|
|
121
|
+
exports.getProjectNewDependenciesType = getProjectNewDependenciesType;
|
|
117
122
|
/**
|
|
118
123
|
* Get the default project name
|
|
119
|
-
*
|
|
120
|
-
* @deprecated use {@link getProjectFromTree} function instead, will be removed in Otter V10
|
|
124
|
+
* @deprecated use {@link getWorkspaceConfig} function instead, will be removed in Otter V10
|
|
121
125
|
* @param projectType
|
|
122
126
|
* @param tree File tree
|
|
123
127
|
*/
|
|
@@ -127,7 +131,6 @@ function getDefaultProjectName(tree, projectType) {
|
|
|
127
131
|
exports.getDefaultProjectName = getDefaultProjectName;
|
|
128
132
|
/**
|
|
129
133
|
* Get the folder of the templates for a specific sub-schematics
|
|
130
|
-
*
|
|
131
134
|
* @param rootPath Root directory of the schematics ran
|
|
132
135
|
* @param currentPath Directory of the current sub-schematics ran
|
|
133
136
|
* @param templateFolder Folder containing the templates
|
|
@@ -139,7 +142,6 @@ function getTemplateFolder(rootPath, currentPath, templateFolder = 'templates')
|
|
|
139
142
|
exports.getTemplateFolder = getTemplateFolder;
|
|
140
143
|
/**
|
|
141
144
|
* Get the path of all the files in the Tree
|
|
142
|
-
*
|
|
143
145
|
* @param basePath Base path from which starting the list
|
|
144
146
|
* @param tree Schematics file tree
|
|
145
147
|
* @param excludes Array of globs to be ignored
|
|
@@ -157,7 +159,6 @@ function getAllFilesInTree(tree, basePath = '/', excludes = [], recursive = true
|
|
|
157
159
|
exports.getAllFilesInTree = getAllFilesInTree;
|
|
158
160
|
/**
|
|
159
161
|
* Get all files with specific extension from the specified folder for all the projects described in the workspace
|
|
160
|
-
*
|
|
161
162
|
* @deprecated please use {@link getFilesInFolderFromWorkspaceProjectsInTree}, will be removed in v9
|
|
162
163
|
* @param tree
|
|
163
164
|
* @param folderInProject
|
|
@@ -175,7 +176,6 @@ function getFilesInFolderFromWorkspaceProjects(tree, folderInProject, extension)
|
|
|
175
176
|
exports.getFilesInFolderFromWorkspaceProjects = getFilesInFolderFromWorkspaceProjects;
|
|
176
177
|
/**
|
|
177
178
|
* Get all files with specific extension from the specified folder for all the projects described in the workspace
|
|
178
|
-
*
|
|
179
179
|
* @param tree
|
|
180
180
|
* @param folderInProject
|
|
181
181
|
* @param extension
|
|
@@ -191,7 +191,6 @@ function getFilesInFolderFromWorkspaceProjectsInTree(tree, folderInProject, exte
|
|
|
191
191
|
exports.getFilesInFolderFromWorkspaceProjectsInTree = getFilesInFolderFromWorkspaceProjectsInTree;
|
|
192
192
|
/**
|
|
193
193
|
* Get all files with specific extension from the tree
|
|
194
|
-
*
|
|
195
194
|
* @param tree
|
|
196
195
|
* @param extension
|
|
197
196
|
*/
|
|
@@ -204,7 +203,6 @@ function getFilesWithExtensionFromTree(tree, extension) {
|
|
|
204
203
|
exports.getFilesWithExtensionFromTree = getFilesWithExtensionFromTree;
|
|
205
204
|
/**
|
|
206
205
|
* Get all files with specific extension from the root of all the projects described in the workspace
|
|
207
|
-
*
|
|
208
206
|
* @param tree
|
|
209
207
|
* @param extension
|
|
210
208
|
*/
|
|
@@ -214,7 +212,6 @@ function getFilesFromRootOfWorkspaceProjects(tree, extension) {
|
|
|
214
212
|
exports.getFilesFromRootOfWorkspaceProjects = getFilesFromRootOfWorkspaceProjects;
|
|
215
213
|
/**
|
|
216
214
|
* Get all files with specific extension from the src folder for all the projects described in the workspace
|
|
217
|
-
*
|
|
218
215
|
* @param tree
|
|
219
216
|
* @param extension
|
|
220
217
|
*/
|
|
@@ -224,7 +221,6 @@ function getFilesFromWorkspaceProjects(tree, extension) {
|
|
|
224
221
|
exports.getFilesFromWorkspaceProjects = getFilesFromWorkspaceProjects;
|
|
225
222
|
/**
|
|
226
223
|
* Get all the typescript files from the src folder for all the projects described in the workspace
|
|
227
|
-
*
|
|
228
224
|
* @param tree
|
|
229
225
|
*/
|
|
230
226
|
function getSourceFilesFromWorkspaceProjects(tree) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AACvE,2EAA8E;AAC9E,mCAA4C;AAC5C,yCAAsC;AACtC,kCAAkC;AAIlC
|
|
1
|
+
{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"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"}
|
package/src/utility/modules.d.ts
CHANGED
|
@@ -2,7 +2,6 @@ import { SchematicContext, Tree, UpdateRecorder } from '@angular-devkit/schemati
|
|
|
2
2
|
import * as ts from 'typescript';
|
|
3
3
|
/**
|
|
4
4
|
* Get the path to the app.module.ts
|
|
5
|
-
*
|
|
6
5
|
* @param tree File tree
|
|
7
6
|
* @param context Context of the rule
|
|
8
7
|
* @param projectName The name of the project where to search for an app module file
|
|
@@ -13,12 +12,12 @@ export declare function getAppModuleFilePath(tree: Tree, context: SchematicConte
|
|
|
13
12
|
*
|
|
14
13
|
* @param tree File tree
|
|
15
14
|
* @param context Context of the rule
|
|
15
|
+
* @param projectName
|
|
16
16
|
*/
|
|
17
|
-
export declare function getMainFilePath(tree: Tree, context: SchematicContext): string | undefined;
|
|
17
|
+
export declare function getMainFilePath(tree: Tree, context: SchematicContext, projectName?: string): string | undefined;
|
|
18
18
|
/**
|
|
19
19
|
* Returns true if the project is an application and contains a TS file that imports the angular RouterModule in
|
|
20
20
|
* one of its modules.
|
|
21
|
-
*
|
|
22
21
|
* @param tree
|
|
23
22
|
* @param options @see RuleFactory.options
|
|
24
23
|
* @param options.projectName
|
|
@@ -28,7 +27,6 @@ export declare function isApplicationThatUsesRouterModule(tree: Tree, options: {
|
|
|
28
27
|
}): boolean | "" | undefined;
|
|
29
28
|
/**
|
|
30
29
|
* Add import to the main module
|
|
31
|
-
*
|
|
32
30
|
* @param name
|
|
33
31
|
* @param file
|
|
34
32
|
* @param sourceFile
|
|
@@ -43,7 +41,6 @@ export declare function isApplicationThatUsesRouterModule(tree: Tree, options: {
|
|
|
43
41
|
export declare function addImportToModuleFile(name: string, file: string, sourceFile: ts.SourceFile, sourceFileContent: string, context: SchematicContext, recorder: UpdateRecorder, moduleFilePath: string, moduleIndex: number, moduleFunction?: string, override?: boolean): UpdateRecorder;
|
|
44
42
|
/**
|
|
45
43
|
* Insert import on top of the main module file
|
|
46
|
-
*
|
|
47
44
|
* @param name
|
|
48
45
|
* @param file
|
|
49
46
|
* @param sourceFile
|
|
@@ -54,7 +51,6 @@ export declare function addImportToModuleFile(name: string, file: string, source
|
|
|
54
51
|
export declare function insertImportToModuleFile(name: string, file: string, sourceFile: ts.SourceFile, recorder: UpdateRecorder, moduleFilePath: string, isDefault?: boolean): UpdateRecorder;
|
|
55
52
|
/**
|
|
56
53
|
* Add providers to the main module
|
|
57
|
-
*
|
|
58
54
|
* @param name
|
|
59
55
|
* @param file
|
|
60
56
|
* @param sourceFile
|
|
@@ -68,7 +64,6 @@ export declare function insertImportToModuleFile(name: string, file: string, sou
|
|
|
68
64
|
export declare function addProviderToModuleFile(name: string, file: string, sourceFile: ts.SourceFile, sourceFileContent: string, context: SchematicContext, recorder: UpdateRecorder, moduleFilePath: string, moduleIndex: number, customProvider?: string): UpdateRecorder;
|
|
69
65
|
/**
|
|
70
66
|
* Add custom code before the module definition
|
|
71
|
-
*
|
|
72
67
|
* @param line
|
|
73
68
|
* @param file
|
|
74
69
|
* @param recorder
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../../src/utility/modules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAuB,IAAI,EAAE,cAAc,EAAC,MAAM,4BAA4B,CAAC;AACvG,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAejC
|
|
1
|
+
{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../../src/utility/modules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAuB,IAAI,EAAE,cAAc,EAAC,MAAM,4BAA4B,CAAC;AACvG,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAejC;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,sBA0DtG;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,CAAC,EAAE,MAAM,sBAU1F;AAED;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,4BAgB1G;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EACrI,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,QAAQ,UAAQ,kBAoB3H;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,kBAMpK;AAGD;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EACrI,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,kBAY3G;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAK3G"}
|
package/src/utility/modules.js
CHANGED
|
@@ -12,13 +12,12 @@ const ast_1 = require("./ast");
|
|
|
12
12
|
const loaders_1 = require("./loaders");
|
|
13
13
|
/**
|
|
14
14
|
* Get the path to the app.module.ts
|
|
15
|
-
*
|
|
16
15
|
* @param tree File tree
|
|
17
16
|
* @param context Context of the rule
|
|
18
17
|
* @param projectName The name of the project where to search for an app module file
|
|
19
18
|
*/
|
|
20
19
|
function getAppModuleFilePath(tree, context, projectName) {
|
|
21
|
-
const workspaceProject = (0, loaders_1.
|
|
20
|
+
const workspaceProject = projectName ? (0, loaders_1.getWorkspaceConfig)(tree)?.projects[projectName] : undefined;
|
|
22
21
|
// exit if not an application
|
|
23
22
|
if (!workspaceProject) {
|
|
24
23
|
context.logger.debug('Aborted. App module file path will be searched only in application project.');
|
|
@@ -69,9 +68,10 @@ exports.getAppModuleFilePath = getAppModuleFilePath;
|
|
|
69
68
|
*
|
|
70
69
|
* @param tree File tree
|
|
71
70
|
* @param context Context of the rule
|
|
71
|
+
* @param projectName
|
|
72
72
|
*/
|
|
73
|
-
function getMainFilePath(tree, context) {
|
|
74
|
-
const workspaceProject = (0, loaders_1.
|
|
73
|
+
function getMainFilePath(tree, context, projectName) {
|
|
74
|
+
const workspaceProject = projectName ? (0, loaders_1.getWorkspaceConfig)(tree)?.projects[projectName] : undefined;
|
|
75
75
|
// exit if not an application
|
|
76
76
|
if (!workspaceProject) {
|
|
77
77
|
context.logger.debug('Register localization on main module only in application project');
|
|
@@ -84,13 +84,12 @@ exports.getMainFilePath = getMainFilePath;
|
|
|
84
84
|
/**
|
|
85
85
|
* Returns true if the project is an application and contains a TS file that imports the angular RouterModule in
|
|
86
86
|
* one of its modules.
|
|
87
|
-
*
|
|
88
87
|
* @param tree
|
|
89
88
|
* @param options @see RuleFactory.options
|
|
90
89
|
* @param options.projectName
|
|
91
90
|
*/
|
|
92
91
|
function isApplicationThatUsesRouterModule(tree, options) {
|
|
93
|
-
const workspaceProject = (0, loaders_1.
|
|
92
|
+
const workspaceProject = options.projectName ? (0, loaders_1.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
|
|
94
93
|
const cwd = process.cwd().replace(/[\\/]+/g, '/');
|
|
95
94
|
const root = (workspaceProject?.root && cwd.endsWith(workspaceProject.root)) ? workspaceProject.root.replace(/[^\\/]+/g, '..') : '.';
|
|
96
95
|
return workspaceProject?.sourceRoot &&
|
|
@@ -110,7 +109,6 @@ function isApplicationThatUsesRouterModule(tree, options) {
|
|
|
110
109
|
exports.isApplicationThatUsesRouterModule = isApplicationThatUsesRouterModule;
|
|
111
110
|
/**
|
|
112
111
|
* Add import to the main module
|
|
113
|
-
*
|
|
114
112
|
* @param name
|
|
115
113
|
* @param file
|
|
116
114
|
* @param sourceFile
|
|
@@ -149,7 +147,6 @@ function addImportToModuleFile(name, file, sourceFile, sourceFileContent, contex
|
|
|
149
147
|
exports.addImportToModuleFile = addImportToModuleFile;
|
|
150
148
|
/**
|
|
151
149
|
* Insert import on top of the main module file
|
|
152
|
-
*
|
|
153
150
|
* @param name
|
|
154
151
|
* @param file
|
|
155
152
|
* @param sourceFile
|
|
@@ -167,7 +164,6 @@ function insertImportToModuleFile(name, file, sourceFile, recorder, moduleFilePa
|
|
|
167
164
|
exports.insertImportToModuleFile = insertImportToModuleFile;
|
|
168
165
|
/**
|
|
169
166
|
* Add providers to the main module
|
|
170
|
-
*
|
|
171
167
|
* @param name
|
|
172
168
|
* @param file
|
|
173
169
|
* @param sourceFile
|
|
@@ -194,7 +190,6 @@ function addProviderToModuleFile(name, file, sourceFile, sourceFileContent, cont
|
|
|
194
190
|
exports.addProviderToModuleFile = addProviderToModuleFile;
|
|
195
191
|
/**
|
|
196
192
|
* Add custom code before the module definition
|
|
197
|
-
*
|
|
198
193
|
* @param line
|
|
199
194
|
* @param file
|
|
200
195
|
* @param recorder
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../../src/utility/modules.ts"],"names":[],"mappings":";;;AAAA,2DAAuG;AACvG,iCAAiC;AACjC,qEAK+C;AAC/C,+DAAgE;AAChE,8BAA8B;AAC9B,mCAA0C;AAC1C,kCAAkC;AAClC,+BAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../../src/utility/modules.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,12 @@ export declare function findConfigFileRelativePath(tree: Tree, files: string[],
|
|
|
15
15
|
* @param tree
|
|
16
16
|
*/
|
|
17
17
|
export declare function isNxContext(tree: Tree): boolean;
|
|
18
|
+
/**
|
|
19
|
+
* Determine if a repository is standalone (not part of a monorepo)
|
|
20
|
+
*
|
|
21
|
+
* @param tree
|
|
22
|
+
*/
|
|
23
|
+
export declare function isStandaloneRepository(tree: Tree): boolean | null;
|
|
18
24
|
/**
|
|
19
25
|
* Determine if we are in a project with multi packages
|
|
20
26
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monorepo.d.ts","sourceRoot":"","sources":["../../../src/utility/monorepo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"monorepo.d.ts","sourceRoot":"","sources":["../../../src/utility/monorepo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAKnF;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,UAOzF;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,WAErC;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,kBAGhD;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,WAEhD;AAED,mFAAmF;AACnF,eAAO,MAAM,qBAAqB,SAAS,CAAC;AAC5C,sFAAsF;AACtF,eAAO,MAAM,wBAAwB,SAAS,CAAC;AAE/C,oEAAoE;AACpE,eAAO,MAAM,oBAAoB,EAAE,eAGlC,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,MAAM,eAAe,CAGhG,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,OAQtJ"}
|
package/src/utility/monorepo.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getPackagesBaseRootFolder = exports.BASE_ROOT_FOLDERS_MAP = exports.DEFAULT_ROOT_FOLDERS = exports.APPLICATIONS_FOLDER_NAME = exports.LIBRARIES_FOLDER_NAME = exports.isMultipackagesContext = exports.isNxContext = exports.findConfigFileRelativePath = void 0;
|
|
3
|
+
exports.getPackagesBaseRootFolder = exports.BASE_ROOT_FOLDERS_MAP = exports.DEFAULT_ROOT_FOLDERS = exports.APPLICATIONS_FOLDER_NAME = exports.LIBRARIES_FOLDER_NAME = exports.isMultipackagesContext = exports.isStandaloneRepository = exports.isNxContext = exports.findConfigFileRelativePath = void 0;
|
|
4
4
|
const path = require("node:path");
|
|
5
5
|
const collection_1 = require("./collection");
|
|
6
|
+
const loaders_1 = require("./loaders");
|
|
6
7
|
/**
|
|
7
8
|
* Find the relative path to a configuration file at the monorepo root
|
|
8
9
|
*
|
|
@@ -28,6 +29,16 @@ function isNxContext(tree) {
|
|
|
28
29
|
return tree.exists('/nx.json');
|
|
29
30
|
}
|
|
30
31
|
exports.isNxContext = isNxContext;
|
|
32
|
+
/**
|
|
33
|
+
* Determine if a repository is standalone (not part of a monorepo)
|
|
34
|
+
*
|
|
35
|
+
* @param tree
|
|
36
|
+
*/
|
|
37
|
+
function isStandaloneRepository(tree) {
|
|
38
|
+
const workspaceConfig = (0, loaders_1.getWorkspaceConfig)(tree);
|
|
39
|
+
return workspaceConfig && Object.keys(workspaceConfig.projects || {}).length === 1 && Object.values(workspaceConfig.projects)[0].root === '';
|
|
40
|
+
}
|
|
41
|
+
exports.isStandaloneRepository = isStandaloneRepository;
|
|
31
42
|
/**
|
|
32
43
|
* Determine if we are in a project with multi packages
|
|
33
44
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monorepo.js","sourceRoot":"","sources":["../../../src/utility/monorepo.ts"],"names":[],"mappings":";;;AACA,kCAAkC;AAElC,6CAAmD;
|
|
1
|
+
{"version":3,"file":"monorepo.js","sourceRoot":"","sources":["../../../src/utility/monorepo.ts"],"names":[],"mappings":";;;AACA,kCAAkC;AAElC,6CAAmD;AAEnD,uCAA+C;AAE/C;;;;;;;GAOG;AACH,SAAgB,0BAA0B,CAAC,IAAU,EAAE,KAAe,EAAE,UAAkB;IACxF,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;QAC3B,OAAO,EAAE,CAAC;KACX;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,SAAS,EAAE,CAAC,CAAC;AAC1D,CAAC;AAPD,gEAOC;AAED;;;;GAIG;AACH,SAAgB,WAAW,CAAC,IAAU;IACpC,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;AACjC,CAAC;AAFD,kCAEC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,IAAU;IAC/C,MAAM,eAAe,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,CAAC;IACjD,OAAO,eAAe,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC;AAC/I,CAAC;AAHD,wDAGC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,IAAU;IAC/C,OAAO,CAAC,CAAE,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAiB,CAAC,SAAS,CAAC;AACrE,CAAC;AAFD,wDAEC;AAED,mFAAmF;AACtE,QAAA,qBAAqB,GAAG,MAAM,CAAC;AAC5C,sFAAsF;AACzE,QAAA,wBAAwB,GAAG,MAAM,CAAC;AAE/C,oEAAoE;AACvD,QAAA,oBAAoB,GAAoB;IACnD,OAAO,EAAE,6BAAqB;IAC9B,OAAO,EAAE,gCAAwB;CAClC,CAAC;AAEF,uDAAuD;AAC1C,QAAA,qBAAqB,GAAmE;IACnG,OAAO,EAAE,SAAS;IAClB,WAAW,EAAE,SAAS;CACvB,CAAC;AAEF;;;;;;;;;GASG;AACH,SAAgB,yBAAyB,CAAC,IAAU,EAAE,OAAyB,EAAE,MAAuB,EAAE,WAA6C;IACrJ,MAAM,UAAU,GAAG,WAAW,IAAI,6BAAqB,CAAC,WAAW,CAAC,CAAC;IACrE,MAAM,aAAa,GAAG,UAAU,IAAI,WAAW,CAAC,IAAI,CAAC,IAAK,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAS,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;IAEzH,MAAM,kBAAkB,GAAG,UAAU,IAAI,IAAA,gCAAmB,EAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;IAE5F,qEAAqE;IACrE,OAAO,kBAAkB,IAAI,aAAa,IAAI,CAAC,CAAC,WAAW,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,4BAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AACvH,CAAC;AARD,8DAQC"}
|