Move final libs contents to app: libs/api and libs/util (#1977)

libs/api -> app/api and libs/util -> app/util
oxidecomputer · Feb 23, 2024 · d731de2 · d731de2
1 parent 6c5883d
commit d731de2
Show file tree

Hide file tree

Showing 37 changed files with 11 additions and 15 deletions.
diff --git a/libs/api/__generated__/Api.ts → app/api/__generated__/Api.ts b/libs/api/__generated__/Api.ts → app/api/__generated__/Api.ts
diff --git a/libs/api/__generated__/OMICRON_VERSION → app/api/__generated__/OMICRON_VERSION b/libs/api/__generated__/OMICRON_VERSION → app/api/__generated__/OMICRON_VERSION
diff --git a/libs/api/__generated__/http-client.ts → app/api/__generated__/http-client.ts b/libs/api/__generated__/http-client.ts → app/api/__generated__/http-client.ts
diff --git a/libs/api/__generated__/msw-handlers.ts → app/api/__generated__/msw-handlers.ts b/libs/api/__generated__/msw-handlers.ts → app/api/__generated__/msw-handlers.ts
diff --git a/libs/api/__generated__/util.ts → app/api/__generated__/util.ts b/libs/api/__generated__/util.ts → app/api/__generated__/util.ts
diff --git a/libs/api/__generated__/validate.ts → app/api/__generated__/validate.ts b/libs/api/__generated__/validate.ts → app/api/__generated__/validate.ts
diff --git a/libs/api/__tests__/errors.spec.ts → app/api/__tests__/errors.spec.ts b/libs/api/__tests__/errors.spec.ts → app/api/__tests__/errors.spec.ts
diff --git a/libs/api/__tests__/hooks.spec.tsx → app/api/__tests__/hooks.spec.tsx b/libs/api/__tests__/hooks.spec.tsx → app/api/__tests__/hooks.spec.tsx
diff --git a/libs/api/__tests__/nav-to-login.spec.ts → app/api/__tests__/nav-to-login.spec.ts b/libs/api/__tests__/nav-to-login.spec.ts → app/api/__tests__/nav-to-login.spec.ts
diff --git a/libs/api/__tests__/safety.spec.ts → app/api/__tests__/safety.spec.ts b/libs/api/__tests__/safety.spec.ts → app/api/__tests__/safety.spec.ts
@@ -35,8 +35,8 @@ const grepFiles = (s: string) =>
 it('@oxide/api-mocks is only referenced in test files', () => {
   expect(grepFiles('api-mocks')).toMatchInlineSnapshot(`
     [
+      "app/api/__tests__/hooks.spec.tsx",
       "app/msw-mock-api.ts",
-      "libs/api/__tests__/hooks.spec.tsx",
       "mock-api/msw/db.ts",
       "test/e2e/instance-create.e2e.ts",
       "test/e2e/inventory.e2e.ts",

diff --git a/libs/api/client.ts → app/api/client.ts b/libs/api/client.ts → app/api/client.ts
diff --git a/libs/api/errors.ts → app/api/errors.ts b/libs/api/errors.ts → app/api/errors.ts
diff --git a/libs/api/hooks.ts → app/api/hooks.ts b/libs/api/hooks.ts → app/api/hooks.ts
diff --git a/libs/api/index.ts → app/api/index.ts b/libs/api/index.ts → app/api/index.ts
diff --git a/libs/api/nav-to-login.ts → app/api/nav-to-login.ts b/libs/api/nav-to-login.ts → app/api/nav-to-login.ts
diff --git a/libs/api/path-params.ts → app/api/path-params.ts b/libs/api/path-params.ts → app/api/path-params.ts
diff --git a/libs/api/roles.spec.ts → app/api/roles.spec.ts b/libs/api/roles.spec.ts → app/api/roles.spec.ts
diff --git a/libs/api/roles.ts → app/api/roles.ts b/libs/api/roles.ts → app/api/roles.ts
diff --git a/libs/api/util.spec.ts → app/api/util.spec.ts b/libs/api/util.spec.ts → app/api/util.spec.ts
diff --git a/libs/api/util.ts → app/api/util.ts b/libs/api/util.ts → app/api/util.ts
diff --git a/libs/util/array.spec.tsx → app/util/array.spec.tsx b/libs/util/array.spec.tsx → app/util/array.spec.tsx
diff --git a/libs/util/array.ts → app/util/array.ts b/libs/util/array.ts → app/util/array.ts
diff --git a/libs/util/children.spec.tsx → app/util/children.spec.tsx b/libs/util/children.spec.tsx → app/util/children.spec.tsx
diff --git a/libs/util/children.tsx → app/util/children.tsx b/libs/util/children.tsx → app/util/children.tsx
diff --git a/libs/util/classed.ts → app/util/classed.ts b/libs/util/classed.ts → app/util/classed.ts
diff --git a/app/util/date.ts b/app/util/date.ts
@@ -5,7 +5,11 @@
  *
  * Copyright Oxide Computer Company
  */
-import { formatDistanceToNowStrict, type FormatDistanceToNowStrictOptions } from 'date-fns'
+import {
+  format,
+  formatDistanceToNowStrict,
+  type FormatDistanceToNowStrictOptions,
+} from 'date-fns'
 
 // locale setup and formatDistance function copied from here and modified
 // https://github.com/date-fns/date-fns/blob/56a3856/src/locale/en-US/_lib/formatDistance/index.js
@@ -42,3 +46,5 @@ export const timeAgoAbbr = (d: Date, options?: FormatDistanceToNowStrictOptions)
       },
     },
   })
+
+export const formatDateTime = (d: Date) => format(d, 'MMM d, yyyy H:mm aa')
diff --git a/libs/util/index.ts → app/util/index.ts b/libs/util/index.ts → app/util/index.ts
diff --git a/libs/util/invariant.ts → app/util/invariant.ts b/libs/util/invariant.ts → app/util/invariant.ts
diff --git a/libs/util/math.spec.ts → app/util/math.spec.ts b/libs/util/math.spec.ts → app/util/math.spec.ts
diff --git a/libs/util/math.ts → app/util/math.ts b/libs/util/math.ts → app/util/math.ts
diff --git a/libs/util/object.spec.ts → app/util/object.spec.ts b/libs/util/object.spec.ts → app/util/object.spec.ts
diff --git a/libs/util/object.ts → app/util/object.ts b/libs/util/object.ts → app/util/object.ts
diff --git a/libs/util/str.spec.ts → app/util/str.spec.ts b/libs/util/str.spec.ts → app/util/str.spec.ts
diff --git a/libs/util/str.ts → app/util/str.ts b/libs/util/str.ts → app/util/str.ts
diff --git a/libs/util/units.ts → app/util/units.ts b/libs/util/units.ts → app/util/units.ts
diff --git a/libs/util/date.ts b/libs/util/date.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -14,11 +14,11 @@
     "paths": {
       "~/*": ["app/*"],
       "app/*": ["app/*"],
-      "@oxide/gen/*": ["libs/api/__generated__/*"],
-      "@oxide/api": ["libs/api/index.ts"],
+      "@oxide/gen/*": ["app/api/__generated__/*"],
+      "@oxide/api": ["app/api/index.ts"],
       "@oxide/api-mocks": ["mock-api/index.ts"],
       "@oxide/ui": ["app/ui/index.ts"],
-      "@oxide/util": ["libs/util/index.ts"],
+      "@oxide/util": ["app/util/index.ts"],
       "@oxide/table": ["app/table/index.ts"]
     },
     "resolveJsonModule": true,