diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 6d3187854..c6603ae9c 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -12,8 +12,8 @@ "dmg": "open ../../target/release/bundle/dmg/" }, "dependencies": { - "@rspc/tauri": "^0.0.0-main-7c0a67c1", "@rspc/client": "^0.0.0-main-7c0a67c1", + "@rspc/tauri": "^0.0.0-main-7c0a67c1", "@sd/client": "workspace:*", "@sd/interface": "workspace:*", "@sd/ui": "workspace:*", @@ -22,6 +22,7 @@ "react-dom": "^18.2.0" }, "devDependencies": { + "@sd/config": "workspace:*", "@tauri-apps/cli": "1.1.1", "@tauri-apps/tauricon": "github:tauri-apps/tauricon", "@types/babel-core": "^6.25.7", @@ -33,6 +34,7 @@ "sass": "^1.55.0", "typescript": "^4.8.4", "vite": "^3.1.4", - "vite-plugin-svgr": "^2.2.1" + "vite-plugin-svgr": "^2.2.1", + "vite-tsconfig-paths": "^3.5.2" } } diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json index 435bfd6d3..404c5a9cb 100644 --- a/apps/desktop/tsconfig.json +++ b/apps/desktop/tsconfig.json @@ -1,7 +1,4 @@ { - "extends": "../../packages/config/interface.tsconfig.json", - "compilerOptions": { - "target": "es2020" - }, + "extends": "@sd/config/interface.tsconfig.json", "include": ["src"] } diff --git a/apps/desktop/vite.config.ts b/apps/desktop/vite.config.ts index 512405f20..00103bb15 100644 --- a/apps/desktop/vite.config.ts +++ b/apps/desktop/vite.config.ts @@ -1,6 +1,7 @@ import react from '@vitejs/plugin-react'; import { defineConfig } from 'vite'; import svgr from 'vite-plugin-svgr'; +import tsconfigPaths from 'vite-tsconfig-paths'; import { name, version } from './package.json'; @@ -10,6 +11,7 @@ export default defineConfig({ port: 8001 }, plugins: [ + tsconfigPaths(), react(), svgr({ svgrOptions: { diff --git a/apps/web/package.json b/apps/web/package.json index 35e3cda8b..b8e845a14 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -12,12 +12,12 @@ "@rspc/client": "^0.0.0-main-7c0a67c1", "@sd/client": "workspace:*", "@sd/interface": "workspace:*", - "@sd/ui": "workspace:*", "@tanstack/react-query": "^4.12.0", "react": "^18.2.0", "react-dom": "^18.2.0" }, "devDependencies": { + "@sd/config": "workspace:*", "@types/react": "^18.0.21", "@types/react-dom": "^18.0.6", "@vitejs/plugin-react": "^2.1.0", @@ -28,6 +28,6 @@ "vite": "^3.1.4", "vite-plugin-html": "^3.2.0", "vite-plugin-svgr": "^2.2.1", - "vite-plugin-tsconfig-paths": "^1.2.0" + "vite-tsconfig-paths": "^3.5.2" } } diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json index 168f12434..404c5a9cb 100644 --- a/apps/web/tsconfig.json +++ b/apps/web/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "../../packages/config/interface.tsconfig.json", - "compilerOptions": {}, + "extends": "@sd/config/interface.tsconfig.json", "include": ["src"] } diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts index affc565fe..6595d6480 100644 --- a/apps/web/vite.config.ts +++ b/apps/web/vite.config.ts @@ -3,7 +3,7 @@ import { visualizer } from 'rollup-plugin-visualizer'; import { defineConfig } from 'vite'; import { createHtmlPlugin } from 'vite-plugin-html'; import svg from 'vite-plugin-svgr'; -import tsconfigPaths from 'vite-plugin-tsconfig-paths'; +import tsconfigPaths from 'vite-tsconfig-paths'; import { name, version } from './package.json'; @@ -13,9 +13,9 @@ export default defineConfig({ port: 8002 }, plugins: [ + tsconfigPaths(), react(), svg({ svgrOptions: { icon: true } }), - tsconfigPaths(), createHtmlPlugin({ minify: true }), @@ -25,7 +25,6 @@ export default defineConfig({ }) ], root: 'src', - publicDir: '../../packages/interface/src/assets', define: { pkgJson: { name, version } }, diff --git a/packages/interface/src/assets/svg/alert.svg b/packages/assets/svgs/alert.svg similarity index 100% rename from packages/interface/src/assets/svg/alert.svg rename to packages/assets/svgs/alert.svg diff --git a/packages/interface/src/assets/svg/arrow-right.svg b/packages/assets/svgs/arrow-right.svg similarity index 100% rename from packages/interface/src/assets/svg/arrow-right.svg rename to packages/assets/svgs/arrow-right.svg diff --git a/packages/interface/src/assets/svg/drive.svg b/packages/assets/svgs/drive.svg similarity index 100% rename from packages/interface/src/assets/svg/drive.svg rename to packages/assets/svgs/drive.svg diff --git a/packages/interface/src/assets/svg/info.svg b/packages/assets/svgs/info.svg similarity index 100% rename from packages/interface/src/assets/svg/info.svg rename to packages/assets/svgs/info.svg diff --git a/packages/interface/src/assets/svg/macos_close.svg b/packages/assets/svgs/macos_close.svg similarity index 100% rename from packages/interface/src/assets/svg/macos_close.svg rename to packages/assets/svgs/macos_close.svg diff --git a/packages/interface/src/assets/svg/macos_fullscreen.svg b/packages/assets/svgs/macos_fullscreen.svg similarity index 100% rename from packages/interface/src/assets/svg/macos_fullscreen.svg rename to packages/assets/svgs/macos_fullscreen.svg diff --git a/packages/interface/src/assets/svg/macos_minimize.svg b/packages/assets/svgs/macos_minimize.svg similarity index 100% rename from packages/interface/src/assets/svg/macos_minimize.svg rename to packages/assets/svgs/macos_minimize.svg diff --git a/packages/interface/src/assets/svg/spinner.svg b/packages/assets/svgs/spinner.svg similarity index 100% rename from packages/interface/src/assets/svg/spinner.svg rename to packages/assets/svgs/spinner.svg diff --git a/packages/client/package.json b/packages/client/package.json index 2452db02b..70ab2ec59 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -8,8 +8,6 @@ ], "scripts": { "test": "jest", - "dev": "tsc -w", - "build": "tsc", "lint": "TIMING=1 eslint src --fix", "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist" }, diff --git a/packages/config/base.tsconfig.json b/packages/config/base.tsconfig.json index 819f5cfbd..db03ce4b6 100644 --- a/packages/config/base.tsconfig.json +++ b/packages/config/base.tsconfig.json @@ -23,7 +23,8 @@ "paths": { "@sd/interface": ["../../packages/interface"], "@sd/ui": ["../../packages/ui"], - "@sd/client": ["../../packages/client"] + "@sd/client": ["../../packages/client"], + "@sd/assets": ["../../packages/assets"] } }, "exclude": ["node_modules"] diff --git a/packages/interface/src/components/os/TrafficLights.tsx b/packages/interface/src/components/os/TrafficLights.tsx index 17eda944a..1682e6f6a 100644 --- a/packages/interface/src/components/os/TrafficLights.tsx +++ b/packages/interface/src/components/os/TrafficLights.tsx @@ -1,9 +1,9 @@ +import closeIconPath from '@sd/assets/svgs/macos_close.svg'; +import fullscreenIconPath from '@sd/assets/svgs/macos_fullscreen.svg'; +import minimizeIconPath from '@sd/assets/svgs/macos_minimize.svg'; import clsx from 'clsx'; import { HTMLAttributes, useEffect, useRef } from 'react'; -import closeIconPath from '../../assets/svg/macos_close.svg'; -import fullscreenIconPath from '../../assets/svg/macos_fullscreen.svg'; -import minimizeIconPath from '../../assets/svg/macos_minimize.svg'; import { useFocusState } from '../../hooks/useFocusState'; import { DefaultProps } from '../primitive/types'; diff --git a/packages/interface/tsconfig.json b/packages/interface/tsconfig.json index cf8e0fb5a..404c5a9cb 100644 --- a/packages/interface/tsconfig.json +++ b/packages/interface/tsconfig.json @@ -1,8 +1,4 @@ { - "extends": "../config/interface.tsconfig.json", - "compilerOptions": { - "target": "es2020", - "outDir": "./dist" - }, - "include": ["src", "../ui/src/Dialog.tsx", "../ui/src/Loader.tsx"] + "extends": "@sd/config/interface.tsconfig.json", + "include": ["src"] } diff --git a/packages/ui/package.json b/packages/ui/package.json index a98927f32..aa9d39046 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -12,7 +12,6 @@ "./package.json": "./package.json" }, "scripts": { - "build": "tsc", "storybook": "start-storybook -p 6006", "storybook:build": "build-storybook" }, diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json index b24a29cd7..a68a989fe 100644 --- a/packages/ui/tsconfig.json +++ b/packages/ui/tsconfig.json @@ -1,9 +1,7 @@ { - "extends": "../config/base.tsconfig.json", - "include": [ - "src" - ], - "compilerOptions": { - "outDir": "./dist" - } + "extends": "../config/interface.tsconfig.json", + "include": ["src"], + "compilerOptions": { + "outDir": "./dist" + } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a49f7536f..a72b2bbf0 100644 Binary files a/pnpm-lock.yaml and b/pnpm-lock.yaml differ