From 6c3d8790cb7c7bc5e6eab9286ea0a6440f8c11bd Mon Sep 17 00:00:00 2001 From: amrbashir Date: Wed, 14 Aug 2024 17:47:57 +0300 Subject: [PATCH] format files --- .husky/.gitignore | 1 - .prettierignore | 44 ++++++++++++++----- README.md | 14 +++--- examples/api/index.html | 2 +- examples/api/isolation-dist/index.html | 2 +- examples/api/src-tauri/capabilities/main.json | 4 +- .../api/src-tauri/capabilities/run-app.json | 7 +-- examples/commands/index.html | 2 +- examples/file-associations/index.html | 2 +- examples/helloworld/index.html | 2 +- examples/isolation/isolation-dist/index.html | 2 +- examples/multiwebview/index.html | 2 +- examples/multiwindow/index.html | 2 +- examples/navigation/public/index.html | 2 +- examples/navigation/public/nested/index.html | 2 +- .../navigation/public/nested/secondary.html | 2 +- examples/navigation/public/secondary.html | 2 +- examples/parent-window/index.html | 2 +- examples/resources/index.html | 2 +- .../resources/src-tauri/capabilities/app.json | 11 ++--- examples/run-iteration/index.html | 2 +- examples/state/index.html | 2 +- examples/streaming/index.html | 2 +- examples/web/src/app.html | 2 +- examples/workspace/index.html | 2 +- .../tests/cpu_intensive/public/index.html | 2 +- .../tests/files_transfer/public/index.html | 2 +- .../bench/tests/helloworld/public/index.html | 2 +- tooling/cli/node/README.md | 16 +++++-- tooling/cli/node/index.d.ts | 6 ++- tooling/cli/node/index.js | 13 +++--- tooling/cli/node/main.d.ts | 5 ++- .../node/test/jest/__tests__/template.spec.js | 10 ++++- tooling/cli/node/test/jest/helpers/spawn.js | 14 +----- .../v1/fixtures/cli-template.tauri.conf.json | 2 +- 35 files changed, 108 insertions(+), 83 deletions(-) delete mode 100644 .husky/.gitignore diff --git a/.husky/.gitignore b/.husky/.gitignore deleted file mode 100644 index 31354ec13..000000000 --- a/.husky/.gitignore +++ /dev/null @@ -1 +0,0 @@ -_ diff --git a/.prettierignore b/.prettierignore index c0d96f2c7..328d7a9a5 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,17 +1,37 @@ +/.changes /.github /.husky -/.vscode /audits -node_modules -target -dist -/core/tauri/scripts/bundle.global.js -/tooling/cli/templates -/tooling/cli/node -/tooling/cli/schema.json -/core/tauri-config-schema/schema.json +/.vscode + +# dependcies and artifacts directories +node_modules/ +target/ +dist/ + +# lock files +pnpm-lock.yaml + +# autogenerated and minimized js file +core/tauri/scripts/bundle.global.js + +# this file is an IIFE, shouldn't be formatted +core/tauri/scripts/process-ipc-message-fn.js + +# cli templates should be formatted manually +# it also includes invalid json files that +# prettier can't handle +tooling/cli/templates + +# autogenerated files +**/autogenerated/**/*.md +tooling/cli/node/index.js +tooling/cli/node/index.d.ts CHANGELOG.md -*.wxs -**/reference.md *schema.json -core/tauri/scripts/process-ipc-message-fn.js \ No newline at end of file + +# WiX templates +*.wxs + +# examples /gen directory +examples/**/src-tauri/gen diff --git a/README.md b/README.md index 51c2cc99e..ab9ae506d 100644 --- a/README.md +++ b/README.md @@ -43,13 +43,13 @@ The list of Tauri's features includes, but is not limited to: Tauri currently supports development and distribution on the following platforms: -| Platform | Versions | -| :----------------- | :-------------------------------------------------------------------------------------------------------------- | -| Windows | 7 and above | -| macOS | 10.15 and above | -| Linux | webkit2gtk 4.0 for Tauri v1 (for example Ubuntu 18.04). webkit2gtk 4.1 for Tauri v2 (for example Ubuntu 22.04). | -| iOS/iPadOS (beta) | 9 and above | -| Android (beta) | 7 and above | +| Platform | Versions | +| :---------------- | :-------------------------------------------------------------------------------------------------------------- | +| Windows | 7 and above | +| macOS | 10.15 and above | +| Linux | webkit2gtk 4.0 for Tauri v1 (for example Ubuntu 18.04). webkit2gtk 4.1 for Tauri v2 (for example Ubuntu 22.04). | +| iOS/iPadOS (beta) | 9 and above | +| Android (beta) | 7 and above | ## Contributing diff --git a/examples/api/index.html b/examples/api/index.html index df11ed2ea..010944d8e 100644 --- a/examples/api/index.html +++ b/examples/api/index.html @@ -1,4 +1,4 @@ - + diff --git a/examples/api/isolation-dist/index.html b/examples/api/isolation-dist/index.html index 27c8d3f39..a97caa83a 100644 --- a/examples/api/isolation-dist/index.html +++ b/examples/api/isolation-dist/index.html @@ -1,4 +1,4 @@ - + diff --git a/examples/api/src-tauri/capabilities/main.json b/examples/api/src-tauri/capabilities/main.json index eecad73d1..21f8d1f9b 100644 --- a/examples/api/src-tauri/capabilities/main.json +++ b/examples/api/src-tauri/capabilities/main.json @@ -2,9 +2,7 @@ "$schema": "../gen/schemas/desktop-schema.json", "identifier": "secondary-window", "description": "capability for secondary window", - "windows": [ - "main-*" - ], + "windows": ["main-*"], "permissions": [ { "identifier": "sample:allow-ping", diff --git a/examples/api/src-tauri/capabilities/run-app.json b/examples/api/src-tauri/capabilities/run-app.json index 5c2bf7942..982486b95 100644 --- a/examples/api/src-tauri/capabilities/run-app.json +++ b/examples/api/src-tauri/capabilities/run-app.json @@ -2,10 +2,7 @@ "$schema": "../gen/schemas/desktop-schema.json", "identifier": "run-app", "description": "permissions to run the app", - "windows": [ - "main", - "main-*" - ], + "windows": ["main", "main-*"], "permissions": [ { "identifier": "allow-log-operation", @@ -62,4 +59,4 @@ "core:webview:allow-create-webview-window", "core:webview:allow-print" ] -} \ No newline at end of file +} diff --git a/examples/commands/index.html b/examples/commands/index.html index 91ace0521..aed95c21c 100644 --- a/examples/commands/index.html +++ b/examples/commands/index.html @@ -1,4 +1,4 @@ - + diff --git a/examples/file-associations/index.html b/examples/file-associations/index.html index ec0e4f76f..202135920 100644 --- a/examples/file-associations/index.html +++ b/examples/file-associations/index.html @@ -1,4 +1,4 @@ - + diff --git a/examples/helloworld/index.html b/examples/helloworld/index.html index 30db0bd4e..63bf89177 100644 --- a/examples/helloworld/index.html +++ b/examples/helloworld/index.html @@ -1,4 +1,4 @@ - + diff --git a/examples/isolation/isolation-dist/index.html b/examples/isolation/isolation-dist/index.html index 27c8d3f39..a97caa83a 100644 --- a/examples/isolation/isolation-dist/index.html +++ b/examples/isolation/isolation-dist/index.html @@ -1,4 +1,4 @@ - + diff --git a/examples/multiwebview/index.html b/examples/multiwebview/index.html index 30db0bd4e..63bf89177 100644 --- a/examples/multiwebview/index.html +++ b/examples/multiwebview/index.html @@ -1,4 +1,4 @@ - + diff --git a/examples/multiwindow/index.html b/examples/multiwindow/index.html index d47bfafc6..7cca83fd6 100644 --- a/examples/multiwindow/index.html +++ b/examples/multiwindow/index.html @@ -1,4 +1,4 @@ - +