@o3r/schematics 8.2.0-alpha.82 → 8.2.0-alpha.84
Sign up to get free protection for your applications and to get access to all the features.
- package/package.json +4 -4
- package/schematics/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +2 -4
- package/src/rule-factories/eslint-fix/index.js +3 -3
- package/src/rule-factories/eslint-fix/index.js.map +1 -1
- package/src/rule-factories/ng-add/index.d.ts.map +1 -1
- package/src/rule-factories/ng-add/index.js +3 -4
- package/src/rule-factories/ng-add/index.js.map +1 -1
- package/src/rules/install.js +2 -2
- package/src/rules/install.js.map +1 -1
- package/src/tasks/eslint/index.js +2 -2
- package/src/tasks/eslint/index.js.map +1 -1
- package/src/tasks/link/index.js +2 -2
- package/src/tasks/link/index.js.map +1 -1
- package/src/tasks/ng-add/index.d.ts.map +1 -1
- package/src/tasks/ng-add/index.js +2 -2
- package/src/tasks/ng-add/index.js.map +1 -1
- package/src/utility/index.d.ts +1 -0
- package/src/utility/index.d.ts.map +1 -1
- package/src/utility/index.js +1 -0
- package/src/utility/index.js.map +1 -1
- package/src/utility/package-manager-runner.d.ts +14 -0
- package/src/utility/package-manager-runner.d.ts.map +1 -0
- package/src/utility/package-manager-runner.js +31 -0
- package/src/utility/package-manager-runner.js.map +1 -0
- package/schematics/ng-add/index.js.map +0 -1
- package/schematics/ng-add/schema.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/schematics",
|
|
3
|
-
"version": "8.2.0-alpha.
|
|
3
|
+
"version": "8.2.0-alpha.84",
|
|
4
4
|
"description": "Schematics module of the Otter framework",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"keywords": [
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
}
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@o3r/dev-tools": "^8.2.0-alpha.
|
|
31
|
+
"@o3r/dev-tools": "^8.2.0-alpha.84",
|
|
32
32
|
"comment-json": "^4.1.0",
|
|
33
33
|
"globby": "^11.1.0",
|
|
34
34
|
"minimatch": "^6.1.6",
|
|
@@ -54,8 +54,8 @@
|
|
|
54
54
|
"@nrwl/jest": "~15.9.0",
|
|
55
55
|
"@nrwl/js": "~15.9.0",
|
|
56
56
|
"@nrwl/linter": "~15.9.0",
|
|
57
|
-
"@o3r/build-helpers": "^8.2.0-alpha.
|
|
58
|
-
"@o3r/eslint-plugin": "^8.2.0-alpha.
|
|
57
|
+
"@o3r/build-helpers": "^8.2.0-alpha.84",
|
|
58
|
+
"@o3r/eslint-plugin": "^8.2.0-alpha.84",
|
|
59
59
|
"@schematics/angular": "~15.2.0",
|
|
60
60
|
"@types/jest": "~28.1.2",
|
|
61
61
|
"@types/node": "^17.0.45",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AA+B/E;;GAEG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAuB5B"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ngAdd = void 0;
|
|
4
4
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
5
|
-
const dev_tools_1 = require("@o3r/dev-tools");
|
|
6
5
|
const fs = require("node:fs");
|
|
7
6
|
const path = require("node:path");
|
|
8
7
|
const rxjs_1 = require("rxjs");
|
|
@@ -16,7 +15,7 @@ const options_1 = require("@angular-devkit/schematics/tasks/package-manager/opti
|
|
|
16
15
|
class DevInstall extends tasks_1.NodePackageInstallTask {
|
|
17
16
|
/** @inheritDoc */
|
|
18
17
|
toConfiguration() {
|
|
19
|
-
const installOptions =
|
|
18
|
+
const installOptions = process.env && process.env.npm_execpath && process.env.npm_execpath.indexOf('yarn') === -1 ? 'npm' : 'yarn';
|
|
20
19
|
return {
|
|
21
20
|
name: options_1.NodePackageName,
|
|
22
21
|
options: {
|
|
@@ -24,7 +23,7 @@ class DevInstall extends tasks_1.NodePackageInstallTask {
|
|
|
24
23
|
quiet: this.quiet,
|
|
25
24
|
workingDirectory: this.workingDirectory,
|
|
26
25
|
packageName: `${this.packageName} ${installOptions === 'yarn' ? '--prefer-dev' : '-D'}`,
|
|
27
|
-
packageManager:
|
|
26
|
+
packageManager: installOptions
|
|
28
27
|
}
|
|
29
28
|
};
|
|
30
29
|
}
|
|
@@ -44,7 +43,6 @@ function ngAdd() {
|
|
|
44
43
|
context.logger.info(`Installing ${dependency}${version || ''}`);
|
|
45
44
|
treePackageJson.devDependencies = { ...packageJsonContent.devDependencies, [dependency]: version };
|
|
46
45
|
context.addTask(new DevInstall({
|
|
47
|
-
packageManager: (0, dev_tools_1.getPackageManager)(),
|
|
48
46
|
packageName: `${dependency}${version ? '@' + version : ''}`,
|
|
49
47
|
hideOutput: false,
|
|
50
48
|
quiet: false
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.applyEsLintFix = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
-
const dev_tools_1 = require("@o3r/dev-tools");
|
|
6
5
|
const node_child_process_1 = require("node:child_process");
|
|
7
6
|
const node_path_1 = require("node:path");
|
|
7
|
+
const package_manager_runner_1 = require("../../utility/package-manager-runner");
|
|
8
8
|
/**
|
|
9
9
|
* Apply EsLint fix
|
|
10
10
|
*
|
|
@@ -50,8 +50,8 @@ function applyEsLintFix(_prootPath = '/', extension = ['ts'], options) {
|
|
|
50
50
|
return acc;
|
|
51
51
|
}, new Set());
|
|
52
52
|
try {
|
|
53
|
-
const packageManager = (0,
|
|
54
|
-
(0, node_child_process_1.exec)(`${packageManager} ${
|
|
53
|
+
const packageManager = (0, package_manager_runner_1.getPackageManager)();
|
|
54
|
+
(0, node_child_process_1.exec)(`${packageManager} ${(0, package_manager_runner_1.getPackageManagerRunner)()} eslint ` +
|
|
55
55
|
Array.from(files).map((file) => `"${file}"`).join(' ') +
|
|
56
56
|
' --fix --color' +
|
|
57
57
|
(linterOptions.hideWarnings ? ' --quiet' : '') +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":";;;AAAA,2DAAyG;AACzG,
|
|
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":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,IAAI,EAAkD,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,IAAI,EAAkD,MAAM,4BAA4B,CAAC;AAG5H,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAG9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAG7D;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,mBAAmB,EAAE,eAAe,SAAkB,GAAG,IAAI,CAsFxH;AAGD;;;;;;;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,QAezD"}
|
|
@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ngAddPeerDependencyPackages = exports.ngAddPackages = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
6
|
-
const dev_tools_1 = require("@o3r/dev-tools");
|
|
7
6
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
8
7
|
const rxjs_1 = require("rxjs");
|
|
9
|
-
const
|
|
8
|
+
const index_1 = require("../../utility/index");
|
|
10
9
|
/**
|
|
11
10
|
* Install via `ng add` a list of npm packages.
|
|
12
11
|
*
|
|
@@ -67,7 +66,7 @@ function ngAddPackages(packages, options, packageJsonPath = '/package.json') {
|
|
|
67
66
|
context.logger.info(`installed version of ${packageName}: ${installedVersion || 'undefined'} | expected: ${options?.version || 'latest'} as ${options?.dependencyType?.toString() || ''}`);
|
|
68
67
|
if (!installedVersion || version !== installedVersion) {
|
|
69
68
|
context.logger.info(`Running ng add for: ${packageName}${options?.version ? ' with version: ' + options.version : ''}`);
|
|
70
|
-
const packageManager = (0,
|
|
69
|
+
const packageManager = (0, index_1.getPackageManager)();
|
|
71
70
|
let installOptions = '';
|
|
72
71
|
if (options?.dependencyType === dependencies_1.NodeDependencyType.Dev && packageManager === 'yarn') {
|
|
73
72
|
installOptions = ' --prefer-dev';
|
|
@@ -113,7 +112,7 @@ exports.ngAddPackages = ngAddPackages;
|
|
|
113
112
|
* @param parentPackageInfo for logging purposes
|
|
114
113
|
*/
|
|
115
114
|
function ngAddPeerDependencyPackages(packages, packageJsonPath, type = dependencies_1.NodeDependencyType.Default, options, parentPackageInfo) {
|
|
116
|
-
const dependencies = (0,
|
|
115
|
+
const dependencies = (0, index_1.getNodeDependencyList)((0, index_1.getExternalDependenciesVersionRange)(packages, packageJsonPath), type);
|
|
117
116
|
const externalPeerDepsRules = dependencies.map((dependency) => {
|
|
118
117
|
return ngAddPackages([dependency.name], {
|
|
119
118
|
...options,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAA4H;AAC5H,4DAA0E;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"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"}
|
package/src/rules/install.js
CHANGED
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.install = void 0;
|
|
4
4
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
5
|
-
const dev_tools_1 = require("@o3r/dev-tools");
|
|
6
5
|
const rxjs_1 = require("rxjs");
|
|
6
|
+
const package_manager_runner_1 = require("../utility/package-manager-runner");
|
|
7
7
|
/**
|
|
8
8
|
* Install the Otter packages
|
|
9
9
|
*
|
|
@@ -11,7 +11,7 @@ const rxjs_1 = require("rxjs");
|
|
|
11
11
|
* @param context
|
|
12
12
|
*/
|
|
13
13
|
async function install(tree, context) {
|
|
14
|
-
const packageManager = (0,
|
|
14
|
+
const packageManager = (0, package_manager_runner_1.getPackageManager)();
|
|
15
15
|
context.logger.info('Running application install');
|
|
16
16
|
context.addTask(new tasks_1.NodePackageInstallTask({ packageManager }));
|
|
17
17
|
await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
|
package/src/rules/install.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/rules/install.ts"],"names":[],"mappings":";;;AACA,4DAA0E;AAC1E
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/rules/install.ts"],"names":[],"mappings":";;;AACA,4DAA0E;AAC1E,+BAAqC;AACrC,8EAAsE;AAEtE;;;;;GAKG;AACI,KAAK,UAAU,OAAO,CAAC,IAAU,EAAE,OAAyB;IACjE,MAAM,cAAc,GAAG,IAAA,0CAAiB,GAAE,CAAC;IAC3C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IACnD,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,CAAC,EAAC,cAAc,EAAC,CAAC,CAAC,CAAC;IAC9D,MAAM,IAAA,oBAAa,EAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACvD,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC;AACpB,CAAC;AAND,0BAMC"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EslintFixTask = void 0;
|
|
4
4
|
const options_1 = require("@angular-devkit/schematics/tasks/package-manager/options");
|
|
5
|
-
const dev_tools_1 = require("@o3r/dev-tools");
|
|
6
5
|
const path = require("node:path");
|
|
6
|
+
const package_manager_runner_1 = require("../../utility/package-manager-runner");
|
|
7
7
|
class EslintFixTask {
|
|
8
8
|
constructor(files, workingDirectory, configFile) {
|
|
9
9
|
this.files = files;
|
|
@@ -20,7 +20,7 @@ class EslintFixTask {
|
|
|
20
20
|
workingDirectory: this.workingDirectory,
|
|
21
21
|
packageName: 'eslint ' + this.files.join(' ') +
|
|
22
22
|
' --fix' + (this.configFile ? ` --config ${this.configFile} --parser-options=tsconfigRootDir:${path.resolve(process.cwd(), path.dirname(this.configFile))}` : ''),
|
|
23
|
-
packageManager: (0,
|
|
23
|
+
packageManager: (0, package_manager_runner_1.getPackageManager)()
|
|
24
24
|
}
|
|
25
25
|
};
|
|
26
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/eslint/index.ts"],"names":[],"mappings":";;;AACA,sFAAmH;AACnH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/eslint/index.ts"],"names":[],"mappings":";;;AACA,sFAAmH;AACnH,kCAAkC;AAClC,iFAAyE;AAEzE,MAAa,aAAa;IACxB,YAAmB,KAAe,EAAS,gBAAyB,EAAS,UAAmB;QAA7E,UAAK,GAAL,KAAK,CAAU;QAAS,qBAAgB,GAAhB,gBAAgB,CAAS;QAAS,eAAU,GAAV,UAAU,CAAS;IAChG,CAAC;IAED,4EAA4E;IACrE,eAAe;QACpB,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,QAAQ;gBACjB,KAAK,EAAE,KAAK;gBACZ,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,WAAW,EAAE,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;oBAC3C,QAAQ,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,IAAI,CAAC,UAAU,qCAAqC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnK,cAAc,EAAE,IAAA,0CAAiB,GAAE;aACpC;SACF,CAAC;IACJ,CAAC;CACF;AAlBD,sCAkBC"}
|
package/src/tasks/link/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NodePackageLinkTask = void 0;
|
|
4
4
|
const options_1 = require("@angular-devkit/schematics/tasks/package-manager/options");
|
|
5
|
-
const
|
|
5
|
+
const package_manager_runner_1 = require("../../utility/package-manager-runner");
|
|
6
6
|
class NodePackageLinkTask {
|
|
7
7
|
constructor(packageName, workingDirectory) {
|
|
8
8
|
this.packageName = packageName;
|
|
@@ -17,7 +17,7 @@ class NodePackageLinkTask {
|
|
|
17
17
|
quiet: this.quiet,
|
|
18
18
|
workingDirectory: this.workingDirectory,
|
|
19
19
|
packageName: `link ${this.packageName}`,
|
|
20
|
-
packageManager: (0,
|
|
20
|
+
packageManager: (0, package_manager_runner_1.getPackageManager)()
|
|
21
21
|
}
|
|
22
22
|
};
|
|
23
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/link/index.ts"],"names":[],"mappings":";;;AACA,sFAAmH;AACnH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/link/index.ts"],"names":[],"mappings":";;;AACA,sFAAmH;AACnH,iFAAyE;AAEzE,MAAa,mBAAmB;IAG9B,YAAmB,WAAoB,EAAS,gBAAyB;QAAtD,gBAAW,GAAX,WAAW,CAAS;QAAS,qBAAgB,GAAhB,gBAAgB,CAAS;QAFlE,UAAK,GAAG,IAAI,CAAC;IAEwD,CAAC;IAEtE,eAAe;QACpB,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,WAAW,EAAE,QAAQ,IAAI,CAAC,WAAY,EAAE;gBACxC,cAAc,EAAE,IAAA,0CAAiB,GAAE;aACpC;SAC2C,CAAC;IACjD,CAAC;CACF;AAjBD,kDAiBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAmB,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAmB,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AACnH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAGnF;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,yBAAyB;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,kBAAkB;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,yBAAyB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,gEAAgE;IAChE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B;;OAEG;IACH,cAAc,CAAC,EAAE,kBAAkB,CAAC;CACrC;AAED,qBAAa,oBAAqB,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IAG1E,WAAW,EAAE,MAAM;IAAS,OAAO,CAAC;IAFhD,KAAK,UAAS;gBAEF,WAAW,EAAE,MAAM,EAAS,OAAO,CAAC,iCAAqB;IAErE,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAgBpE"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NodePackageNgAddTask = void 0;
|
|
4
4
|
const options_1 = require("@angular-devkit/schematics/tasks/package-manager/options");
|
|
5
|
-
const
|
|
5
|
+
const package_manager_runner_1 = require("../../utility/package-manager-runner");
|
|
6
6
|
class NodePackageNgAddTask {
|
|
7
7
|
constructor(packageName, options) {
|
|
8
8
|
this.packageName = packageName;
|
|
@@ -21,7 +21,7 @@ class NodePackageNgAddTask {
|
|
|
21
21
|
quiet: this.quiet,
|
|
22
22
|
workingDirectory: this.options?.workingDirectory,
|
|
23
23
|
packageName: `ng add ${this.packageName}${this.options?.version ? '@' + this.options.version : ''} ${cmdArguments.join(' ')}`,
|
|
24
|
-
packageManager: (0,
|
|
24
|
+
packageManager: (0, package_manager_runner_1.getPackageManager)()
|
|
25
25
|
}
|
|
26
26
|
};
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/ng-add/index.ts"],"names":[],"mappings":";;;AACA,sFAAmH;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/ng-add/index.ts"],"names":[],"mappings":";;;AACA,sFAAmH;AAEnH,iFAAyE;AA2BzE,MAAa,oBAAoB;IAG/B,YAAmB,WAAmB,EAAS,OAA6B;QAAzD,gBAAW,GAAX,WAAW,CAAQ;QAAS,YAAO,GAAP,OAAO,CAAsB;QAFrE,UAAK,GAAG,KAAK,CAAC;IAE0D,CAAC;IAEzE,eAAe;QACpB,MAAM,YAAY,GAAG;YACnB,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE;YAC3D,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,iBAAiB,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE;SAC7E,CAAC;QACF,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,QAAQ;gBACjB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,gBAAgB,EAAE,IAAI,CAAC,OAAO,EAAE,gBAAgB;gBAChD,WAAW,EAAE,UAAU,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBAC7H,cAAc,EAAE,IAAA,0CAAiB,GAAE;aACpC;SAC2C,CAAC;IACjD,CAAC;CACF;AArBD,oDAqBC"}
|
package/src/utility/index.d.ts
CHANGED
|
@@ -9,6 +9,7 @@ export * from './routes';
|
|
|
9
9
|
export * from './sub-entry';
|
|
10
10
|
export * from './template-property.helper';
|
|
11
11
|
export * from './matching-peers';
|
|
12
|
+
export * from './package-manager-runner';
|
|
12
13
|
export * from './package-version';
|
|
13
14
|
export * from './monorepo';
|
|
14
15
|
export * from './update-imports';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC"}
|
package/src/utility/index.js
CHANGED
|
@@ -12,6 +12,7 @@ tslib_1.__exportStar(require("./routes"), exports);
|
|
|
12
12
|
tslib_1.__exportStar(require("./sub-entry"), exports);
|
|
13
13
|
tslib_1.__exportStar(require("./template-property.helper"), exports);
|
|
14
14
|
tslib_1.__exportStar(require("./matching-peers"), exports);
|
|
15
|
+
tslib_1.__exportStar(require("./package-manager-runner"), exports);
|
|
15
16
|
tslib_1.__exportStar(require("./package-version"), exports);
|
|
16
17
|
tslib_1.__exportStar(require("./monorepo"), exports);
|
|
17
18
|
tslib_1.__exportStar(require("./update-imports"), exports);
|
package/src/utility/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":";;;AAAA,gDAAsB;AACtB,yDAA+B;AAC/B,sDAA4B;AAC5B,uDAA6B;AAC7B,sDAA4B;AAC5B,oDAA0B;AAC1B,oDAA0B;AAC1B,mDAAyB;AACzB,sDAA4B;AAC5B,qEAA2C;AAC3C,2DAAiC;AACjC,4DAAkC;AAClC,qDAA2B;AAC3B,2DAAiC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":";;;AAAA,gDAAsB;AACtB,yDAA+B;AAC/B,sDAA4B;AAC5B,uDAA6B;AAC7B,sDAA4B;AAC5B,oDAA0B;AAC1B,oDAA0B;AAC1B,mDAAyB;AACzB,sDAA4B;AAC5B,qEAA2C;AAC3C,2DAAiC;AACjC,mEAAyC;AACzC,4DAAkC;AAClC,qDAA2B;AAC3B,2DAAiC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Get package manager used in runs
|
|
3
|
+
* Defaults to the package manager setup in process.env if no package manager set in angular.json
|
|
4
|
+
*
|
|
5
|
+
* @param angularJsonString Content of angular.json file
|
|
6
|
+
*/
|
|
7
|
+
export declare function getPackageManager(angularJsonString?: string | null): string;
|
|
8
|
+
/**
|
|
9
|
+
* Get command to execute scripts with your package manager
|
|
10
|
+
*
|
|
11
|
+
* @param angularJsonString
|
|
12
|
+
*/
|
|
13
|
+
export declare function getPackageManagerRunner(angularJsonString?: string | null): "yarn" | "npx";
|
|
14
|
+
//# sourceMappingURL=package-manager-runner.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"package-manager-runner.d.ts","sourceRoot":"","sources":["../../../src/utility/package-manager-runner.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,UASlE;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,kBAExE"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getPackageManagerRunner = exports.getPackageManager = void 0;
|
|
4
|
+
const commentJson = require("comment-json");
|
|
5
|
+
/**
|
|
6
|
+
* Get package manager used in runs
|
|
7
|
+
* Defaults to the package manager setup in process.env if no package manager set in angular.json
|
|
8
|
+
*
|
|
9
|
+
* @param angularJsonString Content of angular.json file
|
|
10
|
+
*/
|
|
11
|
+
function getPackageManager(angularJsonString) {
|
|
12
|
+
let packageManager = process.env && process.env.npm_execpath && process.env.npm_execpath.indexOf('yarn') === -1 ? 'npm' : 'yarn';
|
|
13
|
+
if (angularJsonString) {
|
|
14
|
+
const angularJsonObj = commentJson.parse(angularJsonString);
|
|
15
|
+
if (angularJsonObj?.cli?.packageManager) {
|
|
16
|
+
packageManager = angularJsonObj.cli.packageManager;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
return packageManager;
|
|
20
|
+
}
|
|
21
|
+
exports.getPackageManager = getPackageManager;
|
|
22
|
+
/**
|
|
23
|
+
* Get command to execute scripts with your package manager
|
|
24
|
+
*
|
|
25
|
+
* @param angularJsonString
|
|
26
|
+
*/
|
|
27
|
+
function getPackageManagerRunner(angularJsonString) {
|
|
28
|
+
return getPackageManager(angularJsonString) === 'yarn' ? 'yarn' : 'npx';
|
|
29
|
+
}
|
|
30
|
+
exports.getPackageManagerRunner = getPackageManagerRunner;
|
|
31
|
+
//# sourceMappingURL=package-manager-runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"package-manager-runner.js","sourceRoot":"","sources":["../../../src/utility/package-manager-runner.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAE5C;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,iBAAiC;IACjE,IAAI,cAAc,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IACjI,IAAI,iBAAiB,EAAE;QACrB,MAAM,cAAc,GAAG,WAAW,CAAC,KAAK,CAAC,iBAAiB,CAAQ,CAAC;QACnE,IAAI,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE;YACvC,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC;SACpD;KACF;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AATD,8CASC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,iBAAiC;IACvE,OAAO,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;AAC1E,CAAC;AAFD,0DAEC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AACA,4DAA0E;AAC1E,8CAAmD;AACnD,8BAA8B;AAC9B,kCAAkC;AAClC,+BAAqC;AAErC,sFAA2F;AAE3F;;;;;GAKG;AACH,MAAM,UAAW,SAAQ,8BAAsB;IAC7C,kBAAkB;IACX,eAAe;QACpB,MAAM,cAAc,GAAG,IAAA,6BAAiB,GAAE,CAAC;QAC3C,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,SAAS;gBAClB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,WAAW,EAAE,GAAG,IAAI,CAAC,WAAY,IAAI,cAAc,KAAK,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE;gBACxF,cAAc,EAAE,MAAM;aACvB;SACF,CAAC;IACJ,CAAC;CACF;AAED;;GAEG;AACH,SAAgB,KAAK;IACnB,MAAM,sBAAsB,GAAG,CAAC,2BAA2B,EAAE,4BAA4B,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC9K,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAgB,CAAC;QACvE,MAAM,kBAAkB,GAAgB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,CAAC,CAAC;QAC1G,MAAM,oBAAoB,GAAG,CAAC,UAAkB,EAAE,EAAE,CAAC,kBAAkB,EAAE,YAAY,EAAE,CAAC,UAAU,CAAC,IAAI,kBAAkB,EAAE,gBAAgB,EAAE,CAAC,UAAU,CAAC,CAAC;QAC1J,sBAAsB,CAAC,OAAO,CAC5B,CAAC,UAAU,EAAE,EAAE;YACb,MAAM,OAAO,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;YACjD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,UAAU,GAAG,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;YAChE,eAAe,CAAC,eAAe,GAAG,EAAC,GAAG,kBAAkB,CAAC,eAAe,EAAE,CAAC,UAAU,CAAC,EAAE,OAAO,EAAC,CAAC;YACjG,OAAO,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC;gBAC7B,cAAc,EAAE,IAAA,6BAAiB,GAAE;gBACnC,WAAW,EAAE,GAAG,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC3D,UAAU,EAAE,KAAK;gBACjB,KAAK,EAAE,KAAK;aACN,CAAC,CAAC,CAAC;QACb,CAAC,CACF,CAAC;QACF,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC;QAClE,MAAM,IAAA,oBAAa,EAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACvD,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AAxBD,sBAwBC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":""}
|