This commit is contained in:
tensor-programming
2019-12-31 14:31:29 -05:00
18 changed files with 70 additions and 133 deletions

View File

@@ -41,19 +41,19 @@ jobs:
uses: actions/cache@v1
with:
path: ${{ format('{0}/bin/', matrix.CARGO_HOME) }}
key: ${{ runner.OS }}-build-bin-${{ hashFiles('**/Cargo.lock') }}-
key: ${{ runner.OS }}-build-bin-${{ hashFiles('**/Cargo.toml') }}-
- name: cache rust registry/index
id: cache_rust_reg_index
uses: actions/cache@v1
with:
path: ${{ format('{0}/registry/index/', matrix.CARGO_HOME) }}
key: ${{ runner.OS }}-build-reg-index-${{ hashFiles('**/Cargo.lock') }}-
key: ${{ runner.OS }}-build-reg-index-${{ hashFiles('**/Cargo.toml') }}-
- name: cache rust registry/cache
id: cache_rust_reg_cache
uses: actions/cache@v1
with:
path: ${{ format('{0}/registry/cache/', matrix.CARGO_HOME) }}
key: ${{ runner.OS }}-build-reg-cache-${{ hashFiles('**/Cargo.lock') }}-
key: ${{ runner.OS }}-build-reg-cache-${{ hashFiles('**/Cargo.toml') }}-
- run: cargo install tauri-cli --force
# if we pull from cache, this will be skipped, but force just in case cache has an issue but it does exist
if: steps.cache_rust_bin.outputs.cache-hit != 'true' || steps.cache_rust_reg_index.outputs.cache-hit != 'true' || steps.cache_rust_reg_cache.outputs.cache-hit != 'true'

View File

@@ -62,17 +62,17 @@ jobs:
uses: actions/cache@v1
with:
path: ${{ format('{0}/bin/', matrix.CARGO_HOME) }}
key: ${{ runner.OS }}-build-bin-${{ hashFiles('**/Cargo.lock') }}-
key: ${{ runner.OS }}-build-bin-${{ hashFiles('**/Cargo.toml') }}-
- name: cache rust registry/index
uses: actions/cache@v1
with:
path: ${{ format('{0}/registry/index/', matrix.CARGO_HOME) }}
key: ${{ runner.OS }}-build-reg-index-${{ hashFiles('**/Cargo.lock') }}-
key: ${{ runner.OS }}-build-reg-index-${{ hashFiles('**/Cargo.toml') }}-
- name: cache rust registry/cache
uses: actions/cache@v1
with:
path: ${{ format('{0}/registry/cache/', matrix.CARGO_HOME) }}
key: ${{ runner.OS }}-build-reg-cache-${{ hashFiles('**/Cargo.lock') }}-
key: ${{ runner.OS }}-build-reg-cache-${{ hashFiles('**/Cargo.toml') }}-
- name: build rust
run: cargo build
env:

View File

@@ -1,22 +1,22 @@
#!/bin/sh
#!/usr/bin/env sh
# Note: Script must be run like this `. .init_env.sh` to setup variables for your current shell
# define relative paths
DistPath="tauri/test/fixture/dist"
SrcPath="tauri/test/fixture/src-tauri"
DistPath='tauri/test/fixture/dist'
SrcPath='tauri/test/fixture/src-tauri'
echo "Setting up enviromental Variables"
echo "Setting up enviroment Variables"
# check if relative paths exist
if [ -d "$DistPath" ]||[ -d "$SrcPath" ]
if [ -d "${DistPath}" ]||[ -d "${SrcPath}" ]
then
# Convert to absolute paths
DistPath="$(cd "$DistPath" && pwd -P)"
SrcPath="$(cd "$SrcPath" && pwd -P)"
DistPath="$(cd "${DistPath}" && pwd -P)"
SrcPath="$(cd "${SrcPath}" && pwd -P)"
# export enviromental variables
export TAURI_DIST_DIR=$DistPath
export TAURI_DIR=$SrcPath
export TAURI_DIST_DIR=${DistPath}
export TAURI_DIR=${SrcPath}
echo "Variables set, ready to work!"
else

View File

