diff --git a/packages/fastify/package.json b/packages/fastify/package.json index e3f8e14..7fcebd6 100644 --- a/packages/fastify/package.json +++ b/packages/fastify/package.json @@ -28,7 +28,7 @@ "lint:fix": "eslint . --fix", "sort-package": "npx sort-package-json", "test": "vitest run --coverage", - "typecheck": "tsc --noEmit -p tsconfig.json --composite false" + "typecheck": "tsc --noEmit -p tsconfig.vitest.json --composite false" }, "dependencies": { "@graphql-tools/merge": "9.1.9", diff --git a/packages/fastify/src/lib/__test__/domainSchema.test.ts b/packages/fastify/src/lib/__test__/domainSchema.test.ts index ca07352..116bb0c 100644 --- a/packages/fastify/src/lib/__test__/domainSchema.test.ts +++ b/packages/fastify/src/lib/__test__/domainSchema.test.ts @@ -2,12 +2,14 @@ import { describe, expect, it } from "vitest"; import getSaasConfig from "../../config"; import { accountCreateInputSchema } from "../../schemas"; +import createConfig from "./helpers/createConfig"; -const saasConfig = getSaasConfig({ - saas: { +const saasConfig = getSaasConfig( + createConfig({ + rootDomain: "example.test", subdomains: "optional", - }, -}); + }), +); const domainSchema = accountCreateInputSchema(saasConfig).shape.domain; diff --git a/packages/fastify/src/lib/__test__/helpers/createConfig.ts b/packages/fastify/src/lib/__test__/helpers/createConfig.ts index efcf5d1..d13971c 100644 --- a/packages/fastify/src/lib/__test__/helpers/createConfig.ts +++ b/packages/fastify/src/lib/__test__/helpers/createConfig.ts @@ -5,7 +5,7 @@ import type { SaasConfig } from "../../../types"; declare module "@prefabs.tech/fastify-config" { interface ApiConfig { - saas?: SaasConfig; + saas: SaasConfig; } } diff --git a/packages/fastify/src/lib/__test__/slugSchema.test.ts b/packages/fastify/src/lib/__test__/slugSchema.test.ts index afd9997..c5a948c 100644 --- a/packages/fastify/src/lib/__test__/slugSchema.test.ts +++ b/packages/fastify/src/lib/__test__/slugSchema.test.ts @@ -2,12 +2,14 @@ import { describe, expect, it } from "vitest"; import getSaasConfig from "../../config"; import { accountCreateInputSchema } from "../../schemas"; +import createConfig from "./helpers/createConfig"; -const saasConfig = getSaasConfig({ - saas: { +const saasConfig = getSaasConfig( + createConfig({ + rootDomain: "example.test", subdomains: "optional", - }, -}); + }), +); const slugSchema = accountCreateInputSchema(saasConfig).shape.slug; diff --git a/packages/fastify/tsconfig.vitest.json b/packages/fastify/tsconfig.vitest.json new file mode 100644 index 0000000..52df5a2 --- /dev/null +++ b/packages/fastify/tsconfig.vitest.json @@ -0,0 +1,11 @@ +{ + "extends": "./tsconfig.json", + "exclude": [], + "compilerOptions": { + "composite": true, + "types": ["vite/client", "node", "vitest/globals"], + "paths": { + "@/*": ["./src/*"] + } + } +} diff --git a/packages/react/tsconfig.vitest.json b/packages/react/tsconfig.vitest.json index 7eed54f..52df5a2 100644 --- a/packages/react/tsconfig.vitest.json +++ b/packages/react/tsconfig.vitest.json @@ -3,7 +3,9 @@ "exclude": [], "compilerOptions": { "composite": true, - "lib": [], - "types": ["node", "jsdom", "vitest/globals"], + "types": ["vite/client", "node", "vitest/globals"], + "paths": { + "@/*": ["./src/*"] + } } } diff --git a/packages/vue/package.json b/packages/vue/package.json index a526689..75c1280 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -20,10 +20,15 @@ "build": "vite build && vue-tsc --emitDeclarationOnly", "lint": "eslint . --ext .vue", "lint:fix": "eslint . --ext .vue --fix", + "snapshot:update": "vitest --environment jsdom run --update", "sort-package": "npx sort-package-json", "stylelint": "stylelint \"src/**/*.{css,vue}\" --allow-empty-input", "stylelint:fix": "stylelint \"src/**/*.{css,vue}\" --fix --allow-empty-input", - "typecheck": "vue-tsc --noEmit -p tsconfig.json --composite false" + "test": "vitest --environment jsdom run --coverage --passWithNoTests", + "test:component": "vitest --environment jsdom run component/ --passWithNoTests", + "test:snapshot": "vitest --environment jsdom run snapshot/ --passWithNoTests", + "test:unit": "vitest --environment jsdom run unit/ --passWithNoTests", + "typecheck": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false" }, "dependencies": {}, "devDependencies": { diff --git a/packages/vue/src/api/axios/client.ts b/packages/vue/src/api/axios/client.ts index b6c6659..ca18595 100644 --- a/packages/vue/src/api/axios/client.ts +++ b/packages/vue/src/api/axios/client.ts @@ -1,11 +1,11 @@ -import axios from "axios"; +import { create } from "axios"; import { ACCOUNT_HEADER_NAME } from "../../constant"; export const client = (baseURL: string) => { const accountId = sessionStorage.getItem(ACCOUNT_HEADER_NAME); - return axios.create({ + return create({ baseURL: baseURL, headers: { [ACCOUNT_HEADER_NAME]: accountId || "", diff --git a/packages/vue/tsconfig.vitest.json b/packages/vue/tsconfig.vitest.json new file mode 100644 index 0000000..52df5a2 --- /dev/null +++ b/packages/vue/tsconfig.vitest.json @@ -0,0 +1,11 @@ +{ + "extends": "./tsconfig.json", + "exclude": [], + "compilerOptions": { + "composite": true, + "types": ["vite/client", "node", "vitest/globals"], + "paths": { + "@/*": ["./src/*"] + } + } +}