From da99f632f0c8a6b3b7fc5dfecaffb04b74537f0f Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Sun, 19 Jul 2020 09:57:28 -0300 Subject: [PATCH] fix(tauri.js) app name as kebab case (#856) * fix(tauri.js) init regression, app name as kebab case * chore(changes) update changefile --- .changes/tauri-init.md | 5 +++++ cli/tauri.js/bin/tauri-init.js | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 .changes/tauri-init.md diff --git a/.changes/tauri-init.md b/.changes/tauri-init.md new file mode 100644 index 000000000..dbdc471df --- /dev/null +++ b/.changes/tauri-init.md @@ -0,0 +1,5 @@ +--- +"tauri.js": patch +--- + +Convert the `--app-name` value to kebab case. diff --git a/cli/tauri.js/bin/tauri-init.js b/cli/tauri.js/bin/tauri-init.js index 30d340630..4fd2495cc 100644 --- a/cli/tauri.js/bin/tauri-init.js +++ b/cli/tauri.js/bin/tauri-init.js @@ -8,12 +8,10 @@ const { writeFileSync } = require('fs') const { - merge + merge, + kebabCase } = require('lodash') const toml = require('@tauri-apps/toml') -const { - installDependencies -} = require('../dist/api/dependency-manager') /** * @type {object} @@ -148,7 +146,7 @@ async function runInit(config = {}) { if (appName || argv.A) { const manifestPath = resolve(directory, 'src-tauri/Cargo.toml') const cargoManifest = toml.parse(readFileSync(manifestPath).toString()) - let binName = (appName || argv.A).replace(/ /g, '-') + let binName = kebabCase(appName || argv.A) cargoManifest.package.name = binName cargoManifest.package['default-run'] = binName if (cargoManifest.bin && cargoManifest.bin.length) { @@ -157,5 +155,8 @@ async function runInit(config = {}) { writeFileSync(manifestPath, toml.stringify(cargoManifest)) } + const { + installDependencies + } = require('../dist/api/dependency-manager') await installDependencies() }