From 8a635a8e5bf8d23994d30d7d90b0318c27246a5d Mon Sep 17 00:00:00 2001 From: Matt Strapp Date: Fri, 5 Apr 2024 16:56:02 -0500 Subject: Lint Signed-off-by: Matt Strapp --- clients/www/.prettierrc | 1 - clients/www/.vscode/settings.json | 6 +- clients/www/package.json | 86 +++++++------- clients/www/postcss.config.cjs | 6 +- clients/www/src-tauri/tauri.conf.json | 128 ++++++++++----------- clients/www/src/app.d.ts | 2 +- clients/www/src/app.html | 2 +- clients/www/src/app.postcss | 2 +- clients/www/src/lib/components/ReloadPrompt.svelte | 56 ++++----- clients/www/src/routes/+layout.svelte | 6 +- clients/www/src/routes/+layout.ts | 2 +- clients/www/src/routes/+page.svelte | 2 +- clients/www/static/img/favicon (Custom).png | Bin 213853 -> 0 bytes clients/www/svelte.config.js | 7 +- clients/www/tailwind.config.ts | 25 ++-- clients/www/vite.config.ts | 14 +-- libs/zora-rs/Cargo.toml | 2 + packages/zora-rs/.travis.yml | 69 ----------- 18 files changed, 174 insertions(+), 242 deletions(-) delete mode 100644 clients/www/static/img/favicon (Custom).png delete mode 100644 packages/zora-rs/.travis.yml diff --git a/clients/www/.prettierrc b/clients/www/.prettierrc index a77fdde..9573023 100644 --- a/clients/www/.prettierrc +++ b/clients/www/.prettierrc @@ -4,6 +4,5 @@ "trailingComma": "none", "printWidth": 100, "plugins": ["prettier-plugin-svelte"], - "pluginSearchDirs": ["."], "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }] } diff --git a/clients/www/.vscode/settings.json b/clients/www/.vscode/settings.json index c35c0ee..9829d16 100644 --- a/clients/www/.vscode/settings.json +++ b/clients/www/.vscode/settings.json @@ -1,7 +1,5 @@ { - "prettier.documentSelectors": [ - "**/*.svelte" - ], + "prettier.documentSelectors": ["**/*.svelte"], "tailwindCSS.classAttributes": [ "class", "accent", @@ -114,4 +112,4 @@ "width", "zIndex" ] -} \ No newline at end of file +} diff --git a/clients/www/package.json b/clients/www/package.json index ae00942..d601c9f 100644 --- a/clients/www/package.json +++ b/clients/www/package.json @@ -1,44 +1,44 @@ { - "name": "zorascript-web", - "description": "A Svelte interface for ZoraScript", - "version": "0.0.1", - "private": true, - "license": "MIT", - "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", - "lint": "prettier --plugin-search-dir . --check . && eslint .", - "format": "prettier --plugin-search-dir . --write ." - }, - "devDependencies": { - "@skeletonlabs/skeleton": "2.9.0", - "@skeletonlabs/tw-plugin": "0.3.1", - "@sveltejs/adapter-static": "^3.0.1", - "@sveltejs/kit": "^2.5.5", - "@sveltejs/vite-plugin-svelte": "^3.0.2", - "@tailwindcss/forms": "0.5.7", - "@tailwindcss/typography": "0.5.12", - "@types/node": "20.12.4", - "@typescript-eslint/eslint-plugin": "^7.5.0", - "@typescript-eslint/parser": "^7.5.0", - "@vite-pwa/sveltekit": "^0.4.0", - "autoprefixer": "10.4.19", - "eslint": "^8.57.0", - "eslint-config-prettier": "^9.1.0", - "eslint-plugin-svelte": "^2.35.1", - "postcss": "8.4.38", - "prettier": "^3.2.5", - "prettier-plugin-svelte": "^3.2.2", - "svelte": "^4.2.12", - "svelte-check": "^3.6.9", - "tailwindcss": "3.4.3", - "tslib": "^2.6.2", - "typescript": "^5.4.4", - "vite": "^5.2.8", - "vite-plugin-tailwind-purgecss": "0.2.1" - }, - "type": "module" -} \ No newline at end of file + "name": "zorascript-web", + "description": "A Svelte interface for ZoraScript", + "version": "0.0.1", + "private": true, + "license": "MIT", + "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", + "lint": "prettier --check . && eslint .", + "format": "prettier --write ." + }, + "devDependencies": { + "@skeletonlabs/skeleton": "2.9.0", + "@skeletonlabs/tw-plugin": "0.3.1", + "@sveltejs/adapter-static": "^3.0.1", + "@sveltejs/kit": "^2.5.5", + "@sveltejs/vite-plugin-svelte": "^3.0.2", + "@tailwindcss/forms": "0.5.7", + "@tailwindcss/typography": "0.5.12", + "@types/node": "20.12.4", + "@typescript-eslint/eslint-plugin": "^7.5.0", + "@typescript-eslint/parser": "^7.5.0", + "@vite-pwa/sveltekit": "^0.4.0", + "autoprefixer": "10.4.19", + "eslint": "^8.57.0", + "eslint-config-prettier": "^9.1.0", + "eslint-plugin-svelte": "^2.35.1", + "postcss": "8.4.38", + "prettier": "^3.2.5", + "prettier-plugin-svelte": "^3.2.2", + "svelte": "^4.2.12", + "svelte-check": "^3.6.9", + "tailwindcss": "3.4.3", + "tslib": "^2.6.2", + "typescript": "^5.4.4", + "vite": "^5.2.8", + "vite-plugin-tailwind-purgecss": "0.2.1" + }, + "type": "module" +} diff --git a/clients/www/postcss.config.cjs b/clients/www/postcss.config.cjs index 16dce0b..054c147 100644 --- a/clients/www/postcss.config.cjs +++ b/clients/www/postcss.config.cjs @@ -1,6 +1,6 @@ module.exports = { plugins: { tailwindcss: {}, - autoprefixer: {}, - }, -} \ No newline at end of file + autoprefixer: {} + } +}; diff --git a/clients/www/src-tauri/tauri.conf.json b/clients/www/src-tauri/tauri.conf.json index 24cb318..abb7183 100644 --- a/clients/www/src-tauri/tauri.conf.json +++ b/clients/www/src-tauri/tauri.conf.json @@ -1,66 +1,66 @@ { - "$schema": "../../../node_modules/@tauri-apps/cli/schema.json", - "build": { - "beforeBuildCommand": "pnpm run build", - "beforeDevCommand": "pnpm run dev", - "devPath": "http://localhost:5173", - "distDir": "../build" - }, - "package": { - "productName": "zorascript", - "version": "0.1.0" - }, - "tauri": { - "allowlist": { - "all": false - }, - "bundle": { - "active": true, - "category": "DeveloperTool", - "copyright": "", - "deb": { - "depends": [] - }, - "externalBin": [], - "icon": [ - "icons/32x32.png", - "icons/128x128.png", - "icons/128x128@2x.png", - "icons/icon.icns", - "icons/icon.ico" - ], - "identifier": "io.github.rosstheross.zorascript", - "longDescription": "", - "macOS": { - "entitlements": null, - "exceptionDomain": "", - "frameworks": [], - "providerShortName": null, - "signingIdentity": null - }, - "resources": [], - "shortDescription": "", - "targets": "all", - "windows": { - "certificateThumbprint": null, - "digestAlgorithm": "sha256", - "timestampUrl": "" - } - }, - "security": { - "csp": null - }, - "updater": { - "active": false - }, - "windows": [ - { - "fullscreen": false, - "height": 600, - "resizable": true, - "title": "Zorascript", - "width": 800 - } - ] - } + "$schema": "../../../node_modules/@tauri-apps/cli/schema.json", + "build": { + "beforeBuildCommand": "pnpm run build", + "beforeDevCommand": "pnpm run dev", + "devPath": "http://localhost:5173", + "distDir": "../build" + }, + "package": { + "productName": "zorascript", + "version": "0.1.0" + }, + "tauri": { + "allowlist": { + "all": false + }, + "bundle": { + "active": true, + "category": "DeveloperTool", + "copyright": "", + "deb": { + "depends": [] + }, + "externalBin": [], + "icon": [ + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico" + ], + "identifier": "io.github.rosstheross.zorascript", + "longDescription": "", + "macOS": { + "entitlements": null, + "exceptionDomain": "", + "frameworks": [], + "providerShortName": null, + "signingIdentity": null + }, + "resources": [], + "shortDescription": "", + "targets": "all", + "windows": { + "certificateThumbprint": null, + "digestAlgorithm": "sha256", + "timestampUrl": "" + } + }, + "security": { + "csp": null + }, + "updater": { + "active": false + }, + "windows": [ + { + "fullscreen": false, + "height": 600, + "resizable": true, + "title": "Zorascript", + "width": 800 + } + ] + } } diff --git a/clients/www/src/app.d.ts b/clients/www/src/app.d.ts index 4c48b71..e3534e2 100644 --- a/clients/www/src/app.d.ts +++ b/clients/www/src/app.d.ts @@ -2,7 +2,7 @@ // for information about these interfaces // and what to do when importing types -import 'vite-plugin-pwa/info' +import 'vite-plugin-pwa/info'; declare namespace App { // interface Locals {} diff --git a/clients/www/src/app.html b/clients/www/src/app.html index cc192f8..c40af2d 100644 --- a/clients/www/src/app.html +++ b/clients/www/src/app.html @@ -1,4 +1,4 @@ - + diff --git a/clients/www/src/app.postcss b/clients/www/src/app.postcss index ddaec40..8ef7d35 100644 --- a/clients/www/src/app.postcss +++ b/clients/www/src/app.postcss @@ -6,4 +6,4 @@ html, body { @apply h-full overflow-hidden; -} \ No newline at end of file +} diff --git a/clients/www/src/lib/components/ReloadPrompt.svelte b/clients/www/src/lib/components/ReloadPrompt.svelte index e6effbb..6c778b6 100644 --- a/clients/www/src/lib/components/ReloadPrompt.svelte +++ b/clients/www/src/lib/components/ReloadPrompt.svelte @@ -1,32 +1,32 @@ diff --git a/clients/www/src/routes/+layout.svelte b/clients/www/src/routes/+layout.svelte index 6567ed5..a651da6 100644 --- a/clients/www/src/routes/+layout.svelte +++ b/clients/www/src/routes/+layout.svelte @@ -11,8 +11,8 @@ - - {@html webManifest} + + {@html webManifest} @@ -36,5 +36,5 @@ {#await import('$lib/components/ReloadPrompt.svelte') then { default: ReloadPrompt }} - + {/await} diff --git a/clients/www/src/routes/+layout.ts b/clients/www/src/routes/+layout.ts index c8cacf0..189f71e 100644 --- a/clients/www/src/routes/+layout.ts +++ b/clients/www/src/routes/+layout.ts @@ -1 +1 @@ -export const prerender = true; \ No newline at end of file +export const prerender = true; diff --git a/clients/www/src/routes/+page.svelte b/clients/www/src/routes/+page.svelte index 84d1c45..e963da4 100644 --- a/clients/www/src/routes/+page.svelte +++ b/clients/www/src/routes/+page.svelte @@ -1,3 +1,3 @@ Zelda: Oracle of [Ages,Seasons] Passphrase Generator - \ No newline at end of file + diff --git a/clients/www/static/img/favicon (Custom).png b/clients/www/static/img/favicon (Custom).png deleted file mode 100644 index 64dfd1e..0000000 Binary files a/clients/www/static/img/favicon (Custom).png and /dev/null differ diff --git a/clients/www/svelte.config.js b/clients/www/svelte.config.js index df04fc1..1e368d6 100644 --- a/clients/www/svelte.config.js +++ b/clients/www/svelte.config.js @@ -1,18 +1,17 @@ import adapter from '@sveltejs/adapter-static'; import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'; - /** @type {import('@sveltejs/kit').Config} */ const config = { extensions: ['.svelte'], // Consult https://kit.svelte.dev/docs/integrations#preprocessors // for more information about preprocessors - preprocess: [ vitePreprocess()], + preprocess: [vitePreprocess()], kit: { adapter: adapter(), paths: { - base: process.env.NODE_ENV === "production" ? "/zorascript" : "", + base: process.env.NODE_ENV === 'production' ? '/zorascript' : '' } } }; -export default config; \ No newline at end of file +export default config; diff --git a/clients/www/tailwind.config.ts b/clients/www/tailwind.config.ts index 9f08643..a776fd4 100644 --- a/clients/www/tailwind.config.ts +++ b/clients/www/tailwind.config.ts @@ -1,14 +1,17 @@ -import { join } from 'path' -import type { Config } from 'tailwindcss' +import { join } from 'path'; +import type { Config } from 'tailwindcss'; import forms from '@tailwindcss/forms'; import typography from '@tailwindcss/typography'; -import { skeleton } from '@skeletonlabs/tw-plugin' +import { skeleton } from '@skeletonlabs/tw-plugin'; export default { darkMode: 'class', - content: ['./src/**/*.{html,js,svelte,ts}', join(require.resolve('@skeletonlabs/skeleton'), '../**/*.{html,js,svelte,ts}')], + content: [ + './src/**/*.{html,js,svelte,ts}', + join(require.resolve('@skeletonlabs/skeleton'), '../**/*.{html,js,svelte,ts}') + ], theme: { - extend: {}, + extend: {} }, plugins: [ forms, @@ -18,10 +21,10 @@ export default { preset: [ { name: 'wintry', - enhancements: true, - }, - ], - }, - }), - ], + enhancements: true + } + ] + } + }) + ] } satisfies Config; diff --git a/clients/www/vite.config.ts b/clients/www/vite.config.ts index 752ed61..e81bca8 100644 --- a/clients/www/vite.config.ts +++ b/clients/www/vite.config.ts @@ -21,17 +21,17 @@ export default defineConfig({ name: 'Oracle Client', short_name: 'Oracle Client', theme_color: '#3EBCC5', - description: "A web-based client for the Oracle of Ages/Seasons password system", - display_override: ["standalone", "minimal-ui"], - display: "fullscreen", + description: 'A web-based client for the Oracle of Ages/Seasons password system', + display_override: ['standalone', 'minimal-ui'], + display: 'fullscreen', icons: [ { - src: "img/pwa-192x192.png", - sizes: "192x192", - type: "image/png", + src: 'img/pwa-192x192.png', + sizes: '192x192', + type: 'image/png' } ], - id: "zorascript", + id: 'zorascript' }, registerType: 'autoUpdate', workbox: { diff --git a/libs/zora-rs/Cargo.toml b/libs/zora-rs/Cargo.toml index bb5172f..08fa52a 100644 --- a/libs/zora-rs/Cargo.toml +++ b/libs/zora-rs/Cargo.toml @@ -14,6 +14,8 @@ crate-type = ["cdylib", "rlib"] default = ["console_error_panic_hook"] [dependencies] +serde_json = "1.0" +serde = { version = "1.0", features = ["derive"] } wasm-bindgen = "0.2.84" # The `console_error_panic_hook` crate provides better debugging of panics by diff --git a/packages/zora-rs/.travis.yml b/packages/zora-rs/.travis.yml deleted file mode 100644 index 7a91325..0000000 --- a/packages/zora-rs/.travis.yml +++ /dev/null @@ -1,69 +0,0 @@ -language: rust -sudo: false - -cache: cargo - -matrix: - include: - - # Builds with wasm-pack. - - rust: beta - env: RUST_BACKTRACE=1 - addons: - firefox: latest - chrome: stable - before_script: - - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update) - - (test -x $HOME/.cargo/bin/cargo-generate || cargo install --vers "^0.2" cargo-generate) - - cargo install-update -a - - curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -f - script: - - cargo generate --git . --name testing - # Having a broken Cargo.toml (in that it has curlies in fields) anywhere - # in any of our parent dirs is problematic. - - mv Cargo.toml Cargo.toml.tmpl - - cd testing - - wasm-pack build - - wasm-pack test --chrome --firefox --headless - - # Builds on nightly. - - rust: nightly - env: RUST_BACKTRACE=1 - before_script: - - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update) - - (test -x $HOME/.cargo/bin/cargo-generate || cargo install --vers "^0.2" cargo-generate) - - cargo install-update -a - - rustup target add wasm32-unknown-unknown - script: - - cargo generate --git . --name testing - - mv Cargo.toml Cargo.toml.tmpl - - cd testing - - cargo check - - cargo check --target wasm32-unknown-unknown - - cargo check --no-default-features - - cargo check --target wasm32-unknown-unknown --no-default-features - - cargo check --no-default-features --features console_error_panic_hook - - cargo check --target wasm32-unknown-unknown --no-default-features --features console_error_panic_hook - - cargo check --no-default-features --features "console_error_panic_hook wee_alloc" - - cargo check --target wasm32-unknown-unknown --no-default-features --features "console_error_panic_hook wee_alloc" - - # Builds on beta. - - rust: beta - env: RUST_BACKTRACE=1 - before_script: - - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update) - - (test -x $HOME/.cargo/bin/cargo-generate || cargo install --vers "^0.2" cargo-generate) - - cargo install-update -a - - rustup target add wasm32-unknown-unknown - script: - - cargo generate --git . --name testing - - mv Cargo.toml Cargo.toml.tmpl - - cd testing - - cargo check - - cargo check --target wasm32-unknown-unknown - - cargo check --no-default-features - - cargo check --target wasm32-unknown-unknown --no-default-features - - cargo check --no-default-features --features console_error_panic_hook - - cargo check --target wasm32-unknown-unknown --no-default-features --features console_error_panic_hook - # Note: no enabling the `wee_alloc` feature here because it requires - # nightly for now. -- cgit v1.2.3