Skip to content

Commit b563337

Browse files
rocwindrocwind
committed
fix(deps): update slash to 3.0.0 and use package types for slash, yargs
1 parent e9b4202 commit b563337

6 files changed

Lines changed: 102 additions & 208 deletions

File tree

‎package-lock.json‎

Lines changed: 18 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"rimraf": "3.0.2",
5050
"semver": "7.3.5",
5151
"simctl": "0.0.9",
52-
"slash": "1.0.0",
52+
"slash": "3.0.0",
5353
"update-notifier": "2.5.0",
5454
"which": "1.3.1",
5555
"wordwrap": "1.0.0",
@@ -61,6 +61,7 @@
6161
"@shm-open/eslint-config-bundle": "1.4.0",
6262
"@types/node": "14.6.0",
6363
"@types/semver": "7.3.3",
64+
"@types/yargs": "17.0.2",
6465
"@types/yazl": "2.4.2",
6566
"standard-version": "9.3.1",
6667
"typescript": "4.3.5"

‎src/command-parser.ts‎

Lines changed: 81 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,8 @@ var argv = yargs
11171117
.wrap(/*columnLimit*/ null)
11181118
.strict() // Validate hyphenated (named) arguments.
11191119
.check((argv: any, aliases: { [aliases: string]: string }): any => isValidCommandCategory) // Report unrecognized, non-hyphenated command category.
1120-
.fail((msg: string) => showHelp(/*showRootDescription*/ true)).argv; // Suppress the default error message.
1120+
.fail((msg: string) => showHelp(/*showRootDescription*/ true))
1121+
.parseSync(); // Suppress the default error message.
11211122

