Skip to content

Commit 73101b6

Browse files
vasfvitorvasfvitor
authored
Merge branch 'v1' into v1
2 parents 5bcea1c + bcc11b4 commit 73101b6

File tree

15 files changed

+91
-64
lines changed

15 files changed

+91
-64
lines changed

‎blog/2022-09-15-tauri-1-1.mdx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@ You can update the NPM dependencies with:
2121
<TabItem value="npm">
2222

2323
```shell
24-
npm install @tauri-apps/cli@latest @tauri-apps/api@latest
24+
npm install @tauri-apps/cli@">1.0.0" @tauri-apps/api@">1.0.0"
2525
```
2626

2727
</TabItem>
2828
<TabItem value="Yarn Classic">
2929

3030
```shell
31-
yarn upgrade @tauri-apps/cli @tauri-apps/api --latest
31+
yarn upgrade @tauri-apps/cli@^1.0.0 @tauri-apps/api@^1.0.0
3232
```
3333

3434
</TabItem>
3535
<TabItem value="Yarn Berry">
3636

3737
```shell
38-
yarn up @tauri-apps/cli @tauri-apps/api
38+
yarn up @tauri-apps/cli@^1.0.0 @tauri-apps/api@^1.0.0
3939
```
4040

4141
</TabItem>
4242
<TabItem value="pnpm">
4343

4444
```shell
45-
pnpm update @tauri-apps/cli @tauri-apps/api --latest
45+
pnpm update @tauri-apps/cli@1 @tauri-apps/api@1
4646
```
4747

4848
</TabItem>
@@ -110,19 +110,19 @@ In the 1.0 releases Tauri supports the `JSON` configuration format by default, a
110110
```json title=tauri.conf.json
111111
{
112112
"build": {
113-
"devPath": "http://localhost:8000",
114-
"distDir": "../dist"
113+
"devPath": "http://localhost:8000",
114+
"distDir": "../dist"
115115
}
116116
}
117117
```
118118

119119
```json5 title=tauri.conf.json5
120120
{
121-
"build": {
122-
// devServer URL (comments are allowed!)
123-
"devPath": "http://localhost:8000",
124-
"distDir": "../dist"
125-
}
121+
build: {
122+
// devServer URL (comments are allowed!)
123+
devPath: 'http://localhost:8000',
124+
distDir: '../dist',
125+
},
126126
}
127127
```
128128

‎blog/2022-11-08-tauri-1-2.mdx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@ Make sure to update both NPM and Cargo dependencies to the 1.2.0 release. You ca
2121
<TabItem value="npm">
2222

2323
```shell
24-
npm install @tauri-apps/cli@latest @tauri-apps/api@latest
24+
npm install @tauri-apps/cli@">1.0.0" @tauri-apps/api@">1.0.0"
2525
```
2626

2727
</TabItem>
2828
<TabItem value="Yarn Classic">
2929

3030
```shell
31-
yarn upgrade @tauri-apps/cli @tauri-apps/api --latest
31+
yarn upgrade @tauri-apps/cli@^1.0.0 @tauri-apps/api@^1.0.0
3232
```
3333

3434
</TabItem>
3535
<TabItem value="Yarn Berry">
3636

3737
```shell
38-
yarn up @tauri-apps/cli @tauri-apps/api
38+
yarn up @tauri-apps/cli@^1.0.0 @tauri-apps/api@^1.0.0
3939
```
4040

4141
</TabItem>
4242
<TabItem value="pnpm">
4343

4444
```shell
45-
pnpm update @tauri-apps/cli @tauri-apps/api --latest
45+
pnpm update @tauri-apps/cli@1 @tauri-apps/api@1
4646
```
4747

4848
</TabItem>

‎blog/2023-05-03-tauri-1-3.mdx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@ Make sure to update both NPM and Cargo dependencies to the 1.3.0 release. You ca
2323
<TabItem value="npm">
2424

2525
```shell
26-
npm install @tauri-apps/cli@latest @tauri-apps/api@latest
26+
npm install @tauri-apps/cli@">1.0.0" @tauri-apps/api@">1.0.0"
2727
```
2828

2929
</TabItem>
3030
<TabItem value="Yarn Classic">
3131

3232
```shell
33-
yarn upgrade @tauri-apps/cli @tauri-apps/api --latest
33+
yarn upgrade @tauri-apps/cli@^1.0.0 @tauri-apps/api@^1.0.0
3434
```
3535

3636
</TabItem>
3737
<TabItem value="Yarn Berry">
3838

