Skip to content

Commit

Permalink
Merge branch 'next' of github.com:tauri-apps/tauri-docs into next
Browse files Browse the repository at this point in the history
  • Loading branch information
@FabianLars
FabianLars committed Sep 21, 2023
2 parents 873b9b0 + 8e526a4 commit 06384bf
Show file tree
Hide file tree
Showing 93 changed files with 314 additions and 270 deletions.
81 changes: 27 additions & 54 deletions astro.config.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,36 +93,36 @@ export default defineConfig({
{
label: 'Quick Start',
items: [
{ label: 'Why Tauri?', link: '/2/guide/' },
{ label: 'Why Tauri?', link: 'guides' },
{
label: 'Prerequisites',
translations: {
es: 'Prerrequisitos',
},
link: '/2/guide/prerequisites',
link: 'guides/prerequisites',
},
{
label: 'Create a Project',
link: '/2/guide/create/',
link: 'guides/create',
},
{
label: 'Frontend Configuration',
translations: {
es: 'Configuración del Frontend',
},
link: '/2/guide/frontend/',
link: 'guides/frontend',
},
{
label: 'Upgrade & Migrate',
link: '2/guide/upgrade-migrate',
link: 'guides/upgrade-migrate',
},
{
label: 'Core Concepts',
link: '2/guide/core-concepts',
link: 'guides/core-concepts',
},
{
label: 'Troubleshooting',
link: '2/guide/troubleshoot',
link: 'guides/troubleshoot',
},
],
},
Expand All @@ -131,27 +131,27 @@ export default defineConfig({
items: [
{
label: 'Develop',
link: '2/guide/develop',
link: 'guides/develop',
},
{
label: 'Debug',
link: '2/guide/debug',
link: 'guides/debug',
},
{
label: 'Test',
link: '2/guide/test',
link: 'guides/test',
},
{
label: 'Build',
link: '2/guide/build',
link: 'guides/build',
},
{
label: 'Distribute',
link: '2/guide/distribute',
link: 'guides/distribute',
},
{
label: 'Plugin Development',
link: '2/guide/plugins',
link: 'guides/plugins',
},
],
},
Expand Down Expand Up @@ -179,34 +179,7 @@ export default defineConfig({
},
{
label: 'Features & Recipes',
items: [
{ label: 'All Features and Recipes', link: '2/guide/list' },
{ label: 'Authenticator', link: '2/guide/authenticator' },
{ label: 'Autostart', link: '2/guide/autostart' },
{ label: 'CLI', link: '2/guide/cli' },
{ label: 'Clipboard', link: '2/guide/clipboard' },
{ label: 'Dialog', link: '2/guide/dialog' },
{ label: 'File System', link: '2/guide/file-system' },
{ label: 'Global Shortcut', link: '2/guide/global-shortcut' },
{ label: 'HTTP Client', link: '2/guide/http-client' },
{ label: 'Localhost', link: '2/guide/localhost' },
{ label: 'Logging', link: '2/guide/logging' },
{ label: 'Notification', link: '2/guide/notification' },
{ label: 'OS Info', link: '2/guide/os-info' },
{ label: 'Persisted Scope', link: '2/guide/persisted-scope' },
{ label: 'Positioner', link: '2/guide/positioner' },
{ label: 'Process', link: '2/guide/process' },
{ label: 'Shell', link: '2/guide/shell' },
{ label: 'Single Instance', link: '2/guide/single-instance' },
{ label: 'SQL', link: '2/guide/sql' },
{ label: 'Store', link: '2/guide/store' },
{ label: 'Stronghold', link: '2/guide/stronghold' },
{ label: 'Updater', link: '2/guide/updater' },
{ label: 'Upload', link: '2/guide/upload' },
{ label: 'Websocket', link: '2/guide/websocket' },
{ label: 'Window Customization', link: '2/guide/window-customization' },
{ label: 'Window State', link: '2/guide/window-state' },
],
autogenerate: { directory: 'features' },
},
],
locales,
Expand All @@ -230,23 +203,23 @@ export default defineConfig({
},
redirects: {
// Old blog url schema redirects
'/blog/2022-06-19-tauri-1-0': '/blog/tauri-1-0',
'/blog/2022/06/19/tauri-1-0': '/blog/tauri-1-0',
'/blog/tauri_1_0': '/blog/tauri-1-0',
'/blog/2022-07-12-tauri-programme-turns-1-and-board-elections':
'/blog/2022/07/12/tauri-programme-turns-1-and-board-elections':
'/blog/tauri-programme-turns-1-and-board-elections',
'/blog/2022-09-15-tauri-1-1': '/blog/tauri-1-1',
'/blog/2022-09-19-tauri-egui-0-1': '/blog/tauri-egui-0-1',
'/blog/2022-11-18-tauri-1-2': '/blog/tauri-1-2',
'/blog/2022-12-09-tauri-mobile-alpha': '/blog/tauri-mobile-alpha',
'/blog/2023-02-03-tauri-2-0-0-alpha-3': '/blog/tauri-2-0-0-alpha-3',
'/blog/2023-02-09-tauri-community-growth-and-feedback':
'/blog/2022/09/15/tauri-1-1': '/blog/tauri-1-1',
'/blog/2022/09/19/tauri-egui-0-1': '/blog/tauri-egui-0-1',
'/blog/2022/11/18/tauri-1-2': '/blog/tauri-1-2',
'/blog/2022/12/09/tauri-mobile-alpha': '/blog/tauri-mobile-alpha',
'/blog/2023/02/03/tauri-2-0-0-alpha-3': '/blog/tauri-2-0-0-alpha-3',
'/blog/2023/02/09/tauri-community-growth-and-feedback':
'/blog/tauri-community-growth-and-feedback',
'/blog/2023-03-01-create-tauri-app-version-3-released':
'/blog/2023/03/01/create-tauri-app-version-3-released':
'/blog/create-tauri-app-version-3-released',
'/blog/2023-03-20-tauri-2-0-0-alpha-4': '/blog/tauri-2-0-0-alpha-4',
'/blog/2023-05-03-tauri-1-3': '/blog/tauri-1-3',
'/blog/2023-06-14-tauri-1-4': '/blog/tauri-1-4',
'/blog/2023-06-15-tauri-board-elections-and-governance-updates':
'/blog/2023/03/20/tauri-2-0-0-alpha-4': '/blog/tauri-2-0-0-alpha-4',
'/blog/2023/05/03/tauri-1-3': '/blog/tauri-1-3',
'/blog/2023/06/14/tauri-1-4': '/blog/tauri-1-4',
'/blog/2023/06/15/tauri-board-elections-and-governance-updates':
'/blog/tauri-board-elections-and-governance-updates',
},
});
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@astrojs/markdown-remark": "^3.1.0",
"@astrojs/starlight": "^0.9.0",
"@astrojs/starlight": "^0.9.1",
"@types/json-schema": "^7.0.12",
"astro": "^3.0.12",
"astro-feelback": "^0.3.4",
Expand All @@ -28,7 +28,7 @@
"rehype-autolink-headings": "^7.0.0",
"sharp": "^0.32.5",
"shiki": "^0.14.4",
"starlight-blog": "^0.3.0",
"starlight-blog": "^0.3.2",
"starlight-links-validator": "^0.3.0"
},
"pnpm": {
Expand Down
2 changes: 2 additions & 0 deletions packages/js-api-generator/build.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,10 @@ async function generator() {
'app',
'authenticator',
'autostart',
'barcode-scanner',
'cli',
'clipboard-manager',
'deep-link',
'dialog',
'fs',
'global-shortcut',
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins-workspace
Submodule plugins-workspace updated 318 files
66 changes: 33 additions & 33 deletions pnpm-lock.yaml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions src/components/PluginLinks.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@ type Plugin = 'notification';
interface Props {
plugin: Plugin;
version: string;
showJsLinks?: boolean;
}
const { plugin, version } = Astro.props;
const { plugin, showJsLinks = true } = Astro.props;
const github = `https://github.com/tauri-apps/plugins-workspace/tree/v2/plugins/${plugin}`;
const npm = `https://www.npmjs.com/package/@tauri-apps/plugin-${plugin}`;
const npm = showJsLinks ? `https://www.npmjs.com/package/@tauri-apps/plugin-${plugin}` : undefined;
const cratesio = `https://crates.io/crates/tauri-plugin-${plugin}`;
const jsApi = `/2/reference/js/${plugin}`;
const docsrs = `https://docs.rs/tauri-plugin-${plugin}/${version}`;
const jsApi = showJsLinks ? `/2/reference/js/${plugin}` : undefined;
const docsrs = `https://docs.rs/tauri-plugin-${plugin}`;
const hasApiLinks = jsApi || docsrs;
---

<div class="flex row not-content">
<div>v{version}</div>
<a href={github} class="flex" target="_blank">
<svg viewBox="0 0 24 24" fill="currentColor">
<path
Expand Down
5 changes: 5 additions & 0 deletions src/components/list/Community.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ const list: Entry[] = [
description: 'Open a pull request to show us your amazing resource',
href: 'https://github.com/tauri-apps/tauri-docs/pulls',
},
{
name: 'Github OAuth with Lucia',
description: 'Authenticate users with a simple JS server',
href: 'https://lucia-auth.com/guidebook/github-oauth-native/tauri',
},
];
---

Expand Down
Loading

0 comments on commit 06384bf

Please sign in to comment.