From c496ec6b33f6ab52f86be22edfce426dd24ab40a Mon Sep 17 00:00:00 2001 From: Jacob Bolda Date: Sun, 22 Dec 2019 03:57:32 -0600 Subject: [PATCH] add empty build command to monolith (#201) * add empty build command to monolith * rerun init and add empty workspaces seems if we don't add the empty workspaces the toml, it gets picked up as part of the root cargo package * fix(cargo): match latest signature * fix(updater): purge for now * fix(config): whitelist:true and autoStart:false Co-authored-by: nothingismagick --- examples/vanillajs/monolith/package.json | 1 + examples/vanillajs/monolith/src-tauri/Cargo.toml | 4 +++- examples/vanillajs/monolith/tauri.conf.js | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/examples/vanillajs/monolith/package.json b/examples/vanillajs/monolith/package.json index d11ddda66..f75d3be98 100644 --- a/examples/vanillajs/monolith/package.json +++ b/examples/vanillajs/monolith/package.json @@ -5,6 +5,7 @@ "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", + "build": "echo \"No build is necessary for Vanillajs, skipping.\"", "html:dev": "quasar serve ./dist", "tauri:prod": "tauri", "tauri:source": "node ../../../cli/tauri.js/bin/tauri", diff --git a/examples/vanillajs/monolith/src-tauri/Cargo.toml b/examples/vanillajs/monolith/src-tauri/Cargo.toml index 5c007cdaf..3f02472a7 100644 --- a/examples/vanillajs/monolith/src-tauri/Cargo.toml +++ b/examples/vanillajs/monolith/src-tauri/Cargo.toml @@ -1,3 +1,5 @@ +workspace = { } + [package] name = "app" version = "0.1.0" @@ -31,7 +33,7 @@ includedir = "0.5.0" features = [ "all-api", "edge" ] [features] -dev = [ "tauri/dev" ] +dev-server = [ "tauri/dev-server" ] embedded-server = [ "tauri/embedded-server" ] [[bin]] diff --git a/examples/vanillajs/monolith/tauri.conf.js b/examples/vanillajs/monolith/tauri.conf.js index 19ebc419a..cbb73b19f 100644 --- a/examples/vanillajs/monolith/tauri.conf.js +++ b/examples/vanillajs/monolith/tauri.conf.js @@ -23,8 +23,10 @@ module.exports = function () { }, security: { csp: 'default-src data: filesystem: ws: http: https: \'unsafe-eval\' \'unsafe-inline\'' + }, + edge: { + active: true } - }, - edge: true + } } }