Skip to content

Commit dd60c20

Browse files
authored
Merge pull request #342 from datum-cloud/fix/vitest-config-import
Fix vitest.config.ts to import defineConfig from vitest/config
2 parents fa2e036 + 364e81f commit dd60c20

File tree

8 files changed

+393
-79
lines changed

8 files changed

+393
-79
lines changed

app/modules/i18n/locales/en.po

Lines changed: 192 additions & 35 deletions
Large diffs are not rendered by default.

app/modules/i18n/locales/en.ts

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

app/modules/i18n/locales/fr.po

Lines changed: 192 additions & 35 deletions
Large diffs are not rendered by default.

app/modules/i18n/locales/fr.ts

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

app/resources/request/client/quota.request.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export const orgQuotaGrantListQuery = (
9393
if (params?.resourceType)
9494
fieldSelectorParts.push(`spec.allowances.resourceType=${params.resourceType}`);
9595

96-
return quotaGrantListQuery(orgName, {
96+
return quotaGrantListQuery(`organization-${orgName}`, {
9797
...params,
9898
baseURL: getOrgControlPlaneBaseURL(orgName),
9999
fieldSelector: fieldSelectorParts.join(','),
@@ -184,7 +184,7 @@ export const orgQuotaBucketListQuery = (
184184
];
185185
if (params?.resourceType) fieldSelectorParts.push(`spec.resourceType=${params.resourceType}`);
186186

187-
return quotaBucketListQuery(orgName, {
187+
return quotaBucketListQuery(`organization-${orgName}`, {
188188
...params,
189189
baseURL: getOrgControlPlaneBaseURL(orgName),
190190
fieldSelector: fieldSelectorParts.join(','),
@@ -256,7 +256,7 @@ export const orgQuotaClaimListQuery = (
256256
// Filter by request resourceType if provided (server-side may ignore; client can post-filter)
257257
if (params?.resourceType) parts.push(`spec.requests.resourceType=${params.resourceType}`);
258258

259-
return quotaClaimListQuery(orgName, {
259+
return quotaClaimListQuery(`organization-${orgName}`, {
260260
...params,
261261
baseURL: getOrgControlPlaneBaseURL(orgName),
262262
fieldSelector: parts.join(','),

bun.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"lefthook": "^2.0.0",
121121
"postcss": "^8.5.3",
122122
"prettier": "^3.5.3",
123-
"prettier-plugin-tailwindcss": "^0.7.0",
123+
"prettier-plugin-tailwindcss": "^0.7.2",
124124
"start-server-and-test": "^2.1.3",
125125
"tailwindcss": "^4.1.6",
126126
"tw-animate-css": "^1.3.0",

vitest.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import tailwindcss from '@tailwindcss/vite';
2-
import { defineConfig } from 'vite';
32
import macrosPlugin from 'vite-plugin-babel-macros';
43
import tsconfigPaths from 'vite-tsconfig-paths';
4+
import { defineConfig } from 'vitest/config';
55

66
export default defineConfig({
77
plugins: [tailwindcss(), tsconfigPaths(), macrosPlugin()],

0 commit comments

Comments
 (0)