move libs/pagination too and get rid of @oxide/pagination alias

oxidecomputer · Feb 23, 2024 · bf9e4ff · bf9e4ff
1 parent 11351e5
commit bf9e4ff
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 61 deletions.
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -18,6 +18,7 @@ export default {
     '',
     '^@oxide/(.*)$',
     '',
+    '^~/(.*)$',
     '^app/(.*)$',
     '',
     '^[./]',

diff --git a/app/layouts/helpers.tsx b/app/layouts/helpers.tsx
@@ -8,10 +8,10 @@
 import { useRef } from 'react'
 import { Outlet } from 'react-router-dom'
 
-import { Pagination } from '@oxide/pagination'
 import { SkipLinkTarget } from '@oxide/ui'
 import { classed } from '@oxide/util'
 
+import { Pagination } from '~/pagination'
 import { PageActionsTarget } from 'app/components/PageActions'
 import { useScrollRestoration } from 'app/hooks/use-scroll-restoration'
 

diff --git a/...gination/__tests__/use-pagination.spec.ts → ...gination/__tests__/use-pagination.spec.ts b/...gination/__tests__/use-pagination.spec.ts → ...gination/__tests__/use-pagination.spec.ts
diff --git a/libs/pagination/index.tsx → app/pagination/index.tsx b/libs/pagination/index.tsx → app/pagination/index.tsx
diff --git a/app/table/QueryTable.tsx b/app/table/QueryTable.tsx
@@ -31,10 +31,11 @@ import {
   type Result,
   type ResultItem,
 } from '@oxide/api'
-import { Pagination, usePagination } from '@oxide/pagination'
 import { EmptyMessage, TableEmptyBox } from '@oxide/ui'
 import { invariant, isOneOf } from '@oxide/util'
 
+import { Pagination, usePagination } from '~/pagination'
+
 import { DefaultCell } from './cells'
 import { getActionsCol, getMultiSelectCol, getSelectCol, type MakeActions } from './columns'
 import { Table } from './Table'

diff --git a/libs/pagination/Pagination.tsx b/libs/pagination/Pagination.tsx
diff --git a/tsconfig.json b/tsconfig.json
@@ -12,14 +12,14 @@
     "noEmit": true,
     "outDir": "dist",
     "paths": {
+      "~/*": ["app/*"],
       "app/*": ["app/*"],
       "@oxide/gen/*": ["libs/api/__generated__/*"],
       "@oxide/api": ["libs/api/index.ts"],
       "@oxide/api-mocks": ["libs/api-mocks/index.ts"],
       "@oxide/ui": ["libs/ui/index.ts"],
       "@oxide/util": ["libs/util/index.ts"],
-      "@oxide/table": ["app/table/index.ts"],
-      "@oxide/pagination": ["libs/pagination/index.tsx"]
+      "@oxide/table": ["app/table/index.ts"]
     },
     "resolveJsonModule": true,
     "rootDir": ".",