Skip to content

Commit 7d9e8de

Browse files
committed
Prepare reset of yargs
1 parent eebe869 commit 7d9e8de

File tree

9 files changed

+76
-21
lines changed

9 files changed

+76
-21
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Piral Changelog
22

3+
## 1.8.2 (tbd)
4+
5+
- Fixed issue with command line parsing in the `piral-cli` on Windows
6+
37
## 1.8.1 (January 27, 2025)
48

59
- Fixed build issue in `publish-microfrontend`

src/tooling/piral-cli-webpack5/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@types/mini-css-extract-plugin": "^2",
4848
"@types/node": "^18",
4949
"@types/terser-webpack-plugin": "^5.2.0",
50-
"@types/yargs": "^17",
50+
"@types/yargs": "^15",
5151
"piral-cli": "^1.8.1",
5252
"strip-ansi": "^6"
5353
},

src/tooling/piral-cli/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"@types/mime": "^4",
5555
"@types/node": "^18",
5656
"@types/rc": "^1",
57-
"@types/yargs": "^17",
57+
"@types/yargs": "^15",
5858
"axios": "^1",
5959
"chalk": "^5",
6060
"enhanced-resolve": "^5",
@@ -68,14 +68,14 @@
6868
"ora": "^8",
6969
"rc": "^1",
7070
"rimraf": "^6",
71-
"tar": "^7"
71+
"tar": "^7",
72+
"yargs": "^15"
7273
},
7374
"dependencies": {
7475
"css-conflict-inspector": "^0.2",
7576
"dets": "^0.16.7",
7677
"kras": "^1",
7778
"open": "^10",
78-
"typescript": "^5",
79-
"yargs": "^17"
79+
"typescript": "^5"
8080
}
8181
}

src/tooling/piral-cli/src/cli.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import yargs from 'yargs';
2-
import { detailed } from 'yargs-parser';
31
import { caterpillerIcon, zapIcon, butterflyIcon, cliName, cliVersion } from './common';
42
import { runQuestionnaireFor } from './questionnaire';
3+
import { yargs, detailed } from './external';
54
import { ToolCommand } from './types';
65

76
let argv = yargs;

src/tooling/piral-cli/src/external/index.ts

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import * as jju from 'jju';
22
import * as tar from 'tar';
3+
import yargs from 'yargs';
4+
import { detailed } from 'yargs-parser';
35
import glob from 'glob';
46
import FormData from 'form-data';
57
import rc = require('rc');
@@ -34,4 +36,6 @@ export {
3436
getPort,
3537
jju,
3638
getModulePath,
39+
yargs,
40+
detailed,
3741
};

src/tooling/piral-cli/src/types/public.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Argv, Arguments } from 'yargs';
2-
import { RuleRunner, PiletRuleContext, PiralRuleContext, LogLevels, SharedDependency } from './common';
1+
import type { Argv, Arguments } from 'yargs';
2+
import type { RuleRunner, PiletRuleContext, PiralRuleContext, LogLevels, SharedDependency } from './common';
33

44
export type FlagType = 'string' | 'number' | 'boolean' | 'object';
55

src/tooling/publish-microfrontend/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@types/mime": "^4",
5151
"@types/node": "^18",
5252
"@types/rc": "^1",
53-
"@types/yargs": "^17",
53+
"@types/yargs": "^15",
5454
"axios": "^1.7.7",
5555
"chalk": "^5",
5656
"enhanced-resolve": "^5",
@@ -66,6 +66,6 @@
6666
"rimraf": "^6",
6767
"tar": "^7",
6868
"typescript": "^5",
69-
"yargs": "^17"
69+
"yargs": "^15"
7070
}
7171
}

src/tooling/publish-microfrontend/src/index.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const defaultArgs = rc('microfrontend', {
2222
interactive: false,
2323
});
2424

25-
const y = yargs(process.argv.slice(2), current)
25+
const args = yargs
2626
.string('source')
2727
.describe('source', 'Sets the source of either the previously packed *.tgz bundle or the directory to publish.')
2828
.default('source', current)
@@ -53,10 +53,9 @@ const y = yargs(process.argv.slice(2), current)
5353
.default('headers', defaultArgs.headers)
5454
.boolean('interactive')
5555
.describe('interactive', 'Defines if authorization tokens can be retrieved interactively.')
56-
.default('interactive', defaultArgs.interactive);
56+
.default('interactive', defaultArgs.interactive).argv;
5757

