diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index ec05aeb5..07cd0e72 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -15,21 +15,19 @@ jobs: steps: - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@stable + - uses: Swatinem/rust-cache@v2 - uses: actions/setup-node@v3 with: node-version: 18 cache: 'npm' - - uses: dtolnay/rust-toolchain@stable - name: install dependencies (ubuntu only) if: matrix.platform == 'ubuntu-20.04' run: | sudo apt-get update sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf - name: Install dependencies - run: | - cargo install rsw - npm install -g wasm-pack - npm ci + run: npm ci - name: Run tests run: npm test - uses: tauri-apps/tauri-action@v0 diff --git a/.gitignore b/.gitignore index 2abab6cd..89903f59 100644 --- a/.gitignore +++ b/.gitignore @@ -23,5 +23,4 @@ dist-ssr *.sln *.sw? -.rsw *.sqlite diff --git a/package-lock.json b/package-lock.json index 8ac3e1ea..48465b33 100644 --- a/package-lock.json +++ b/package-lock.json @@ -57,7 +57,6 @@ "tailwindcss": "^3.2.7", "typescript": "^4.6.4", "vite": "^4.0.0", - "vite-plugin-rsw": "^2.0.11", "vite-plugin-top-level-await": "^1.2.4", "vitest": "^0.29.2" } @@ -7485,15 +7484,6 @@ "url": "https://github.com/sponsors/antfu" } }, - "node_modules/vite-plugin-rsw": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/vite-plugin-rsw/-/vite-plugin-rsw-2.0.11.tgz", - "integrity": "sha512-OqbGAtdDfK88gDoxA9wVdGowCmlzLSXEyRvD8CgTu9IP5O7tx8Tg2CtIzKOyOWZtHHZPhtdYiN+5Il6rTZCkzw==", - "dev": true, - "peerDependencies": { - "vite": ">2.8.0-0" - } - }, "node_modules/vite-plugin-top-level-await": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/vite-plugin-top-level-await/-/vite-plugin-top-level-await-1.2.4.tgz", @@ -13130,13 +13120,6 @@ "vite": "^3.0.0 || ^4.0.0" } }, - "vite-plugin-rsw": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/vite-plugin-rsw/-/vite-plugin-rsw-2.0.11.tgz", - "integrity": "sha512-OqbGAtdDfK88gDoxA9wVdGowCmlzLSXEyRvD8CgTu9IP5O7tx8Tg2CtIzKOyOWZtHHZPhtdYiN+5Il6rTZCkzw==", - "dev": true, - "requires": {} - }, "vite-plugin-top-level-await": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/vite-plugin-top-level-await/-/vite-plugin-top-level-await-1.2.4.tgz", diff --git a/package.json b/package.json index 95005640..f9c33ffa 100644 --- a/package.json +++ b/package.json @@ -4,13 +4,12 @@ "version": "0.0.0", "type": "module", "scripts": { - "tauri-dev": "concurrently -n app,rsw \"tauri dev\" \"rsw watch\"", + "tauri-dev": "tauri dev", "tauri-build": "npm run build:icon && tauri build", - "build": "npm run build:rsw && npm run build:frontend", + "build": "npm run build:frontend", "dev": "vite dev", "lint": "tsc && eslint . --ext .ts,.tsx", "build:icon": "tauri icon src-tauri/icons/icon.png", - "build:rsw": "rsw build", "build:frontend": "vite build", "test": "vitest", "coverage": "vitest run --coverage" @@ -65,7 +64,6 @@ "tailwindcss": "^3.2.7", "typescript": "^4.6.4", "vite": "^4.0.0", - "vite-plugin-rsw": "^2.0.11", "vite-plugin-top-level-await": "^1.2.4", "vitest": "^0.29.2" } diff --git a/rsw.toml b/rsw.toml deleted file mode 100644 index e6d5e046..00000000 --- a/rsw.toml +++ /dev/null @@ -1,39 +0,0 @@ -name = "rsw" -version = "0.1.0" - -#! time interval for file changes to trigger wasm-pack build, default `50` milliseconds -interval = 50 - -#! link -#! npm link @see https://docs.npmjs.com/cli/v8/commands/npm-link -#! yarn link @see https://classic.yarnpkg.com/en/docs/cli/link -#! pnpm link @see https://pnpm.io/cli/link -#! The link command will only be executed if `[[crates]] link = true` -#! cli: `npm` | `yarn` | `pnpm`, default is `npm` -cli = "npm" - -#! --------------------------- - -#! rsw new -[new] -#! @see https://rustwasm.github.io/docs/wasm-pack/commands/new.html -#! using: `wasm-pack` | `rsw` | `user`, default is `wasm-pack` -#! 1. wasm-pack: `rsw new --template