diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 13ea8f4..35e1842 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -44,7 +44,7 @@ jobs: cd backend cargo test --verbose cd sync_lib - # wasm-pack test --node # todo: fix this is CI + # wasm-pack test --node # todo: fix this in CI - name: Lint frontend run: | diff --git a/frontend/obsidian-plugin/webpack.config.js b/frontend/obsidian-plugin/webpack.config.js index 72059dc..66c35d6 100644 --- a/frontend/obsidian-plugin/webpack.config.js +++ b/frontend/obsidian-plugin/webpack.config.js @@ -83,10 +83,6 @@ module.exports = (env, argv) => ({ { test: /\.ts$/, use: ["ts-loader"] - }, - { - test: /\.wasm$/, - type: "asset/inline" } ] }, diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 400ad40..67805aa 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -6743,14 +6743,12 @@ }, "test-client": { "version": "0.0.0", - "dependencies": { - "sync-client": "file:../sync-client" - }, "bin": { "test-client": "dist/cli.js" }, "devDependencies": { "chalk": "^5.4.1", + "sync-client": "file:../sync-client", "ts-loader": "^9.5.2", "tslib": "2.8.1", "typescript": "5.7.3", diff --git a/frontend/package.json b/frontend/package.json index dd9baea..301e28f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -16,7 +16,7 @@ "build": "npm run build --workspaces", "dev": "concurrently --kill-others \"npm run dev -w sync-client\" \"npm run dev -w obsidian-plugin\"", "test": "npm run test --workspaces", - "lint": "eslint --fix sync-client obsidian-plugin test-client; prettier --write \"**/*.(ts|scss|json|html)\"", + "lint": "eslint --fix sync-client obsidian-plugin test-client && prettier --write \"**/*.(ts|scss|json|html)\"", "update": "ncu -u -ws" }, "devDependencies": { diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts index 7361c73..0325962 100644 --- a/frontend/sync-client/src/sync-client.ts +++ b/frontend/sync-client/src/sync-client.ts @@ -1,5 +1,5 @@ import init from "sync_lib"; -import wasmBin from "sync_lib/sync_lib_bg.wasm"; +import wasmBin from "../../../backend/sync_lib/pkg/sync_lib_bg.wasm"; import type { PersistenceProvider } from "./persistence/persistence"; import { SyncHistory } from "./tracing/sync-history"; import { Logger } from "./tracing/logger"; diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json index 071e38f..56f2732 100644 --- a/frontend/test-client/package.json +++ b/frontend/test-client/package.json @@ -10,10 +10,8 @@ "build": "webpack --mode production", "test": "jest --passWithNoTests" }, - "dependencies": { - "sync-client": "file:../sync-client" - }, "devDependencies": { + "sync-client": "file:../sync-client", "uuid": "^11.1.0", "chalk": "^5.4.1", "ts-loader": "^9.5.2",