diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 02eb106..276c7cb 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -8,14 +8,14 @@ on: - dev jobs: - build: + v1: strategy: fail-fast: false matrix: include: - platform: 'macos-latest' args: '--verbose --target universal-apple-darwin' - - platform: 'ubuntu-latest' + - platform: 'ubuntu-20.04' args: '--verbose' - platform: 'windows-latest' args: '--verbose' @@ -39,7 +39,7 @@ jobs: # example-with-tauri tests the auto installation of the tauri cli - name: install example dependencies run: pnpm install - working-directory: ./__fixtures__/example + working-directory: ./__fixtures__/example-v1 # rust - name: install Rust stable @@ -51,12 +51,12 @@ jobs: with: cache-on-failure: true workspaces: | - ./__fixtures__/example/src-tauri -> ../../target - ./__fixtures__/example-with-tauri/src-tauri -> ../../target + ./__fixtures__/example-v1/src-tauri -> ../../target + ./__fixtures__/example-with-tauri-v1/src-tauri -> ../../target # system - name: install dependencies (ubuntu only) - if: matrix.platform == 'ubuntu-latest' + if: matrix.platform == 'ubuntu-20.04' run: | sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev @@ -68,11 +68,11 @@ jobs: # Updater signature is exposed here to make sure it works in PR's TAURI_PRIVATE_KEY: dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5YTBGV3JiTy9lRDZVd3NkL0RoQ1htZmExNDd3RmJaNmRMT1ZGVjczWTBKZ0FBQkFBQUFBQUFBQUFBQUlBQUFBQWdMekUzVkE4K0tWQ1hjeGt1Vkx2QnRUR3pzQjVuV0ZpM2czWXNkRm9hVUxrVnB6TUN3K1NheHJMREhQbUVWVFZRK3NIL1VsMDBHNW5ET1EzQno0UStSb21nRW4vZlpTaXIwZFh5ZmRlL1lSN0dKcHdyOUVPclVvdzFhVkxDVnZrbHM2T1o4Tk1NWEU9Cg== with: - projectPath: ./__fixtures__/example-with-tauri + projectPath: ./__fixtures__/example-with-tauri-v1 includeDebug: true includeRelease: false tagName: ${{ github.event.pull_request.head.repo.full_name == github.repository && 'example-with-tauri-v__VERSION__' || '' }} - releaseName: 'Release example with preconfigured Tauri app v__VERSION__' + releaseName: 'Release example with preconfigured Tauri app v__VERSION__ for tauri-v1' releaseBody: 'See the assets to download this version and install.' releaseDraft: true args: ${{ matrix.args }} @@ -84,7 +84,7 @@ jobs: # Updater signature is exposed here to make sure it works in PR's TAURI_PRIVATE_KEY: dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5YTBGV3JiTy9lRDZVd3NkL0RoQ1htZmExNDd3RmJaNmRMT1ZGVjczWTBKZ0FBQkFBQUFBQUFBQUFBQUlBQUFBQWdMekUzVkE4K0tWQ1hjeGt1Vkx2QnRUR3pzQjVuV0ZpM2czWXNkRm9hVUxrVnB6TUN3K1NheHJMREhQbUVWVFZRK3NIL1VsMDBHNW5ET1EzQno0UStSb21nRW4vZlpTaXIwZFh5ZmRlL1lSN0dKcHdyOUVPclVvdzFhVkxDVnZrbHM2T1o4Tk1NWEU9Cg== with: - projectPath: ./__fixtures__/example + projectPath: ./__fixtures__/example-v1 distPath: ../dist # relative to tauri.conf.json iconPath: ./icon.png # relative to projectPath bundleIdentifier: com.tauri.actiontest @@ -93,7 +93,100 @@ jobs: includeDebug: true includeRelease: false tagName: ${{ github.event.pull_request.head.repo.full_name == github.repository && 'example-v__VERSION__' || '' }} - releaseName: 'Release example app v__VERSION__' + releaseName: 'Release example app v__VERSION__ for tauri-v1' + releaseBody: 'See the assets to download this version and install.' + releaseDraft: true + args: ${{ matrix.args }} + + v2: + strategy: + fail-fast: false + matrix: + include: + - platform: 'macos-latest' + args: '--verbose --target universal-apple-darwin' + - platform: 'ubuntu-22.04' + args: '--verbose' + - platform: 'windows-latest' + args: '--verbose' + + runs-on: ${{ matrix.platform }} + steps: + - uses: actions/checkout@v4 + + # node + - name: install pnpm + uses: pnpm/action-setup@v4 + with: + version: 9.x.x + + - name: setup node + uses: actions/setup-node@v4 + with: + node-version: lts/* + cache: pnpm + + # TODO: example-with-tauri tests the auto installation of the tauri cli + - name: install example dependencies + run: | + cd ./__fixtures__/example-v2 + pnpm install + cd ../example-with-tauri-v2 + pnpm install + + # rust + - name: install Rust stable + uses: dtolnay/rust-toolchain@stable + with: + targets: aarch64-apple-darwin,x86_64-apple-darwin + + - uses: Swatinem/rust-cache@v2 + with: + cache-on-failure: true + workspaces: | + ./__fixtures__/example-v2/src-tauri -> ../../target + ./__fixtures__/example-with-tauri-v2/src-tauri -> ../../target + + # system + - name: install dependencies (ubuntu only) + if: matrix.platform == 'ubuntu-22.04' + run: | + sudo apt-get update + sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev + + - name: Preconfigured Tauri Project + uses: ./ + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Updater signature is exposed here to make sure it works in PR's + TAURI_SIGNING_PRIVATE_KEY: dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5YTBGV3JiTy9lRDZVd3NkL0RoQ1htZmExNDd3RmJaNmRMT1ZGVjczWTBKZ0FBQkFBQUFBQUFBQUFBQUlBQUFBQWdMekUzVkE4K0tWQ1hjeGt1Vkx2QnRUR3pzQjVuV0ZpM2czWXNkRm9hVUxrVnB6TUN3K1NheHJMREhQbUVWVFZRK3NIL1VsMDBHNW5ET1EzQno0UStSb21nRW4vZlpTaXIwZFh5ZmRlL1lSN0dKcHdyOUVPclVvdzFhVkxDVnZrbHM2T1o4Tk1NWEU9Cg== + with: + projectPath: ./__fixtures__/example-with-tauri-v2 + includeDebug: true + includeRelease: false + tagName: ${{ github.event.pull_request.head.repo.full_name == github.repository && 'example-with-tauri-v__VERSION__' || '' }} + releaseName: 'Release example with preconfigured Tauri app v__VERSION__ for tauri-v2' + releaseBody: 'See the assets to download this version and install.' + releaseDraft: true + args: ${{ matrix.args }} + + - name: Frontend-only Project + uses: ./ + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Updater signature is exposed here to make sure it works in PR's + TAURI_SIGNING_PRIVATE_KEY: dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5YTBGV3JiTy9lRDZVd3NkL0RoQ1htZmExNDd3RmJaNmRMT1ZGVjczWTBKZ0FBQkFBQUFBQUFBQUFBQUlBQUFBQWdMekUzVkE4K0tWQ1hjeGt1Vkx2QnRUR3pzQjVuV0ZpM2czWXNkRm9hVUxrVnB6TUN3K1NheHJMREhQbUVWVFZRK3NIL1VsMDBHNW5ET1EzQno0UStSb21nRW4vZlpTaXIwZFh5ZmRlL1lSN0dKcHdyOUVPclVvdzFhVkxDVnZrbHM2T1o4Tk1NWEU9Cg== + with: + projectPath: ./__fixtures__/example-v2 + distPath: ../dist # relative to tauri.conf.json + iconPath: ./icon.png # relative to projectPath + bundleIdentifier: com.tauri.actiontest + appName: example + appVersion: ../package.json # relative to tauri.conf.json + includeDebug: true + includeRelease: false + tagName: ${{ github.event.pull_request.head.repo.full_name == github.repository && 'example-v__VERSION__' || '' }} + releaseName: 'Release example app v__VERSION__ for tauri-v2' releaseBody: 'See the assets to download this version and install.' releaseDraft: true args: ${{ matrix.args }} diff --git a/__fixtures__/example-with-tauri/.gitignore b/__fixtures__/example-v1/.gitignore similarity index 100% rename from __fixtures__/example-with-tauri/.gitignore rename to __fixtures__/example-v1/.gitignore diff --git a/__fixtures__/example-with-tauri/dist/index.html b/__fixtures__/example-v1/dist/index.html similarity index 100% rename from __fixtures__/example-with-tauri/dist/index.html rename to __fixtures__/example-v1/dist/index.html diff --git a/__fixtures__/example/icon.png b/__fixtures__/example-v1/icon.png similarity index 100% rename from __fixtures__/example/icon.png rename to __fixtures__/example-v1/icon.png diff --git a/__fixtures__/example/package.json b/__fixtures__/example-v1/package.json similarity index 91% rename from __fixtures__/example/package.json rename to __fixtures__/example-v1/package.json index 71c8e97..ddf16d6 100644 --- a/__fixtures__/example/package.json +++ b/__fixtures__/example-v1/package.json @@ -1,6 +1,6 @@ { "name": "example", - "version": "0.1.1", + "version": "0.0.1", "description": "", "main": "index.js", "scripts": { diff --git a/__fixtures__/example/.gitignore b/__fixtures__/example-v2/.gitignore similarity index 100% rename from __fixtures__/example/.gitignore rename to __fixtures__/example-v2/.gitignore diff --git a/__fixtures__/example/dist/index.html b/__fixtures__/example-v2/dist/index.html similarity index 100% rename from __fixtures__/example/dist/index.html rename to __fixtures__/example-v2/dist/index.html diff --git a/__fixtures__/example-v2/icon.png b/__fixtures__/example-v2/icon.png new file mode 100644 index 0000000..736feb3 Binary files /dev/null and b/__fixtures__/example-v2/icon.png differ diff --git a/__fixtures__/example-v2/package.json b/__fixtures__/example-v2/package.json new file mode 100644 index 0000000..abf79ef --- /dev/null +++ b/__fixtures__/example-v2/package.json @@ -0,0 +1,14 @@ +{ + "name": "example", + "version": "0.0.2", + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "MIT", + "dependencies": { + "@tauri-apps/cli": "next" + } +} diff --git a/__fixtures__/example-with-tauri-v1/.gitignore b/__fixtures__/example-with-tauri-v1/.gitignore new file mode 100644 index 0000000..2b1fa6c --- /dev/null +++ b/__fixtures__/example-with-tauri-v1/.gitignore @@ -0,0 +1 @@ +dist/index.tauri.html \ No newline at end of file diff --git a/__fixtures__/example-with-tauri-v1/dist/index.html b/__fixtures__/example-with-tauri-v1/dist/index.html new file mode 100644 index 0000000..01744e2 --- /dev/null +++ b/__fixtures__/example-with-tauri-v1/dist/index.html @@ -0,0 +1,7 @@ + + + + +

