Skip to content

Commit 8e247f2

Browse files
committed
get rid of @oxide/gen alias
1 parent 7d936d7 commit 8e247f2

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

mock-api/json-type.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
* Copyright Oxide Computer Company
77
*/
88

9-
export { Json } from '@oxide/gen/msw-handlers'
9+
export { Json } from '~/api/__generated__/msw-handlers'

mock-api/msw/db.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ import type { ApiTypes as Api, PathParams as PP } from '@oxide/api'
1313
import * as mock from '@oxide/api-mocks'
1414
import { pick } from '@oxide/util'
1515

16+
import { json } from '~/api/__generated__/msw-handlers'
17+
1618
import type { Json } from '../json-type'
17-
import { internalError, json } from './util'
19+
import { internalError } from './util'
1820

1921
const notFoundBody = { error_code: 'ObjectNotFound' } as const
2022
export type NotFound = typeof notFoundBody

mock-api/msw/handlers.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ import {
1818
type ApiTypes as Api,
1919
type SamlIdentityProvider,
2020
} from '@oxide/api'
21-
import { json, makeHandlers, type Json } from '@oxide/gen/msw-handlers'
2221
import { GiB, pick, sortBy } from '@oxide/util'
2322

23+
import { json, makeHandlers, type Json } from '~/api/__generated__/msw-handlers'
24+
2425
import { genCumulativeI64Data } from '../metrics'
2526
import { serial } from '../serial'
2627
import { defaultSilo, toIdp } from '../silo'

mock-api/msw/util.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@ import {
1919
type SystemMetricQueryParams,
2020
type User,
2121
} from '@oxide/api'
22-
import { json, type Json } from '@oxide/gen/msw-handlers'
2322
import { GiB, isTruthy, TiB } from '@oxide/util'
2423

24+
import { json, type Json } from '~/api/__generated__/msw-handlers'
25+
2526
import type { DbRoleAssignmentResourceType } from '..'
2627
import { genI64Data } from '../metrics'
2728
import { db } from './db'
2829

29-
export { json } from '@oxide/gen/msw-handlers'
30-
3130
interface PaginateOptions {
3231
limit?: number
3332
pageToken?: string

tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"paths": {
1515
"~/*": ["app/*"],
1616
"app/*": ["app/*"],
17-
"@oxide/gen/*": ["app/api/__generated__/*"],
1817
"@oxide/api": ["app/api/index.ts"],
1918
"@oxide/api-mocks": ["mock-api/index.ts"],
2019
"@oxide/ui": ["app/ui/index.ts"],

0 commit comments

Comments
 (0)