diff --git a/.gitignore b/.gitignore index aae11a5..a5dacdb 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,8 @@ build/Release # Dependency directory # https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git node_modules +.nvmrc + # Python virtual environment in case it's created for the Castlabs code signing tool venv diff --git a/package-lock.json b/package-lock.json index 8c710d5..20c52be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nativefier", - "version": "45.0.0", + "version": "45.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nativefier", - "version": "45.0.0", + "version": "45.0.1", "license": "MIT", "dependencies": { "axios": "^0.21.1", @@ -19,7 +19,7 @@ "sanitize-filename": "^1.6.3", "source-map-support": "^0.5.19", "tmp": "^0.2.1", - "yargs": "17.0.1" + "yargs": "^17.1.1" }, "bin": { "nativefier": "lib/cli.js" @@ -7715,9 +7715,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yargs": { - "version": "17.0.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.0.1.tgz", - "integrity": "sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==", + "version": "17.1.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz", + "integrity": "sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -13580,9 +13580,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "yargs": { - "version": "17.0.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.0.1.tgz", - "integrity": "sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==", + "version": "17.1.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz", + "integrity": "sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==", "requires": { "cliui": "^7.0.2", "escalade": "^3.1.1", diff --git a/package.json b/package.json index 8a15746..9d45646 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "sanitize-filename": "^1.6.3", "source-map-support": "^0.5.19", "tmp": "^0.2.1", - "yargs": "17.0.1" + "yargs": "^17.1.1" }, "devDependencies": { "@types/debug": "^4.1.6", diff --git a/src/cli.ts b/src/cli.ts index 6b7cfc0..4d25bfd 100755 --- a/src/cli.ts +++ b/src/cli.ts @@ -567,6 +567,21 @@ export function parseArgs(args: yargs.Argv): RawOptions { parsed.noOverwrite = parsed['no-overwrite'] = !parsed.overwrite; + // Since coerce in yargs seems to have broken since + // https://github.com/yargs/yargs/pull/1978 + for (const arg of [ + 'win32metadata', + 'browserwindow-options', + 'file-download-options', + ]) { + if (parsed[arg] && typeof parsed[arg] === 'string') { + parsed[arg] = parseJson(parsed[arg] as string); + } + } + if (parsed['process-envs'] && typeof parsed['process-envs'] === 'string') { + parsed['process-envs'] = getProcessEnvs(parsed['process-envs']); + } + return parsed; }