Hello!

+ + diff --git a/__fixtures__/example-with-tauri/package.json b/__fixtures__/example-with-tauri-v1/package.json similarity index 100% rename from __fixtures__/example-with-tauri/package.json rename to __fixtures__/example-with-tauri-v1/package.json diff --git a/__fixtures__/example-with-tauri/src-tauri/.gitignore b/__fixtures__/example-with-tauri-v1/src-tauri/.gitignore similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/.gitignore rename to __fixtures__/example-with-tauri-v1/src-tauri/.gitignore diff --git a/__fixtures__/example-with-tauri/src-tauri/Cargo.toml b/__fixtures__/example-with-tauri-v1/src-tauri/Cargo.toml similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/Cargo.toml rename to __fixtures__/example-with-tauri-v1/src-tauri/Cargo.toml diff --git a/__fixtures__/example-with-tauri/src-tauri/build.rs b/__fixtures__/example-with-tauri-v1/src-tauri/build.rs similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/build.rs rename to __fixtures__/example-with-tauri-v1/src-tauri/build.rs diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/128x128.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/128x128.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/128x128.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/128x128.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/128x128@2x.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/128x128@2x.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/128x128@2x.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/128x128@2x.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/32x32.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/32x32.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/32x32.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/32x32.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square107x107Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square107x107Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square107x107Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square107x107Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square142x142Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square142x142Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square142x142Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square142x142Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square150x150Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square150x150Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square150x150Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square150x150Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square284x284Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square284x284Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square284x284Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square284x284Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square30x30Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square30x30Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square30x30Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square30x30Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square310x310Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square310x310Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square310x310Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square310x310Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square44x44Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square44x44Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square44x44Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square44x44Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square71x71Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square71x71Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square71x71Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square71x71Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square89x89Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square89x89Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square89x89Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square89x89Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/StoreLogo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/StoreLogo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/StoreLogo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/StoreLogo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/icon.icns b/__fixtures__/example-with-tauri-v1/src-tauri/icons/icon.icns similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/icon.icns rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/icon.icns diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/icon.ico b/__fixtures__/example-with-tauri-v1/src-tauri/icons/icon.ico similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/icon.ico rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/icon.ico diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/icon.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/icon.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/icon.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/icon.png diff --git a/__fixtures__/example-with-tauri/src-tauri/src/main.rs b/__fixtures__/example-with-tauri-v1/src-tauri/src/main.rs similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/src/main.rs rename to __fixtures__/example-with-tauri-v1/src-tauri/src/main.rs diff --git a/__fixtures__/example-with-tauri/src-tauri/tauri.conf.json b/__fixtures__/example-with-tauri-v1/src-tauri/tauri.conf.json similarity index 95% rename from __fixtures__/example-with-tauri/src-tauri/tauri.conf.json rename to __fixtures__/example-with-tauri-v1/src-tauri/tauri.conf.json index 1b76f20..fa7f92f 100644 --- a/__fixtures__/example-with-tauri/src-tauri/tauri.conf.json +++ b/__fixtures__/example-with-tauri-v1/src-tauri/tauri.conf.json @@ -6,7 +6,8 @@ "beforeBuildCommand": "" }, "package": { - "productName": "TauriExample App" + "productName": "TauriExample App", + "version": "0.1.1" }, "tauri": { "bundle": { diff --git a/__fixtures__/example-with-tauri-v2/.gitignore b/__fixtures__/example-with-tauri-v2/.gitignore new file mode 100644 index 0000000..2b1fa6c --- /dev/null +++ b/__fixtures__/example-with-tauri-v2/.gitignore @@ -0,0 +1 @@ +dist/index.tauri.html \ No newline at end of file diff --git a/__fixtures__/example-with-tauri-v2/dist/index.html b/__fixtures__/example-with-tauri-v2/dist/index.html new file mode 100644 index 0000000..01744e2 --- /dev/null +++ b/__fixtures__/example-with-tauri-v2/dist/index.html @@ -0,0 +1,7 @@ + + + + +

Hello!

+ + diff --git a/__fixtures__/example-with-tauri-v2/package.json b/__fixtures__/example-with-tauri-v2/package.json new file mode 100644 index 0000000..40886fb --- /dev/null +++ b/__fixtures__/example-with-tauri-v2/package.json @@ -0,0 +1,14 @@ +{ + "name": "example-with-tauri", + "version": "0.1.1", + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "MIT", + "dependencies": { + "@tauri-apps/cli": "next" + } +} \ No newline at end of file diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/.gitignore b/__fixtures__/example-with-tauri-v2/src-tauri/.gitignore new file mode 100644 index 0000000..270a92d --- /dev/null +++ b/__fixtures__/example-with-tauri-v2/src-tauri/.gitignore @@ -0,0 +1,10 @@ +# Generated by Cargo +# will have compiled files and executables +/target/ +WixTools + +# These are backup files generated by rustfmt +**/*.rs.bk + +config.json +bundle.json diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/Cargo.toml b/__fixtures__/example-with-tauri-v2/src-tauri/Cargo.toml new file mode 100644 index 0000000..4c3f7b8 --- /dev/null +++ b/__fixtures__/example-with-tauri-v2/src-tauri/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "test-app" +version = "0.1.0" +description = "A Tauri App" +authors = [ "you" ] +license = "" +repository = "" +edition = "2021" + +[dependencies] +serde_json = "1" +serde = { version = "1", features = [ "derive" ] } +tauri = { version = "2.0.0-beta", features = [] } + +[build-dependencies] +tauri-build = { version = "2.0.0-beta", features = [] } + +[features] +prod = [ "tauri/custom-protocol" ] diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/build.rs b/__fixtures__/example-with-tauri-v2/src-tauri/build.rs new file mode 100644 index 0000000..795b9b7 --- /dev/null +++ b/__fixtures__/example-with-tauri-v2/src-tauri/build.rs @@ -0,0 +1,3 @@ +fn main() { + tauri_build::build() +} diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/128x128.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/128x128.png new file mode 100644 index 0000000..f8d9962 Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/128x128.png differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/128x128@2x.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/128x128@2x.png new file mode 100644 index 0000000..44d26d0 Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/128x128@2x.png differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/32x32.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/32x32.png new file mode 100644 index 0000000..b6bf7d6 Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/32x32.png differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square107x107Logo.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square107x107Logo.png new file mode 100644 index 0000000..6146c33 Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square107x107Logo.png differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square142x142Logo.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square142x142Logo.png new file mode 100644 index 0000000..e24cb2a Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square142x142Logo.png differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square150x150Logo.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square150x150Logo.png new file mode 100644 index 0000000..a389fb4 Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square150x150Logo.png differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square284x284Logo.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square284x284Logo.png new file mode 100644 index 0000000..c43c42f Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square284x284Logo.png differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square30x30Logo.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square30x30Logo.png new file mode 100644 index 0000000..493f155 Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square30x30Logo.png differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square310x310Logo.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square310x310Logo.png new file mode 100644 index 0000000..6380a98 Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square310x310Logo.png differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square44x44Logo.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square44x44Logo.png new file mode 100644 index 0000000..61e4eff Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square44x44Logo.png differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square71x71Logo.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square71x71Logo.png new file mode 100644 index 0000000..668945b Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square71x71Logo.png differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square89x89Logo.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square89x89Logo.png new file mode 100644 index 0000000..1e14926 Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/Square89x89Logo.png differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/StoreLogo.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/StoreLogo.png new file mode 100644 index 0000000..1f20ed7 Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/StoreLogo.png differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/icon.icns b/__fixtures__/example-with-tauri-v2/src-tauri/icons/icon.icns new file mode 100644 index 0000000..43c73bd Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/icon.icns differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/icon.ico b/__fixtures__/example-with-tauri-v2/src-tauri/icons/icon.ico new file mode 100644 index 0000000..db7fd98 Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/icon.ico differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/icon.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/icon.png new file mode 100644 index 0000000..e65ea7e Binary files /dev/null and b/__fixtures__/example-with-tauri-v2/src-tauri/icons/icon.png differ diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/src/main.rs b/__fixtures__/example-with-tauri-v2/src-tauri/src/main.rs new file mode 100644 index 0000000..06be565 --- /dev/null +++ b/__fixtures__/example-with-tauri-v2/src-tauri/src/main.rs @@ -0,0 +1,7 @@ +#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] + +fn main() { + tauri::Builder::default() + .run(tauri::generate_context!()) + .expect("error while running tauri application"); +} diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/tauri.conf.json b/__fixtures__/example-with-tauri-v2/src-tauri/tauri.conf.json new file mode 100644 index 0000000..f3424a2 --- /dev/null +++ b/__fixtures__/example-with-tauri-v2/src-tauri/tauri.conf.json @@ -0,0 +1,31 @@ +{ + "productName": "TauriExample App", + "version": "0.1.2", + "identifier": "com.tauri.actiontest", + "build": { + "frontendDist": "../dist" + }, + "app": { + "windows": [ + { + "title": "Tauri App", + "width": 800, + "height": 600 + } + ], + "security": { + "csp": null + } + }, + "bundle": { + "active": true, + "targets": "all", + "icon": [ + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico" + ] + } +} diff --git a/__fixtures__/example-with-tauri/src-tauri/rustfmt.toml b/__fixtures__/example-with-tauri/src-tauri/rustfmt.toml deleted file mode 100644 index 45642c1..0000000 --- a/__fixtures__/example-with-tauri/src-tauri/rustfmt.toml +++ /dev/null @@ -1,13 +0,0 @@ -max_width = 100 -hard_tabs = false -tab_spaces = 2 -newline_style = "Auto" -use_small_heuristics = "Default" -reorder_imports = true -reorder_modules = true -remove_nested_parens = true -edition = "2018" -merge_derives = true -use_try_shorthand = false -use_field_init_shorthand = false -force_explicit_abi = true