From 08e6ecb89c032b1e1b3cc9ff6c460e633f268a8a Mon Sep 17 00:00:00 2001 From: amrbashir Date: Tue, 25 Apr 2023 17:39:04 +0200 Subject: [PATCH 1/8] refactor: change package names to match published packages --- .changes/api-on-resized-on-moved.md | 2 +- .changes/cli-dev-server-available-port.md | 2 +- .changes/cli-dev-server-port.md | 2 +- .changes/cli-info.md | 3 +- .changes/cli-rustc-not-found-msg.md | 2 +- .changes/cli-sign-non-interactive.md | 4 +- .changes/cli-templates.md | 5 +- .changes/cli-watcher-crash.md | 4 +- .changes/cli-windows-paths-print.md | 5 +- .changes/clijs-node-version.md | 2 +- .changes/config.json | 10 +- .changes/content-protection-api.md | 2 +- .changes/custom-buttons-api.md | 2 +- .changes/custom-icon.md | 4 +- .changes/empty-tauri-key-password.md | 4 +- .changes/fix-cli-default-run.md | 4 +- .changes/fix-dev-server-html-serialization.md | 4 +- .changes/heck-unicode.md | 2 +- .changes/is-minimized.md | 8 +- .changes/msrv-1.60.md | 18 +- .changes/nsis-linux.md | 10 +- .changes/nsis.md | 8 +- .changes/template-default-features.md | 4 +- .changes/title-getter.md | 8 +- .changes/version-inheritance.md | 2 +- .github/CONTRIBUTING.md | 16 +- .github/workflows/artifacts-updater.yml | 2 +- .../workflows/covector-version-or-publish.yml | 12 +- .github/workflows/lint-js.yml | 28 +- .github/workflows/publish-cli-js.yml | 6 +- .github/workflows/publish-cli-rs.yml | 8 +- .github/workflows/test-cli-js.yml | 4 +- .github/workflows/test-cli-rs.yml | 2 +- .husky/pre-commit | 2 +- .scripts/covector/sync-cli-metadata.js | 6 +- ARCHITECTURE.md | 15 +- README.md | 12 +- tooling/cli/Cargo.lock | 255 ++++++++++++++---- tooling/cli/Cargo.toml | 2 +- tooling/cli/metadata.json | 2 +- tooling/cli/node/README.md | 2 +- .../node/test/jest/__tests__/template.spec.js | 2 +- tooling/cli/src/info/mod.rs | 2 +- 43 files changed, 323 insertions(+), 176 deletions(-) diff --git a/.changes/api-on-resized-on-moved.md b/.changes/api-on-resized-on-moved.md index 561f6466ed45..4e7a988276b2 100644 --- a/.changes/api-on-resized-on-moved.md +++ b/.changes/api-on-resized-on-moved.md @@ -1,5 +1,5 @@ --- -'api': 'patch' +'@tauri-apps/api': 'patch' --- Return correct type for `event.payload ` in `onResized` and `onMoved` window event handlers. diff --git a/.changes/cli-dev-server-available-port.md b/.changes/cli-dev-server-available-port.md index e39a8fba543f..5e4283f8255d 100644 --- a/.changes/cli-dev-server-available-port.md +++ b/.changes/cli-dev-server-available-port.md @@ -1,5 +1,5 @@ --- -'cli.rs': 'patch' +'tauri-apps': 'patch' --- Look for available port when using the built-in dev server for static files. diff --git a/.changes/cli-dev-server-port.md b/.changes/cli-dev-server-port.md index cbb229086204..89c94a95a093 100644 --- a/.changes/cli-dev-server-port.md +++ b/.changes/cli-dev-server-port.md @@ -1,5 +1,5 @@ --- -'cli.rs': 'patch' +'tauri-apps': 'patch' --- Add `--port` to specify the port used for static files dev server. It can also be specified through `TAURI_DEV_SERVER_PORT` env var. diff --git a/.changes/cli-info.md b/.changes/cli-info.md index e35cd900773e..1cc09ba9306e 100644 --- a/.changes/cli-info.md +++ b/.changes/cli-info.md @@ -1,6 +1,5 @@ --- -"cli.rs": "patch" +'tauri-cli': 'patch' --- Fix `tauri info` panicking when parsing crates version on a newly created project without a `Cargo.lock` file. - diff --git a/.changes/cli-rustc-not-found-msg.md b/.changes/cli-rustc-not-found-msg.md index 719f4994696f..205cd462740d 100644 --- a/.changes/cli-rustc-not-found-msg.md +++ b/.changes/cli-rustc-not-found-msg.md @@ -1,5 +1,5 @@ --- -"cli.rs": "patch" +'tauri-cli': 'patch' --- Improve the error message when `rustc` couldn't be found. diff --git a/.changes/cli-sign-non-interactive.md b/.changes/cli-sign-non-interactive.md index 473dad10c265..6f197aaa2618 100644 --- a/.changes/cli-sign-non-interactive.md +++ b/.changes/cli-sign-non-interactive.md @@ -1,6 +1,6 @@ --- -"cli.rs": patch -"cli.js": patch +'tauri-cli': patch +'@tauri-apps/cli': patch --- Add `--ci` flag and respect the `CI` environment variable on the `signer generate` command. In this case the default password will be an empty string and the CLI will not prompt for a value. diff --git a/.changes/cli-templates.md b/.changes/cli-templates.md index 66e262d90591..b8674d914869 100644 --- a/.changes/cli-templates.md +++ b/.changes/cli-templates.md @@ -1,7 +1,6 @@ --- -"cli.rs": "patch" -"cli.js": "patch" +'tauri-cli': 'patch' +'@tauri-apps/cli': 'patch' --- Fix Outdated Github Actions in the Plugin Templates `with-api` and `backend` - diff --git a/.changes/cli-watcher-crash.md b/.changes/cli-watcher-crash.md index 368e57bd8e3d..459ebc82db7e 100644 --- a/.changes/cli-watcher-crash.md +++ b/.changes/cli-watcher-crash.md @@ -1,6 +1,6 @@ --- -"cli.rs": patch -"cli.js": patch +'tauri-cli': patch +'@tauri-apps/cli': patch --- Do not crash on Cargo.toml watcher. diff --git a/.changes/cli-windows-paths-print.md b/.changes/cli-windows-paths-print.md index 774040c191c9..e4b1d7d3d275 100644 --- a/.changes/cli-windows-paths-print.md +++ b/.changes/cli-windows-paths-print.md @@ -1,7 +1,6 @@ --- -"cli.rs": "patch" -"tauri-bundler": "patch" +'tauri-cli': 'patch' +'tauri-bundler': 'patch' --- On Windows, printing consistent paths on Windows with backslashs only. - diff --git a/.changes/clijs-node-version.md b/.changes/clijs-node-version.md index 82cb91bc1e7c..7e6ef20ea520 100644 --- a/.changes/clijs-node-version.md +++ b/.changes/clijs-node-version.md @@ -1,5 +1,5 @@ --- -'cli.js': patch +'@tauri-apps/cli': patch --- Fix crash when nodejs binary has the version in its name, for example `node-18` diff --git a/.changes/config.json b/.changes/config.json index 7243cc8a52b9..a7b1f4507624 100644 --- a/.changes/config.json +++ b/.changes/config.json @@ -123,13 +123,13 @@ } }, "packages": { - "api": { + "@tauri-apps/api": { "path": "./tooling/api", "manager": "javascript", "assets": [ { "path": "./tooling/api/dist/tauri-apps-api-${ pkgFile.version }.tgz", - "name": "api-${ pkgFile.version }.tgz" + "name": "tauri-apps-api-${ pkgFile.version }.tgz" } ], "prepublish": [ @@ -231,11 +231,11 @@ ], "postversion": "node ../../.scripts/covector/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }" }, - "cli.js": { + "@tauri-apps/cli": { "path": "./tooling/cli/node", "manager": "javascript", "getPublishedVersion": "node ../../../.scripts/covector/package-latest-version.js npm ${ pkgFile.pkg.name } ${ pkgFile.pkg.version }", - "dependencies": ["cli.rs"], + "dependencies": ["tauri-cli"], "postversion": [ "node ../../../.scripts/covector/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }", "cargo build --manifest-path ../../../core/tauri-config-schema/Cargo.toml" @@ -244,7 +244,7 @@ "publish": [], "postpublish": [] }, - "cli.rs": { + "tauri-cli": { "path": "./tooling/cli", "manager": "rust", "dependencies": ["tauri-bundler", "tauri-utils"], diff --git a/.changes/content-protection-api.md b/.changes/content-protection-api.md index b82d184b1124..e54e4c676ab3 100644 --- a/.changes/content-protection-api.md +++ b/.changes/content-protection-api.md @@ -1,5 +1,5 @@ --- -"api": "minor" +'@tauri-apps/api': 'minor' --- Added the `WindowOptions::contentProtected` option and `WebviewWindow#setContentProtected` to change it at runtime. diff --git a/.changes/custom-buttons-api.md b/.changes/custom-buttons-api.md index 15c9058ac7bd..e5d746984e26 100644 --- a/.changes/custom-buttons-api.md +++ b/.changes/custom-buttons-api.md @@ -1,5 +1,5 @@ --- -"api": minor +'@tauri-apps/api': minor --- Allow setting the text of the dialog buttons. diff --git a/.changes/custom-icon.md b/.changes/custom-icon.md index b41a58565006..314a21d81f94 100644 --- a/.changes/custom-icon.md +++ b/.changes/custom-icon.md @@ -1,6 +1,6 @@ --- -"cli.rs": minor -"cli.js": minor +'tauri-cli': minor +'@tauri-apps/cli': minor --- Add `--png` option for the `icon` command to generate custom icon sizes. diff --git a/.changes/empty-tauri-key-password.md b/.changes/empty-tauri-key-password.md index 14b8d8da1eeb..b80a09161328 100644 --- a/.changes/empty-tauri-key-password.md +++ b/.changes/empty-tauri-key-password.md @@ -1,6 +1,6 @@ --- -"cli.rs": patch -"cli.js": patch +'tauri-cli': patch +'@tauri-apps/cli': patch --- Skip the password prompt on the build command when `TAURI_KEY_PASSWORD` environment variable is empty and the `--ci` argument is provided or the `CI` environment variable is set. diff --git a/.changes/fix-cli-default-run.md b/.changes/fix-cli-default-run.md index 8fca485cae67..ad24efcdceaa 100644 --- a/.changes/fix-cli-default-run.md +++ b/.changes/fix-cli-default-run.md @@ -1,6 +1,6 @@ --- -"cli.rs": patch -"cli.js": patch +'tauri-cli': patch +'@tauri-apps/cli': patch --- Fix `default-run` not deserialized. diff --git a/.changes/fix-dev-server-html-serialization.md b/.changes/fix-dev-server-html-serialization.md index 7427b8591667..fe19bde1b975 100644 --- a/.changes/fix-dev-server-html-serialization.md +++ b/.changes/fix-dev-server-html-serialization.md @@ -1,6 +1,6 @@ --- -"cli.rs": patch -"cli.js": patch +'tauri-cli': patch +'@tauri-apps/cli': patch --- Fixes HTML serialization removing template tags on the dev server. diff --git a/.changes/heck-unicode.md b/.changes/heck-unicode.md index f0a0e4a26013..195af5bd253d 100644 --- a/.changes/heck-unicode.md +++ b/.changes/heck-unicode.md @@ -1,5 +1,5 @@ --- -"cli.rs": "patch" +'tauri-cli': 'patch' --- Fix building apps with unicode characters in their `productName`. diff --git a/.changes/is-minimized.md b/.changes/is-minimized.md index 106e0906d4b0..9066a6cb60e3 100644 --- a/.changes/is-minimized.md +++ b/.changes/is-minimized.md @@ -1,8 +1,8 @@ --- -"tauri": minor -"tauri-runtime": minor -"tauri-runtime-wry": minor -"api": minor +'tauri': minor +'tauri-runtime': minor +'tauri-runtime-wry': minor +'@tauri-apps/api': minor --- Add `is_minimized()` window method. diff --git a/.changes/msrv-1.60.md b/.changes/msrv-1.60.md index 532141279cda..59f20a02f8ed 100644 --- a/.changes/msrv-1.60.md +++ b/.changes/msrv-1.60.md @@ -1,13 +1,13 @@ --- -"cli.rs": minor -"tauri-bundler": minor -"tauri": minor -"tauri-build": minor -"tauri-codegen": minor -"tauri-macros": minor -"tauri-utils": minor -"tauri-runtime": minor -"tauri-runtime-wry": minor +'tauri-cli': minor +'tauri-bundler': minor +'tauri': minor +'tauri-build': minor +'tauri-codegen': minor +'tauri-macros': minor +'tauri-utils': minor +'tauri-runtime': minor +'tauri-runtime-wry': minor --- Bump minimum supported Rust version to 1.60. diff --git a/.changes/nsis-linux.md b/.changes/nsis-linux.md index 558b43959bf6..35cfcbbef24b 100644 --- a/.changes/nsis-linux.md +++ b/.changes/nsis-linux.md @@ -1,9 +1,9 @@ --- -"tauri-bundler": minor -"tauri-utils": minor -"cli.rs": minor -"cli.js": minor -"tauri-build": minor +'tauri-bundler': minor +'tauri-utils': minor +'tauri-cli': minor +'@tauri-apps/cli': minor +'tauri-build': minor --- Add initial support for building `nsis` bundles on non-Windows platforms. diff --git a/.changes/nsis.md b/.changes/nsis.md index 2a196dd74850..329e35303275 100644 --- a/.changes/nsis.md +++ b/.changes/nsis.md @@ -1,8 +1,8 @@ --- -"tauri-bundler": minor -"tauri-utils": minor -"cli.rs": minor -"cli.js": minor +'tauri-bundler': minor +'tauri-utils': minor +'tauri-cli': minor +'@tauri-apps/cli': minor --- Add `nsis` bundle target diff --git a/.changes/template-default-features.md b/.changes/template-default-features.md index 4cdd1741974b..6ca068b174f3 100644 --- a/.changes/template-default-features.md +++ b/.changes/template-default-features.md @@ -1,6 +1,6 @@ --- -'cli.rs': minor -'cli.js': minor +'tauri-apps': minor +'@tauri-apps/cli': minor --- Remove default features from Cargo.toml template. diff --git a/.changes/title-getter.md b/.changes/title-getter.md index d24da5817f60..7e881ddcd6e7 100644 --- a/.changes/title-getter.md +++ b/.changes/title-getter.md @@ -1,8 +1,8 @@ --- -"tauri": "minor" -"api": "minor" -"tauri-runtime": "minor" -"tauri-runtime-wry": "minor" +'tauri': 'minor' +'@tauri-apps/api': 'minor' +'tauri-runtime': 'minor' +'tauri-runtime-wry': 'minor' --- Add `title` getter on window. diff --git a/.changes/version-inheritance.md b/.changes/version-inheritance.md index 3244330058f2..34d5b7396c77 100644 --- a/.changes/version-inheritance.md +++ b/.changes/version-inheritance.md @@ -1,5 +1,5 @@ --- -'cli.rs': 'minor' +'tauri-apps': 'minor' 'tauri-build': 'minor' --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 455a184d05a4..5ddc5cd30346 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -54,20 +54,20 @@ Some Tauri packages will be automatically built when running one of the examples ### Packages Overview -- The JS API (`/tooling/api`) contains JS bindings to the builtin Rust functions in the Rust API. -- cli.rs (`/tooling/cli`) is the primary CLI for creating and developing Tauri apps. -- cli.js (`/tooling/cli/node`) is a Node.js CLI wrapper for `cli.rs`. -- Tauri Bundler (`/tooling/bundler`) is used by the Rust CLI to package executables into installers. - Tauri Core (`/core/tauri`) is the heart of Tauri. It contains the code that starts the app, configures communication between Rust and the Webview, and ties all the other packages together. - The Macros (`/core/tauri-macros`) are used by Tauri Core for various functions. +- Tauri Bundler (`/tooling/bundler`) is used by the Rust CLI to package executables into installers. +- The Rust CLI aka `tauri-cli` (`/tooling/cli`) is the primary CLI for creating and developing Tauri apps. +- The JS CLI aka `@tauri-apps/cli` (`/tooling/cli/node`) is a Node.js CLI wrapper for `tauri-cli`. +- The JS API aka `@tauri-apps/api` (`/tooling/api`) contains JS bindings to the builtin Rust functions in the Rust API. -### Developing The Node.js CLI (cli.js) +### Developing Tauri Bundler and Rust CLI -`cli.js` is a wrapper to `cli.rs` so most changes should be written on the Rust CLI. The `[Tauri repo root]/tooling/cli/node` folder contains only packaging scripts to properly publish the Rust CLI binaries to NPM. +The code for the bundler is located in `[Tauri repo root]/tooling/bundler`, and the code for the Rust CLI is located in `[Tauri repo root]/tooling/cli`. If you are using your local copy of `@tauri-apps/cli` (see above), any changes you make to the bundler and CLI will be automatically built and applied when running the build or dev command. Otherwise, running `cargo install --path .` in the Rust CLI directory will allow you to run `cargo tauri build` and `cargo tauri dev` anywhere, using the updated copy of the bundler and cli. You will have to run this command each time you make a change in either package. -### Developing Tauri Bundler and Rust CLI +### Developing The Node.js CLI (`@tauri-apps/cli`) -The code for the bundler is located in `[Tauri repo root]/tooling/bundler`, and the code for the Rust CLI is located in `[Tauri repo root]/tooling/cli`. If you are using your local copy of cli.js (see above), any changes you make to the bundler and CLI will be automatically built and applied when running the build or dev command. Otherwise, running `cargo install --path .` in the Rust CLI directory will allow you to run `cargo tauri build` and `cargo tauri dev` anywhere, using the updated copy of the bundler and cli. You will have to run this command each time you make a change in either package. +`@tauri-apps/cli` is a wrapper to `tauri-cli` so most changes should be written on the Rust CLI. The `[Tauri repo root]/tooling/cli/node` folder contains only packaging scripts to properly publish the Rust CLI binaries to NPM. ### Developing Tauri Core and Related Components (Rust API, Macros, Codegen, and Utils) diff --git a/.github/workflows/artifacts-updater.yml b/.github/workflows/artifacts-updater.yml index edeb7ecf36e7..6b70317e335e 100644 --- a/.github/workflows/artifacts-updater.yml +++ b/.github/workflows/artifacts-updater.yml @@ -48,7 +48,7 @@ jobs: core -> ../target tooling/cli - - name: build and install cli.rs + - name: build and install `tauri-cli` run: cargo install --path tooling/cli --force - name: Check whether code signing should be enabled id: enablecodesigning diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml index 6de039f8b3e7..4c2c46f3340a 100644 --- a/.github/workflows/covector-version-or-publish.yml +++ b/.github/workflows/covector-version-or-publish.yml @@ -115,21 +115,21 @@ jobs: repository: tauri-apps/tauri-docs event-type: update-docs - - name: Trigger cli.js publishing workflow + - name: Trigger `@tauri-apps/cli` publishing workflow if: | steps.covector.outputs.successfulPublish == 'true' && - contains(steps.covector.outputs.packagesPublished, 'cli.rs') + contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli') uses: peter-evans/repository-dispatch@v1 with: token: ${{ secrets.ORG_TAURI_BOT_PAT }} repository: tauri-apps/tauri - event-type: publish-clijs - client-payload: '{"releaseId": "${{ steps.covector.outputs.cli.js-releaseId }}" }' + event-type: publish-js-cli + client-payload: '{"releaseId": "${{ steps.covector.outputs.-tauri-apps-cli-releaseId }}" }' - - name: Trigger cli.rs publishing workflow + - name: Trigger `tauri-cli` publishing workflow if: | steps.covector.outputs.successfulPublish == 'true' && - contains(steps.covector.outputs.packagesPublished, 'cli.rs') + contains(steps.covector.outputs.packagesPublished, 'tauri-cli') uses: peter-evans/repository-dispatch@v1 with: token: ${{ secrets.ORG_TAURI_BOT_PAT }} diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml index 7165c07d0b4b..995c115c27ab 100644 --- a/.github/workflows/lint-js.yml +++ b/.github/workflows/lint-js.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: MIT -name: api and cli.js lint check +name: lint js on: pull_request: @@ -16,7 +16,7 @@ concurrency: cancel-in-progress: true jobs: - eslint-check: + eslint-@tauri-apps/cli: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -24,24 +24,34 @@ jobs: with: node-version: '14' cache: yarn - cache-dependency-path: tooling/*/yarn.lock - - name: install cli.js deps via yarn + cache-dependency-path: tooling/cli/node/yarn.lock + - name: install deps via yarn working-directory: ./tooling/cli/node/ run: yarn # nothing to lint - #- name: run cli.js lint + #- name: run lint # working-directory: ./tooling/cli/node/ # run: yarn lint - - name: run cli.js format + - name: run format working-directory: ./tooling/cli/node/ run: yarn format:check - - name: install api deps via yarn + eslint-@tauri-apps/api: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: '14' + cache: yarn + cache-dependency-path: tooling/api/yarn.lock + + - name: install deps via yarn working-directory: ./tooling/api/ run: yarn - - name: run api lint + - name: run lint working-directory: ./tooling/api/ run: yarn lint - - name: run api format + - name: run format working-directory: ./tooling/api/ run: yarn format:check diff --git a/.github/workflows/publish-cli-js.yml b/.github/workflows/publish-cli-js.yml index e487e6ca057a..cff71fa64c7b 100644 --- a/.github/workflows/publish-cli-js.yml +++ b/.github/workflows/publish-cli-js.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: MIT -name: publish cli.js +name: publish `@tauri-apps/cli` env: DEBUG: napi:* APP_NAME: cli @@ -11,10 +11,10 @@ on: workflow_dispatch: inputs: releaseId: - description: 'ID of the cli.js release' + description: 'ID of the `@tauri-apps/cli` release' required: true repository_dispatch: - types: [publish-clijs] + types: [publish-js-cli] defaults: run: diff --git a/.github/workflows/publish-cli-rs.yml b/.github/workflows/publish-cli-rs.yml index e0e88c0b24dd..258f644770f1 100644 --- a/.github/workflows/publish-cli-rs.yml +++ b/.github/workflows/publish-cli-rs.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: MIT -name: publish cli.rs +name: publish `tauri-cli` env: MACOSX_DEPLOYMENT_TARGET: '10.13' on: @@ -39,7 +39,7 @@ jobs: uses: dtolnay/rust-toolchain@stable with: targets: ${{ matrix.config.rust_target }} - + - uses: Swatinem/rust-cache@v2 with: key: ${{ matrix.config.rust_target }} @@ -80,12 +80,12 @@ jobs: run: ./.scripts/ci/pack-cli.sh - name: Get CLI version - run: echo "CLI_VERSION=$(cat tooling/cli/metadata.json | jq '."cli.js".version' -r)" >> $GITHUB_ENV + run: echo "CLI_VERSION=$(cat tooling/cli/metadata.json | jq '."@tauri-apps/cli".version' -r)" >> $GITHUB_ENV - name: Publish release uses: softprops/action-gh-release@50195ba7f6f93d1ac97ba8332a178e008ad176aa with: - tag_name: cli.rs-v${{ env.CLI_VERSION }} + tag_name: tauri-cli-v${{ env.CLI_VERSION }} files: | outputs/cargo-tauri-*.zip outputs/cargo-tauri-*.tgz diff --git a/.github/workflows/test-cli-js.yml b/.github/workflows/test-cli-js.yml index b4f988e2dca4..30f953b31df6 100644 --- a/.github/workflows/test-cli-js.yml +++ b/.github/workflows/test-cli-js.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: MIT -name: test cli.js +name: test `@tauri-apps/cli` on: push: @@ -12,7 +12,7 @@ on: pull_request: paths: - '.github/workflows/test-cli-js.yml' - # currently cli.js only tests the template + # currently` @tauri-apps/cli` only tests the template - 'tooling/cli/templates/app/**' env: diff --git a/.github/workflows/test-cli-rs.yml b/.github/workflows/test-cli-rs.yml index 6dfbd246eb23..d4ba65b4adb0 100644 --- a/.github/workflows/test-cli-rs.yml +++ b/.github/workflows/test-cli-rs.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: MIT -name: test cli.rs +name: test `tauri-cli` on: push: diff --git a/.husky/pre-commit b/.husky/pre-commit index dcd6fda848fd..3050d5d43f92 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -16,7 +16,7 @@ else fi if [ -z "$(git diff --name-only tooling/cli/node)" ]; then - echo "skipping cli.js - no changes detected" + echo "skipping \`@tauri-apps/cli\` - no changes detected" else cd tooling/cli/node yarn format diff --git a/.scripts/covector/sync-cli-metadata.js b/.scripts/covector/sync-cli-metadata.js index 128bff02edf0..0b2df8b8e209 100644 --- a/.scripts/covector/sync-cli-metadata.js +++ b/.scripts/covector/sync-cli-metadata.js @@ -6,7 +6,7 @@ /* This script is solely intended to be run as part of the `covector version` step to keep the `../tooling/cli/metadata.json` up to date with other version bumps. Long term -we should look to find a more "rusty way" to import / "pin" a version value in our cli.rs +we should look to find a more "rusty way" to import / "pin" a version value in our tauri-cli rust binaries. */ @@ -14,7 +14,7 @@ const { readFileSync, writeFileSync } = require('fs') const packageNickname = process.argv[2] const filePath = - packageNickname === 'cli.js' + packageNickname === '@tauri-apps/cli' ? `../../../tooling/cli/metadata.json` : `../../tooling/cli/metadata.json` const bump = process.argv[3] @@ -51,7 +51,7 @@ const metadata = JSON.parse(readFileSync(filePath, 'utf-8')) // set field version let version -if (packageNickname === 'cli.js') { +if (packageNickname === '@tauri-apps/cli') { version = inc(metadata[packageNickname].version) metadata[packageNickname].version = version } else { diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 5f40656bf1ff..bebaed43e01f 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -39,16 +39,16 @@ This is common code that is reused in many places and offers useful utilities li ### Tauri Tooling -#### [api](https://github.com/tauri-apps/tauri/tree/dev/tooling/api) [TS -> JS] +#### [@tauri-apps/api](https://github.com/tauri-apps/tauri/tree/dev/tooling/api) [TS -> JS] A TypeScript library that creates `cjs` and `esm` JavaScript endpoints for you to import into your Frontend framework so that the Webview can call and listen to backend activity. We also ship the pure TypeScript, because for some frameworks this is more optimal. It uses the message passing of webviews to their hosts. #### [bundler](https://github.com/tauri-apps/tauri/tree/dev/tooling/bundler) [RUST / SHELL] The bundler is a library that builds a Tauri App for the platform triple it detects / is told. At the moment it currently supports macOS, Windows and Linux - but in the near future will support mobile platforms as well. May be used outside of Tauri projects. -#### [cli.js](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli/node) [JS] -It is a wrapper around [cli.rs](https://github.com/tauri-apps/tauri/blob/dev/tooling/cli) using [napi-rs](https://github.com/napi-rs/napi-rs) to produce NPM packages for each platform. +#### [@tauri-apps/cli](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli/node) [JS] +It is a wrapper around [tauri-cli](https://github.com/tauri-apps/tauri/blob/dev/tooling/cli) using [napi-rs](https://github.com/napi-rs/napi-rs) to produce NPM packages for each platform. -#### [cli.rs](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli) [RUST] +#### [tauri-cli](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli) [RUST] This rust executable provides the full interface to all of the required activities for which the CLI is required. It will run on macOS, Windows, and Linux. #### [create-tauri-app](https://github.com/tauri-apps/create-tauri-app) [JS] @@ -67,9 +67,6 @@ Tauri uses WRY as the abstract layer responsible to determine which webview is u # Additional tooling -## [binary-releases](https://github.com/tauri-apps/binary-releases) -This is the delivery mechanism for tauri prebuilt binaries: currently the cli.rs (used by cli.js) and rustup binaries (used by the deps install command of cli.js). These artifacts are automatically created on release. - ## [tauri-action](https://github.com/tauri-apps/tauri-action) This is a github workflow that builds tauri binaries for all platforms. It is not the fastest out there, but it gets the job done and is highly configurable. Even allowing you to create a (very basic) tauri app even if tauri is not setup. @@ -119,7 +116,7 @@ This will do several things: 1. start the JS Framework devserver 2. begin the long process of downloading and compiling the rust libraries 3. open an application window with devtools enabled -4. keep a long-lived console alive +4. keep a long-lived console alive If you change your HTML/CSS/TS/JS, your framework devserver should give you its best shot at instant hot module reloading and you will see the changes instantly. @@ -149,7 +146,7 @@ After some time, the process will end and you can see the results in the `./src- End users will be provided with binaries in ways that are appropriate for their systems. Whether macOS, Linux, or Windows, direct download or store installations - they will be able to follow procedures for installing and removing that they are used to. ## What does the Updating flow look like? -When a new version is ready, the developer publishes the new signed artifacts to a server (that they have configured within `tauri.conf.json`). +When a new version is ready, the developer publishes the new signed artifacts to a server (that they have configured within `tauri.conf.json`). The application can poll this server to see if there is a new release. When there is a new release, the user is prompted to update. The application update is downloaded, verified (checksum & signature), updated, closed, and restarted. diff --git a/README.md b/README.md index 4feac90fd06e..aba7be7dcaf6 100644 --- a/README.md +++ b/README.md @@ -25,12 +25,12 @@ ### Tooling -| Component | Description | Version | Lin | Win | Mac | -| --------------------------------------------------------------------------- | ---------------------------------------- | ------------------------------------------------------------------------------------------------------ | --- | --- | --- | -| [**bundler**](https://github.com/tauri-apps/tauri/tree/dev/tooling/bundler) | manufacture the final binaries | [![](https://img.shields.io/crates/v/tauri-bundler.svg)](https://crates.io/crates/tauri-bundler) | ✅ | ✅ | ✅ | -| [**api.js**](https://github.com/tauri-apps/tauri/tree/dev/tooling/api) | JS API for interaction with Rust backend | [![](https://img.shields.io/npm/v/@tauri-apps/api.svg)](https://www.npmjs.com/package/@tauri-apps/api) | ✅ | ✅ | ✅ | -| [**cli.rs**](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli) | create, develop and build apps | [![](https://img.shields.io/crates/v/tauri-cli.svg)](https://crates.io/crates/tauri-cli) | ✅ | ✅ | ✅ | -| [**cli.js**](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli/node) | Node.js CLI wrapper for cli.rs | [![](https://img.shields.io/npm/v/@tauri-apps/cli.svg)](https://www.npmjs.com/package/@tauri-apps/cli) | ✅ | ✅ | ✅ | +| Component | Description | Version | Lin | Win | Mac | +| ------------------------------------------------------------------------------------ | ---------------------------------------- | ------------------------------------------------------------------------------------------------------ | --- | --- | --- | +| [**bundler**](https://github.com/tauri-apps/tauri/tree/dev/tooling/bundler) | manufacture the final binaries | [![](https://img.shields.io/crates/v/tauri-bundler.svg)](https://crates.io/crates/tauri-bundler) | ✅ | ✅ | ✅ | +| [**tauri-cli**](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli) | create, develop and build apps | [![](https://img.shields.io/crates/v/tauri-cli.svg)](https://crates.io/crates/tauri-cli) | ✅ | ✅ | ✅ | +| [**@tauri-apps/cli**](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli/node) | Node.js CLI wrapper for `tauri-cli` | [![](https://img.shields.io/npm/v/@tauri-apps/cli.svg)](https://www.npmjs.com/package/@tauri-apps/cli) | ✅ | ✅ | ✅ | +| [**@tauri-apps/api**](https://github.com/tauri-apps/tauri/tree/dev/tooling/api) | JS API for interaction with Rust backend | [![](https://img.shields.io/npm/v/@tauri-apps/api.svg)](https://www.npmjs.com/package/@tauri-apps/api) | ✅ | ✅ | ✅ | ### Utilities and Plugins diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index 365d8ac91f3f..8e704a8dbd2a 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -82,6 +82,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "ansi_term" version = "0.12.1" @@ -111,7 +120,7 @@ checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -379,6 +388,19 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chrono" +version = "0.4.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +dependencies = [ + "iana-time-zone", + "num-integer", + "num-traits", + "serde", + "winapi", +] + [[package]] name = "chunked_transfer" version = "1.4.0" @@ -444,7 +466,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -456,6 +478,16 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -629,7 +661,7 @@ dependencies = [ "proc-macro2", "quote", "smallvec", - "syn", + "syn 1.0.107", ] [[package]] @@ -639,7 +671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" dependencies = [ "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -649,7 +681,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" dependencies = [ "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -671,11 +703,55 @@ dependencies = [ "winapi", ] +[[package]] +name = "cxx" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.15", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "darling" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ "darling_core", "darling_macro", @@ -683,27 +759,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.10.0", - "syn", + "syn 1.0.107", ] [[package]] name = "darling_macro" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -716,7 +792,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", + "syn 1.0.107", ] [[package]] @@ -1226,7 +1302,7 @@ dependencies = [ "markup5ever", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1299,6 +1375,30 @@ dependencies = [ "want", ] +[[package]] +name = "iana-time-zone" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows 0.48.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1380,6 +1480,7 @@ checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", "hashbrown", + "serde", ] [[package]] @@ -1516,9 +1617,9 @@ dependencies = [ [[package]] name = "json-patch" -version = "0.3.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e712e62827c382a77b87f590532febb1f8b2fdbc3eefa1ee37fe7281687075ef" +checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" dependencies = [ "serde", "serde_json", @@ -1655,6 +1756,15 @@ dependencies = [ "safemem", ] +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + [[package]] name = "linux-raw-sys" version = "0.3.1" @@ -1831,7 +1941,7 @@ dependencies = [ "napi-derive-backend", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1846,7 +1956,7 @@ dependencies = [ "quote", "regex", "semver", - "syn", + "syn 1.0.107", ] [[package]] @@ -2091,7 +2201,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2229,7 +2339,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2306,7 +2416,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2320,7 +2430,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2358,7 +2468,7 @@ checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2438,7 +2548,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "version_check", ] @@ -2461,9 +2571,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -2479,9 +2589,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.20" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -2799,7 +2909,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn", + "syn 1.0.107", ] [[package]] @@ -2808,6 +2918,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + [[package]] name = "scrypt" version = "0.8.1" @@ -2881,9 +2997,9 @@ checksum = "a41d061efea015927ac527063765e73601444cdc344ba855bc7bd44578b25e1c" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] @@ -2900,13 +3016,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] @@ -2917,14 +3033,14 @@ checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa 1.0.2", "ryu", @@ -2945,24 +3061,30 @@ dependencies = [ [[package]] name = "serde_with" -version = "1.14.0" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +checksum = "331bb8c3bf9b92457ab7abecf07078c13f7d270ba490103e84e8b014490cd0b0" dependencies = [ + "base64 0.13.0", + "chrono", + "hex", + "indexmap", "serde", + "serde_json", "serde_with_macros", + "time", ] [[package]] name = "serde_with_macros" -version = "1.5.2" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +checksum = "859011bddcc11f289f07f467cc1fe01c7a941daa4d8f6c40d4d1c92eb6d9319c" dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2984,7 +3106,7 @@ checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -3169,7 +3291,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -3195,6 +3317,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "sync_wrapper" version = "0.1.1" @@ -3346,7 +3479,7 @@ dependencies = [ "heck 0.4.0", "html5ever", "infer", - "json-patch 0.3.0", + "json-patch 1.0.0", "json5", "kuchiki", "memchr", @@ -3361,7 +3494,7 @@ dependencies = [ "toml", "url", "walkdir", - "windows", + "windows 0.39.0", ] [[package]] @@ -3424,22 +3557,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] @@ -3480,6 +3613,7 @@ dependencies = [ "itoa 1.0.2", "libc", "num_threads", + "serde", "time-macros", ] @@ -3530,7 +3664,7 @@ checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -3894,7 +4028,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-shared", ] @@ -3928,7 +4062,7 @@ checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4019,13 +4153,22 @@ dependencies = [ "windows_x86_64_msvc 0.39.0", ] +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + [[package]] name = "windows-implement" version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" dependencies = [ - "syn", + "syn 1.0.107", "windows-tokens", ] diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index f224a5abe141..fd37d61d9e92 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -24,7 +24,7 @@ include = [ ] [package.metadata.binstall] -pkg-url = "{ repo }/releases/download/cli.rs-v{ version }/cargo-tauri-{ target }.{ archive-format }" +pkg-url = "{ repo }/releases/download/tauri-cli-v{ version }/cargo-tauri-{ target }.{ archive-format }" bin-dir = "{ bin }{ binary-ext }" pkg-fmt = "tgz" diff --git a/tooling/cli/metadata.json b/tooling/cli/metadata.json index 50acced34532..22f0b6bc43ba 100644 --- a/tooling/cli/metadata.json +++ b/tooling/cli/metadata.json @@ -1,5 +1,5 @@ { - "cli.js": { + "@tauri-apps/cli": { "version": "1.2.3", "node": ">= 10.0.0" }, diff --git a/tooling/cli/node/README.md b/tooling/cli/node/README.md index 1911835b1bb3..37f9e20d6f5f 100644 --- a/tooling/cli/node/README.md +++ b/tooling/cli/node/README.md @@ -19,7 +19,7 @@ Tauri is a polyglot and generic system that is very composable and allows engine Tauri apps can have custom menus and have tray-type interfaces. They can be updated, and are managed by the user's operating system as expected. They are very small, because they use the system's webview. They do not ship a runtime, since the final binary is compiled from rust. This makes the reversing of Tauri apps not a trivial task. ## This module -Written in Typescript and packaged such that it can be used with `npm`, `pnpm`, and `yarn`, this library provides a node.js runner for common tasks when using Tauri, like `yarn tauri dev`. For the most part it is a wrapper around [cli.rs](https://github.com/tauri-apps/tauri/blob/dev/tooling/cli). +Written in Typescript and packaged such that it can be used with `npm`, `pnpm`, and `yarn`, this library provides a node.js runner for common tasks when using Tauri, like `yarn tauri dev`. For the most part it is a wrapper around [tauri-cli](https://github.com/tauri-apps/tauri/blob/dev/tooling/cli). To learn more about the details of how all of these pieces fit together, please consult this [ARCHITECTURE.md](https://github.com/tauri-apps/tauri/blob/dev/ARCHITECTURE.md) document. diff --git a/tooling/cli/node/test/jest/__tests__/template.spec.js b/tooling/cli/node/test/jest/__tests__/template.spec.js index d598a0347b3b..61d1ca6814b9 100644 --- a/tooling/cli/node/test/jest/__tests__/template.spec.js +++ b/tooling/cli/node/test/jest/__tests__/template.spec.js @@ -10,7 +10,7 @@ const cli = require('~/main.js') const currentDirName = __dirname -describe('[CLI] cli.js template', () => { +describe('[CLI] @tauri-apps/cli template', () => { it('init a project and builds it', async () => { const cwd = process.cwd() const fixturePath = resolve(currentDirName, '../fixtures/empty') diff --git a/tooling/cli/src/info/mod.rs b/tooling/cli/src/info/mod.rs index 1abc22bbf56e..23c4dda6994f 100644 --- a/tooling/cli/src/info/mod.rs +++ b/tooling/cli/src/info/mod.rs @@ -29,7 +29,7 @@ struct JsCliVersionMetadata { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] pub struct VersionMetadata { - #[serde(rename = "cli.js")] + #[serde(rename = "@tauri-apps/cli")] js_cli: JsCliVersionMetadata, } From c1995886e40a6fbb3f66458f5148086df4cbbc59 Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Tue, 25 Apr 2023 17:45:08 +0200 Subject: [PATCH 2/8] Update .changes/cli-dev-server-available-port.md Co-authored-by: Fabian-Lars --- .changes/cli-dev-server-available-port.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changes/cli-dev-server-available-port.md b/.changes/cli-dev-server-available-port.md index 5e4283f8255d..9d4f22442171 100644 --- a/.changes/cli-dev-server-available-port.md +++ b/.changes/cli-dev-server-available-port.md @@ -1,5 +1,5 @@ --- -'tauri-apps': 'patch' +'tauri-cli': 'patch' --- Look for available port when using the built-in dev server for static files. From e1f96c53051acbd7b33bcb4e6c2cb72de3d6c521 Mon Sep 17 00:00:00 2001 From: amrbashir Date: Tue, 25 Apr 2023 17:53:38 +0200 Subject: [PATCH 3/8] simplify naming --- .github/workflows/bench.yml | 2 +- .github/workflows/check-generated-files.yml | 6 +++--- .github/workflows/check-license-header.yml | 2 +- .../{change-status-on-PR.yml => covector-status.yml} | 0 .github/workflows/covector-version-or-publish.yml | 2 +- .github/workflows/{lint-fmt-cli.yml => lint-cli.yml} | 8 ++++---- .github/workflows/{lint-fmt-core.yml => lint-core.yml} | 8 ++++---- .github/workflows/test-cli-js.yml | 2 +- .github/workflows/test-cli-rs.yml | 2 +- .github/workflows/test-core.yml | 2 +- .../workflows/{test-bundler.yml => test-lint-bundler.yml} | 8 ++++---- .../{artifacts-updater.yml => test-updater-artifacts.yml} | 6 +++--- 12 files changed, 24 insertions(+), 24 deletions(-) rename .github/workflows/{change-status-on-PR.yml => covector-status.yml} (100%) rename .github/workflows/{lint-fmt-cli.yml => lint-cli.yml} (93%) rename .github/workflows/{lint-fmt-core.yml => lint-core.yml} (94%) rename .github/workflows/{test-bundler.yml => test-lint-bundler.yml} (96%) rename .github/workflows/{artifacts-updater.yml => test-updater-artifacts.yml} (97%) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 576a17b03e87..432e82239893 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: MIT -name: benches +name: bench on: push: diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml index 099ba0129665..2fc6b7fea826 100644 --- a/.github/workflows/check-generated-files.yml +++ b/.github/workflows/check-generated-files.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: MIT -name: Check generated files +name: check generated files on: pull_request: @@ -49,7 +49,7 @@ jobs: - 'tooling/cli/schema.json' - 'core/tauri-config-schema/schema.json' - check-api: + api: runs-on: ubuntu-latest needs: changes if: needs.changes.outputs.api == 'true' @@ -64,7 +64,7 @@ jobs: git restore tooling/api/docs/js-api.json ./.scripts/ci/has-diff.sh - check-schema: + schema: runs-on: ubuntu-latest needs: changes if: needs.changes.outputs.schema == 'true' diff --git a/.github/workflows/check-license-header.yml b/.github/workflows/check-license-header.yml index fb2055c10d00..61a83af07253 100644 --- a/.github/workflows/check-license-header.yml +++ b/.github/workflows/check-license-header.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: MIT -name: Check generated files +name: check license headers on: pull_request: diff --git a/.github/workflows/change-status-on-PR.yml b/.github/workflows/covector-status.yml similarity index 100% rename from .github/workflows/change-status-on-PR.yml rename to .github/workflows/covector-status.yml diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml index 4c2c46f3340a..d32d1247d9b4 100644 --- a/.github/workflows/covector-version-or-publish.yml +++ b/.github/workflows/covector-version-or-publish.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: MIT -name: version or publish +name: covector version or publish on: push: diff --git a/.github/workflows/lint-fmt-cli.yml b/.github/workflows/lint-cli.yml similarity index 93% rename from .github/workflows/lint-fmt-cli.yml rename to .github/workflows/lint-cli.yml index 200e1daa5e37..297330b136ea 100644 --- a/.github/workflows/lint-fmt-cli.yml +++ b/.github/workflows/lint-cli.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: MIT -name: cli clippy and fmt check +name: lint cli on: push: @@ -11,7 +11,7 @@ on: - next pull_request: paths: - - '.github/workflows/lint-fmt-cli.yml' + - '.github/workflows/lint-cli.yml' - 'tooling/cli/**' env: @@ -23,7 +23,7 @@ concurrency: cancel-in-progress: true jobs: - fmt_check: + fmt: runs-on: ubuntu-latest steps: @@ -41,7 +41,7 @@ jobs: command: fmt args: --manifest-path ./tooling/cli/Cargo.toml --all -- --check - cli_clippy_check: + clippy: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/lint-fmt-core.yml b/.github/workflows/lint-core.yml similarity index 94% rename from .github/workflows/lint-fmt-core.yml rename to .github/workflows/lint-core.yml index edbcdad4baba..0ea262d12c5e 100644 --- a/.github/workflows/lint-fmt-core.yml +++ b/.github/workflows/lint-core.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: MIT -name: core clippy and fmt check +name: lint core on: push: @@ -11,7 +11,7 @@ on: - next pull_request: paths: - - '.github/workflows/lint-fmt-core.yml' + - '.github/workflows/lint-core.yml' - 'core/**' - '!core/tauri/scripts/**' - 'examples/**' @@ -25,7 +25,7 @@ concurrency: cancel-in-progress: true jobs: - fmt_check: + fmt: runs-on: ubuntu-latest steps: @@ -43,7 +43,7 @@ jobs: command: fmt args: --all -- --check - core_clippy_check: + clippy: runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/test-cli-js.yml b/.github/workflows/test-cli-js.yml index 30f953b31df6..e9717674d79c 100644 --- a/.github/workflows/test-cli-js.yml +++ b/.github/workflows/test-cli-js.yml @@ -24,7 +24,7 @@ concurrency: cancel-in-progress: true jobs: - test-tauri-js-cli: + test: runs-on: ${{ matrix.platform }} strategy: diff --git a/.github/workflows/test-cli-rs.yml b/.github/workflows/test-cli-rs.yml index d4ba65b4adb0..20485b551676 100644 --- a/.github/workflows/test-cli-rs.yml +++ b/.github/workflows/test-cli-rs.yml @@ -23,7 +23,7 @@ concurrency: cancel-in-progress: true jobs: - test-tauri-cli: + test: runs-on: ${{ matrix.platform }} strategy: diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml index e92403a38c82..220fa5bb700e 100644 --- a/.github/workflows/test-core.yml +++ b/.github/workflows/test-core.yml @@ -24,7 +24,7 @@ concurrency: cancel-in-progress: true jobs: - test-tauri-core: + test: runs-on: ${{ matrix.platform.os }} strategy: diff --git a/.github/workflows/test-bundler.yml b/.github/workflows/test-lint-bundler.yml similarity index 96% rename from .github/workflows/test-bundler.yml rename to .github/workflows/test-lint-bundler.yml index 4467a3574fc3..f53a151175da 100644 --- a/.github/workflows/test-bundler.yml +++ b/.github/workflows/test-lint-bundler.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: MIT -name: test bundler +name: test and lint bundler on: push: @@ -23,7 +23,7 @@ concurrency: cancel-in-progress: true jobs: - build-tauri-bundler: + test: runs-on: ${{ matrix.platform }} strategy: @@ -48,7 +48,7 @@ jobs: cd ./tooling/bundler cargo test - fmt_check: + fmt: runs-on: ubuntu-latest steps: @@ -66,7 +66,7 @@ jobs: command: fmt args: --manifest-path ./tooling/bundler/Cargo.toml --all -- --check - clippy-check: + clippy: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/artifacts-updater.yml b/.github/workflows/test-updater-artifacts.yml similarity index 97% rename from .github/workflows/artifacts-updater.yml rename to .github/workflows/test-updater-artifacts.yml index 6b70317e335e..dbe6d00ab7ca 100644 --- a/.github/workflows/artifacts-updater.yml +++ b/.github/workflows/test-updater-artifacts.yml @@ -2,13 +2,13 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: MIT -name: updater test artifacts +name: test updater artifacts on: schedule: - cron: '0 0 * * *' pull_request: paths: - - '.github/workflows/artifacts-updater.yml' + - '.github/workflows/test-updater-artifacts.yml' - 'examples/updater/**' workflow_dispatch: @@ -21,7 +21,7 @@ concurrency: cancel-in-progress: true jobs: - build-artifacts: + test: runs-on: ${{ matrix.platform }} strategy: From 4b8890b47944c4da937ac8797f3633db4755d909 Mon Sep 17 00:00:00 2001 From: amrbashir Date: Tue, 25 Apr 2023 17:55:24 +0200 Subject: [PATCH 4/8] fix change files --- .changes/cli-dev-server-port.md | 2 +- .changes/template-default-features.md | 2 +- .changes/version-inheritance.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.changes/cli-dev-server-port.md b/.changes/cli-dev-server-port.md index 89c94a95a093..65e699230d8e 100644 --- a/.changes/cli-dev-server-port.md +++ b/.changes/cli-dev-server-port.md @@ -1,5 +1,5 @@ --- -'tauri-apps': 'patch' +'tauri-cli': 'patch' --- Add `--port` to specify the port used for static files dev server. It can also be specified through `TAURI_DEV_SERVER_PORT` env var. diff --git a/.changes/template-default-features.md b/.changes/template-default-features.md index 6ca068b174f3..f08d666c295b 100644 --- a/.changes/template-default-features.md +++ b/.changes/template-default-features.md @@ -1,5 +1,5 @@ --- -'tauri-apps': minor +'tauri-cli': minor '@tauri-apps/cli': minor --- diff --git a/.changes/version-inheritance.md b/.changes/version-inheritance.md index 34d5b7396c77..59a63fe74cc4 100644 --- a/.changes/version-inheritance.md +++ b/.changes/version-inheritance.md @@ -1,5 +1,5 @@ --- -'tauri-apps': 'minor' +'tauri-cli': 'minor' 'tauri-build': 'minor' --- From c7c88a062de7065867c805213fcf3c54e579fda6 Mon Sep 17 00:00:00 2001 From: amrbashir Date: Mon, 22 May 2023 17:47:30 +0300 Subject: [PATCH 5/8] update names --- .changes/cli-profile.md | 2 +- .changes/fix-feature-removal.md | 4 ++-- .changes/nsis-custom-language-files.md | 2 +- .changes/nsis-custom-template.md | 4 ++-- .changes/nsis-updater-restart.md | 2 +- .changes/tauri-info-msvc-detection.md | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.changes/cli-profile.md b/.changes/cli-profile.md index fa48bfcb45d0..28bfc9940aa3 100644 --- a/.changes/cli-profile.md +++ b/.changes/cli-profile.md @@ -1,5 +1,5 @@ --- -'cli.rs': 'patch' +'tauri-cli': 'patch' --- Fix building with a custom cargo profile diff --git a/.changes/fix-feature-removal.md b/.changes/fix-feature-removal.md index 258b7e32c832..07dc78e5fb05 100644 --- a/.changes/fix-feature-removal.md +++ b/.changes/fix-feature-removal.md @@ -1,6 +1,6 @@ --- -'cli.rs': 'patch' -'cli.js': 'patch' +'tauri-cli': 'patch' +'@tauri-apps/cli': 'patch' --- Fixes Cargo.toml feature rewriting. diff --git a/.changes/nsis-custom-language-files.md b/.changes/nsis-custom-language-files.md index cf9b1c40458c..80fe9af738c2 100644 --- a/.changes/nsis-custom-language-files.md +++ b/.changes/nsis-custom-language-files.md @@ -1,7 +1,7 @@ --- 'tauri-bundler': 'minor' 'tauri-utils': 'minor' -'cli.rs': 'minor' +'tauri-cli': 'minor' --- Allow specifying custom language files of Tauri's custom messages for the NSIS installer diff --git a/.changes/nsis-custom-template.md b/.changes/nsis-custom-template.md index d1f5c717a7c9..7d06f378eb36 100644 --- a/.changes/nsis-custom-template.md +++ b/.changes/nsis-custom-template.md @@ -1,8 +1,8 @@ --- 'tauri-utils': 'minor' 'tauri-bundler': 'minor' -'cli.rs': 'minor' -'cli.js': 'minor' +'tauri-cli': 'minor' +'@tauri-apps/cli': 'minor' --- Add `nsis > template` option to specify custom NSIS installer template. diff --git a/.changes/nsis-updater-restart.md b/.changes/nsis-updater-restart.md index 8958fa150b2c..2ea6d7f70aa0 100644 --- a/.changes/nsis-updater-restart.md +++ b/.changes/nsis-updater-restart.md @@ -1,6 +1,6 @@ --- 'tauri': 'minor' -'cli.rs': 'minor' +'tauri-cli': 'minor' --- Restart the app after the NSIS updater is finished. diff --git a/.changes/tauri-info-msvc-detection.md b/.changes/tauri-info-msvc-detection.md index 5ac6d3cb2f07..78ca165f802b 100644 --- a/.changes/tauri-info-msvc-detection.md +++ b/.changes/tauri-info-msvc-detection.md @@ -1,5 +1,5 @@ --- -'cli.rs': 'patch' +'tauri-cli': 'patch' --- Improve Visual Studio installation detection in `tauri info` command to check for the necessary components instead of whole workloads. This also fixes the detection of minimal installations and auto-installations done by `rustup`. From 81547e0ac305b5b644207ff8490e5dde18649eff Mon Sep 17 00:00:00 2001 From: amrbashir Date: Mon, 22 May 2023 17:48:50 +0300 Subject: [PATCH 6/8] fix workflows --- .github/workflows/lint-js.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml index 995c115c27ab..fc0b14ec940e 100644 --- a/.github/workflows/lint-js.yml +++ b/.github/workflows/lint-js.yml @@ -16,7 +16,7 @@ concurrency: cancel-in-progress: true jobs: - eslint-@tauri-apps/cli: + eslint-tauri-apps/cli: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -36,7 +36,7 @@ jobs: working-directory: ./tooling/cli/node/ run: yarn format:check - eslint-@tauri-apps/api: + eslint-tauri-apps/api: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From 944d271a7412b52544d81db31c5fa93588e44d33 Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Mon, 22 May 2023 17:52:57 +0300 Subject: [PATCH 7/8] Update metadata.json --- tooling/cli/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/cli/metadata.json b/tooling/cli/metadata.json index ef378c86caa4..f7d41ac1a2ab 100644 --- a/tooling/cli/metadata.json +++ b/tooling/cli/metadata.json @@ -1,6 +1,6 @@ { "@tauri-apps/cli": { - "version": "1.2.3", + "version": "1.3.1", "node": ">= 10.0.0" }, "tauri": "1.3.0", From a730feb4d62f5085df6fd95f64108285c0ed2a3d Mon Sep 17 00:00:00 2001 From: amrbashir Date: Mon, 22 May 2023 17:54:13 +0300 Subject: [PATCH 8/8] fix workflows again --- .github/workflows/lint-js.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml index fc0b14ec940e..7cf54f022af0 100644 --- a/.github/workflows/lint-js.yml +++ b/.github/workflows/lint-js.yml @@ -16,7 +16,7 @@ concurrency: cancel-in-progress: true jobs: - eslint-tauri-apps/cli: + eslint-cli: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -36,7 +36,7 @@ jobs: working-directory: ./tooling/cli/node/ run: yarn format:check - eslint-tauri-apps/api: + eslint-api: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2