5858
async function run() {
59-
const args = await y.argv;
6059
const {
6160
cert,
6261
source,

yarn.lock

+56-7
Original file line numberDiff line numberDiff line change
@@ -3898,10 +3898,10 @@
38983898
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.1.tgz#07773d7160494d56aa882d7531aac7319ea67c3b"
38993899
integrity sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ==
39003900

3901-
"@types/yargs@^17":
3902-
version "17.0.33"
3903-
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.33.tgz#8c32303da83eec050a84b3c7ae7b9f922d13e32d"
3904-
integrity sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==
3901+
"@types/yargs@^15":
3902+
version "15.0.19"
3903+
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.19.tgz#328fb89e46109ecbdb70c295d96ff2f46dfd01b9"
3904+
integrity sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==
39053905
dependencies:
39063906
"@types/yargs-parser" "*"
39073907

@@ -5323,7 +5323,7 @@ camelcase-keys@^6.2.2:
53235323
map-obj "^4.0.0"
53245324
quick-lru "^4.0.1"
53255325

5326-
camelcase@^5.3.1:
5326+
camelcase@^5.0.0, camelcase@^5.3.1:
53275327
version "5.3.1"
53285328
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
53295329
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -5570,6 +5570,15 @@ cli-width@^4.1.0:
55705570
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-4.1.0.tgz#42daac41d3c254ef38ad8ac037672130173691c5"
55715571
integrity sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==
55725572

5573+
cliui@^6.0.0:
5574+
version "6.0.0"
5575+
resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
5576+
integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
5577+
dependencies:
5578+
string-width "^4.2.0"
5579+
strip-ansi "^6.0.0"
5580+
wrap-ansi "^6.2.0"
5581+
55735582
cliui@^7.0.2:
55745583
version "7.0.4"
55755584
resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -6140,7 +6149,7 @@ decamelize-keys@^1.1.0:
61406149
decamelize "^1.1.0"
61416150
map-obj "^1.0.0"
61426151

6143-
decamelize@^1.1.0:
6152+
decamelize@^1.1.0, decamelize@^1.2.0:
61446153
version "1.2.0"
61456154
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
61466155
integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
@@ -7350,7 +7359,7 @@ gensync@^1.0.0-beta.2:
73507359
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
73517360
integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
73527361

7353-
get-caller-file@^2.0.5:
7362+
get-caller-file@^2.0.1, get-caller-file@^2.0.5:
73547363
version "2.0.5"
73557364
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
73567365
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -11498,6 +11507,11 @@ require-from-string@^2.0.2:
1149811507
resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
1149911508
integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
1150011509

11510+
require-main-filename@^2.0.0:
11511+
version "2.0.0"
11512+
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
11513+
integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
11514+
1150111515
requires-port@^1.0.0:
1150211516
version "1.0.0"
1150311517
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
@@ -13301,6 +13315,11 @@ which-collection@^1.0.1:
1330113315
is-weakmap "^2.0.1"
1330213316
is-weakset "^2.0.1"
1330313317

13318+
which-module@^2.0.0:
13319+
version "2.0.1"
13320+
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
13321+
integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
13322+
1330413323
which-typed-array@^1.1.11, which-typed-array@^1.1.13:
1330513324
version "1.1.13"
1330613325
resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36"
@@ -13482,6 +13501,11 @@ xtend@~4.0.1:
1348213501
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
1348313502
integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
1348413503

13504+
y18n@^4.0.0:
13505+
version "4.0.3"
13506+
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
13507+
integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
13508+
1348513509
y18n@^5.0.5:
1348613510
version "5.0.8"
1348713511
resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
@@ -13517,6 +13541,14 @@ [email protected], yargs-parser@^21.1.1:
1351713541
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
1351813542
integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
1351913543

13544+
yargs-parser@^18.1.2:
13545+
version "18.1.3"
13546+
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
13547+
integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
13548+
dependencies:
13549+
camelcase "^5.0.0"
13550+
decamelize "^1.2.0"
13551+
1352013552
yargs-parser@^20.2.2, yargs-parser@^20.2.3:
1352113553
version "20.2.9"
1352213554
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
@@ -13535,6 +13567,23 @@ [email protected], yargs@^17, yargs@^17.2.1, yargs@^17.6.2:
1353513567
y18n "^5.0.5"
1353613568
yargs-parser "^21.1.1"
1353713569

13570+
yargs@^15:
13571+
version "15.4.1"
13572+
resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
13573+
integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
13574+
dependencies:
13575+
cliui "^6.0.0"
13576+
decamelize "^1.2.0"
13577+
find-up "^4.1.0"
13578+
get-caller-file "^2.0.1"
13579+
require-directory "^2.1.1"
13580+
require-main-filename "^2.0.0"
13581+
set-blocking "^2.0.0"
13582+
string-width "^4.2.0"
13583+
which-module "^2.0.0"
13584+
y18n "^4.0.0"
13585+
yargs-parser "^18.1.2"
13586+
1353813587
yargs@^16.2.0:
1353913588
version "16.2.0"
1354013589
resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"

0 commit comments

Comments
 (0)