Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: tauri paths #2611

Merged
merged 1 commit into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"version": "0.0.1",
"scripts": {
"dev:setup:submodules": "git submodule update --init",
"dev:setup:tauri": "pnpm install -C packages/tauri/tooling/api --ignore-workspace --no-frozen-lockfile",
"dev:setup:tauri": "pnpm install -C packages/tauri/packages/api --ignore-workspace --no-frozen-lockfile",
"dev:setup:plugins-workspace": "pnpm --prefix packages/plugins-workspace install",
"dev:setup": "pnpm dev:setup:submodules && pnpm dev:setup:tauri && pnpm dev:setup:plugins-workspace",
"dev": "astro dev",
Expand Down
10 changes: 5 additions & 5 deletions packages/config-generator/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@ import { existsSync, writeFileSync } from 'node:fs';
import { slug } from 'github-slugger';

generatePageFromSchema(
'../tauri/core/tauri-config-schema/schema.json',
'../tauri/crates/tauri-schema-generator/schemas/config.schema.json',
'../../src/content/docs/reference/config.md',
'Configuration'
);

generatePageFromSchema(
'../tauri/core/tauri-acl-schema/capability-schema.json',
'../tauri/crates/tauri-schema-generator/schemas/capability.schema.json',
'../../src/content/docs/reference/acl/capability.md',
'Capability'
);

generatePageFromSchema(
'../tauri/core/tauri-acl-schema/permission-schema.json',
'../tauri/crates/tauri-schema-generator/schemas/permission.schema.json',
'../../src/content/docs/reference/acl/permission.md',
'Permission'
);

generatePageFromSchema(
'../tauri/core/tauri-acl-schema/scope-schema.json',
'../tauri/crates/tauri-schema-generator/schemas/scope.schema.json',
'../../src/content/docs/reference/acl/scope.md',
'Scope'
);
Expand All @@ -45,7 +45,7 @@ async function generatePageFromSchema(
# NOTE: This file is auto-generated. Do not edit here!
# For corrections please directly edit the documentation of the underlying Rust source code.
# Example for the configuration reference:
# - https://github.com/tauri-apps/tauri/blob/dev/core/tauri-utils/src/config.rs
# - https://github.com/tauri-apps/tauri/blob/dev/crates/tauri-utils/src/config.rs

title: ${pageTitle}
sidebar:
Expand Down
12 changes: 6 additions & 6 deletions packages/js-api-generator/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ const typeDocConfigBaseOptions: Partial<TypeDocOptions | PluginOptions> = {
};

async function generator() {
if (existsSync('../tauri/tooling/api/node_modules')) {
if (existsSync('../tauri/packages/api/node_modules')) {
const coreJsOptions: Partial<TypeDocOptions> = {
entryPoints: ['../tauri/tooling/api/src/index.ts'],
tsconfig: '../tauri/tooling/api/tsconfig.json',
entryPoints: ['../tauri/packages/api/src/index.ts'],
tsconfig: '../tauri/packages/api/tsconfig.json',
gitRevision: 'dev',
publicPath: '/reference/javascript/api/',
basePath: '/reference/javascript/api/',
Expand Down Expand Up @@ -108,10 +108,10 @@ async function generator() {
);
}

if (existsSync('../tauri/tooling/api/node_modules')) {
if (existsSync('../tauri/packages/api/node_modules')) {
const coreJsOptions: Partial<TypeDocOptions> = {
entryPoints: ['../tauri/tooling/api/src/index.ts'],
tsconfig: '../tauri/tooling/api/tsconfig.json',
entryPoints: ['../tauri/packages/api/src/index.ts'],
tsconfig: '../tauri/packages/api/tsconfig.json',
gitRevision: 'dev',
publicPath: '/reference/javascript/api/',
basePath: '/reference/javascript/api/',
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins-workspace
Submodule plugins-workspace updated 191 files
10 changes: 5 additions & 5 deletions packages/releases-generator/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ const note =
const packages = [
{
name: 'tauri',
url: 'https://raw.githubusercontent.com/tauri-apps/tauri/dev/core/tauri/CHANGELOG.md',
url: 'https://raw.githubusercontent.com/tauri-apps/tauri/dev/crates/tauri/CHANGELOG.md',
tag: 'https://github.com/tauri-apps/tauri/releases/tag',
},
{
name: '@tauri-apps/api',
url: 'https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/api/CHANGELOG.md',
url: 'https://raw.githubusercontent.com/tauri-apps/tauri/dev/packages/api/CHANGELOG.md',
tag: 'https://github.com/tauri-apps/tauri/releases/tag',
},
{
name: 'tauri-cli',
url: 'https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/cli/CHANGELOG.md',
url: 'https://raw.githubusercontent.com/tauri-apps/tauri/dev/crates/tauri-cli/CHANGELOG.md',
tag: 'https://github.com/tauri-apps/tauri/releases/tag',
},
{
name: '@tauri-apps/cli',
url: 'https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/cli/node/CHANGELOG.md',
url: 'https://raw.githubusercontent.com/tauri-apps/tauri/dev/packages/cli/CHANGELOG.md',
tag: 'https://github.com/tauri-apps/tauri/releases/tag',
},
{
name: 'tauri-bundler',
url: 'https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/bundler/CHANGELOG.md',
url: 'https://raw.githubusercontent.com/tauri-apps/tauri/dev/crates/tauri-bundler/CHANGELOG.md',
tag: 'https://github.com/tauri-apps/tauri/releases/tag',
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/tauri
Submodule tauri updated 1089 files
26 changes: 13 additions & 13 deletions src/content/docs/concept/architecture.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -57,71 +57,71 @@ Core."tauri-runtime-wry" -> Upstream.Wry {style.animated: true}

### tauri

[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/core/tauri)
[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/crates/tauri)

This is the major crate that holds everything together. It brings the runtimes, macros, utilities and API into one final product. It reads the [`tauri.conf.json`](/reference/config) file at compile time to bring in features and undertake the actual configuration of the app (and even the `Cargo.toml` file in the project's folder). It handles script injection (for polyfills / prototype revision) at runtime, hosts the API for systems interaction, and even manages the updating process.

### tauri-runtime

[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/core/tauri-runtime)
[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/crates/tauri-runtime)

The glue layer between Tauri itself and lower-level webview libraries.

### tauri-macros

[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/core/tauri-macros)
[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/crates/tauri-macros)

Creates macros for the context, handler, and commands by leveraging the [`tauri-codegen`](https://github.com/tauri-apps/tauri/tree/dev/core/tauri-codegen) crate.
Creates macros for the context, handler, and commands by leveraging the [`tauri-codegen`](https://github.com/tauri-apps/tauri/tree/dev/crates/tauri-codegen) crate.

### tauri-utils

[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/core/tauri-utils)
[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/crates/tauri-utils)

Common code that is reused in many places and offers useful utilities like parsing configuration files, detecting platform triples, injecting the CSP, and managing assets.

### tauri-build

[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/core/tauri-build)
[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/crates/tauri-build)

Applies the macros at build-time to rig some special features needed by `cargo`.

### tauri-codegen

[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/core/tauri-codegen)
[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/crates/tauri-codegen)

Embeds, hashes, and compresses assets, including icons for the app as well as the system tray. Parses [`tauri.conf.json`](/reference/config) at compile time and generates the Config struct.

### tauri-runtime-wry

[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/core/tauri-runtime-wry)
[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/crates/tauri-runtime-wry)

This crate opens up direct systems-level interactions specifically for WRY, such as printing, monitor detection, and other windowing-related tasks.

## Tauri Tooling

### API (JavaScript / TypeScript)

[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/tooling/api)
[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/packages/api)

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. Also ships in pure typescript, because for some frameworks this is more optimal. It uses the message passing of webviews to their hosts.

### Bundler (Rust / Shell)

[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/tooling/bundler)
[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/crates/tauri-bundler)

A library that builds a Tauri app for the platform it detects or is told. 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.rs (Rust)

[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli)
[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/crates/tauri-cli)

This Rust executable provides the full interface to all of the required activities for which the CLI is required. It runs on macOS, Windows, and Linux.

### cli.js (JavaScript)

[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli/node)
[View on GitHub](https://github.com/tauri-apps/tauri/tree/dev/packages/cli)

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.
Wrapper around [`cli.rs`](https://github.com/tauri-apps/tauri/blob/dev/crates/tauri-cli) using [`napi-rs`](https://github.com/napi-rs/napi-rs) to produce npm packages for each platform.

### create-tauri-app (JavaScript)

Expand Down
2 changes: 1 addition & 1 deletion src/content/docs/develop/calling-frontend.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ onEvent.onmessage = (message) => {
};

await invoke('download', {
url: 'https://raw.githubusercontent.com/tauri-apps/tauri/dev/core/tauri-config-schema/schema.json',
url: 'https://raw.githubusercontent.com/tauri-apps/tauri/dev/crates/tauri-schema-generator/schemas/config.schema.json',
onEvent,
});
```
Expand Down
6 changes: 3 additions & 3 deletions src/content/docs/distribute/windows-installer.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -624,8 +624,8 @@ to verify the current Webview2 version and run the Webview2 bootstrapper if it d
[platform support]: https://doc.rust-lang.org/nightly/rustc/platform-support.html
[webviewinstallmode]: /reference/config/#webviewinstallmode
[download-webview2-runtime]: https://developer.microsoft.com/en-us/microsoft-edge/webview2/#download-section
[default wix template]: https://github.com/tauri-apps/tauri/blob/dev/tooling/bundler/src/bundle/windows/templates/main.wxs
[default nsis template]: https://github.com/tauri-apps/tauri/blob/dev/tooling/bundler/src/bundle/windows/templates/installer.nsi
[default wix template]: https://github.com/tauri-apps/tauri/blob/dev/packages/tauri-bundler/src/bundle/windows/templates/main.wxs
[default nsis template]: https://github.com/tauri-apps/tauri/blob/dev/packages/tauri-bundler/src/bundle/windows/templates/installer.nsi
[handlebars]: https://docs.rs/handlebars/latest/handlebars/
[`tauri.bundle.windows.wix.template`]: /reference/config/#template-2
[`tauri.bundle.windows.nsis.template`]: /reference/config/#template-1
Expand All @@ -634,7 +634,7 @@ to verify the current Webview2 version and run the Webview2 bootstrapper if it d
[wix localization documentation]: https://wixtoolset.org/documentation/manual/v3/howtos/ui_and_localization/make_installer_localizable.html
[localizing the error and actiontext tables]: https://docs.microsoft.com/en-us/windows/win32/msi/localizing-the-error-and-actiontext-tables
[the nsis github project]: https://github.com/kichik/nsis/tree/9465c08046f00ccb6eda985abbdbf52c275c6c4d/Contrib/Language%20files
[tauri-specific translations]: https://github.com/tauri-apps/tauri/tree/dev/tooling/bundler/src/bundle/windows/templates/nsis-languages
[tauri-specific translations]: https://github.com/tauri-apps/tauri/tree/dev/packages/tauri-bundler/src/bundle/windows/templates/nsis-languages
[tauri's main repo]: https://github.com/tauri-apps/tauri/issues/new?assignees=&labels=type%3A+feature+request&template=feature_request.yml&title=%5Bfeat%5D+
[signing documentation]: /distribute/signing/windows
[WiX configuration]: /reference/config/#wixconfig
Expand Down
Loading