From 682193f2fad62e2da656010c3934cef2bee5b92d Mon Sep 17 00:00:00 2001 From: Tanish Manku Date: Thu, 8 May 2025 13:05:25 -0700 Subject: [PATCH] Move all common packages into a single package --- frontend/apps/editor3d/tsconfig.json | 27 ++++--- frontend/libs/common/{enums => }/.babelrc | 0 frontend/libs/common/{enums => }/README.md | 0 frontend/libs/common/enums/src/index.ts | 5 -- frontend/libs/common/enums/tsconfig.spec.json | 34 --------- frontend/libs/common/interfaces/.babelrc | 12 ---- frontend/libs/common/interfaces/README.md | 7 -- frontend/libs/common/interfaces/package.json | 17 ----- frontend/libs/common/interfaces/src/index.ts | 8 --- frontend/libs/common/interfaces/tsconfig.json | 19 ----- .../libs/common/interfaces/tsconfig.lib.json | 53 -------------- .../libs/common/interfaces/tsconfig.spec.json | 34 --------- .../libs/common/interfaces/vite.config.ts | 49 ------------- frontend/libs/common/{enums => }/package.json | 2 +- frontend/libs/common/src/index.ts | 3 + .../src/lib => src/lib/enums}/EditorState.ts | 0 .../src/lib => src/lib/enums}/Hotkeys.ts | 0 .../lib => src/lib/enums}/Queue/AssetType.ts | 0 .../lib => src/lib/enums}/Queue/ClipGroup.ts | 0 .../lib => src/lib/enums}/Queue/ClipType.ts | 0 .../lib/enums}/Queue/FromEngineActions.ts | 0 .../lib => src/lib/enums}/Queue/QueueNames.ts | 0 .../lib/enums}/Queue/ToEngineActions.ts | 0 .../lib/enums}/Queue/ToTimelineActions.ts | 0 .../src/lib => src/lib/enums}/Queue/index.ts | 0 .../lib/enums}/Toaster/ToastTypes.ts | 0 .../lib => src/lib/enums}/Toaster/index.ts | 0 .../lib => src/lib/enums}/UploaderStates.ts | 0 frontend/libs/common/src/lib/enums/index.ts | 5 ++ .../src/lib => src/lib/interfaces}/Camera.ts | 0 .../lib/interfaces}/IGenerationOptions.ts | 0 .../lib => src/lib/interfaces}/MediaItem.ts | 2 +- .../src/lib => src/lib/interfaces}/Queue.ts | 4 +- .../lib => src/lib/interfaces}/UpdateTime.ts | 0 .../lib => src/lib/interfaces}/UploadImage.ts | 0 .../lib/interfaces}/UploaderState.ts | 2 +- .../libs/common/src/lib/interfaces/index.ts | 8 +++ .../src/lib => src/lib/types}/bitmap.ts | 0 .../{types/src/lib => src/lib/types}/index.ts | 0 .../src/lib => src/lib/types}/jobcontext.ts | 0 .../{types/src/lib => src/lib/types}/queue.ts | 7 +- .../{types/src/lib => src/lib/types}/toast.ts | 0 .../{types/src/lib => src/lib/types}/xyz.ts | 0 .../libs/common/{enums => }/tsconfig.json | 2 +- .../libs/common/{enums => }/tsconfig.lib.json | 2 +- .../common/{types => }/tsconfig.spec.json | 2 +- frontend/libs/common/types/.babelrc | 12 ---- frontend/libs/common/types/README.md | 7 -- frontend/libs/common/types/package.json | 17 ----- frontend/libs/common/types/src/index.ts | 1 - frontend/libs/common/types/tsconfig.json | 19 ----- frontend/libs/common/types/tsconfig.lib.json | 53 -------------- frontend/libs/common/types/vite.config.ts | 49 ------------- .../libs/common/{enums => }/vite.config.ts | 6 +- .../promptbox/src/lib/PromptBox2D.tsx | 4 +- .../promptbox/src/lib/PromptBox3D.tsx | 10 ++- .../libs/components/promptbox/tsconfig.json | 8 +-- .../components/promptbox/tsconfig.lib.json | 8 +-- .../toaster/src/lib/toaster.module.css | 7 -- .../toaster/src/lib/toaster.spec.tsx | 12 ---- .../src/lib/transition-dialogue.tsx | 2 +- .../transition-dialogue/tsconfig.json | 2 +- .../transition-dialogue/tsconfig.lib.json | 2 +- frontend/package-lock.json | 71 +++++++++---------- frontend/tsconfig.json | 8 +-- 65 files changed, 94 insertions(+), 508 deletions(-) rename frontend/libs/common/{enums => }/.babelrc (100%) rename frontend/libs/common/{enums => }/README.md (100%) delete mode 100644 frontend/libs/common/enums/src/index.ts delete mode 100644 frontend/libs/common/enums/tsconfig.spec.json delete mode 100644 frontend/libs/common/interfaces/.babelrc delete mode 100644 frontend/libs/common/interfaces/README.md delete mode 100644 frontend/libs/common/interfaces/package.json delete mode 100644 frontend/libs/common/interfaces/src/index.ts delete mode 100644 frontend/libs/common/interfaces/tsconfig.json delete mode 100644 frontend/libs/common/interfaces/tsconfig.lib.json delete mode 100644 frontend/libs/common/interfaces/tsconfig.spec.json delete mode 100644 frontend/libs/common/interfaces/vite.config.ts rename frontend/libs/common/{enums => }/package.json (91%) create mode 100644 frontend/libs/common/src/index.ts rename frontend/libs/common/{enums/src/lib => src/lib/enums}/EditorState.ts (100%) rename frontend/libs/common/{enums/src/lib => src/lib/enums}/Hotkeys.ts (100%) rename frontend/libs/common/{enums/src/lib => src/lib/enums}/Queue/AssetType.ts (100%) rename frontend/libs/common/{enums/src/lib => src/lib/enums}/Queue/ClipGroup.ts (100%) rename frontend/libs/common/{enums/src/lib => src/lib/enums}/Queue/ClipType.ts (100%) rename frontend/libs/common/{enums/src/lib => src/lib/enums}/Queue/FromEngineActions.ts (100%) rename frontend/libs/common/{enums/src/lib => src/lib/enums}/Queue/QueueNames.ts (100%) rename frontend/libs/common/{enums/src/lib => src/lib/enums}/Queue/ToEngineActions.ts (100%) rename frontend/libs/common/{enums/src/lib => src/lib/enums}/Queue/ToTimelineActions.ts (100%) rename frontend/libs/common/{enums/src/lib => src/lib/enums}/Queue/index.ts (100%) rename frontend/libs/common/{enums/src/lib => src/lib/enums}/Toaster/ToastTypes.ts (100%) rename frontend/libs/common/{enums/src/lib => src/lib/enums}/Toaster/index.ts (100%) rename frontend/libs/common/{enums/src/lib => src/lib/enums}/UploaderStates.ts (100%) create mode 100644 frontend/libs/common/src/lib/enums/index.ts rename frontend/libs/common/{interfaces/src/lib => src/lib/interfaces}/Camera.ts (100%) rename frontend/libs/common/{interfaces/src/lib => src/lib/interfaces}/IGenerationOptions.ts (100%) rename frontend/libs/common/{interfaces/src/lib => src/lib/interfaces}/MediaItem.ts (87%) rename frontend/libs/common/{interfaces/src/lib => src/lib/interfaces}/Queue.ts (82%) rename frontend/libs/common/{interfaces/src/lib => src/lib/interfaces}/UpdateTime.ts (100%) rename frontend/libs/common/{interfaces/src/lib => src/lib/interfaces}/UploadImage.ts (100%) rename frontend/libs/common/{interfaces/src/lib => src/lib/interfaces}/UploaderState.ts (66%) create mode 100644 frontend/libs/common/src/lib/interfaces/index.ts rename frontend/libs/common/{types/src/lib => src/lib/types}/bitmap.ts (100%) rename frontend/libs/common/{types/src/lib => src/lib/types}/index.ts (100%) rename frontend/libs/common/{types/src/lib => src/lib/types}/jobcontext.ts (100%) rename frontend/libs/common/{types/src/lib => src/lib/types}/queue.ts (91%) rename frontend/libs/common/{types/src/lib => src/lib/types}/toast.ts (100%) rename frontend/libs/common/{types/src/lib => src/lib/types}/xyz.ts (100%) rename frontend/libs/common/{enums => }/tsconfig.json (78%) rename frontend/libs/common/{enums => }/tsconfig.lib.json (95%) rename frontend/libs/common/{types => }/tsconfig.spec.json (93%) delete mode 100644 frontend/libs/common/types/.babelrc delete mode 100644 frontend/libs/common/types/README.md delete mode 100644 frontend/libs/common/types/package.json delete mode 100644 frontend/libs/common/types/src/index.ts delete mode 100644 frontend/libs/common/types/tsconfig.json delete mode 100644 frontend/libs/common/types/tsconfig.lib.json delete mode 100644 frontend/libs/common/types/vite.config.ts rename frontend/libs/common/{enums => }/vite.config.ts (90%) delete mode 100644 frontend/libs/components/toaster/src/lib/toaster.module.css delete mode 100644 frontend/libs/components/toaster/src/lib/toaster.spec.tsx diff --git a/frontend/apps/editor3d/tsconfig.json b/frontend/apps/editor3d/tsconfig.json index f4535364ef..15aceb4cda 100644 --- a/frontend/apps/editor3d/tsconfig.json +++ b/frontend/apps/editor3d/tsconfig.json @@ -42,9 +42,6 @@ { "path": "../../libs/components/close-button" }, - { - "path": "../../libs/components/button" - }, { "path": "../../libs/components/modal" }, @@ -54,6 +51,24 @@ { "path": "../../libs/components/demo-modal" }, + { + "path": "../../libs/components/popover" + }, + { + "path": "../../libs/soundboard" + }, + { + "path": "../../libs/components/button" + }, + { + "path": "../../libs/components/promptbox" + }, + { + "path": "../../libs/components/tab-selector" + }, + { + "path": "../../libs/api" + }, { "path": "../../libs/components/tooltip" }, @@ -65,12 +80,6 @@ }, { "path": "../../libs/tauri-utils" - }, - { - "path": "../../libs/api" - }, - { - "path": "../../libs/soundboard" } ] } diff --git a/frontend/libs/common/enums/.babelrc b/frontend/libs/common/.babelrc similarity index 100% rename from frontend/libs/common/enums/.babelrc rename to frontend/libs/common/.babelrc diff --git a/frontend/libs/common/enums/README.md b/frontend/libs/common/README.md similarity index 100% rename from frontend/libs/common/enums/README.md rename to frontend/libs/common/README.md diff --git a/frontend/libs/common/enums/src/index.ts b/frontend/libs/common/enums/src/index.ts deleted file mode 100644 index c56d15c4e9..0000000000 --- a/frontend/libs/common/enums/src/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from "./lib/EditorState"; -export * from "./lib/Queue"; -export * from "./lib/UploaderStates"; -export * from "./lib/Hotkeys"; -export * from "./lib/Toaster"; diff --git a/frontend/libs/common/enums/tsconfig.spec.json b/frontend/libs/common/enums/tsconfig.spec.json deleted file mode 100644 index 18b7de51b8..0000000000 --- a/frontend/libs/common/enums/tsconfig.spec.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "./out-tsc/vitest", - "types": [ - "vitest/globals", - "vitest/importMeta", - "vite/client", - "node", - "vitest" - ], - "jsx": "react-jsx" - }, - "include": [ - "vite.config.ts", - "vite.config.mts", - "vitest.config.ts", - "vitest.config.mts", - "src/**/*.test.ts", - "src/**/*.spec.ts", - "src/**/*.test.tsx", - "src/**/*.spec.tsx", - "src/**/*.test.js", - "src/**/*.spec.js", - "src/**/*.test.jsx", - "src/**/*.spec.jsx", - "src/**/*.d.ts" - ], - "references": [ - { - "path": "./tsconfig.lib.json" - } - ] -} diff --git a/frontend/libs/common/interfaces/.babelrc b/frontend/libs/common/interfaces/.babelrc deleted file mode 100644 index 1ea870ead4..0000000000 --- a/frontend/libs/common/interfaces/.babelrc +++ /dev/null @@ -1,12 +0,0 @@ -{ - "presets": [ - [ - "@nx/react/babel", - { - "runtime": "automatic", - "useBuiltIns": "usage" - } - ] - ], - "plugins": [] -} diff --git a/frontend/libs/common/interfaces/README.md b/frontend/libs/common/interfaces/README.md deleted file mode 100644 index 4fd2b09c84..0000000000 --- a/frontend/libs/common/interfaces/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# @storyteller/interfaces - -This library was generated with [Nx](https://nx.dev). - -## Running unit tests - -Run `nx test @storyteller/interfaces` to execute the unit tests via [Vitest](https://vitest.dev/). diff --git a/frontend/libs/common/interfaces/package.json b/frontend/libs/common/interfaces/package.json deleted file mode 100644 index a8784da926..0000000000 --- a/frontend/libs/common/interfaces/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "@storyteller/interfaces", - "version": "0.0.1", - "type": "module", - "main": "./dist/index.js", - "module": "./dist/index.js", - "types": "./dist/index.d.ts", - "exports": { - "./package.json": "./package.json", - ".": { - "development": "./src/index.ts", - "types": "./dist/index.d.ts", - "import": "./dist/index.js", - "default": "./dist/index.js" - } - } -} diff --git a/frontend/libs/common/interfaces/src/index.ts b/frontend/libs/common/interfaces/src/index.ts deleted file mode 100644 index 7d3378fb18..0000000000 --- a/frontend/libs/common/interfaces/src/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -export * from "./lib/Camera"; -export * from "./lib/UploadImage"; -export * from "./lib/IGenerationOptions"; -export * from "./lib/UpdateTime"; -export * from "./lib/Queue"; -export * from "./lib/MediaItem"; -export * from "./lib/UploadImage"; -export * from "./lib/UploaderState"; diff --git a/frontend/libs/common/interfaces/tsconfig.json b/frontend/libs/common/interfaces/tsconfig.json deleted file mode 100644 index 9731eb786b..0000000000 --- a/frontend/libs/common/interfaces/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "files": [], - "include": [], - "references": [ - { - "path": "../types" - }, - { - "path": "../enums" - }, - { - "path": "./tsconfig.lib.json" - }, - { - "path": "./tsconfig.spec.json" - } - ], - "extends": "../../../tsconfig.base.json" -} diff --git a/frontend/libs/common/interfaces/tsconfig.lib.json b/frontend/libs/common/interfaces/tsconfig.lib.json deleted file mode 100644 index 6285e4860b..0000000000 --- a/frontend/libs/common/interfaces/tsconfig.lib.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "dist", - "types": [ - "node", - "@nx/react/typings/cssmodule.d.ts", - "@nx/react/typings/image.d.ts", - "vite/client" - ], - "rootDir": "src", - "jsx": "react-jsx", - "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo" - }, - "exclude": [ - "out-tsc", - "dist", - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "**/*.spec.js", - "**/*.test.js", - "**/*.spec.jsx", - "**/*.test.jsx", - "vite.config.ts", - "vite.config.mts", - "vitest.config.ts", - "vitest.config.mts", - "src/**/*.test.ts", - "src/**/*.spec.ts", - "src/**/*.test.tsx", - "src/**/*.spec.tsx", - "src/**/*.test.js", - "src/**/*.spec.js", - "src/**/*.test.jsx", - "src/**/*.spec.jsx" - ], - "include": [ - "src/**/*.js", - "src/**/*.jsx", - "src/**/*.ts", - "src/**/*.tsx" - ], - "references": [ - { - "path": "../types/tsconfig.lib.json" - }, - { - "path": "../enums/tsconfig.lib.json" - } - ] -} diff --git a/frontend/libs/common/interfaces/tsconfig.spec.json b/frontend/libs/common/interfaces/tsconfig.spec.json deleted file mode 100644 index 18b7de51b8..0000000000 --- a/frontend/libs/common/interfaces/tsconfig.spec.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "./out-tsc/vitest", - "types": [ - "vitest/globals", - "vitest/importMeta", - "vite/client", - "node", - "vitest" - ], - "jsx": "react-jsx" - }, - "include": [ - "vite.config.ts", - "vite.config.mts", - "vitest.config.ts", - "vitest.config.mts", - "src/**/*.test.ts", - "src/**/*.spec.ts", - "src/**/*.test.tsx", - "src/**/*.spec.tsx", - "src/**/*.test.js", - "src/**/*.spec.js", - "src/**/*.test.jsx", - "src/**/*.spec.jsx", - "src/**/*.d.ts" - ], - "references": [ - { - "path": "./tsconfig.lib.json" - } - ] -} diff --git a/frontend/libs/common/interfaces/vite.config.ts b/frontend/libs/common/interfaces/vite.config.ts deleted file mode 100644 index f1857d7838..0000000000 --- a/frontend/libs/common/interfaces/vite.config.ts +++ /dev/null @@ -1,49 +0,0 @@ -/// -import { defineConfig } from 'vite'; -import react from '@vitejs/plugin-react'; -import dts from 'vite-plugin-dts'; -import * as path from 'path'; - -export default defineConfig(() => ({ - root: __dirname, - cacheDir: '../../../node_modules/.vite/libs/common/interfaces', - plugins: [react(), dts({ entryRoot: 'src', tsconfigPath: path.join(__dirname, 'tsconfig.lib.json') })], - // Uncomment this if you are using workers. - // worker: { - // plugins: [ nxViteTsPaths() ], - // }, - // Configuration for building your library. - // See: https://vitejs.dev/guide/build.html#library-mode - build: { - outDir: './dist', - emptyOutDir: true, - reportCompressedSize: true, - commonjsOptions: { - transformMixedEsModules: true, - }, - lib: { - // Could also be a dictionary or array of multiple entry points. - entry: 'src/index.ts', - name: '@storyteller/interfaces', - fileName: 'index', - // Change this to the formats you want to support. - // Don't forget to update your package.json as well. - formats: ['es' as const] - }, - rollupOptions: { - // External packages that should not be bundled into your library. - external: ['react','react-dom','react/jsx-runtime'] - }, - }, - test: { - watch: false, - globals: true, - environment: 'jsdom', - include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], - reporters: ['default'], - coverage: { - reportsDirectory: './test-output/vitest/coverage', - provider: 'v8' as const, - } - }, -})); diff --git a/frontend/libs/common/enums/package.json b/frontend/libs/common/package.json similarity index 91% rename from frontend/libs/common/enums/package.json rename to frontend/libs/common/package.json index 75debb8970..e08efa2038 100644 --- a/frontend/libs/common/enums/package.json +++ b/frontend/libs/common/package.json @@ -1,5 +1,5 @@ { - "name": "@storyteller/enums", + "name": "@storyteller/common", "version": "0.0.1", "type": "module", "main": "./dist/index.js", diff --git a/frontend/libs/common/src/index.ts b/frontend/libs/common/src/index.ts new file mode 100644 index 0000000000..43893fd0d0 --- /dev/null +++ b/frontend/libs/common/src/index.ts @@ -0,0 +1,3 @@ +export * from './lib/enums'; +export * from './lib/interfaces'; +export * from './lib/types'; diff --git a/frontend/libs/common/enums/src/lib/EditorState.ts b/frontend/libs/common/src/lib/enums/EditorState.ts similarity index 100% rename from frontend/libs/common/enums/src/lib/EditorState.ts rename to frontend/libs/common/src/lib/enums/EditorState.ts diff --git a/frontend/libs/common/enums/src/lib/Hotkeys.ts b/frontend/libs/common/src/lib/enums/Hotkeys.ts similarity index 100% rename from frontend/libs/common/enums/src/lib/Hotkeys.ts rename to frontend/libs/common/src/lib/enums/Hotkeys.ts diff --git a/frontend/libs/common/enums/src/lib/Queue/AssetType.ts b/frontend/libs/common/src/lib/enums/Queue/AssetType.ts similarity index 100% rename from frontend/libs/common/enums/src/lib/Queue/AssetType.ts rename to frontend/libs/common/src/lib/enums/Queue/AssetType.ts diff --git a/frontend/libs/common/enums/src/lib/Queue/ClipGroup.ts b/frontend/libs/common/src/lib/enums/Queue/ClipGroup.ts similarity index 100% rename from frontend/libs/common/enums/src/lib/Queue/ClipGroup.ts rename to frontend/libs/common/src/lib/enums/Queue/ClipGroup.ts diff --git a/frontend/libs/common/enums/src/lib/Queue/ClipType.ts b/frontend/libs/common/src/lib/enums/Queue/ClipType.ts similarity index 100% rename from frontend/libs/common/enums/src/lib/Queue/ClipType.ts rename to frontend/libs/common/src/lib/enums/Queue/ClipType.ts diff --git a/frontend/libs/common/enums/src/lib/Queue/FromEngineActions.ts b/frontend/libs/common/src/lib/enums/Queue/FromEngineActions.ts similarity index 100% rename from frontend/libs/common/enums/src/lib/Queue/FromEngineActions.ts rename to frontend/libs/common/src/lib/enums/Queue/FromEngineActions.ts diff --git a/frontend/libs/common/enums/src/lib/Queue/QueueNames.ts b/frontend/libs/common/src/lib/enums/Queue/QueueNames.ts similarity index 100% rename from frontend/libs/common/enums/src/lib/Queue/QueueNames.ts rename to frontend/libs/common/src/lib/enums/Queue/QueueNames.ts diff --git a/frontend/libs/common/enums/src/lib/Queue/ToEngineActions.ts b/frontend/libs/common/src/lib/enums/Queue/ToEngineActions.ts similarity index 100% rename from frontend/libs/common/enums/src/lib/Queue/ToEngineActions.ts rename to frontend/libs/common/src/lib/enums/Queue/ToEngineActions.ts diff --git a/frontend/libs/common/enums/src/lib/Queue/ToTimelineActions.ts b/frontend/libs/common/src/lib/enums/Queue/ToTimelineActions.ts similarity index 100% rename from frontend/libs/common/enums/src/lib/Queue/ToTimelineActions.ts rename to frontend/libs/common/src/lib/enums/Queue/ToTimelineActions.ts diff --git a/frontend/libs/common/enums/src/lib/Queue/index.ts b/frontend/libs/common/src/lib/enums/Queue/index.ts similarity index 100% rename from frontend/libs/common/enums/src/lib/Queue/index.ts rename to frontend/libs/common/src/lib/enums/Queue/index.ts diff --git a/frontend/libs/common/enums/src/lib/Toaster/ToastTypes.ts b/frontend/libs/common/src/lib/enums/Toaster/ToastTypes.ts similarity index 100% rename from frontend/libs/common/enums/src/lib/Toaster/ToastTypes.ts rename to frontend/libs/common/src/lib/enums/Toaster/ToastTypes.ts diff --git a/frontend/libs/common/enums/src/lib/Toaster/index.ts b/frontend/libs/common/src/lib/enums/Toaster/index.ts similarity index 100% rename from frontend/libs/common/enums/src/lib/Toaster/index.ts rename to frontend/libs/common/src/lib/enums/Toaster/index.ts diff --git a/frontend/libs/common/enums/src/lib/UploaderStates.ts b/frontend/libs/common/src/lib/enums/UploaderStates.ts similarity index 100% rename from frontend/libs/common/enums/src/lib/UploaderStates.ts rename to frontend/libs/common/src/lib/enums/UploaderStates.ts diff --git a/frontend/libs/common/src/lib/enums/index.ts b/frontend/libs/common/src/lib/enums/index.ts new file mode 100644 index 0000000000..2b644167d1 --- /dev/null +++ b/frontend/libs/common/src/lib/enums/index.ts @@ -0,0 +1,5 @@ +export * from "./EditorState"; +export * from "./Queue"; +export * from "./UploaderStates"; +export * from "./Hotkeys"; +export * from "./Toaster"; diff --git a/frontend/libs/common/interfaces/src/lib/Camera.ts b/frontend/libs/common/src/lib/interfaces/Camera.ts similarity index 100% rename from frontend/libs/common/interfaces/src/lib/Camera.ts rename to frontend/libs/common/src/lib/interfaces/Camera.ts diff --git a/frontend/libs/common/interfaces/src/lib/IGenerationOptions.ts b/frontend/libs/common/src/lib/interfaces/IGenerationOptions.ts similarity index 100% rename from frontend/libs/common/interfaces/src/lib/IGenerationOptions.ts rename to frontend/libs/common/src/lib/interfaces/IGenerationOptions.ts diff --git a/frontend/libs/common/interfaces/src/lib/MediaItem.ts b/frontend/libs/common/src/lib/interfaces/MediaItem.ts similarity index 87% rename from frontend/libs/common/interfaces/src/lib/MediaItem.ts rename to frontend/libs/common/src/lib/interfaces/MediaItem.ts index 4ab432ecc5..20b56f1a3f 100644 --- a/frontend/libs/common/interfaces/src/lib/MediaItem.ts +++ b/frontend/libs/common/src/lib/interfaces/MediaItem.ts @@ -1,4 +1,4 @@ -import { AssetType } from "@storyteller/enums"; +import { AssetType } from "../enums"; export interface MediaItem { version: number; diff --git a/frontend/libs/common/interfaces/src/lib/Queue.ts b/frontend/libs/common/src/lib/interfaces/Queue.ts similarity index 82% rename from frontend/libs/common/interfaces/src/lib/Queue.ts rename to frontend/libs/common/src/lib/interfaces/Queue.ts index 8c11beccc3..d20852fdcc 100644 --- a/frontend/libs/common/interfaces/src/lib/Queue.ts +++ b/frontend/libs/common/src/lib/interfaces/Queue.ts @@ -1,5 +1,5 @@ -import { ClipGroup, ClipType } from "@storyteller/enums"; -import { XYZ } from "@storyteller/types"; +import { ClipGroup, ClipType } from "../enums"; +import { XYZ } from "../types"; export interface QueueClip { version: number; diff --git a/frontend/libs/common/interfaces/src/lib/UpdateTime.ts b/frontend/libs/common/src/lib/interfaces/UpdateTime.ts similarity index 100% rename from frontend/libs/common/interfaces/src/lib/UpdateTime.ts rename to frontend/libs/common/src/lib/interfaces/UpdateTime.ts diff --git a/frontend/libs/common/interfaces/src/lib/UploadImage.ts b/frontend/libs/common/src/lib/interfaces/UploadImage.ts similarity index 100% rename from frontend/libs/common/interfaces/src/lib/UploadImage.ts rename to frontend/libs/common/src/lib/interfaces/UploadImage.ts diff --git a/frontend/libs/common/interfaces/src/lib/UploaderState.ts b/frontend/libs/common/src/lib/interfaces/UploaderState.ts similarity index 66% rename from frontend/libs/common/interfaces/src/lib/UploaderState.ts rename to frontend/libs/common/src/lib/interfaces/UploaderState.ts index 5d2f22fabb..e6a5346a11 100644 --- a/frontend/libs/common/interfaces/src/lib/UploaderState.ts +++ b/frontend/libs/common/src/lib/interfaces/UploaderState.ts @@ -1,4 +1,4 @@ -import { UploaderStates } from "@storyteller/enums"; +import { UploaderStates } from "../enums"; export interface UploaderState { status: UploaderStates; diff --git a/frontend/libs/common/src/lib/interfaces/index.ts b/frontend/libs/common/src/lib/interfaces/index.ts new file mode 100644 index 0000000000..d7d95b982a --- /dev/null +++ b/frontend/libs/common/src/lib/interfaces/index.ts @@ -0,0 +1,8 @@ +export * from "./Camera"; +export * from "./UploadImage"; +export * from "./IGenerationOptions"; +export * from "./UpdateTime"; +export * from "./Queue"; +export * from "./MediaItem"; +export * from "./UploadImage"; +export * from "./UploaderState"; diff --git a/frontend/libs/common/types/src/lib/bitmap.ts b/frontend/libs/common/src/lib/types/bitmap.ts similarity index 100% rename from frontend/libs/common/types/src/lib/bitmap.ts rename to frontend/libs/common/src/lib/types/bitmap.ts diff --git a/frontend/libs/common/types/src/lib/index.ts b/frontend/libs/common/src/lib/types/index.ts similarity index 100% rename from frontend/libs/common/types/src/lib/index.ts rename to frontend/libs/common/src/lib/types/index.ts diff --git a/frontend/libs/common/types/src/lib/jobcontext.ts b/frontend/libs/common/src/lib/types/jobcontext.ts similarity index 100% rename from frontend/libs/common/types/src/lib/jobcontext.ts rename to frontend/libs/common/src/lib/types/jobcontext.ts diff --git a/frontend/libs/common/types/src/lib/queue.ts b/frontend/libs/common/src/lib/types/queue.ts similarity index 91% rename from frontend/libs/common/types/src/lib/queue.ts rename to frontend/libs/common/src/lib/types/queue.ts index a16587b384..8c1399c029 100644 --- a/frontend/libs/common/types/src/lib/queue.ts +++ b/frontend/libs/common/src/lib/types/queue.ts @@ -1,7 +1,6 @@ -import { QueueNames, toTimelineActions, CameraAspectRatio, fromEngineActions, toEngineActions } from "@storyteller/enums"; - -import { IGenerationOptions, UpdateTime, QueueClip, QueueKeyframe, MediaItem } from "@storyteller/interfaces"; -import { ToastDataType } from "@storyteller/types"; +import { CameraAspectRatio, fromEngineActions, QueueNames, toEngineActions, toTimelineActions } from "../enums"; +import { IGenerationOptions, MediaItem, QueueClip, QueueKeyframe, UpdateTime } from "../interfaces"; +import { ToastDataType } from "./toast"; export type UnionedActionTypes = | fromEngineActions diff --git a/frontend/libs/common/types/src/lib/toast.ts b/frontend/libs/common/src/lib/types/toast.ts similarity index 100% rename from frontend/libs/common/types/src/lib/toast.ts rename to frontend/libs/common/src/lib/types/toast.ts diff --git a/frontend/libs/common/types/src/lib/xyz.ts b/frontend/libs/common/src/lib/types/xyz.ts similarity index 100% rename from frontend/libs/common/types/src/lib/xyz.ts rename to frontend/libs/common/src/lib/types/xyz.ts diff --git a/frontend/libs/common/enums/tsconfig.json b/frontend/libs/common/tsconfig.json similarity index 78% rename from frontend/libs/common/enums/tsconfig.json rename to frontend/libs/common/tsconfig.json index b3d19d8f5e..8c5fc025ff 100644 --- a/frontend/libs/common/enums/tsconfig.json +++ b/frontend/libs/common/tsconfig.json @@ -9,5 +9,5 @@ "path": "./tsconfig.spec.json" } ], - "extends": "../../../tsconfig.base.json" + "extends": "../../tsconfig.base.json" } diff --git a/frontend/libs/common/enums/tsconfig.lib.json b/frontend/libs/common/tsconfig.lib.json similarity index 95% rename from frontend/libs/common/enums/tsconfig.lib.json rename to frontend/libs/common/tsconfig.lib.json index f0782e3dd8..ea31c66850 100644 --- a/frontend/libs/common/enums/tsconfig.lib.json +++ b/frontend/libs/common/tsconfig.lib.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "outDir": "dist", "types": [ diff --git a/frontend/libs/common/types/tsconfig.spec.json b/frontend/libs/common/tsconfig.spec.json similarity index 93% rename from frontend/libs/common/types/tsconfig.spec.json rename to frontend/libs/common/tsconfig.spec.json index 18b7de51b8..c1faced82c 100644 --- a/frontend/libs/common/types/tsconfig.spec.json +++ b/frontend/libs/common/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "outDir": "./out-tsc/vitest", "types": [ diff --git a/frontend/libs/common/types/.babelrc b/frontend/libs/common/types/.babelrc deleted file mode 100644 index 1ea870ead4..0000000000 --- a/frontend/libs/common/types/.babelrc +++ /dev/null @@ -1,12 +0,0 @@ -{ - "presets": [ - [ - "@nx/react/babel", - { - "runtime": "automatic", - "useBuiltIns": "usage" - } - ] - ], - "plugins": [] -} diff --git a/frontend/libs/common/types/README.md b/frontend/libs/common/types/README.md deleted file mode 100644 index 83d4bda351..0000000000 --- a/frontend/libs/common/types/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# @storyteller/types - -This library was generated with [Nx](https://nx.dev). - -## Running unit tests - -Run `nx test @storyteller/types` to execute the unit tests via [Vitest](https://vitest.dev/). diff --git a/frontend/libs/common/types/package.json b/frontend/libs/common/types/package.json deleted file mode 100644 index b38d944e26..0000000000 --- a/frontend/libs/common/types/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "@storyteller/types", - "version": "0.0.1", - "type": "module", - "main": "./dist/index.js", - "module": "./dist/index.js", - "types": "./dist/index.d.ts", - "exports": { - "./package.json": "./package.json", - ".": { - "development": "./src/index.ts", - "types": "./dist/index.d.ts", - "import": "./dist/index.js", - "default": "./dist/index.js" - } - } -} diff --git a/frontend/libs/common/types/src/index.ts b/frontend/libs/common/types/src/index.ts deleted file mode 100644 index f41a696fd2..0000000000 --- a/frontend/libs/common/types/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './lib'; diff --git a/frontend/libs/common/types/tsconfig.json b/frontend/libs/common/types/tsconfig.json deleted file mode 100644 index 9fe510ef93..0000000000 --- a/frontend/libs/common/types/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "files": [], - "include": [], - "references": [ - { - "path": "../interfaces" - }, - { - "path": "../enums" - }, - { - "path": "./tsconfig.lib.json" - }, - { - "path": "./tsconfig.spec.json" - } - ], - "extends": "../../../tsconfig.base.json" -} diff --git a/frontend/libs/common/types/tsconfig.lib.json b/frontend/libs/common/types/tsconfig.lib.json deleted file mode 100644 index deb62d408e..0000000000 --- a/frontend/libs/common/types/tsconfig.lib.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "dist", - "types": [ - "node", - "@nx/react/typings/cssmodule.d.ts", - "@nx/react/typings/image.d.ts", - "vite/client" - ], - "rootDir": "src", - "jsx": "react-jsx", - "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo" - }, - "exclude": [ - "out-tsc", - "dist", - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "**/*.spec.js", - "**/*.test.js", - "**/*.spec.jsx", - "**/*.test.jsx", - "vite.config.ts", - "vite.config.mts", - "vitest.config.ts", - "vitest.config.mts", - "src/**/*.test.ts", - "src/**/*.spec.ts", - "src/**/*.test.tsx", - "src/**/*.spec.tsx", - "src/**/*.test.js", - "src/**/*.spec.js", - "src/**/*.test.jsx", - "src/**/*.spec.jsx" - ], - "include": [ - "src/**/*.js", - "src/**/*.jsx", - "src/**/*.ts", - "src/**/*.tsx" - ], - "references": [ - { - "path": "../interfaces/tsconfig.lib.json" - }, - { - "path": "../enums/tsconfig.lib.json" - } - ] -} diff --git a/frontend/libs/common/types/vite.config.ts b/frontend/libs/common/types/vite.config.ts deleted file mode 100644 index 2fca647531..0000000000 --- a/frontend/libs/common/types/vite.config.ts +++ /dev/null @@ -1,49 +0,0 @@ -/// -import { defineConfig } from 'vite'; -import react from '@vitejs/plugin-react'; -import dts from 'vite-plugin-dts'; -import * as path from 'path'; - -export default defineConfig(() => ({ - root: __dirname, - cacheDir: '../../../node_modules/.vite/libs/common/types', - plugins: [react(), dts({ entryRoot: 'src', tsconfigPath: path.join(__dirname, 'tsconfig.lib.json') })], - // Uncomment this if you are using workers. - // worker: { - // plugins: [ nxViteTsPaths() ], - // }, - // Configuration for building your library. - // See: https://vitejs.dev/guide/build.html#library-mode - build: { - outDir: './dist', - emptyOutDir: true, - reportCompressedSize: true, - commonjsOptions: { - transformMixedEsModules: true, - }, - lib: { - // Could also be a dictionary or array of multiple entry points. - entry: 'src/index.ts', - name: '@storyteller/types', - fileName: 'index', - // Change this to the formats you want to support. - // Don't forget to update your package.json as well. - formats: ['es' as const] - }, - rollupOptions: { - // External packages that should not be bundled into your library. - external: ['react','react-dom','react/jsx-runtime'] - }, - }, - test: { - watch: false, - globals: true, - environment: 'jsdom', - include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], - reporters: ['default'], - coverage: { - reportsDirectory: './test-output/vitest/coverage', - provider: 'v8' as const, - } - }, -})); diff --git a/frontend/libs/common/enums/vite.config.ts b/frontend/libs/common/vite.config.ts similarity index 90% rename from frontend/libs/common/enums/vite.config.ts rename to frontend/libs/common/vite.config.ts index 08b5c02bc9..1c66fe96e7 100644 --- a/frontend/libs/common/enums/vite.config.ts +++ b/frontend/libs/common/vite.config.ts @@ -6,7 +6,7 @@ import * as path from 'path'; export default defineConfig(() => ({ root: __dirname, - cacheDir: '../../../node_modules/.vite/libs/common/enums', + cacheDir: '../../node_modules/.vite/libs/common', plugins: [react(), dts({ entryRoot: 'src', tsconfigPath: path.join(__dirname, 'tsconfig.lib.json') })], // Uncomment this if you are using workers. // worker: { @@ -24,7 +24,7 @@ export default defineConfig(() => ({ lib: { // Could also be a dictionary or array of multiple entry points. entry: 'src/index.ts', - name: '@storyteller/enums', + name: '@storyteller/common', fileName: 'index', // Change this to the formats you want to support. // Don't forget to update your package.json as well. @@ -32,7 +32,7 @@ export default defineConfig(() => ({ }, rollupOptions: { // External packages that should not be bundled into your library. - external: ['react','react-dom','react/jsx-runtime'] + external: ['react', 'react-dom', 'react/jsx-runtime'] }, }, test: { diff --git a/frontend/libs/components/promptbox/src/lib/PromptBox2D.tsx b/frontend/libs/components/promptbox/src/lib/PromptBox2D.tsx index 84c6f62803..e7091d5f55 100644 --- a/frontend/libs/components/promptbox/src/lib/PromptBox2D.tsx +++ b/frontend/libs/components/promptbox/src/lib/PromptBox2D.tsx @@ -2,9 +2,7 @@ import { useState, useRef, useEffect } from "react"; import { invoke } from "@tauri-apps/api/core"; import { useSignals } from "@preact/signals-react/runtime"; import { toast } from "sonner"; -import { UploaderStates } from "@storyteller/enums"; -import { UploaderState } from "@storyteller/interfaces"; -import { JobContextType, MaybeCanvasRenderBitmapType } from "@storyteller/types"; +import { JobContextType, MaybeCanvasRenderBitmapType, UploaderState, UploaderStates } from "@storyteller/common"; import { downloadFileFromUrl } from "@storyteller/api"; import { PopoverMenu, PopoverItem } from "@storyteller/ui-popover"; import { Tooltip } from "@storyteller/ui-tooltip"; diff --git a/frontend/libs/components/promptbox/src/lib/PromptBox3D.tsx b/frontend/libs/components/promptbox/src/lib/PromptBox3D.tsx index 70665580d6..4d6b0e87b7 100644 --- a/frontend/libs/components/promptbox/src/lib/PromptBox3D.tsx +++ b/frontend/libs/components/promptbox/src/lib/PromptBox3D.tsx @@ -33,7 +33,10 @@ import { CameraAspectRatio, UploaderStates, DomLevels, -} from "@storyteller/enums"; + Camera, + FocalLengthDragging, + UploadImageArgs, +} from "@storyteller/common"; import { PromptsApi } from "@storyteller/api"; import { SoundRegistry } from "@storyteller/soundboard"; @@ -46,11 +49,6 @@ interface ReferenceImage { mediaToken: string; } -import { - Camera, - FocalLengthDragging, - UploadImageArgs, -} from "@storyteller/interfaces"; import { EngineApi } from "@storyteller/api"; import { CameraSettingsModal } from "@storyteller/ui-camera-settings-modal"; import { twMerge } from "tailwind-merge"; diff --git a/frontend/libs/components/promptbox/tsconfig.json b/frontend/libs/components/promptbox/tsconfig.json index b2e79172bb..4ae3a8d5c2 100644 --- a/frontend/libs/components/promptbox/tsconfig.json +++ b/frontend/libs/components/promptbox/tsconfig.json @@ -33,13 +33,7 @@ "path": "../../api" }, { - "path": "../../common/types" - }, - { - "path": "../../common/interfaces" - }, - { - "path": "../../common/enums" + "path": "../../common" }, { "path": "./tsconfig.lib.json" diff --git a/frontend/libs/components/promptbox/tsconfig.lib.json b/frontend/libs/components/promptbox/tsconfig.lib.json index 0c3d5098c9..aa58099405 100644 --- a/frontend/libs/components/promptbox/tsconfig.lib.json +++ b/frontend/libs/components/promptbox/tsconfig.lib.json @@ -74,13 +74,7 @@ "path": "../../api/tsconfig.lib.json" }, { - "path": "../../common/types/tsconfig.lib.json" - }, - { - "path": "../../common/interfaces/tsconfig.lib.json" - }, - { - "path": "../../common/enums/tsconfig.lib.json" + "path": "../../common/tsconfig.lib.json" } ] } diff --git a/frontend/libs/components/toaster/src/lib/toaster.module.css b/frontend/libs/components/toaster/src/lib/toaster.module.css deleted file mode 100644 index d0246c74b9..0000000000 --- a/frontend/libs/components/toaster/src/lib/toaster.module.css +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Replace this with your own classes - * - * e.g. - * .container { - * } -*/ \ No newline at end of file diff --git a/frontend/libs/components/toaster/src/lib/toaster.spec.tsx b/frontend/libs/components/toaster/src/lib/toaster.spec.tsx deleted file mode 100644 index 6ff83ed6e1..0000000000 --- a/frontend/libs/components/toaster/src/lib/toaster.spec.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import { render } from '@testing-library/react'; - -import Toaster from './toaster'; - -describe('Toaster', () => { - - it('should render successfully', () => { - const { baseElement } = render(); - expect(baseElement).toBeTruthy(); - }); - -}); diff --git a/frontend/libs/components/transition-dialogue/src/lib/transition-dialogue.tsx b/frontend/libs/components/transition-dialogue/src/lib/transition-dialogue.tsx index 750975df06..d7fa049743 100644 --- a/frontend/libs/components/transition-dialogue/src/lib/transition-dialogue.tsx +++ b/frontend/libs/components/transition-dialogue/src/lib/transition-dialogue.tsx @@ -7,7 +7,7 @@ import { faDownLeftAndUpRightToCenter, } from "@fortawesome/pro-solid-svg-icons"; import { Tooltip } from "@storyteller/ui-tooltip"; -import { DomLevels } from "@storyteller/enums"; +import { DomLevels } from "@storyteller/common"; const DialogBackdrop = ({ className, diff --git a/frontend/libs/components/transition-dialogue/tsconfig.json b/frontend/libs/components/transition-dialogue/tsconfig.json index 5c35778f64..49384db661 100644 --- a/frontend/libs/components/transition-dialogue/tsconfig.json +++ b/frontend/libs/components/transition-dialogue/tsconfig.json @@ -3,7 +3,7 @@ "include": [], "references": [ { - "path": "../../common/enums" + "path": "../../common" }, { "path": "../tooltip" diff --git a/frontend/libs/components/transition-dialogue/tsconfig.lib.json b/frontend/libs/components/transition-dialogue/tsconfig.lib.json index 913f6b1995..f83aef478f 100644 --- a/frontend/libs/components/transition-dialogue/tsconfig.lib.json +++ b/frontend/libs/components/transition-dialogue/tsconfig.lib.json @@ -44,7 +44,7 @@ ], "references": [ { - "path": "../../common/enums/tsconfig.lib.json" + "path": "../../common/tsconfig.lib.json" }, { "path": "../tooltip/tsconfig.lib.json" diff --git a/frontend/package-lock.json b/frontend/package-lock.json index b230f22bc0..7ad04dd996 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -2186,17 +2186,24 @@ "@tauri-apps/plugin-upload": "2.2.1" } }, + "libs/common": { + "name": "@storyteller/common", + "version": "0.0.1" + }, "libs/common/enums": { "name": "@storyteller/enums", - "version": "0.0.1" + "version": "0.0.1", + "extraneous": true }, "libs/common/interfaces": { "name": "@storyteller/interfaces", - "version": "0.0.1" + "version": "0.0.1", + "extraneous": true }, "libs/common/types": { "name": "@storyteller/types", - "version": "0.0.1" + "version": "0.0.1", + "extraneous": true }, "libs/components/button": { "name": "@storyteller/ui-button", @@ -5348,7 +5355,7 @@ "version": "0.3.6", "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", @@ -10239,12 +10246,8 @@ "resolved": "libs/api", "link": true }, - "node_modules/@storyteller/enums": { - "resolved": "libs/common/enums", - "link": true - }, - "node_modules/@storyteller/interfaces": { - "resolved": "libs/common/interfaces", + "node_modules/@storyteller/common": { + "resolved": "libs/common", "link": true }, "node_modules/@storyteller/soundboard": { @@ -10255,10 +10258,6 @@ "resolved": "libs/tauri-utils", "link": true }, - "node_modules/@storyteller/types": { - "resolved": "libs/common/types", - "link": true - }, "node_modules/@storyteller/ui-button": { "resolved": "libs/components/button", "link": true @@ -11633,7 +11632,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/@types/prop-types": { @@ -14281,7 +14280,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz", "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@babel/runtime": "^7.12.5", @@ -14297,7 +14296,7 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@types/parse-json": "^4.0.0", @@ -14314,7 +14313,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true, + "devOptional": true, "license": "ISC", "engines": { "node": ">= 6" @@ -14779,7 +14778,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=6" @@ -16397,7 +16396,7 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "is-arrayish": "^0.2.1" @@ -19487,7 +19486,7 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "parent-module": "^1.0.0", @@ -19643,7 +19642,7 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/is-async-function": { @@ -20476,7 +20475,7 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz", "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==", - "dev": true, + "devOptional": true, "license": "MIT", "bin": { "jiti": "lib/jiti-cli.mjs" @@ -20620,7 +20619,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/json-schema-traverse": { @@ -26475,7 +26474,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "callsites": "^3.0.0" @@ -26507,7 +26506,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.0.0", @@ -26526,7 +26525,7 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/parse-ms": { @@ -26609,7 +26608,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/path-scurry": { @@ -26644,7 +26643,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=8" @@ -28169,7 +28168,7 @@ "version": "1.22.8", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "is-core-module": "^2.13.0", @@ -28201,7 +28200,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=4" @@ -29572,7 +29571,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -29854,7 +29853,7 @@ "version": "5.39.0", "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz", "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==", - "dev": true, + "devOptional": true, "license": "BSD-2-Clause", "dependencies": { "@jridgewell/source-map": "^0.3.3", @@ -29941,14 +29940,14 @@ "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/terser/node_modules/source-map-support": { "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "buffer-from": "^1.0.0", @@ -30493,7 +30492,7 @@ "version": "5.7.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", - "dev": true, + "devOptional": true, "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index b46fc49a05..ab8aee409b 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -69,12 +69,6 @@ { "path": "./libs/components/popover" }, - { - "path": "./libs/common/enums" - }, - { - "path": "./libs/common/interfaces" - }, { "path": "./libs/components/camera-settings-modal" }, @@ -85,7 +79,7 @@ "path": "./libs/components/slider-v2" }, { - "path": "./libs/common/types" + "path": "./libs/common" } ] }