@o3r/schematics 9.1.0-alpha.12 → 9.1.0-alpha.14
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 +4 -4
- package/schematics/ng-add/index.js +1 -1
- package/src/modules/modules.helpers.d.ts +32 -7
- package/src/modules/modules.helpers.d.ts.map +1 -1
- package/src/modules/modules.helpers.js +33 -23
- package/src/modules/modules.helpers.js.map +1 -1
- package/src/rule-factories/eslint-fix/index.d.ts.map +1 -1
- package/src/rule-factories/eslint-fix/index.js +1 -2
- package/src/rule-factories/eslint-fix/index.js.map +1 -1
- package/src/tasks/package-manager/add-dev-dependency.d.ts.map +1 -1
- package/src/tasks/package-manager/add-dev-dependency.js +4 -1
- package/src/tasks/package-manager/add-dev-dependency.js.map +1 -1
- package/src/tasks/package-manager/interfaces.d.ts +2 -0
- package/src/tasks/package-manager/interfaces.d.ts.map +1 -1
- package/src/tasks/package-manager/npm-install.d.ts.map +1 -1
- package/src/tasks/package-manager/npm-install.js +4 -1
- package/src/tasks/package-manager/npm-install.js.map +1 -1
- package/src/utility/loaders.d.ts +9 -0
- package/src/utility/loaders.d.ts.map +1 -1
- package/src/utility/loaders.js +18 -3
- package/src/utility/loaders.js.map +1 -1
- package/src/utility/package-manager-runner.d.ts +27 -9
- package/src/utility/package-manager-runner.d.ts.map +1 -1
- package/src/utility/package-manager-runner.js +35 -14
- package/src/utility/package-manager-runner.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/schematics",
|
|
3
|
-
"version": "9.1.0-alpha.
|
|
3
|
+
"version": "9.1.0-alpha.14",
|
|
4
4
|
"description": "Schematics module of the Otter framework",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"keywords": [
|
|
@@ -59,9 +59,9 @@
|
|
|
59
59
|
"@nx/jest": "~16.5.0",
|
|
60
60
|
"@nx/js": "~16.5.0",
|
|
61
61
|
"@nx/linter": "~16.5.0",
|
|
62
|
-
"@o3r/build-helpers": "^9.1.0-alpha.
|
|
63
|
-
"@o3r/dev-tools": "^9.1.0-alpha.
|
|
64
|
-
"@o3r/eslint-plugin": "^9.1.0-alpha.
|
|
62
|
+
"@o3r/build-helpers": "^9.1.0-alpha.14",
|
|
63
|
+
"@o3r/dev-tools": "^9.1.0-alpha.14",
|
|
64
|
+
"@o3r/eslint-plugin": "^9.1.0-alpha.14",
|
|
65
65
|
"@schematics/angular": "~16.0.5",
|
|
66
66
|
"@types/jest": "~29.5.2",
|
|
67
67
|
"@types/node": "^18.0.0",
|
|
@@ -9,7 +9,7 @@ const schematics_1 = require("@o3r/schematics");
|
|
|
9
9
|
* Add Otter schematics to an Angular Project
|
|
10
10
|
*/
|
|
11
11
|
function ngAdd() {
|
|
12
|
-
const schematicsDependencies = ['@angular-devkit/architect', '@angular-devkit/schematics', '@angular-devkit/core', '@schematics/angular', 'comment-json', '
|
|
12
|
+
const schematicsDependencies = ['@angular-devkit/architect', '@angular-devkit/schematics', '@angular-devkit/core', '@schematics/angular', 'comment-json', 'globby'];
|
|
13
13
|
return async (tree, context) => {
|
|
14
14
|
context.logger.info('Running ng add for schematics');
|
|
15
15
|
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { NpmRegistryPackage } from './modules.constants';
|
|
2
2
|
import type { logging } from '@angular-devkit/core';
|
|
3
|
+
import { PackageManagerOptions, SupportedPackageManagerExecutors } from '../utility';
|
|
3
4
|
/**
|
|
4
5
|
* Determine if the given keyword is an Otter tag
|
|
5
6
|
*
|
|
@@ -7,24 +8,48 @@ import type { logging } from '@angular-devkit/core';
|
|
|
7
8
|
* @param expect tag expected for the Otter keyword
|
|
8
9
|
*/
|
|
9
10
|
export declare const isOtterTag: <T extends string | undefined>(keyword: any, expect?: T | undefined) => keyword is `otter-${T extends undefined ? "" : T}`;
|
|
11
|
+
/** Options for getAvailableModules function */
|
|
12
|
+
export interface AvailableModuleOptions extends PackageManagerOptions {
|
|
13
|
+
/**
|
|
14
|
+
* Determine if only the packages that are NOT installed should be returned
|
|
15
|
+
*
|
|
16
|
+
* @default false
|
|
17
|
+
*/
|
|
18
|
+
onlyNotInstalled?: boolean;
|
|
19
|
+
/**
|
|
20
|
+
* Npm Registry to fetch to get the package information
|
|
21
|
+
*
|
|
22
|
+
* @default registry.npmjs.org
|
|
23
|
+
*/
|
|
24
|
+
npmRegistryToFetch?: string;
|
|
25
|
+
}
|
|
10
26
|
/**
|
|
11
27
|
* Get Available Otter modules on NPMjs.org
|
|
12
28
|
*
|
|
13
29
|
* @param keyword Keyword to search for Otter modules
|
|
14
30
|
* @param scopeWhitelist List of whitelisted scopes
|
|
15
|
-
* @param
|
|
31
|
+
* @param options
|
|
16
32
|
*/
|
|
17
|
-
export declare function getAvailableModules(keyword: string, scopeWhitelist: string[] | readonly string[],
|
|
33
|
+
export declare function getAvailableModules(keyword: string, scopeWhitelist: string[] | readonly string[], options?: AvailableModuleOptions): Promise<NpmRegistryPackage[]>;
|
|
34
|
+
/** Options for getAvailableModulesWithLatestPackage function */
|
|
35
|
+
export interface AvailableModuleOptionsWithLatestPackage extends AvailableModuleOptions {
|
|
36
|
+
/** Logger to use to report call failure (as debug message) */
|
|
37
|
+
logger?: logging.LoggerApi;
|
|
38
|
+
/**
|
|
39
|
+
* List of whitelisted scopes
|
|
40
|
+
*
|
|
41
|
+
* @default {@see OTTER_MODULE_SUPPORTED_SCOPES}
|
|
42
|
+
*/
|
|
43
|
+
scopeWhitelist?: string[] | readonly string[];
|
|
44
|
+
}
|
|
18
45
|
/**
|
|
19
46
|
* Get Available Otter modules on NPMjs.org and get latest package information
|
|
20
47
|
* Similar to {@link getAvailableModules} with additional calls to retrieve all the package's information
|
|
21
48
|
*
|
|
22
49
|
* @param keyword Keyword to search for Otter modules
|
|
23
|
-
* @param
|
|
24
|
-
* @param onlyNotInstalled Determine if only the packages that are NOT installed should be returned
|
|
25
|
-
* @param logger Logger to use to report call failure (as debug message)
|
|
50
|
+
* @param options
|
|
26
51
|
*/
|
|
27
|
-
export declare function getAvailableModulesWithLatestPackage(keyword
|
|
52
|
+
export declare function getAvailableModulesWithLatestPackage(keyword: string | undefined, options: AvailableModuleOptionsWithLatestPackage): Promise<NpmRegistryPackage[]>;
|
|
28
53
|
/**
|
|
29
54
|
* Format a module description to be displayed in the terminal
|
|
30
55
|
*
|
|
@@ -33,5 +58,5 @@ export declare function getAvailableModulesWithLatestPackage(keyword?: string, s
|
|
|
33
58
|
* @param keywordTags Mapping of the NPM package Keywords and a displayed tag
|
|
34
59
|
* @param logger Logger to use to report package read failure (as debug message)
|
|
35
60
|
*/
|
|
36
|
-
export declare function formatModuleDescription(npmPackage: NpmRegistryPackage, runner?:
|
|
61
|
+
export declare function formatModuleDescription(npmPackage: NpmRegistryPackage, runner?: SupportedPackageManagerExecutors, keywordTags?: Record<string, string>, logger?: logging.LoggerApi): string;
|
|
37
62
|
//# sourceMappingURL=modules.helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.helpers.d.ts","sourceRoot":"","sources":["../../../src/modules/modules.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAuH,MAAM,qBAAqB,CAAC;AAG9K,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"modules.helpers.d.ts","sourceRoot":"","sources":["../../../src/modules/modules.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAuH,MAAM,qBAAqB,CAAC;AAG9K,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAUpD,OAAO,EAAqB,qBAAqB,EAAE,gCAAgC,EAAE,MAAM,YAAY,CAAC;AA8CxG;;;;;GAKG;AACH,eAAO,MAAM,UAAU,0CAA2C,GAAG,+EAGpE,CAAC;AAEF,+CAA+C;AAC/C,MAAM,WAAW,sBAAuB,SAAQ,qBAAqB;IACnE;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAsBxK;AAED,gEAAgE;AAChE,MAAM,WAAW,uCAAwC,SAAQ,sBAAsB;IACrF,8DAA8D;IAC9D,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC;IAE3B;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,CAAC;CAC/C;AAED;;;;;;GAMG;AACH,wBAAsB,oCAAoC,CAAC,OAAO,oBAA+B,EAAE,OAAO,EAAE,uCAAuC,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAoBlL;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,kBAAkB,EAAE,MAAM,GAAE,gCAAwC,EAAE,WAAW,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,UA8B7L"}
|
|
@@ -11,6 +11,8 @@ const path = require("node:path");
|
|
|
11
11
|
const node_util_1 = require("node:util");
|
|
12
12
|
const node_child_process_1 = require("node:child_process");
|
|
13
13
|
const chalk = require("chalk");
|
|
14
|
+
const utility_1 = require("../utility");
|
|
15
|
+
const DEFAULT_NPM_REGISTRY = 'registry.npmjs.org';
|
|
14
16
|
async function promiseGetRequest(url) {
|
|
15
17
|
const res = await new Promise((resolve, reject) => (0, node_https_1.get)(url, resolve)
|
|
16
18
|
.on('error', (err) => reject(err)));
|
|
@@ -26,20 +28,27 @@ async function promiseGetRequest(url) {
|
|
|
26
28
|
*
|
|
27
29
|
* @param search search text
|
|
28
30
|
* @param packageManager Package manager to use, determined automatically if not specified
|
|
31
|
+
* @param packageManagerOptions
|
|
29
32
|
*/
|
|
30
|
-
async function npmSearchExec(search,
|
|
31
|
-
const manager =
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
33
|
+
async function npmSearchExec(search, packageManagerOptions) {
|
|
34
|
+
const manager = (0, utility_1.getPackageManager)(packageManagerOptions);
|
|
35
|
+
switch (manager) {
|
|
36
|
+
case 'npm': {
|
|
37
|
+
const remoteModulesPromise = (0, node_util_1.promisify)(node_child_process_1.exec)(`npm search "${search}" --json`);
|
|
38
|
+
try {
|
|
39
|
+
const results = JSON.parse((await remoteModulesPromise).stdout);
|
|
40
|
+
return results
|
|
41
|
+
.reduce((acc, pck) => {
|
|
42
|
+
acc.objects.push({ package: pck });
|
|
43
|
+
return acc;
|
|
44
|
+
}, { objects: [] });
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
41
49
|
}
|
|
42
|
-
|
|
50
|
+
default: {
|
|
51
|
+
// Only npm client is supported
|
|
43
52
|
return undefined;
|
|
44
53
|
}
|
|
45
54
|
}
|
|
@@ -60,15 +69,16 @@ exports.isOtterTag = isOtterTag;
|
|
|
60
69
|
*
|
|
61
70
|
* @param keyword Keyword to search for Otter modules
|
|
62
71
|
* @param scopeWhitelist List of whitelisted scopes
|
|
63
|
-
* @param
|
|
72
|
+
* @param options
|
|
64
73
|
*/
|
|
65
|
-
async function getAvailableModules(keyword, scopeWhitelist,
|
|
74
|
+
async function getAvailableModules(keyword, scopeWhitelist, options) {
|
|
66
75
|
const search = `keywords:${keyword}`;
|
|
67
|
-
const
|
|
76
|
+
const npmRegistry = options?.npmRegistryToFetch || DEFAULT_NPM_REGISTRY;
|
|
77
|
+
const registry = await npmSearchExec(search) || await promiseGetRequest(`https://${npmRegistry}-/v1/search?text=${search}&size=250`);
|
|
68
78
|
let packages = registry.objects
|
|
69
79
|
.filter((pck) => pck.package?.scope && scopeWhitelist.includes(pck.package?.scope))
|
|
70
80
|
.map((pck) => pck.package);
|
|
71
|
-
if (onlyNotInstalled) {
|
|
81
|
+
if (options?.onlyNotInstalled) {
|
|
72
82
|
packages = packages
|
|
73
83
|
.filter((pck) => {
|
|
74
84
|
try {
|
|
@@ -88,23 +98,23 @@ exports.getAvailableModules = getAvailableModules;
|
|
|
88
98
|
* Similar to {@link getAvailableModules} with additional calls to retrieve all the package's information
|
|
89
99
|
*
|
|
90
100
|
* @param keyword Keyword to search for Otter modules
|
|
91
|
-
* @param
|
|
92
|
-
* @param onlyNotInstalled Determine if only the packages that are NOT installed should be returned
|
|
93
|
-
* @param logger Logger to use to report call failure (as debug message)
|
|
101
|
+
* @param options
|
|
94
102
|
*/
|
|
95
|
-
async function getAvailableModulesWithLatestPackage(keyword = modules_constants_1.OTTER_MODULE_KEYWORD,
|
|
96
|
-
const
|
|
103
|
+
async function getAvailableModulesWithLatestPackage(keyword = modules_constants_1.OTTER_MODULE_KEYWORD, options) {
|
|
104
|
+
const scopeWhitelist = options.scopeWhitelist || modules_constants_1.OTTER_MODULE_SUPPORTED_SCOPES;
|
|
105
|
+
const packages = await getAvailableModules(keyword, scopeWhitelist, options);
|
|
106
|
+
const npmRegistry = options?.npmRegistryToFetch || DEFAULT_NPM_REGISTRY;
|
|
97
107
|
return Promise.all(packages
|
|
98
108
|
.map(async (pck) => {
|
|
99
109
|
try {
|
|
100
|
-
const pckInfo = await promiseGetRequest(`https
|
|
110
|
+
const pckInfo = await promiseGetRequest(`https://${npmRegistry}/${pck.name}/latest`);
|
|
101
111
|
return {
|
|
102
112
|
...pck,
|
|
103
113
|
package: pckInfo
|
|
104
114
|
};
|
|
105
115
|
}
|
|
106
116
|
catch {
|
|
107
|
-
logger?.debug(`Failed to retrieve information for ${pck.name}`);
|
|
117
|
+
options.logger?.debug(`Failed to retrieve information for ${pck.name}`);
|
|
108
118
|
return pck;
|
|
109
119
|
}
|
|
110
120
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.helpers.js","sourceRoot":"","sources":["../../../src/modules/modules.helpers.ts"],"names":[],"mappings":";;;AAAA,2DAA8K;AAI9K,gEAAoE;AACpE,mCAAmC;AACnC,2CAAiC;AACjC,qCAA8B;AAC9B,8BAA8B;AAC9B,kCAAkC;AAClC,yCAAsC;AACtC,2DAA0C;AAC1C,+BAA+B;
|
|
1
|
+
{"version":3,"file":"modules.helpers.js","sourceRoot":"","sources":["../../../src/modules/modules.helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAKpF;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IAEH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,UAAU,SAAM,EAAE,SAAS,GAAE,MAAM,EAAW,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAKpF;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IAEH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,UAAU,SAAM,EAAE,SAAS,GAAE,MAAM,EAAW,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,CAoE5G"}
|
|
@@ -50,8 +50,7 @@ You can consider to run later the following command to add otter linter rules: n
|
|
|
50
50
|
return acc;
|
|
51
51
|
}, new Set());
|
|
52
52
|
try {
|
|
53
|
-
|
|
54
|
-
(0, node_child_process_1.exec)(`${packageManager} ${(0, package_manager_runner_1.getPackageManagerRunner)()} eslint ` +
|
|
53
|
+
(0, node_child_process_1.exec)(`${(0, package_manager_runner_1.getPackageManagerExecutor)()} eslint ` +
|
|
55
54
|
Array.from(files).map((file) => `"${file}"`).join(' ') +
|
|
56
55
|
' --fix --color' +
|
|
57
56
|
(linterOptions.hideWarnings ? ' --quiet' : '') +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":";;;AACA,2DAA0C;AAC1C,yCAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-dev-dependency.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/add-dev-dependency.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAG1E,OAAO,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAE7D;;GAEG;AACH,qBAAa,aAAc,SAAQ,sBAAsB;IAChD,KAAK,UAAS;gBAET,OAAO,CAAC,EAAE,6BAA6B;
|
|
1
|
+
{"version":3,"file":"add-dev-dependency.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/add-dev-dependency.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAG1E,OAAO,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAE7D;;GAEG;AACH,qBAAa,aAAc,SAAQ,sBAAsB;IAChD,KAAK,UAAS;gBAET,OAAO,CAAC,EAAE,6BAA6B;IASnD,kBAAkB;IACX,eAAe;;;;;;;;;;;;;CAYvB"}
|
|
@@ -11,7 +11,10 @@ class AddDevInstall extends tasks_1.NodePackageInstallTask {
|
|
|
11
11
|
constructor(options) {
|
|
12
12
|
super(options);
|
|
13
13
|
this.quiet = false;
|
|
14
|
-
this.packageManager = (0, utility_1.
|
|
14
|
+
this.packageManager = (0, utility_1.getPackageManager)({
|
|
15
|
+
workspaceConfig: options?.tree && (0, utility_1.getWorkspaceConfig)(options.tree),
|
|
16
|
+
enforcedNpmManager: options?.packageName
|
|
17
|
+
});
|
|
15
18
|
}
|
|
16
19
|
/** @inheritdoc */
|
|
17
20
|
toConfiguration() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-dev-dependency.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/add-dev-dependency.ts"],"names":[],"mappings":";;;AAAA,4DAA0E;AAC1E,sFAA2F;AAC3F,
|
|
1
|
+
{"version":3,"file":"add-dev-dependency.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/add-dev-dependency.ts"],"names":[],"mappings":";;;AAAA,4DAA0E;AAC1E,sFAA2F;AAC3F,2CAAsE;AAGtE;;GAEG;AACH,MAAa,aAAc,SAAQ,8BAAsB;IAGvD,YAAY,OAAuC;QACjD,KAAK,CAAC,OAAc,CAAC,CAAC;QAHjB,UAAK,GAAG,KAAK,CAAC;QAInB,IAAI,CAAC,cAAc,GAAG,IAAA,2BAAiB,EAAC;YACtC,eAAe,EAAE,OAAO,EAAE,IAAI,IAAI,IAAA,4BAAkB,EAAC,OAAO,CAAC,IAAI,CAAC;YAClE,kBAAkB,EAAE,OAAO,EAAE,WAAW;SACzC,CAAC,CAAC;IACL,CAAC;IAGD,kBAAkB;IACX,eAAe;QACpB,MAAM,aAAa,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;QAC9C,OAAO;YACL,GAAG,aAAa;YAChB,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,GAAG,aAAa,CAAC,OAAO;gBACxB,OAAO,EAAE,SAAS;gBAClB,WAAW,EAAE,GAAG,IAAI,CAAC,WAAY,IAAI,IAAI,CAAC,cAAc,KAAK,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY,EAAE;aACtG;SACF,CAAC;IACJ,CAAC;CACF;AAzBD,sCAyBC"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { Tree } from '@angular-devkit/schematics';
|
|
1
2
|
/**
|
|
2
3
|
* Duplication of the interface not exposed by the @angular-devkit/schematics
|
|
3
4
|
*/
|
|
4
5
|
export interface NodePackageInstallTaskOptions {
|
|
6
|
+
tree?: Tree;
|
|
5
7
|
packageManager?: 'yarn' | 'npm' | '';
|
|
6
8
|
packageName?: string;
|
|
7
9
|
workingDirectory?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/interfaces.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,cAAc,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,EAAE,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB"}
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,cAAc,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,EAAE,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-install.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAIlE;;GAEG;AACH,qBAAa,UAAW,SAAQ,sBAAsB;IAC7C,KAAK,UAAS;gBAET,OAAO,CAAC,EAAE,6BAA6B;
|
|
1
|
+
{"version":3,"file":"npm-install.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAIlE;;GAEG;AACH,qBAAa,UAAW,SAAQ,sBAAsB;IAC7C,KAAK,UAAS;gBAET,OAAO,CAAC,EAAE,6BAA6B;IAQnD,kBAAkB;IACX,eAAe;;;;;;;;;;;;;CAavB"}
|
|
@@ -11,7 +11,10 @@ class NpmInstall extends tasks_1.NodePackageInstallTask {
|
|
|
11
11
|
constructor(options) {
|
|
12
12
|
super(options);
|
|
13
13
|
this.quiet = false;
|
|
14
|
-
this.packageManager = (0, utility_1.
|
|
14
|
+
this.packageManager = (0, utility_1.getPackageManager)({
|
|
15
|
+
workspaceConfig: options?.tree && (0, utility_1.getWorkspaceConfig)(options.tree),
|
|
16
|
+
enforcedNpmManager: options?.packageName
|
|
17
|
+
});
|
|
15
18
|
}
|
|
16
19
|
/** @inheritdoc */
|
|
17
20
|
toConfiguration() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-install.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-install.ts"],"names":[],"mappings":";;;AAAA,4DAA0E;AAE1E,
|
|
1
|
+
{"version":3,"file":"npm-install.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-install.ts"],"names":[],"mappings":";;;AAAA,4DAA0E;AAE1E,2CAAsE;AACtE,sFAA2F;AAE3F;;GAEG;AACH,MAAa,UAAW,SAAQ,8BAAsB;IAGpD,YAAY,OAAuC;QACjD,KAAK,CAAC,OAAc,CAAC,CAAC;QAHjB,UAAK,GAAG,KAAK,CAAC;QAInB,IAAI,CAAC,cAAc,GAAG,IAAA,2BAAiB,EAAC;YACtC,eAAe,EAAE,OAAO,EAAE,IAAI,IAAI,IAAA,4BAAkB,EAAC,OAAO,CAAC,IAAI,CAAC;YAClE,kBAAkB,EAAE,OAAO,EAAE,WAAW;SACzC,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB;IACX,eAAe;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;QACvC,OAAO;YACL,GAAG,MAAM;YACT,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,GAAG,MAAM,CAAC,OAAO;gBACjB,OAAO,EAAE,SAAS;gBAClB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC;SACF,CAAC;IACJ,CAAC;CACF;AAzBD,gCAyBC"}
|
package/src/utility/loaders.d.ts
CHANGED
|
@@ -8,8 +8,17 @@ import type { WorkspaceProject, WorkspaceSchema } from '../interfaces/index';
|
|
|
8
8
|
* @param tree File tree
|
|
9
9
|
* @param angularJsonFile Angular.json file path
|
|
10
10
|
* @throws Angular JSON invalid or non exist
|
|
11
|
+
* @deprecate use {@link getWorkspaceConfig} function instead, will be removed in Otter v10
|
|
11
12
|
*/
|
|
12
13
|
export declare function readAngularJson(tree: Tree, angularJsonFile?: string): WorkspaceSchema;
|
|
14
|
+
/**
|
|
15
|
+
* Load the Workspace configuration object
|
|
16
|
+
*
|
|
17
|
+
* @param tree File tree
|
|
18
|
+
* @param workspaceConfigFile Workspace config file path, /angular.json in an Angular project
|
|
19
|
+
* @returns null if the given config file does not exist
|
|
20
|
+
*/
|
|
21
|
+
export declare function getWorkspaceConfig<T extends WorkspaceSchema = WorkspaceSchema>(tree: Tree, workspaceConfigFile?: string): WorkspaceSchema | null;
|
|
13
22
|
/**
|
|
14
23
|
* Update angular.json file
|
|
15
24
|
*
|
|
@@ -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;AAK9E,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;AAK9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE7E;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,SAAkB,GAAG,eAAe,CAO9F;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,mBAAmB,SAAkB,GAAG,eAAe,GAAG,IAAI,CAKzJ;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,SAAkB,gEAGzG;AAED;;;;;;GAMG;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,CAkBpK;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,wDAI3C;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAE7G;AAED;;;;;;GAMG;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,GAAG,MAAM,EAAE,CAS/F;AAED;;;;;;;GAOG;AACH,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,YAS3G;AAED;;;;;;GAMG;AACH,wBAAgB,2CAA2C,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,YAOjH;AAGD;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAK1E;AAED;;;;;GAKG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAEhF;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAE1E;AAGD;;;;GAIG;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.getProjectFromTree = exports.readPackageJson = exports.writeAngularJson = exports.readAngularJson = void 0;
|
|
3
|
+
exports.getSourceFilesFromWorkspaceProjects = exports.getFilesFromWorkspaceProjects = exports.getFilesFromRootOfWorkspaceProjects = exports.getFilesWithExtensionFromTree = exports.getFilesInFolderFromWorkspaceProjectsInTree = exports.getFilesInFolderFromWorkspaceProjects = exports.getAllFilesInTree = exports.getTemplateFolder = exports.getDefaultProjectName = exports.getProjectDepType = 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 commentJson = require("comment-json");
|
|
@@ -13,6 +13,7 @@ const path = require("node:path");
|
|
|
13
13
|
* @param tree File tree
|
|
14
14
|
* @param angularJsonFile Angular.json file path
|
|
15
15
|
* @throws Angular JSON invalid or non exist
|
|
16
|
+
* @deprecate use {@link getWorkspaceConfig} function instead, will be removed in Otter v10
|
|
16
17
|
*/
|
|
17
18
|
function readAngularJson(tree, angularJsonFile = '/angular.json') {
|
|
18
19
|
const workspaceConfig = tree.read(angularJsonFile);
|
|
@@ -22,6 +23,20 @@ function readAngularJson(tree, angularJsonFile = '/angular.json') {
|
|
|
22
23
|
return commentJson.parse(workspaceConfig.toString());
|
|
23
24
|
}
|
|
24
25
|
exports.readAngularJson = readAngularJson;
|
|
26
|
+
/**
|
|
27
|
+
* Load the Workspace configuration object
|
|
28
|
+
*
|
|
29
|
+
* @param tree File tree
|
|
30
|
+
* @param workspaceConfigFile Workspace config file path, /angular.json in an Angular project
|
|
31
|
+
* @returns null if the given config file does not exist
|
|
32
|
+
*/
|
|
33
|
+
function getWorkspaceConfig(tree, workspaceConfigFile = '/angular.json') {
|
|
34
|
+
if (!tree.exists(workspaceConfigFile)) {
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
37
|
+
return tree.readJson(workspaceConfigFile);
|
|
38
|
+
}
|
|
39
|
+
exports.getWorkspaceConfig = getWorkspaceConfig;
|
|
25
40
|
/**
|
|
26
41
|
* Update angular.json file
|
|
27
42
|
*
|
|
@@ -182,7 +197,7 @@ exports.getFilesWithExtensionFromTree = getFilesWithExtensionFromTree;
|
|
|
182
197
|
* @param extension
|
|
183
198
|
*/
|
|
184
199
|
function getFilesFromRootOfWorkspaceProjects(tree, extension) {
|
|
185
|
-
return
|
|
200
|
+
return getFilesInFolderFromWorkspaceProjectsInTree(tree, '', extension);
|
|
186
201
|
}
|
|
187
202
|
exports.getFilesFromRootOfWorkspaceProjects = getFilesFromRootOfWorkspaceProjects;
|
|
188
203
|
/**
|
|
@@ -192,7 +207,7 @@ exports.getFilesFromRootOfWorkspaceProjects = getFilesFromRootOfWorkspaceProject
|
|
|
192
207
|
* @param extension
|
|
193
208
|
*/
|
|
194
209
|
function getFilesFromWorkspaceProjects(tree, extension) {
|
|
195
|
-
return
|
|
210
|
+
return getFilesInFolderFromWorkspaceProjectsInTree(tree, 'src', extension);
|
|
196
211
|
}
|
|
197
212
|
exports.getFilesFromWorkspaceProjects = getFilesFromWorkspaceProjects;
|
|
198
213
|
/**
|
|
@@ -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
|
|
1
|
+
{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,40 @@
|
|
|
1
|
-
|
|
1
|
+
import { WorkspaceSchema } from '../interfaces';
|
|
2
|
+
/** Support NPM package managers */
|
|
2
3
|
export type SupportedPackageManagers = 'npm' | 'yarn';
|
|
4
|
+
/** Support NPM package managers */
|
|
5
|
+
export type SupportedPackageManagerRunners = `${SupportedPackageManagers} run` | 'yarn';
|
|
6
|
+
/** Support NPM package managers */
|
|
7
|
+
export type SupportedPackageManagerExecutors = `${SupportedPackageManagers} exec` | 'yarn' | 'npx';
|
|
8
|
+
/** Option to determine Package Manager */
|
|
9
|
+
export interface PackageManagerOptions {
|
|
10
|
+
/** Workspace configuration */
|
|
11
|
+
workspaceConfig?: WorkspaceSchema | string | null;
|
|
12
|
+
/** Package manager to enforce, will be used if supported */
|
|
13
|
+
enforcedNpmManager?: string | null;
|
|
14
|
+
}
|
|
3
15
|
/**
|
|
4
|
-
*
|
|
16
|
+
* Determine if the given packager manager is supported
|
|
5
17
|
*
|
|
6
|
-
* @param
|
|
18
|
+
* @param name Name of the package manager
|
|
7
19
|
*/
|
|
8
|
-
export declare function
|
|
20
|
+
export declare function isSupportedPackageManager(name?: any): name is SupportedPackageManagers;
|
|
9
21
|
/**
|
|
10
22
|
* Get package manager used in runs
|
|
11
23
|
* Defaults to the package manager setup in process.env if no package manager set in angular.json
|
|
12
24
|
*
|
|
13
|
-
* @param
|
|
25
|
+
* @param options Option to determine the final package manager
|
|
14
26
|
*/
|
|
15
|
-
export declare function getPackageManager(
|
|
27
|
+
export declare function getPackageManager(options?: PackageManagerOptions): SupportedPackageManagers;
|
|
16
28
|
/**
|
|
17
|
-
* Get command to
|
|
29
|
+
* Get command to run scripts with your package manager
|
|
18
30
|
*
|
|
19
|
-
* @param
|
|
31
|
+
* @param workspaceConfig Workspace configuration
|
|
20
32
|
*/
|
|
21
|
-
export declare function getPackageManagerRunner(
|
|
33
|
+
export declare function getPackageManagerRunner(workspaceConfig?: WorkspaceSchema | string | null): SupportedPackageManagerRunners;
|
|
34
|
+
/**
|
|
35
|
+
* Get command to execute bin command with your package manager
|
|
36
|
+
*
|
|
37
|
+
* @param workspaceConfig Workspace configuration
|
|
38
|
+
*/
|
|
39
|
+
export declare function getPackageManagerExecutor(workspaceConfig?: WorkspaceSchema | string | null): SupportedPackageManagerExecutors;
|
|
22
40
|
//# sourceMappingURL=package-manager-runner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-manager-runner.d.ts","sourceRoot":"","sources":["../../../src/utility/package-manager-runner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"package-manager-runner.d.ts","sourceRoot":"","sources":["../../../src/utility/package-manager-runner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,mCAAmC;AACnC,MAAM,MAAM,wBAAwB,GAAG,KAAK,GAAG,MAAM,CAAC;AAEtD,mCAAmC;AACnC,MAAM,MAAM,8BAA8B,GAAG,GAAG,wBAAwB,MAAM,GAAG,MAAM,CAAC;AAExF,mCAAmC;AACnC,MAAM,MAAM,gCAAgC,GAAG,GAAG,wBAAwB,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;AAEnG,0CAA0C;AAC1C,MAAM,WAAW,qBAAqB;IACpC,8BAA8B;IAC9B,eAAe,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAAC;IAClD,4DAA4D;IAC5D,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,IAAI,wBAAwB,CAEtF;AAaD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,CAAC,EAAE,qBAAqB,4BAWhE;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,eAAe,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,kCAExF;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,eAAe,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,oCAE1F"}
|
|
@@ -1,40 +1,61 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getPackageManagerRunner = exports.getPackageManager = exports.
|
|
3
|
+
exports.getPackageManagerExecutor = exports.getPackageManagerRunner = exports.getPackageManager = exports.isSupportedPackageManager = void 0;
|
|
4
4
|
const commentJson = require("comment-json");
|
|
5
|
+
/**
|
|
6
|
+
* Determine if the given packager manager is supported
|
|
7
|
+
*
|
|
8
|
+
* @param name Name of the package manager
|
|
9
|
+
*/
|
|
10
|
+
function isSupportedPackageManager(name) {
|
|
11
|
+
return name === 'yarn' || name === 'npm';
|
|
12
|
+
}
|
|
13
|
+
exports.isSupportedPackageManager = isSupportedPackageManager;
|
|
5
14
|
/**
|
|
6
15
|
* Get the Package Manager
|
|
7
16
|
*
|
|
8
17
|
* @param enforcedNpmManager package manager to enforce
|
|
9
18
|
*/
|
|
10
19
|
function getPackageManagerName(enforcedNpmManager) {
|
|
11
|
-
|
|
20
|
+
const envCustomPackageManager = isSupportedPackageManager(process.env?.ENFORCED_PACKAGE_MANAGER) && process.env.ENFORCED_PACKAGE_MANAGER;
|
|
21
|
+
const envNodePackageManager = process.env?.npm_execpath?.includes('yarn') && 'yarn';
|
|
22
|
+
return enforcedNpmManager || envCustomPackageManager || envNodePackageManager || 'npm';
|
|
12
23
|
}
|
|
13
|
-
exports.getPackageManagerName = getPackageManagerName;
|
|
14
24
|
/**
|
|
15
25
|
* Get package manager used in runs
|
|
16
26
|
* Defaults to the package manager setup in process.env if no package manager set in angular.json
|
|
17
27
|
*
|
|
18
|
-
* @param
|
|
28
|
+
* @param options Option to determine the final package manager
|
|
19
29
|
*/
|
|
20
|
-
function getPackageManager(
|
|
21
|
-
let
|
|
22
|
-
if (
|
|
23
|
-
const angularJsonObj = commentJson.parse(
|
|
30
|
+
function getPackageManager(options) {
|
|
31
|
+
let packageManagerFromWorkspace;
|
|
32
|
+
if (options?.workspaceConfig) {
|
|
33
|
+
const angularJsonObj = (typeof options?.workspaceConfig === 'string' ? commentJson.parse(options?.workspaceConfig) : options?.workspaceConfig);
|
|
24
34
|
if (angularJsonObj?.cli?.packageManager) {
|
|
25
|
-
|
|
35
|
+
packageManagerFromWorkspace = angularJsonObj.cli.packageManager;
|
|
26
36
|
}
|
|
27
37
|
}
|
|
28
|
-
|
|
38
|
+
const enforcedNpmManager = options?.enforcedNpmManager && isSupportedPackageManager(options.enforcedNpmManager) ? options.enforcedNpmManager : undefined;
|
|
39
|
+
const workspaceNpmManager = isSupportedPackageManager(packageManagerFromWorkspace) ? packageManagerFromWorkspace : undefined;
|
|
40
|
+
return getPackageManagerName(enforcedNpmManager || workspaceNpmManager);
|
|
29
41
|
}
|
|
30
42
|
exports.getPackageManager = getPackageManager;
|
|
31
43
|
/**
|
|
32
|
-
* Get command to
|
|
44
|
+
* Get command to run scripts with your package manager
|
|
33
45
|
*
|
|
34
|
-
* @param
|
|
46
|
+
* @param workspaceConfig Workspace configuration
|
|
35
47
|
*/
|
|
36
|
-
function getPackageManagerRunner(
|
|
37
|
-
return getPackageManager(
|
|
48
|
+
function getPackageManagerRunner(workspaceConfig) {
|
|
49
|
+
return getPackageManager({ workspaceConfig }) + ' run';
|
|
38
50
|
}
|
|
39
51
|
exports.getPackageManagerRunner = getPackageManagerRunner;
|
|
52
|
+
/**
|
|
53
|
+
* Get command to execute bin command with your package manager
|
|
54
|
+
*
|
|
55
|
+
* @param workspaceConfig Workspace configuration
|
|
56
|
+
*/
|
|
57
|
+
function getPackageManagerExecutor(workspaceConfig) {
|
|
58
|
+
return getPackageManager({ workspaceConfig }) + ' exec';
|
|
59
|
+
}
|
|
60
|
+
exports.getPackageManagerExecutor = getPackageManagerExecutor;
|
|
40
61
|
//# sourceMappingURL=package-manager-runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-manager-runner.js","sourceRoot":"","sources":["../../../src/utility/package-manager-runner.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;
|
|
1
|
+
{"version":3,"file":"package-manager-runner.js","sourceRoot":"","sources":["../../../src/utility/package-manager-runner.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAoB5C;;;;GAIG;AACH,SAAgB,yBAAyB,CAAC,IAAU;IAClD,OAAO,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,KAAK,CAAC;AAC3C,CAAC;AAFD,8DAEC;AAED;;;;GAIG;AACH,SAAS,qBAAqB,CAAC,kBAA6C;IAC1E,MAAM,uBAAuB,GAAG,yBAAyB,CAAC,OAAO,CAAC,GAAG,EAAE,wBAAwB,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;IACzI,MAAM,qBAAqB,GAAG,OAAO,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC;IACpF,OAAO,kBAAkB,IAAI,uBAAuB,IAAI,qBAAqB,IAAI,KAAK,CAAC;AACzF,CAAC;AAED;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,OAA+B;IAC/D,IAAI,2BAA+C,CAAC;IACpD,IAAI,OAAO,EAAE,eAAe,EAAE;QAC5B,MAAM,cAAc,GAAG,CAAC,OAAO,OAAO,EAAE,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAE,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,eAAe,CAAgC,CAAC,CAAC,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAC/K,IAAI,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE;YACvC,2BAA2B,GAAG,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC;SACjE;KACF;IACD,MAAM,kBAAkB,GAAG,OAAO,EAAE,kBAAkB,IAAI,yBAAyB,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC;IACzJ,MAAM,mBAAmB,GAAG,yBAAyB,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7H,OAAO,qBAAqB,CAAC,kBAAkB,IAAI,mBAAmB,CAAC,CAAC;AAC1E,CAAC;AAXD,8CAWC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,eAAiD;IACvF,OAAO,iBAAiB,CAAC,EAAE,eAAe,EAAE,CAAC,GAAG,MAAwC,CAAC;AAC3F,CAAC;AAFD,0DAEC;AAED;;;;GAIG;AACH,SAAgB,yBAAyB,CAAC,eAAiD;IACzF,OAAO,iBAAiB,CAAC,EAAE,eAAe,EAAE,CAAC,GAAG,OAA2C,CAAC;AAC9F,CAAC;AAFD,8DAEC"}
|