@@ -1,6 +1,6 @@
{
"name": "tauri",
"version": "0.2.1",
"version": "0.3.0",
"description": "Multi-binding collection of libraries and templates for building Tauri apps",
"bin": {
"tauri": "./bin/tauri.js"

View File

@@ -18,8 +18,7 @@ export default {
title: 'Tauri App'
},
security: {
csp:
"default-src data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
csp: "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
},
edge: {
active: true

View File

@@ -15,7 +15,7 @@ build = "src/build.rs"
serde_json = "1.0.41"
serde = "1.0.104"
serde_derive = "1.0.104"
tauri = <%= tauriDep || `{ version = "0.2.0" }` %>
tauri = <%= tauriDep || `{ version = "0.3.0" }` %>
[target."cfg(windows)".build-dependencies]
winres = "0.1"

View File

@@ -18,7 +18,7 @@
"title": "Tauri App"
},
"security": {
"csp": "default-src data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
},
"edge": {
"active": true

View File

@@ -18,7 +18,7 @@
"title": "Tauri App"
},
"security": {
"csp": "default-src data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
},
"edge": {
"active": true

View File

@@ -18,7 +18,7 @@
"title": "Tauri App"
},
"security": {
"csp": "default-src data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
},
"edge": {
"active": true

View File

@@ -18,7 +18,7 @@
"title": "Tauri App"
},
"security": {
"csp": "default-src data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
},
"edge": {
"active": true

View File

@@ -18,7 +18,7 @@
"title": "Tauri App"
},
"security": {
"csp": "default-src data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
},
"edge": {
"active": true

View File

@@ -26,7 +26,7 @@
},
"devDependencies": {
"@quasar/app": "1.4.3",
"@tauri-apps/tauri-webpack": "0.1.4",
"@tauri-apps/tauri-webpack": "0.2.0",
"@vue/eslint-config-standard": "5.0.1",
"babel-eslint": "10.0.3",
"eslint": "6.8.0",

View File

@@ -18,7 +18,7 @@
"title": "Tauri App"
},
"security": {
"csp": "default-src data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
},
"edge": {
"active": true

View File

@@ -9,7 +9,7 @@
dependencies:
"@babel/highlight" "^7.0.0"
"@babel/core@^7.0.0", "@babel/core@^7.5.5":
"@babel/core@^7.5.5":
version "7.7.4"
resolved "https://registry.npmjs.org/@babel/core/-/core-7.7.4.tgz#37e864532200cb6b50ee9a4045f5f817840166ab"
integrity sha512-+bYbx56j4nYBmpsWtnPUsKW3NdnYxbqyfrP2w9wILBuHzdfIKz9prieZK0DFPyIzkjYVUe4QkusGL07r5pXznQ==
@@ -350,7 +350,7 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-dynamic-import@^7.0.0", "@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.7.4":
"@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.7.4":
version "7.7.4"
resolved "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec"
integrity sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==
@@ -978,20 +978,15 @@
uglify-js "^2.8.0"
update-notifier "^0.5.0"
"@tauri-apps/tauri-webpack@0.1.4":
version "0.1.4"
resolved "https://registry.yarnpkg.com/@tauri-apps/tauri-webpack/-/tauri-webpack-0.1.4.tgz#be619274933a64370dc7598b916eedf4a78fe646"
integrity sha512-c/NM7PAQM+1vrpGyAQ6cgpv5CdsMGshjWGVZ6tmRESp8JXi9TPH43XBOX/QVIXJNIVz7E3YGiX+KzoTExforYA==
"@tauri-apps/tauri-webpack@0.2.0":
version "0.2.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/tauri-webpack/-/tauri-webpack-0.2.0.tgz#44127fb0eb087c7ebf5dbbcb6ac4d76fada78638"
integrity sha512-B3G9lNvq9pnxW6WQTDsgAOhY0Swy+4DyAs3/pzXIxY1Z4xxJh5EVD/jc/XvPNKc7ODQzy/fmss9WfgOWbVnhMg==
dependencies:
tauri "^0.1.9"
tauri "^0.3.0"
webpack-chain "^6.2.0"
webpack-shell-plugin "0.5.0"
"@tauri-apps/toml@2.2.3":
version "2.2.3"
resolved "https://registry.npmjs.org/@tauri-apps/toml/-/toml-2.2.3.tgz#88cdebed2ae3944734aa8ecccce4834fffb8bc83"
integrity sha512-90BIlU465RLt/643N+obkJVRjagkIJMVNV7NGK7K34ku4IPRLyDYPrIz1hspyKjlhs5g1K3KD7XJMTS6GFMvbg==
"@tauri-apps/toml@2.2.4":
version "2.2.4"
resolved "https://registry.npmjs.org/@tauri-apps/toml/-/toml-2.2.4.tgz#2b4f637aded7fc3a7302724605682c8fa3ac7505"
@@ -1646,15 +1641,6 @@ babel-plugin-syntax-object-rest-spread@^6.8.0:
resolved "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
babel-plugin-system-import-transformer@4.0.0:
version "4.0.0"
resolved "https://registry.npmjs.org/babel-plugin-system-import-transformer/-/babel-plugin-system-import-transformer-4.0.0.tgz#20cca5b04d299f29aff02a27b9a4207efab5fecc"
integrity sha512-l+xJk+z1U8tWX1FZfBCd/ebKOZa7JLAQ91YBmtNO0e/e5v/RwIM+8IGBkliXcSoP7xd+CF7L6Yu4O3wmQrya8g==
dependencies:
"@babel/core" "^7.0.0"
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-dynamic-import" "^7.0.0"
babel-plugin-transform-imports@^1.0.0:
version "1.5.1"
resolved "https://registry.npmjs.org/babel-plugin-transform-imports/-/babel-plugin-transform-imports-1.5.1.tgz#b3756696aea907719d0d63b0e67c88fba963adb0"
@@ -2305,21 +2291,6 @@ cheerio@^0.22.0:
lodash.reject "^4.4.0"
lodash.some "^4.4.0"
chokidar@3.3.0:
version "3.3.0"
resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
dependencies:
anymatch "~3.1.1"
braces "~3.0.2"
glob-parent "~5.1.0"
is-binary-path "~2.1.0"
is-glob "~4.0.1"
normalize-path "~3.0.0"
readdirp "~3.2.0"
optionalDependencies:
fsevents "~2.1.1"
chokidar@3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450"
@@ -4506,7 +4477,7 @@ fsevents@^1.2.7:
nan "^2.12.1"
node-pre-gyp "^0.12.0"
fsevents@~2.1.1, fsevents@~2.1.2:
fsevents@~2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
@@ -4986,15 +4957,6 @@ html-minifier@^3.2.3:
relateurl "0.2.x"
uglify-js "3.4.x"
html-webpack-inline-source-plugin@0.0.10:
version "0.0.10"
resolved "https://registry.npmjs.org/html-webpack-inline-source-plugin/-/html-webpack-inline-source-plugin-0.0.10.tgz#89bd5f761e4f16902aa76a44476eb52831c9f7f0"
integrity sha512-0ZNU57u7283vrXSF5a4VDnVOMWiSwypKIp1z/XfXWoVHLA1r3Xmyxx5+Lz+mnthz/UvxL1OAf41w5UIF68Jngw==
dependencies:
escape-string-regexp "^1.0.5"
slash "^1.0.0"
source-map-url "^0.4.0"
html-webpack-plugin@3.2.0:
version "3.2.0"
resolved "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
@@ -6240,7 +6202,7 @@ lodash.uniq@^4.5.0:
resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
lodash@4.17.15, lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
version "4.17.15"
resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -8402,13 +8364,6 @@ readdirp@^2.2.1:
micromatch "^3.1.10"
readable-stream "^2.0.2"
readdirp@~3.2.0:
version "3.2.0"
resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
integrity sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==
dependencies:
picomatch "^2.0.4"
readdirp@~3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz#984458d13a1e42e2e9f5841b129e162f369aff17"
@@ -9011,21 +8966,6 @@ shallow-clone@^3.0.0:
dependencies:
kind-of "^6.0.2"
sharp@0.23.3:
version "0.23.3"
resolved "https://registry.npmjs.org/sharp/-/sharp-0.23.3.tgz#549770a4c671b9bd221f00639452a3eb803a0ed1"
integrity sha512-pjT4zyviQteXMC1Z8USIiSwQFQbZTlU5J59/UoygE25hh+sSb7PSYI/MZ2MCB1COtxWQuoUAaG3TYIOLon26Mg==
dependencies:
color "^3.1.2"
detect-libc "^1.0.3"
nan "^2.14.0"
npmlog "^4.1.2"
prebuild-install "^5.3.3"
semver "^6.3.0"
simple-get "^3.1.0"
tar "^5.0.5"
tunnel-agent "^0.6.0"
sharp@0.23.4:
version "0.23.4"
resolved "https://registry.npmjs.org/sharp/-/sharp-0.23.4.tgz#ca36067cb6ff7067fa6c77b01651cb9a890f8eb3"
@@ -9749,37 +9689,10 @@ tar@^5.0.5:
mkdirp "^0.5.0"
yallist "^4.0.0"
tauri@^0.1.9:
version "0.1.9"
resolved "https://registry.npmjs.org/tauri/-/tauri-0.1.9.tgz#c7e0631edefaaea0b86d144d4cd301f1a65a928a"
integrity sha512-wnYo1skRTaBWh+uhUswkG8RzFPu5Mw77jIswjsVXFzgb9Pw6ZhZ9uupdQMvVjh6ZUTl1kJaHNR3eWzlESLCLBg==
dependencies:
"@tauri-apps/toml" "2.2.3"
babel-plugin-system-import-transformer "4.0.0"
chalk "3.0.0"
chokidar "3.3.0"
cross-spawn "7.0.1"
fast-glob "3.1.1"
fs-extra "8.1.0"
html-webpack-inline-source-plugin "0.0.10"
imagemin "7.0.1"
imagemin-optipng "7.1.0"
imagemin-pngquant "8.0.0"
imagemin-zopfli "6.0.0"
is-png "2.0.0"
isbinaryfile "4.0.2"
lodash.debounce "4.0.8"
lodash.template "4.5.0"
minimist "1.2.0"
ms "2.1.2"
png2icons "2.0.1"
read-chunk "3.2.0"
sharp "0.23.3"
webpack-merge "4.2.2"
webpack-shell-plugin "0.5.0"
"tauri@file:../../../cli/tauri.js":
version "0.2.1"
tauri@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/tauri/-/tauri-0.3.0.tgz#eca74287af53c71da1c30e07e221eedd4f262d2b"
integrity sha512-LM98GjS+d7w/kUmD8i5FqUq9SvPse6G5TyprtiLCYtK67uPiaDgs7RZbsnm80MyLpEycgrOSytZ/t8at0rbcvg==
dependencies:
"@tauri-apps/tauri-inliner" "1.13.2"
"@tauri-apps/toml" "2.2.4"
@@ -9795,8 +9708,33 @@ tauri@^0.1.9:
is-png "2.0.0"
isbinaryfile "4.0.2"
jsdom "15.2.1"
lodash.debounce "4.0.8"
lodash.template "4.5.0"
lodash "4.17.15"
minimist "1.2.0"
ms "2.1.2"
png2icons "2.0.1"
read-chunk "3.2.0"
sharp "0.23.4"
webpack-merge "4.2.2"
webpack-shell-plugin "0.5.0"
"tauri@file:../../../cli/tauri.js":
version "0.3.0"
dependencies:
"@tauri-apps/tauri-inliner" "1.13.2"
"@tauri-apps/toml" "2.2.4"
chalk "3.0.0"
chokidar "3.3.1"
cross-spawn "7.0.1"
fast-glob "3.1.1"
fs-extra "8.1.0"
imagemin "7.0.1"
imagemin-optipng "7.1.0"
imagemin-pngquant "8.0.0"
imagemin-zopfli "6.0.0"
is-png "2.0.0"
isbinaryfile "4.0.2"
jsdom "15.2.1"
lodash "4.17.15"
minimist "1.2.0"
ms "2.1.2"
png2icons "2.0.1"

View File

@@ -1,6 +1,6 @@
[package]
name = "tauri-api"
version = "0.2.0"
version = "0.3.0"
authors = ["Lucas Fernandes Gonçalves Nogueira <lucas@quasar.dev>", "Daniel Thompson-Yvetot <denjell@sfosc.org>", "Tensor Programming <tensordeveloper@gmail.com>"]
license = "MIT"
homepage = "https://tauri-apps.org"

View File

@@ -19,4 +19,4 @@ zip = "0.5.3"
sysinfo = "0.10"
tempdir = "0.3"
tauri-api = { version = "0.2", path = "../tauri-api" }
tauri-api = { version = "0.3", path = "../tauri-api" }

View File

@@ -1,6 +1,6 @@
[package]
name = "tauri"
version = "0.2.0"
version = "0.3.0"
authors = ["Lucas Fernandes Gonçalves Nogueira <lucas@quasar.dev>", "Daniel Thompson-Yvetot <denjell@sfosc.org>", "Tensor Programming <tensordeveloper@gmail.com>"]
license = "MIT"
homepage = "https://tauri-apps.org"
@@ -23,7 +23,7 @@ lazy_static = "1.4.0"
tiny_http = "0.6"
threadpool = "1.7"
uuid = { version = "0.8.1", features = ["v4"] }
tauri-api = { version = "0.2", path = "../tauri-api" }
tauri-api = { version = "0.3", path = "../tauri-api" }
[build-dependencies]
tauri_includedir_codegen = "0.5.1"

View File

@@ -18,7 +18,7 @@
"title": "Tauri App"
},
"security": {
"csp": "default-src data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
}
},
"edge": true