@wdio/cli 8.24.6 → 8.24.12
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/build/commands/install.d.ts.map +1 -1
- package/build/commands/install.js +2 -4
- package/build/install.d.ts +1 -1
- package/build/install.d.ts.map +1 -1
- package/build/install.js +2 -3
- package/build/utils.d.ts +6 -0
- package/build/utils.d.ts.map +1 -1
- package/build/utils.js +14 -3
- package/package.json +10 -11
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAajC,OAAO,KAAK,EAAE,uBAAuB,EAAoB,MAAM,aAAa,CAAA;AAU5E,eAAO,MAAM,OAAO,0BAA0B,CAAA;AAC9C,eAAO,MAAM,IAAI,QAIN,CAAA;AAEX,eAAO,MAAM,OAAO;;;;CAIV,CAAA;AAEV,eAAO,MAAM,OAAO,UAAW,IAAI,aAalC,CAAA;AAED,wBAAsB,OAAO,CAAC,IAAI,EAAE,uBAAuB,iBAoF1D"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
/* eslint-disable no-console */
|
|
2
2
|
import fs from 'node:fs/promises';
|
|
3
3
|
import path from 'node:path';
|
|
4
|
-
|
|
5
|
-
import { detect } from 'detect-package-manager';
|
|
6
|
-
import { getProjectRoot, replaceConfig, findInConfig, addServiceDeps, convertPackageHashToObject } from '../utils.js';
|
|
4
|
+
import { getProjectRoot, replaceConfig, findInConfig, addServiceDeps, convertPackageHashToObject, detectPackageManager } from '../utils.js';
|
|
7
5
|
import { installPackages } from '../install.js';
|
|
8
6
|
import { formatConfigFilePaths, canAccessConfigPath, missingConfigurationPrompt } from './config.js';
|
|
9
7
|
import { SUPPORTED_PACKAGES, CLI_EPILOGUE } from '../constants.js';
|
|
@@ -91,7 +89,7 @@ export async function handler(argv) {
|
|
|
91
89
|
const selectedPackage = supportedInstallations[type].find(({ short }) => short === name);
|
|
92
90
|
const pkgsToInstall = selectedPackage ? [selectedPackage.package] : [];
|
|
93
91
|
addServiceDeps(selectedPackage ? [selectedPackage] : [], pkgsToInstall, true);
|
|
94
|
-
const pm =
|
|
92
|
+
const pm = detectPackageManager();
|
|
95
93
|
console.log(`Installing "${selectedPackage.package}" using ${pm}.`);
|
|
96
94
|
const success = await installPackages(projectRoot, pkgsToInstall, true);
|
|
97
95
|
if (!success) {
|
package/build/install.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type PM } from '
|
|
1
|
+
import { type PM } from './utils.js';
|
|
2
2
|
export declare function installPackages(cwd: string, packages: string[], dev: boolean): Promise<boolean>;
|
|
3
3
|
export declare function getInstallCommand(pm: PM, packages: string[], dev: boolean): string;
|
|
4
4
|
//# sourceMappingURL=install.d.ts.map
|
package/build/install.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,KAAK,EAAE,EAAE,MAAM,YAAY,CAAA;AAgB1D,wBAAsB,eAAe,CAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,oBAwBnF;AAED,wBAAgB,iBAAiB,CAAE,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,UAG1E"}
|
package/build/install.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { execa } from 'execa';
|
|
2
|
-
|
|
3
|
-
import { detect } from 'detect-package-manager';
|
|
2
|
+
import { detectPackageManager } from './utils.js';
|
|
4
3
|
const installCommand = {
|
|
5
4
|
npm: 'install',
|
|
6
5
|
pnpm: 'add',
|
|
@@ -14,7 +13,7 @@ const devFlag = {
|
|
|
14
13
|
bun: '--dev'
|
|
15
14
|
};
|
|
16
15
|
export async function installPackages(cwd, packages, dev) {
|
|
17
|
-
const pm =
|
|
16
|
+
const pm = detectPackageManager();
|
|
18
17
|
const devParam = dev ? devFlag[pm] : '';
|
|
19
18
|
console.log('\n');
|
|
20
19
|
const p = execa(pm, [installCommand[pm], ...packages, devParam], {
|
package/build/utils.d.ts
CHANGED
|
@@ -119,6 +119,12 @@ export declare function runProgram(command: string, args: string[], options: Spa
|
|
|
119
119
|
*/
|
|
120
120
|
export declare function createPackageJSON(parsedAnswers: ParsedAnswers): Promise<false | undefined>;
|
|
121
121
|
export declare function npmInstall(parsedAnswers: ParsedAnswers, npmTag: string): Promise<void>;
|
|
122
|
+
export declare const PMs: readonly ["npm", "yarn", "pnpm", "bun"];
|
|
123
|
+
export type PM = typeof PMs[number];
|
|
124
|
+
/**
|
|
125
|
+
* detect the package manager that was used
|
|
126
|
+
*/
|
|
127
|
+
export declare function detectPackageManager(argv?: string[]): "npm" | "yarn" | "pnpm" | "bun";
|
|
122
128
|
/**
|
|
123
129
|
* add ts-node if TypeScript is desired but not installed
|
|
124
130
|
*/
|
package/build/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/build/utils.js
CHANGED
|
@@ -10,8 +10,6 @@ import pickBy from 'lodash.pickby';
|
|
|
10
10
|
import logger from '@wdio/logger';
|
|
11
11
|
import readDir from 'recursive-readdir';
|
|
12
12
|
import { $ } from 'execa';
|
|
13
|
-
// @ts-expect-error // @ts-expect-error https://github.com/egoist/detect-package-manager/pull/6
|
|
14
|
-
import { detect } from 'detect-package-manager';
|
|
15
13
|
import { readPackageUp } from 'read-pkg-up';
|
|
16
14
|
import { resolve } from 'import-meta-resolve';
|
|
17
15
|
import { SevereServiceError } from 'webdriverio';
|
|
@@ -673,7 +671,7 @@ export async function npmInstall(parsedAnswers, npmTag) {
|
|
|
673
671
|
*/
|
|
674
672
|
parsedAnswers.packagesToInstall = specifyVersionIfNeeded(parsedAnswers.packagesToInstall, pkg.version, npmTag);
|
|
675
673
|
const cwd = await getProjectRoot(parsedAnswers);
|
|
676
|
-
const pm =
|
|
674
|
+
const pm = detectPackageManager();
|
|
677
675
|
if (parsedAnswers.npmInstall) {
|
|
678
676
|
console.log(`Installing packages using ${pm}:${SEP}${parsedAnswers.packagesToInstall.join(SEP)}`);
|
|
679
677
|
const success = await installPackages(cwd, parsedAnswers.packagesToInstall, true);
|
|
@@ -686,6 +684,19 @@ export async function npmInstall(parsedAnswers, npmTag) {
|
|
|
686
684
|
console.log(util.format(DEPENDENCIES_INSTALLATION_MESSAGE, installationCommand));
|
|
687
685
|
}
|
|
688
686
|
}
|
|
687
|
+
export const PMs = ['npm', 'yarn', 'pnpm', 'bun'];
|
|
688
|
+
/**
|
|
689
|
+
* detect the package manager that was used
|
|
690
|
+
*/
|
|
691
|
+
export function detectPackageManager(argv = process.argv) {
|
|
692
|
+
return PMs.find((pm) => (
|
|
693
|
+
// for pnpm check "~/Library/pnpm/store/v3/..."
|
|
694
|
+
// for NPM check "~/.npm/npx/..."
|
|
695
|
+
// for Yarn check "~/.yarn/bin/create-wdio"
|
|
696
|
+
// for Bun check "~/.bun/bin/create-wdio"
|
|
697
|
+
argv[1].includes(`${path.sep}${pm}${path.sep}`) ||
|
|
698
|
+
argv[1].includes(`${path.sep}.${pm}${path.sep}`))) || 'npm';
|
|
699
|
+
}
|
|
689
700
|
/**
|
|
690
701
|
* add ts-node if TypeScript is desired but not installed
|
|
691
702
|
*/
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wdio/cli",
|
|
3
|
-
"version": "8.24.
|
|
3
|
+
"version": "8.24.12",
|
|
4
4
|
"description": "WebdriverIO testrunner command line interface",
|
|
5
5
|
"author": "Christian Bromann <mail@bromann.dev>",
|
|
6
6
|
"homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-cli",
|
|
@@ -46,28 +46,27 @@
|
|
|
46
46
|
"typeScriptVersion": "3.8.3",
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@types/node": "^20.1.1",
|
|
49
|
-
"@wdio/config": "8.24.
|
|
50
|
-
"@wdio/globals": "8.24.
|
|
51
|
-
"@wdio/logger": "8.
|
|
52
|
-
"@wdio/protocols": "8.
|
|
53
|
-
"@wdio/types": "8.24.
|
|
54
|
-
"@wdio/utils": "8.24.
|
|
49
|
+
"@wdio/config": "8.24.12",
|
|
50
|
+
"@wdio/globals": "8.24.12",
|
|
51
|
+
"@wdio/logger": "8.24.12",
|
|
52
|
+
"@wdio/protocols": "8.24.12",
|
|
53
|
+
"@wdio/types": "8.24.12",
|
|
54
|
+
"@wdio/utils": "8.24.12",
|
|
55
55
|
"async-exit-hook": "^2.0.1",
|
|
56
56
|
"chalk": "^5.2.0",
|
|
57
57
|
"chokidar": "^3.5.3",
|
|
58
58
|
"cli-spinners": "^2.9.0",
|
|
59
|
-
"detect-package-manager": "^3.0.1",
|
|
60
59
|
"dotenv": "^16.3.1",
|
|
61
60
|
"ejs": "^3.1.9",
|
|
62
61
|
"execa": "^8.0.1",
|
|
63
|
-
"import-meta-resolve": "^
|
|
62
|
+
"import-meta-resolve": "^4.0.0",
|
|
64
63
|
"inquirer": "9.2.12",
|
|
65
64
|
"lodash.flattendeep": "^4.4.0",
|
|
66
65
|
"lodash.pickby": "^4.6.0",
|
|
67
66
|
"lodash.union": "^4.6.0",
|
|
68
67
|
"read-pkg-up": "^10.0.0",
|
|
69
68
|
"recursive-readdir": "^2.2.3",
|
|
70
|
-
"webdriverio": "8.24.
|
|
69
|
+
"webdriverio": "8.24.12",
|
|
71
70
|
"yargs": "^17.7.2"
|
|
72
71
|
},
|
|
73
72
|
"devDependencies": {
|
|
@@ -83,5 +82,5 @@
|
|
|
83
82
|
"publishConfig": {
|
|
84
83
|
"access": "public"
|
|
85
84
|
},
|
|
86
|
-
"gitHead": "
|
|
85
|
+
"gitHead": "ebf1ba1875fe210fda7067c1c13944c50cb6a694"
|
|
87
86
|
}
|