diff --git a/src/apps/cli/vite.config.ts b/src/apps/cli/vite.config.ts index 11104cd..01992e1 100644 --- a/src/apps/cli/vite.config.ts +++ b/src/apps/cli/vite.config.ts @@ -2,6 +2,7 @@ import { defineConfig } from "vite"; import { svelte } from "@sveltejs/vite-plugin-svelte"; import path from "node:path"; import { readFileSync } from "node:fs"; +const resolve = (...args: string[]) => path.resolve(...args).replace(/\\/g, "/"); const packageJson = JSON.parse(readFileSync("../../../package.json", "utf-8")); const manifestJson = JSON.parse(readFileSync("../../../manifest.json", "utf-8")); // https://vite.dev/config/ @@ -63,17 +64,14 @@ export default defineConfig({ resolve: { alias: { "@lib/worker/bgWorker.ts": "../../lib/src/worker/bgWorker.mock.ts", - "@lib/pouchdb/pouchdb-browser.ts": path.resolve(__dirname, "lib/pouchdb-node.ts"), + "@lib/pouchdb/pouchdb-browser.ts": resolve(__dirname, "lib/pouchdb-node.ts"), // The CLI runs on Node.js; force AWS XML builder to its CJS Node entry // so Vite does not resolve the browser DOMParser-based XML parser. - "@aws-sdk/xml-builder": path.resolve( - __dirname, - "../../../node_modules/@aws-sdk/xml-builder/dist-cjs/index.js" - ), + "@aws-sdk/xml-builder": resolve(__dirname, "../../../node_modules/@aws-sdk/xml-builder/dist-cjs/index.js"), // Force fflate to the Node CJS entry; browser entry expects Web Worker globals. - fflate: path.resolve(__dirname, "../../../node_modules/fflate/lib/node.cjs"), - "@": path.resolve(__dirname, "../../"), - "@lib": path.resolve(__dirname, "../../lib/src"), + fflate: resolve(__dirname, "../../../node_modules/fflate/lib/node.cjs"), + "@": resolve(__dirname, "../../"), + "@lib": resolve(__dirname, "../../lib/src"), "../../src/worker/bgWorker.ts": "../../src/worker/bgWorker.mock.ts", }, }, @@ -85,7 +83,7 @@ export default defineConfig({ minify: false, rollupOptions: { input: { - index: path.resolve(__dirname, "entrypoint.ts"), + index: resolve(__dirname, "entrypoint.ts"), }, external: (id) => { if (defaultExternal.includes(id)) return true; @@ -101,7 +99,7 @@ export default defineConfig({ }, }, lib: { - entry: path.resolve(__dirname, "entrypoint.ts"), + entry: resolve(__dirname, "entrypoint.ts"), formats: ["cjs"], fileName: "index", }, diff --git a/src/lib b/src/lib index 6fac4a0..2171c5f 160000 --- a/src/lib +++ b/src/lib @@ -1 +1 @@ -Subproject commit 6fac4a00dd4e02ab0beb1e17368fa8630e33f214 +Subproject commit 2171c5f55ec2b98cc6507350856639872fc0a812 diff --git a/vitest.config.unit.ts b/vitest.config.unit.ts index 7bbcb15..18ffbcb 100644 --- a/vitest.config.unit.ts +++ b/vitest.config.unit.ts @@ -15,7 +15,7 @@ export default mergeConfig( // maxConcurrency: 2, name: "unit-tests", include: ["**/*unit.test.ts", "**/*.unit.spec.ts"], - exclude: ["test/**", "src/apps/**"], + exclude: ["test/**", "src/apps/**/testdeno/**"], coverage: { include: ["src/**/*.ts"], exclude: [ @@ -25,7 +25,8 @@ export default mergeConfig( "test/**", "src/lib/**/*.test.ts", "**/_*", - "src/apps/**", + "src/apps/**/testdeno/**", + // "src/apps/**", // "src/cli/**", "src/lib/src/cli/**", "**/*_obsolete.ts",