3939
```shell
40-
yarn up @tauri-apps/cli @tauri-apps/api
40+
yarn up @tauri-apps/cli@^1.0.0 @tauri-apps/api@^1.0.0
4141
```
4242

4343
</TabItem>

‎blog/2023-06-14-tauri-1-4.mdx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,28 @@ Make sure to update both NPM and Cargo dependencies to the 1.4.0 release. You ca
2323
<TabItem value="npm">
2424

2525
```shell
26-
npm install @tauri-apps/cli@latest @tauri-apps/api@latest
26+
npm install @tauri-apps/cli@">1.0.0" @tauri-apps/api@">1.0.0"
2727
```
2828

2929
</TabItem>
3030
<TabItem value="Yarn Classic">
3131

3232
```shell
33-
yarn upgrade @tauri-apps/cli @tauri-apps/api --latest
33+
yarn upgrade @tauri-apps/cli@^1.0.0 @tauri-apps/api@^1.0.0
3434
```
3535

3636
</TabItem>
3737
<TabItem value="Yarn Berry">
3838

3939
```shell
40-
yarn up @tauri-apps/cli @tauri-apps/api
40+
yarn up @tauri-apps/cli@^1.0.0 @tauri-apps/api@^1.0.0
4141
```
4242

4343
</TabItem>
4444
<TabItem value="pnpm">
4545

4646
```shell
47-
pnpm update @tauri-apps/cli @tauri-apps/api --latest
47+
pnpm update @tauri-apps/cli@1 @tauri-apps/api@1
4848
```
4949

5050
</TabItem>

‎docs/guides/building/linux.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ To include custom files in the Debian package, you can provide a list of files o
4141
"deb": {
4242
"files": {
4343
"/usr/share/README.md": "../README.md", // copies the README.md file to /usr/share/README.md
44-
"usr/share/assets": "../assets/" // copies the entire assets directory to /usr/share/assets
44+
"/usr/share/assets": "../assets/" // copies the entire assets directory to /usr/share/assets
4545
}
4646
}
4747
}
@@ -75,7 +75,7 @@ Manual compilation is suitable when you don't need to compile your application f
7575

7676
:::warning
7777

78-
AppImages can only be built on ARM devices. To avoid Tauri from building it, you can customize tauri.conf.json in the src-tauri folder. Adjust the "targets" array to include only the desired platforms for your ARM-based device. For instance:
78+
ARM AppImages can only be built on ARM devices. To avoid Tauri from building it when cross-compiling, you can customize tauri.conf.json in the src-tauri folder. Adjust the "targets" array to include only the desired platforms for your ARM-based device. For instance:
7979

8080
"targets": ["deb", "nsis", "msi", "app", "dmg", "updater"],
8181

@@ -234,7 +234,7 @@ For automated ARM executable builds on GitHub, we'll use the [arm-runner-action]
234234

235235
:::warning
236236

237-
AppImages can only be built on ARM devices. To avoid Tauri from building it, you can customize tauri.conf.json in the src-tauri folder. Adjust the "targets" array to include only the desired platforms for your ARM-based device. For instance:
237+
ARM AppImages can only be built on ARM devices. To avoid Tauri from building it when cross-compiling, you can customize tauri.conf.json in the src-tauri folder. Adjust the "targets" array to include only the desired platforms for your ARM-based device. For instance:
238238

239239
"targets": ["deb", "nsis", "msi", "app", "dmg", "updater"],
240240

‎docs/guides/development/updating-dependencies.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,28 @@ If you are using the `tauri` package:
1515
<TabItem value="npm">
1616

1717
```shell
18-
npm install @tauri-apps/cli@latest @tauri-apps/api@latest
18+
npm install @tauri-apps/cli@">1.0.0" @tauri-apps/api@">1.0.0"
1919
```
2020

2121
</TabItem>
2222
<TabItem value="Yarn Classic">
2323

2424
```shell
25-
yarn upgrade @tauri-apps/cli @tauri-apps/api --latest
25+
yarn upgrade @tauri-apps/cli@^1.0.0 @tauri-apps/api@^1.0.0
2626
```
2727

2828
</TabItem>
2929
<TabItem value="Yarn Berry">
3030

3131
```shell
32-
yarn up @tauri-apps/cli @tauri-apps/api
32+
yarn up @tauri-apps/cli@^1.0.0 @tauri-apps/api@^1.0.0
3333
```
3434

3535
</TabItem>
3636
<TabItem value="pnpm">
3737

