From 0afbc49b66ed54130557be280e9abb95abbeb043 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Sat, 11 Jul 2020 03:50:36 -0300 Subject: [PATCH] refactor(mask) update to new examples/ syntax (#806) --- maskfile.md | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/maskfile.md b/maskfile.md index e31bbe10a..fc0a82090 100644 --- a/maskfile.md +++ b/maskfile.md @@ -8,9 +8,6 @@ git clone --recursive git@github.com:tauri-apps/examples.git \ || (cd examples && git pull origin dev; cd ..) # always prepare up-to-date examples in case it's already available -export TAURI_DIST_DIR=$PWD/tauri/test/fixture/dist -export TAURI_DIR=$PWD/tauri/test/fixture/src-tauri - cargo build cargo install --path cli/tauri-bundler --force cargo install cargo-web # used by example rust/yew @@ -27,10 +24,6 @@ Push-Location $MyInvocation.MyCommand.Path # send git stderr to powershell stdout $env:GIT_REDIRECT_STDERR = '2>&1' -# dist and src paths. -$dist_path = "tauri\test\fixture\dist" -$src_path = "tauri\test\fixture\src-tauri" - # if the examples path doesn't exist. if (-Not (Test-Path $CWD\examples -PathType Any)) { Start-Job -ScriptBlock { @@ -47,21 +40,18 @@ if (-Not (Test-Path $CWD\examples -PathType Any)) { # Enter the examples folder and pull the latest data from origin/dev cd examples; git pull origin dev; cd .. -# Check that dist_path and src_path exist. -if ((Test-Path $dist_path -PathType Any) -Or (Test-Path $src_path -PathType Any)) { - # set the env vars. - $env:TAURI_DIST_DIR = Resolve-Path $dist_path - $env:TAURI_DIR = Resolve-Path $src_path +# set the env vars. +$env:TAURI_DIST_DIR = Resolve-Path $dist_path +$env:TAURI_DIR = Resolve-Path $src_path - # build and install everything Rust related. - cargo build - cargo install --path cli\tauri-bundler --force - cargo install cargo-web +# build and install everything Rust related. +cargo build +cargo install --path cli\tauri-bundler --force +cargo install cargo-web - # install the tauri Node CLI and transpile the TS version of the API. - cd cli\tauri.js - yarn; yarn build; -} +# install the tauri Node CLI and transpile the TS version of the API. +cd cli\tauri.js +yarn; yarn build; ``` ## run @@ -73,7 +63,6 @@ if ((Test-Path $dist_path -PathType Any) -Or (Test-Path $src_path -PathType Any) > Run specific example in dev mode ```sh -source .scripts/init_env.sh shopt -s globstar cd examples/**/$example 2>/dev/null \ @@ -81,7 +70,7 @@ cd examples/**/$example 2>/dev/null \ case "$PWD" in */node/*) - yarn && yarn tauri:source dev + yarn && yarn tauri:dev ;; */rust/*) cargo web deploy @@ -126,7 +115,7 @@ if ($example_path -eq $null) { switch ($example_path.parent) { # if node, run yarn. {"vanillajs" -Or "react" -Or "svelte" -Or "vue"} { - cd $example_path.FullName; yarn; yarn tauri dev + cd $example_path.FullName; yarn; yarn tauri:dev } # if rust, run cargo web deploy "yew" {