From 0b30d8d6181f1a89da34db838c89a4e695b93dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Fernandes=20Gon=C3=A7alves=20Nogueira?= Date: Thu, 5 Dec 2019 08:17:50 -0300 Subject: [PATCH] fix(js-cli) npmignore wrong on windows --- cli/tauri.js/.npmignore | 5 ----- cli/tauri.js/package.json | 2 +- cli/tauri.js/tauri.conf.js | 33 --------------------------------- cli/tauri.js/template.js | 2 ++ 4 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 cli/tauri.js/tauri.conf.js diff --git a/cli/tauri.js/.npmignore b/cli/tauri.js/.npmignore index f4e533e14..3153a0e34 100644 --- a/cli/tauri.js/.npmignore +++ b/cli/tauri.js/.npmignore @@ -1,11 +1,6 @@ test -docs -docs-generator node_modules .git .github .idea SECURITY.md - -src-tauri -/tauri.conf.js \ No newline at end of file diff --git a/cli/tauri.js/package.json b/cli/tauri.js/package.json index d4ae0b8cd..33e6c19c9 100644 --- a/cli/tauri.js/package.json +++ b/cli/tauri.js/package.json @@ -1,6 +1,6 @@ { "name": "tauri", - "version": "0.1.7", + "version": "0.1.8", "description": "Multi-binding collection of libraries and templates for building Tauri apps", "bin": { "tauri": "./bin/tauri.js" diff --git a/cli/tauri.js/tauri.conf.js b/cli/tauri.js/tauri.conf.js deleted file mode 100644 index 5d0d63f4c..000000000 --- a/cli/tauri.js/tauri.conf.js +++ /dev/null @@ -1,33 +0,0 @@ -const path = require('path') -const distDir = path.resolve(__dirname, './dist') - -module.exports = function () { - return { - automaticStart: { - active: true - }, - build: { - distDir: distDir, - devPath: 'http://localhost:4000' // devServer URL or path to html file - }, - ctx: {}, - tauri: { - embeddedServer: { - active: true - }, - bundle: { - active: true - }, - whitelist: { - all: false - }, - window: { - title: 'Tauri App' - }, - security: { - csp: 'default-src data: filesystem: ws: http: https: \'unsafe-eval\' \'unsafe-inline\'' - } - }, - edge: true - } -} diff --git a/cli/tauri.js/template.js b/cli/tauri.js/template.js index 3a723164d..2c7485cdd 100644 --- a/cli/tauri.js/template.js +++ b/cli/tauri.js/template.js @@ -47,6 +47,8 @@ Run \`tauri init --force template\` to overwrite.`) } catch (e) { if (logging) console.log(e) return false + } finally { + if (logging) log('Successfully wrote src-tauri') } }