3838
```shell
39-
pnpm update @tauri-apps/cli @tauri-apps/api --latest
39+
pnpm update @tauri-apps/cli@1 @tauri-apps/api@1
4040
```
4141

4242
</TabItem>

‎docs/guides/distribution/publishing.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ Every framework has its publishing tooling. It is outside of the scope of this d
2020

2121
<Command name="build" />
2222

23-
This command embeds your web assets into a single binary with your Rust code. The binary itself will be located in `src-tauri/target/release/[app name]`, and installers will be located in `src-tauri/target/release/bundle/`.
23+
This command embeds your web assets into a single binary with your Rust code. The binary itself will be located in `src-tauri/target/release/[app name]`, and bundles and installers will be located in `src-tauri/target/release/bundle/`.
2424

2525
Like the `tauri dev` command, the first time you run this, it takes some time to collect the Rust crates and build everything - but on subsequent runs, it only needs to rebuild your app's code, which is much quicker.

‎docs/guides/features/icons.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ If you prefer to build these icons yourself, for example if you want to have a s
6666
- `icon.ico`: The [`ico`] file must include layers for 16, 24, 32, 48, 64 and 256 pixels. For an optimal display of the ICO image _in development_, the 32px layer should be the first layer.
6767
- `png`: The requirements for the png icons are: width == height, RGBA (RGB + Transparency), and 32bit per pixel (8bit per channel). Commonly expected sizes are 32, 128, 256, and 512 pixels. We recommend to at least match the output of `tauri icon`: `32x32.png`, `128x128.png`, `[email protected]`, and `icon.png`.
6868

69-
[`tauricon`]: https://github.com/tauri-apps/tauricon
70-
[in the tauri repo]: https://github.com/tauri-apps/tauri/blob/dev/tooling/cli/src/helpers/icns.json
69+
[in the tauri repo]: https://github.com/tauri-apps/tauri/blob/1.x/tooling/cli/src/helpers/icns.json
7170
[`icns`]: https://en.wikipedia.org/wiki/Apple_Icon_Image_format
7271
[`ico`]: https://en.wikipedia.org/wiki/ICO_(file_format)

‎docusaurus.config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ const navbarItems = [
132132
dropdownItemsAfter: [
133133
{
134134
href: 'https://v2.tauri.app/',
135-
label: 'v2 (RC)',
135+
label: 'v2',
136136
target: '_self',
137137
},
138138
],
@@ -250,7 +250,7 @@ async function siteConfig() {
250250
},
251251
announcementBar: {
252252
content:
253-
"<b>🚀 The <a id='announcement-link' href='https://v2.tauri.app/blog/tauri-2-0-0-release-candidate/'>RC for Tauri 2.0</a> has launched!</b>",
253+
"<b>🚀 <a id='announcement-link' href='https://v2.tauri.app/'>Tauri 2.0</a> has launched!</b>",
254254
backgroundColor: 'var(--ifm-color-primary)',
255255
textColor: 'var(--ifm-button-color)',
256256
},

‎i18n/fr/docusaurus-plugin-content-docs/current/guides/development/updating-dependencies.md‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,35 @@ Si vous utilisez le package `tauri` :
1515
<TabItem value="npm">
1616

1717
```shell
18-
npm install @tauri-apps/cli@latest @tauri-apps/api@latest
18+
npm install @tauri-apps/cli@">1.0.0" @tauri-apps/api@">1.0.0"
1919
```
2020

2121
</TabItem>
2222
<TabItem value="Yarn Classic">
2323

2424
```shell
25-
yarn upgrade @tauri-apps/cli @tauri-apps/api --latest
25+
yarn upgrade @tauri-apps/cli@^1.0.0 @tauri-apps/api@^1.0.0
2626
```
2727

2828
</TabItem>
2929
<TabItem value="Yarn Berry">
3030

3131
```shell
32-
yarn up @tauri-apps/cli @tauri-apps/api
32+
yarn up @tauri-apps/cli@^1.0.0 @tauri-apps/api@^1.0.0
3333
```
3434

3535
</TabItem>
3636
<TabItem value="pnpm">
3737

3838
```shell
39-
pnpm update @tauri-apps/cli @tauri-apps/api --latest
39+
pnpm update @tauri-apps/cli@1 @tauri-apps/api@1
40+
```
41+
42+
</TabItem>
43+
<TabItem value="Bun">
44+
45+
```shell
46+
bun update @tauri-apps/cli @tauri-apps/api
4047
```
4148

4249
</TabItem>

0 commit comments

Comments
 (0)