@appium/support 5.1.7 → 5.1.8
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/lib/npm.d.ts +8 -3
- package/build/lib/npm.d.ts.map +1 -1
- package/build/lib/npm.js +14 -3
- package/build/lib/npm.js.map +1 -1
- package/lib/npm.js +15 -3
- package/package.json +4 -4
package/build/lib/npm.d.ts
CHANGED
|
@@ -67,7 +67,7 @@ export class NPM {
|
|
|
67
67
|
* @param {InstallPackageOpts} opts
|
|
68
68
|
* @returns {Promise<NpmInstallReceipt>}
|
|
69
69
|
*/
|
|
70
|
-
installPackage(cwd: string, installStr: string, { pkgName, installType }
|
|
70
|
+
installPackage(cwd: string, installStr: string, { pkgName, pkgVer, installType }?: InstallPackageOpts): Promise<NpmInstallReceipt>;
|
|
71
71
|
/**
|
|
72
72
|
* @param {string} cwd
|
|
73
73
|
* @param {string} pkg
|
|
@@ -87,13 +87,18 @@ export const npm: NPM;
|
|
|
87
87
|
*/
|
|
88
88
|
export type InstallPackageOpts = {
|
|
89
89
|
/**
|
|
90
|
-
* - the name of the package to install
|
|
90
|
+
* - the name of the package to install. Used by appium package 2.12.2 and newer versions.
|
|
91
91
|
*/
|
|
92
|
-
pkgName
|
|
92
|
+
pkgName?: string | undefined;
|
|
93
93
|
/**
|
|
94
94
|
* - whether to install from a local path or from npm
|
|
95
95
|
*/
|
|
96
96
|
installType?: import("type-fest").LiteralUnion<"local", string> | undefined;
|
|
97
|
+
/**
|
|
98
|
+
* - The version of the package to install.
|
|
99
|
+
* This is used for backward compatibility for this support package v5 with appium package 2.12.1 and lower versions.
|
|
100
|
+
*/
|
|
101
|
+
pkgVer?: string | undefined;
|
|
97
102
|
};
|
|
98
103
|
/**
|
|
99
104
|
* Options for {@link NPM.exec}
|
package/build/lib/npm.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../lib/npm.js"],"names":[],"mappings":"AAWA;;;GAGG;AACH,6CAAqF;AAErF;;GAEG;AACH,oDAAkG;AAElG;;GAEG;AACH;IACE;;;;OAIG;IACH,gCAEC;IAED;;;;;;;;;OASG;IACH,UALW,MAAM,QACN,MAAM,EAAE,QACR,QAAQ,aACR,IAAI,CAAC,sBAAsB,EAAE,KAAK,CAAC;eA0B8B,GAAG;OAyB9E;IAED;;;;OAIG;IACH,sBAJW,MAAM,OACN,MAAM,GACJ,OAAO,CAAC,MAAM,OAAC,CAAC,CAkB5B;IAED;;;;;OAKG;IACH,iCALW,MAAM,OACN,MAAM,cACN,MAAM,GACJ,OAAO,CAAC,MAAM,OAAC,CAAC,CAiB5B;IAED;;;;OAIG;IACH,UAHW,MAAM,QACN,MAAM,gBAIhB;IAED;;;;;;;;;OASG;IACH,6CALW,MAAM,eACN,KAAK,CAAC,MAAM,CAAC,GAEZ,MAAM,GAAC,IAAI,CAmCtB;IAED;;;;;;OAMG;IACH,oBALW,MAAM,cACN,MAAM,
|
|
1
|
+
{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../lib/npm.js"],"names":[],"mappings":"AAWA;;;GAGG;AACH,6CAAqF;AAErF;;GAEG;AACH,oDAAkG;AAElG;;GAEG;AACH;IACE;;;;OAIG;IACH,gCAEC;IAED;;;;;;;;;OASG;IACH,UALW,MAAM,QACN,MAAM,EAAE,QACR,QAAQ,aACR,IAAI,CAAC,sBAAsB,EAAE,KAAK,CAAC;eA0B8B,GAAG;OAyB9E;IAED;;;;OAIG;IACH,sBAJW,MAAM,OACN,MAAM,GACJ,OAAO,CAAC,MAAM,OAAC,CAAC,CAkB5B;IAED;;;;;OAKG;IACH,iCALW,MAAM,OACN,MAAM,cACN,MAAM,GACJ,OAAO,CAAC,MAAM,OAAC,CAAC,CAiB5B;IAED;;;;OAIG;IACH,UAHW,MAAM,QACN,MAAM,gBAIhB;IAED;;;;;;;;;OASG;IACH,6CALW,MAAM,eACN,KAAK,CAAC,MAAM,CAAC,GAEZ,MAAM,GAAC,IAAI,CAmCtB;IAED;;;;;;OAMG;IACH,oBALW,MAAM,cACN,MAAM,qCACN,kBAAkB,GAChB,OAAO,CAAC,iBAAiB,CAAC,CAkEtC;IAED;;;OAGG;IACH,sBAHW,MAAM,OACN,MAAM,iBAOhB;IAED;;;;;OAKG;IACH,oBALW,MAAM,YACN,MAAM,EAAE,GAEN,OAAO,CAAC,OAAO,eAAe,EAAE,YAAY,CAAC,CAOzD;CACF;AAED,sBAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;SAcf,MAAM;;;;;;;;;;qCAMP,OAAO,cAAc,EAAE,sBAAsB;;;;;iBAK5C,MAAM;;;;SACN,OAAO,WAAW,EAAE,WAAW"}
|
package/build/lib/npm.js
CHANGED
|
@@ -217,7 +217,16 @@ class NPM {
|
|
|
217
217
|
* @param {InstallPackageOpts} opts
|
|
218
218
|
* @returns {Promise<NpmInstallReceipt>}
|
|
219
219
|
*/
|
|
220
|
-
async installPackage(cwd, installStr, { pkgName, installType }) {
|
|
220
|
+
async installPackage(cwd, installStr, { pkgName, pkgVer, installType } = {}) {
|
|
221
|
+
let _installStr = installStr;
|
|
222
|
+
// FIXME: Please remove this '!pkgName' case after bumping major version of this support package.
|
|
223
|
+
// This is a temporary workaround for backward compatibility related to https://github.com/appium/appium/pull/20788
|
|
224
|
+
if (!pkgName) {
|
|
225
|
+
// Old appium package passes an empty 'pkgName' as part of the option. Then,
|
|
226
|
+
// we could consider it is for old argument case.
|
|
227
|
+
pkgName = installStr;
|
|
228
|
+
_installStr = pkgVer ? `${pkgName}@${pkgVer}` : pkgName;
|
|
229
|
+
}
|
|
221
230
|
/** @type {any} */
|
|
222
231
|
let dummyPkgJson;
|
|
223
232
|
const dummyPkgPath = path_1.default.join(cwd, 'package.json');
|
|
@@ -241,7 +250,7 @@ class NPM {
|
|
|
241
250
|
installOpts.push('--save-exact', '--global-style', '--no-package-lock');
|
|
242
251
|
}
|
|
243
252
|
const cmd = installType === 'local' ? 'link' : 'install';
|
|
244
|
-
const res = await this.exec(cmd, [...installOpts,
|
|
253
|
+
const res = await this.exec(cmd, [...installOpts, _installStr], {
|
|
245
254
|
cwd,
|
|
246
255
|
json: true,
|
|
247
256
|
lockFile: this._getInstallLockfilePath(cwd),
|
|
@@ -297,8 +306,10 @@ exports.npm = new NPM();
|
|
|
297
306
|
/**
|
|
298
307
|
* Options for {@link NPM.installPackage}
|
|
299
308
|
* @typedef InstallPackageOpts
|
|
300
|
-
* @property {string} pkgName - the name of the package to install
|
|
309
|
+
* @property {string} [pkgName] - the name of the package to install. Used by appium package 2.12.2 and newer versions.
|
|
301
310
|
* @property {import('type-fest').LiteralUnion<'local', string>} [installType] - whether to install from a local path or from npm
|
|
311
|
+
* @property {string} [pkgVer] - The version of the package to install.
|
|
312
|
+
* This is used for backward compatibility for this support package v5 with appium package 2.12.1 and lower versions.
|
|
302
313
|
*/
|
|
303
314
|
/**
|
|
304
315
|
* Options for {@link NPM.exec}
|
package/build/lib/npm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../lib/npm.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../lib/npm.js"],"names":[],"mappings":"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"}
|
package/lib/npm.js
CHANGED
|
@@ -201,7 +201,17 @@ export class NPM {
|
|
|
201
201
|
* @param {InstallPackageOpts} opts
|
|
202
202
|
* @returns {Promise<NpmInstallReceipt>}
|
|
203
203
|
*/
|
|
204
|
-
async installPackage(cwd, installStr, {pkgName, installType}) {
|
|
204
|
+
async installPackage(cwd, installStr, {pkgName, pkgVer, installType} = {}) {
|
|
205
|
+
let _installStr = installStr;
|
|
206
|
+
// FIXME: Please remove this '!pkgName' case after bumping major version of this support package.
|
|
207
|
+
// This is a temporary workaround for backward compatibility related to https://github.com/appium/appium/pull/20788
|
|
208
|
+
if (!pkgName) {
|
|
209
|
+
// Old appium package passes an empty 'pkgName' as part of the option. Then,
|
|
210
|
+
// we could consider it is for old argument case.
|
|
211
|
+
pkgName = installStr;
|
|
212
|
+
_installStr = pkgVer ? `${pkgName}@${pkgVer}` : pkgName;
|
|
213
|
+
}
|
|
214
|
+
|
|
205
215
|
/** @type {any} */
|
|
206
216
|
let dummyPkgJson;
|
|
207
217
|
const dummyPkgPath = path.join(cwd, 'package.json');
|
|
@@ -225,7 +235,7 @@ export class NPM {
|
|
|
225
235
|
}
|
|
226
236
|
|
|
227
237
|
const cmd = installType === 'local' ? 'link' : 'install';
|
|
228
|
-
const res = await this.exec(cmd, [...installOpts,
|
|
238
|
+
const res = await this.exec(cmd, [...installOpts, _installStr], {
|
|
229
239
|
cwd,
|
|
230
240
|
json: true,
|
|
231
241
|
lockFile: this._getInstallLockfilePath(cwd),
|
|
@@ -287,8 +297,10 @@ export const npm = new NPM();
|
|
|
287
297
|
/**
|
|
288
298
|
* Options for {@link NPM.installPackage}
|
|
289
299
|
* @typedef InstallPackageOpts
|
|
290
|
-
* @property {string} pkgName - the name of the package to install
|
|
300
|
+
* @property {string} [pkgName] - the name of the package to install. Used by appium package 2.12.2 and newer versions.
|
|
291
301
|
* @property {import('type-fest').LiteralUnion<'local', string>} [installType] - whether to install from a local path or from npm
|
|
302
|
+
* @property {string} [pkgVer] - The version of the package to install.
|
|
303
|
+
* This is used for backward compatibility for this support package v5 with appium package 2.12.1 and lower versions.
|
|
292
304
|
*/
|
|
293
305
|
|
|
294
306
|
/**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appium/support",
|
|
3
|
-
"version": "5.1.
|
|
3
|
+
"version": "5.1.8",
|
|
4
4
|
"description": "Support libs used across appium packages",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"automation",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"dependencies": {
|
|
44
44
|
"@appium/logger": "^1.6.1",
|
|
45
45
|
"@appium/tsconfig": "^0.3.3",
|
|
46
|
-
"@appium/types": "^0.22.
|
|
46
|
+
"@appium/types": "^0.22.2",
|
|
47
47
|
"@colors/colors": "1.6.0",
|
|
48
48
|
"@types/archiver": "6.0.3",
|
|
49
49
|
"@types/base64-stream": "1.0.5",
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
"source-map-support": "0.5.21",
|
|
90
90
|
"supports-color": "8.1.1",
|
|
91
91
|
"teen_process": "2.2.0",
|
|
92
|
-
"type-fest": "4.29.
|
|
92
|
+
"type-fest": "4.29.1",
|
|
93
93
|
"uuid": "11.0.3",
|
|
94
94
|
"which": "4.0.0",
|
|
95
95
|
"yauzl": "3.2.0"
|
|
@@ -104,5 +104,5 @@
|
|
|
104
104
|
"publishConfig": {
|
|
105
105
|
"access": "public"
|
|
106
106
|
},
|
|
107
|
-
"gitHead": "
|
|
107
|
+
"gitHead": "8daf5e123ac14c8325acf504fb33eb28e1a3dd78"
|
|
108
108
|
}
|