chore: merge v1 into v2 for the last time

2026-07-10 16:27:05 +02:00 · 2024-02-03 20:16:36 +01:00
parent 2643a4c331
commit 14f5961569
72 changed files with 1681 additions and 4863 deletions
@@ -1,10 +0,0 @@
-.DS_Store
-node_modules
-/build
-/.svelte-kit
-/package
-.env
-.env.*
-!.env.example
-vite.config.js.timestamp-*
-vite.config.ts.timestamp-*
@@ -1,26 +0,0 @@
-{
-  "name": "svelte-app",
-  "version": "0.0.1",
-  "private": true,
-  "scripts": {
-    "dev": "vite dev",
-    "build": "vite build",
-    "preview": "vite preview",
-    "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
-    "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
-    "tauri": "tauri"
-  },
-  "devDependencies": {
-    "@sveltejs/adapter-auto": "2.1.1",
-    "@sveltejs/kit": "1.27.7",
-    "@tauri-apps/cli": "2.0.0-beta.0",
-    "svelte": "4.2.8",
-    "svelte-check": "3.6.2",
-    "typescript": "5.3.2",
-    "vite": "5.0.12"
-  },
-  "dependencies": {
-    "@tauri-apps/plugin-websocket": "link:..\\.."
-  },
-  "type": "module"
-}
@@ -1,9 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target/
-WixTools
-
-/capabilities/schemas
-
-# These are backup files generated by rustfmt
-**/*.rs.bk
@@ -1,20 +0,0 @@
-[package]
-name = "websocket-example"
-version = "0.1.0"
-description = "A Tauri App"
-edition = "2021"
-
-[dependencies]
-serde = { workspace = true }
-serde_json = { workspace = true }
-tauri = { workspace = true }
-tokio = { version = "1", features = ["net"] }
-futures-util = "0.3"
-tauri-plugin-websocket = { path = "../../../" }
-tokio-tungstenite = "0.20"
-
-[build-dependencies]
-tauri-build = { workspace = true }
-
-[features]
-custom-protocol = [ "tauri/custom-protocol" ]
@@ -1,7 +0,0 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-fn main() {
-  tauri_build::build()
-}
@@ -1,13 +0,0 @@
-max_width = 100
-hard_tabs = false
-tab_spaces = 2
-newline_style = "Auto"
-use_small_heuristics = "Default"
-reorder_imports = true
-reorder_modules = true
-remove_nested_parens = true
-edition = "2018"
-merge_derives = true
-use_try_shorthand = false
-use_field_init_shorthand = false
-force_explicit_abi = true
@@ -1,42 +0,0 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-#![cfg_attr(
-  all(not(debug_assertions), target_os = "windows"),
-  windows_subsystem = "windows"
-)]
-
-use futures_util::StreamExt;
-use tokio::net::{TcpListener, TcpStream};
-
-async fn start_server() {
-  let addr = "127.0.0.1:8080".to_string();
-
-  // Create the event loop and TCP listener we'll accept connections on.
-  let try_socket = TcpListener::bind(&addr).await;
-  let listener = try_socket.expect("Failed to bind");
-
-  while let Ok((stream, _)) = listener.accept().await {
-    tokio::spawn(accept_connection(stream));
-  }
-}
-
-async fn accept_connection(stream: TcpStream) {
-  let ws_stream = tokio_tungstenite::accept_async(stream)
-    .await
-    .expect("Error during the websocket handshake occurred");
-
-  let (write, read) = ws_stream.split();
-  if let Err(e) = read.forward(write).await {
-    eprintln!("Error: {}", e);
-  }
-}
-
-fn main() {
-  tauri::async_runtime::spawn(start_server());
-  tauri::Builder::default()
-    .plugin(tauri_plugin_websocket::init())
-    .run(tauri::generate_context!())
-    .expect("error while running tauri application");
-}
@@ -1,34 +0,0 @@
-{
-  "identifier": "com.tauri.dev",
-  "build": {
-    "devUrl": "http://localhost:5173/",
-    "frontendDist": "../build",
-    "beforeDevCommand": "pnpm dev",
-    "beforeBuildCommand": "pnpm build"
-  },
-  "app": {
-    "windows": [
-      {
-        "title": "Tauri App",
-        "width": 800,
-        "height": 600,
-        "resizable": true,
-        "fullscreen": false
-      }
-    ],
-    "security": {
-      "csp": null
-    }
-  },
-  "bundle": {
-    "active": true,
-    "targets": "all",
-    "icon": [
-      "icons/32x32.png",
-      "icons/128x128.png",
-      "icons/128x128@2x.png",
-      "icons/icon.icns",
-      "icons/icon.ico"
-    ]
-  }
-}
@@ -1,13 +0,0 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-// See https://kit.svelte.dev/docs/types#app
-// for information about these interfaces
-// and what to do when importing types
-declare namespace App {
-  // interface Error {}
-  // interface Locals {}
-  // interface PageData {}
-  // interface Platform {}
-}
@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%sveltekit.assets%/favicon.png" />
-    <meta name="viewport" content="width=device-width" />
-    <link rel="stylesheet" href="/global.css" />
-    %sveltekit.head%
-  </head>
-  <body data-sveltekit-preload-data="hover">
-    <div style="display: contents">%sveltekit.body%</div>
-  </body>
-</html>
@@ -1,44 +0,0 @@
-<script lang="ts">
-  import WebSocket from "@tauri-apps/plugin-websocket";
-  import { onMount } from "svelte";
-
-  let ws;
-  let response = "";
-  let message = "";
-
-  onMount(async () => {
-    ws = await WebSocket.connect("ws://127.0.0.1:8080")
-      .then((r) => {
-        _updateResponse("Connected");
-        return r;
-      })
-      .catch(_updateResponse);
-    ws.addListener(_updateResponse);
-  });
-
-  function _updateResponse(returnValue) {
-    response +=
-      (typeof returnValue === "string"
-        ? returnValue
-        : JSON.stringify(returnValue)) + "<br>";
-  }
-
-  function send() {
-    ws.send(message)
-      .then(() => _updateResponse("Message sent"))
-      .catch(_updateResponse);
-  }
-
-  function disconnect() {
-    ws.disconnect()
-      .then(() => _updateResponse("Disconnected"))
-      .catch(_updateResponse);
-  }
-</script>
-
-<div>
-  <input bind:value={message} />
-  <button on:click={send}>Send</button>
-  <button on:click={disconnect}>Disconnect</button>
-</div>
-<div>{@html response}</div>
@@ -1,68 +0,0 @@
-html,
-body {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
-
-body {
-  color: #333;
-  margin: 0;
-  padding: 8px;
-  box-sizing: border-box;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-    Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-}
-
-a {
-  color: rgb(0, 100, 200);
-  text-decoration: none;
-}
-
-a:hover {
-  text-decoration: underline;
-}
-
-a:visited {
-  color: rgb(0, 80, 160);
-}
-
-label {
-  display: block;
-}
-
-input,
-button,
-select,
-textarea {
-  font-family: inherit;
-  font-size: inherit;
-  -webkit-padding: 0.4em 0;
-  padding: 0.4em;
-  margin: 0 0 0.5em 0;
-  box-sizing: border-box;
-  border: 1px solid #ccc;
-  border-radius: 2px;
-}
-
-input:disabled {
-  color: #ccc;
-}
-
-button {
-  color: #333;
-  background-color: #f4f4f4;
-  outline: none;
-}
-
-button:disabled {
-  color: #999;
-}
-
-button:not(:disabled):active {
-  background-color: #ddd;
-}
-
-button:focus {
-  border-color: #666;
-}
@@ -1,19 +0,0 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-import adapter from "@sveltejs/adapter-static";
-import { vitePreprocess } from "@sveltejs/kit/vite";
-
-/** @type {import('@sveltejs/kit').Config} */
-const config = {
-  // Consult https://kit.svelte.dev/docs/integrations#preprocessors
-  // for more information about preprocessors
-  preprocess: vitePreprocess(),
-
-  kit: {
-    adapter: adapter(),
-  },
-};
-
-export default config;
@@ -1,17 +0,0 @@
-{
-  "extends": "./.svelte-kit/tsconfig.json",
-  "compilerOptions": {
-    "allowJs": true,
-    "checkJs": true,
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
-    "skipLibCheck": true,
-    "sourceMap": true,
-    "strict": true
-  }
-  // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
-  //
-  // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
-  // from the referenced tsconfig.json - TypeScript does not merge them in
-}
@@ -1,12 +0,0 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-import { sveltekit } from "@sveltejs/kit/vite";
-import type { UserConfig } from "vite";
-
-const config: UserConfig = {
-  plugins: [sveltekit()],
-};
-
-export default config;