11221123
function createCommand(): cli.ICommand {
11231124
var cmd: cli.ICommand;
@@ -1155,8 +1156,8 @@ function createCommand(): cli.ICommand {
11551156
var accessKeyPatchCmd = <cli.IAccessKeyPatchCommand>cmd;
11561157
accessKeyPatchCmd.oldName = arg2;
11571158

1158-
var newNameOption: string = argv['name'];
1159-
var ttlOption: string = argv['ttl'];
1159+
var newNameOption = argv['name'] as string;
1160+
var ttlOption = argv['ttl'] as string;
11601161
if (isDefined(newNameOption)) {
11611162
accessKeyPatchCmd.newName = newNameOption;
11621163
}
@@ -1171,7 +1172,7 @@ function createCommand(): cli.ICommand {
11711172
case 'ls':
11721173
cmd = { type: cli.CommandType.accessKeyList };
11731174

1174-
(<cli.IAccessKeyListCommand>cmd).format = argv['format'];
1175+
(<cli.IAccessKeyListCommand>cmd).format = argv['format'] as string;
11751176
break;
11761177

11771178
case 'remove':
@@ -1203,7 +1204,7 @@ function createCommand(): cli.ICommand {
12031204
case 'ls':
12041205
cmd = { type: cli.CommandType.appList };
12051206

1206-
(<cli.IAppListCommand>cmd).format = argv['format'];
1207+
(<cli.IAppListCommand>cmd).format = argv['format'] as string;
12071208
break;
12081209

12091210
case 'remove':
@@ -1256,7 +1257,7 @@ function createCommand(): cli.ICommand {
12561257
cmd = { type: cli.CommandType.collaboratorList };
12571258

12581259
(<cli.ICollaboratorListCommand>cmd).appName = arg2;
1259-
(<cli.ICollaboratorListCommand>cmd).format = argv['format'];
1260+
(<cli.ICollaboratorListCommand>cmd).format = argv['format'] as string;
12601261
}
12611262
break;
12621263

@@ -1290,7 +1291,7 @@ function createCommand(): cli.ICommand {
12901291

12911292
deploymentAddCommand.appName = arg2;
12921293
deploymentAddCommand.deploymentName = arg3;
1293-
deploymentAddCommand.default = argv['default'];
1294+
deploymentAddCommand.default = argv['default'] as boolean;
12941295
}
12951296
break;
12961297

@@ -1317,8 +1318,8 @@ function createCommand(): cli.ICommand {
13171318
var deploymentListCommand = <cli.IDeploymentListCommand>cmd;
13181319

13191320
deploymentListCommand.appName = arg2;
1320-
deploymentListCommand.format = argv['format'];
1321-
deploymentListCommand.displayKeys = argv['displayKeys'];
1321+
deploymentListCommand.format = argv['format'] as string;
1322+
deploymentListCommand.displayKeys = argv['displayKeys'] as boolean;
13221323
}
13231324
break;
13241325

@@ -1355,8 +1356,10 @@ function createCommand(): cli.ICommand {
13551356

13561357
deploymentHistoryCommand.appName = arg2;
13571358
deploymentHistoryCommand.deploymentName = arg3;
1358-
deploymentHistoryCommand.format = argv['format'];
1359-
deploymentHistoryCommand.displayAuthor = argv['displayAuthor'];
1359+
deploymentHistoryCommand.format = argv['format'] as string;
1360+
deploymentHistoryCommand.displayAuthor = argv[
1361+
'displayAuthor'
1362+
] as boolean;
13601363
}
13611364
break;
13621365
}
@@ -1375,9 +1378,9 @@ function createCommand(): cli.ICommand {
13751378
var loginCommand = <cli.ILoginCommand>cmd;
13761379

13771380
loginCommand.serverUrl = getServerUrl(arg1);
1378-
loginCommand.accessKey = argv['accessKey'];
1379-
loginCommand.proxy = argv['proxy'];
1380-
loginCommand.noProxy = argv['noProxy'];
1381+
loginCommand.accessKey = argv['accessKey'] as string;
1382+
loginCommand.proxy = argv['proxy'] as string;
1383+
loginCommand.noProxy = argv['noProxy'] as boolean;
13811384
break;
13821385

13831386
case 'logout':
@@ -1392,15 +1395,15 @@ function createCommand(): cli.ICommand {
13921395

13931396
patchCommand.appName = arg1;
13941397
patchCommand.deploymentName = arg2;
1395-
patchCommand.label = argv['label'];
1398+
patchCommand.label = argv['label'] as string;
13961399
// Description must be set to null to indicate that it is not being patched.
13971400
patchCommand.description = argv['description']
1398-
? backslash(argv['description'])
1401+
? backslash(argv['description'] as string)
13991402
: null;
1400-
patchCommand.disabled = argv['disabled'];
1401-
patchCommand.mandatory = argv['mandatory'];
1402-
patchCommand.rollout = getRolloutValue(argv['rollout']);
1403-
patchCommand.appStoreVersion = argv['targetBinaryVersion'];
1403+
patchCommand.disabled = argv['disabled'] as boolean;
1404+
patchCommand.mandatory = argv['mandatory'] as boolean;
1405+
patchCommand.rollout = getRolloutValue(argv['rollout'] as string);
1406+
patchCommand.appStoreVersion = argv['targetBinaryVersion'] as string;
14041407
}
14051408
break;
14061409

@@ -1414,15 +1417,18 @@ function createCommand(): cli.ICommand {
14141417
deploymentPromoteCommand.sourceDeploymentName = arg2;
14151418
deploymentPromoteCommand.destDeploymentName = arg3;
14161419
deploymentPromoteCommand.description = argv['description']
1417-
? backslash(argv['description'])
1420+
? backslash(argv['description'] as string)
14181421
: '';
1419-
deploymentPromoteCommand.label = argv['label'];
1420-
deploymentPromoteCommand.disabled = argv['disabled'];
1421-
deploymentPromoteCommand.mandatory = argv['mandatory'];
1422-
deploymentPromoteCommand.noDuplicateReleaseError =
1423-
argv['noDuplicateReleaseError'];
1424-
deploymentPromoteCommand.rollout = getRolloutValue(argv['rollout']);
1425-
deploymentPromoteCommand.appStoreVersion = argv['targetBinaryVersion'];
1422+
deploymentPromoteCommand.label = argv['label'] as string;
1423+
deploymentPromoteCommand.disabled = argv['disabled'] as boolean;
1424+
deploymentPromoteCommand.mandatory = argv['mandatory'] as boolean;
1425+
deploymentPromoteCommand.noDuplicateReleaseError = argv[
1426+
'noDuplicateReleaseError'
1427+
] as boolean;
1428+
deploymentPromoteCommand.rollout = getRolloutValue(argv['rollout'] as string);
1429+
deploymentPromoteCommand.appStoreVersion = argv[
1430+
'targetBinaryVersion'
1431+
] as string;
14261432
}
14271433
break;
14281434

@@ -1432,8 +1438,8 @@ function createCommand(): cli.ICommand {
14321438
var registerCommand = <cli.IRegisterCommand>cmd;
14331439

14341440
registerCommand.serverUrl = getServerUrl(arg1);
1435-
registerCommand.proxy = argv['proxy'];
1436-
registerCommand.noProxy = argv['noProxy'];
1441+
registerCommand.proxy = argv['proxy'] as string;
1442+
registerCommand.noProxy = argv['noProxy'] as boolean;
14371443
break;
14381444

14391445
case 'release':
@@ -1445,15 +1451,17 @@ function createCommand(): cli.ICommand {
14451451
releaseCommand.appName = arg1;
14461452
releaseCommand.package = arg2;
14471453
releaseCommand.appStoreVersion = arg3;
1448-
releaseCommand.deploymentName = argv['deploymentName'];
1454+
releaseCommand.deploymentName = argv['deploymentName'] as string;
14491455
releaseCommand.description = argv['description']
1450-
? backslash(argv['description'])
1456+
? backslash(argv['description'] as string)
14511457
: '';
1452-
releaseCommand.disabled = argv['disabled'];
1453-
releaseCommand.mandatory = argv['mandatory'];
1454-
releaseCommand.noDuplicateReleaseError = argv['noDuplicateReleaseError'];
1455-
releaseCommand.rollout = getRolloutValue(argv['rollout']);
1456-
releaseCommand.privateKeyPath = argv['privateKeyPath'];
1458+
releaseCommand.disabled = argv['disabled'] as boolean;
1459+
releaseCommand.mandatory = argv['mandatory'] as boolean;
1460+
releaseCommand.noDuplicateReleaseError = argv[
1461+
'noDuplicateReleaseError'
1462+
] as boolean;
1463+
releaseCommand.rollout = getRolloutValue(argv['rollout'] as string);
1464+
releaseCommand.privateKeyPath = argv['privateKeyPath'] as string;
14571465
}
14581466
break;
14591467

@@ -1466,18 +1474,22 @@ function createCommand(): cli.ICommand {
14661474
releaseCordovaCommand.appName = arg1;
14671475
releaseCordovaCommand.platform = arg2;
14681476

1469-
releaseCordovaCommand.build = argv['build'];
1470-
releaseCordovaCommand.deploymentName = argv['deploymentName'];
1477+
releaseCordovaCommand.build = argv['build'] as boolean;
1478+
releaseCordovaCommand.deploymentName = argv['deploymentName'] as string;
14711479
releaseCordovaCommand.description = argv['description']
1472-
? backslash(argv['description'])
1480+
? backslash(argv['description'] as string)
14731481
: '';
1474-
releaseCordovaCommand.disabled = argv['disabled'];
1475-
releaseCordovaCommand.mandatory = argv['mandatory'];
1476-
releaseCordovaCommand.noDuplicateReleaseError = argv['noDuplicateReleaseError'];
1477-
releaseCordovaCommand.rollout = getRolloutValue(argv['rollout']);
1478-
releaseCordovaCommand.appStoreVersion = argv['targetBinaryVersion'];
1479-
releaseCordovaCommand.isReleaseBuildType = argv['isReleaseBuildType'];
1480-
releaseCordovaCommand.privateKeyPath = argv['privateKeyPath'];
1482+
releaseCordovaCommand.disabled = argv['disabled'] as boolean;
1483+
releaseCordovaCommand.mandatory = argv['mandatory'] as boolean;
1484+
releaseCordovaCommand.noDuplicateReleaseError = argv[
1485+
'noDuplicateReleaseError'
1486+
] as boolean;
1487+
releaseCordovaCommand.rollout = getRolloutValue(argv['rollout'] as string);
1488+
releaseCordovaCommand.appStoreVersion = argv['targetBinaryVersion'] as string;
1489+
releaseCordovaCommand.isReleaseBuildType = argv[
1490+
'isReleaseBuildType'
1491+
] as boolean;
1492+
releaseCordovaCommand.privateKeyPath = argv['privateKeyPath'] as string;
14811493
}
14821494
break;
14831495

@@ -1490,27 +1502,29 @@ function createCommand(): cli.ICommand {
14901502
releaseReactCommand.appName = arg1;
14911503
releaseReactCommand.platform = arg2;
14921504

1493-
releaseReactCommand.appStoreVersion = argv['targetBinaryVersion'];
1494-
releaseReactCommand.bundleName = argv['bundleName'];
1495-
releaseReactCommand.deploymentName = argv['deploymentName'];
1496-
releaseReactCommand.disabled = argv['disabled'];
1505+
releaseReactCommand.appStoreVersion = argv['targetBinaryVersion'] as string;
1506+
releaseReactCommand.bundleName = argv['bundleName'] as string;
1507+
releaseReactCommand.deploymentName = argv['deploymentName'] as string;
1508+
releaseReactCommand.disabled = argv['disabled'] as boolean;
14971509
releaseReactCommand.description = argv['description']
1498-
? backslash(argv['description'])
1510+
? backslash(argv['description'] as string)
14991511
: '';
1500-
releaseReactCommand.development = argv['development'];
1501-
releaseReactCommand.entryFile = argv['entryFile'];
1502-
releaseReactCommand.gradleFile = argv['gradleFile'];
1503-
releaseReactCommand.podFile = argv['podFile'];
1504-
releaseReactCommand.mandatory = argv['mandatory'];
1505-
releaseReactCommand.noDuplicateReleaseError = argv['noDuplicateReleaseError'];
1506-
releaseReactCommand.plistFile = argv['plistFile'];
1507-
releaseReactCommand.plistFilePrefix = argv['plistFilePrefix'];
1508-
releaseReactCommand.rollout = getRolloutValue(argv['rollout']);
1509-
releaseReactCommand.privateKeyPath = argv['privateKeyPath'];
1510-
releaseReactCommand.sourcemapOutput = argv['sourcemapOutput'];
1511-
releaseReactCommand.sourcemapOutputDir = argv['sourcemapOutputDir'];
1512-
releaseReactCommand.outputDir = argv['outputDir'];
1513-
releaseReactCommand.config = argv['config'];
1512+
releaseReactCommand.development = argv['development'] as boolean;
1513+
releaseReactCommand.entryFile = argv['entryFile'] as string;
1514+
releaseReactCommand.gradleFile = argv['gradleFile'] as string;
1515+
releaseReactCommand.podFile = argv['podFile'] as string;
1516+
releaseReactCommand.mandatory = argv['mandatory'] as boolean;
1517+
releaseReactCommand.noDuplicateReleaseError = argv[
1518+
'noDuplicateReleaseError'
1519+
] as boolean;
1520+
releaseReactCommand.plistFile = argv['plistFile'] as string;
1521+
releaseReactCommand.plistFilePrefix = argv['plistFilePrefix'] as string;
1522+
releaseReactCommand.rollout = getRolloutValue(argv['rollout'] as string);
1523+
releaseReactCommand.privateKeyPath = argv['privateKeyPath'] as string;
1524+
releaseReactCommand.sourcemapOutput = argv['sourcemapOutput'] as string;
1525+
releaseReactCommand.sourcemapOutputDir = argv['sourcemapOutputDir'] as string;
1526+
releaseReactCommand.outputDir = argv['outputDir'] as string;
1527+
releaseReactCommand.config = argv['config'] as string;
15141528
}
15151529
break;
15161530

@@ -1522,7 +1536,7 @@ function createCommand(): cli.ICommand {
15221536

15231537
rollbackCommand.appName = arg1;
15241538
rollbackCommand.deploymentName = arg2;
1525-
rollbackCommand.targetRelease = argv['targetRelease'];
1539+
rollbackCommand.targetRelease = argv['targetRelease'] as string;
15261540
}
15271541
break;
15281542

‎src/definitions/slash.d.ts‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)