diff --git a/assets/esbuild.ts b/assets/esbuild.ts index 49562d2..62a255f 100644 --- a/assets/esbuild.ts +++ b/assets/esbuild.ts @@ -1,7 +1,7 @@ +import { walkFsTree } from "@repo/script/walkFsTree" import { watch as chokidar } from "chokidar" import { writeFile } from "node:fs/promises" import { basename, dirname, join, relative } from "node:path" -import { walkFsTree } from "script/walkFsTree" function dTsTemplate(name: string) { return `declare const query: string diff --git a/assets/package.json b/assets/package.json index 033ac69..5fd1534 100644 --- a/assets/package.json +++ b/assets/package.json @@ -1,5 +1,5 @@ { - "name": "assets", + "name": "@repo/assets", "version": "1.0.0", "private": true, "type": "module", @@ -13,6 +13,6 @@ "./*": "./src/*" }, "devDependencies": { - "script": "workspace:script@*" + "@repo/script": "workspace:@repo/script@*" } } diff --git a/client/main.tsx b/client/main.tsx index ab23449..04994c5 100644 --- a/client/main.tsx +++ b/client/main.tsx @@ -2,7 +2,7 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query" import { ReactQueryDevtools } from "@tanstack/react-query-devtools" import { createRoot } from "react-dom/client" import App from "./src/App" -import { enableServiceWorker } from "client/sw/enableServiceWorker" +import { enableServiceWorker } from "@repo/client/sw/enableServiceWorker" const client = new QueryClient({ defaultOptions: { diff --git a/client/package.json b/client/package.json index 68fd9c9..7081824 100644 --- a/client/package.json +++ b/client/package.json @@ -1,5 +1,5 @@ { - "name": "client", + "name": "@repo/client", "version": "1.0.0", "private": true, "type": "module", @@ -20,10 +20,10 @@ "clear": "rm -rf node_modules; rm -rf .turbo; rm public/sw.js; rm public/sw.js.map; find src -name '*.module.css.d.ts' -type f -delete" }, "dependencies": { - "assets": "workspace:assets@*", - "shared": "workspace:shared@*" + "@repo/assets": "workspace:@repo/assets@*", + "@repo/shared": "workspace:@repo/shared@*" }, "devDependencies": { - "script": "workspace:script@*" + "@repo/script": "workspace:@repo/script@*" } } diff --git a/client/src/App.tsx b/client/src/App.tsx index 455409f..3a20252 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -1,11 +1,11 @@ import { useEffect, useState } from "react" -import { type Provider } from "client/auth/providers" -import { useAuth } from "client/auth/useAuth" -import { Content } from "client/db/DbTest" -import { DbProvider } from "client/db/ParentTest" -import { fooBar } from "shared/foo/bar" -import { useServiceWorker } from "client/sw/useServiceWorker" -import { Button } from "client/Button/Button" +import { type Provider } from "@repo/client/auth/providers" +import { useAuth } from "@repo/client/auth/useAuth" +import { Content } from "@repo/client/db/DbTest" +import { DbProvider } from "@repo/client/db/ParentTest" +import { fooBar } from "@repo/shared/foo/bar" +import { useServiceWorker } from "@repo/client/sw/useServiceWorker" +import { Button } from "@repo/client/Button/Button" fooBar() diff --git a/client/src/auth/useAuth.tsx b/client/src/auth/useAuth.tsx index 44fcb34..eee0e09 100644 --- a/client/src/auth/useAuth.tsx +++ b/client/src/auth/useAuth.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from "react" -import { PUBLIC_CONFIG } from "shared/env/publicConfig" -import { providers, type Provider } from "client/auth/providers" +import { PUBLIC_CONFIG } from "@repo/shared/env/publicConfig" +import { providers, type Provider } from "@repo/client/auth/providers" type States = | { diff --git a/client/src/db/DbTest.tsx b/client/src/db/DbTest.tsx index f026134..971f1b4 100644 --- a/client/src/db/DbTest.tsx +++ b/client/src/db/DbTest.tsx @@ -1,11 +1,11 @@ import { useDB, useQuery } from "@vlcn.io/react" import { useEffect, useState } from "react" -import { sql } from "shared/sql" +import { sql } from "@repo/shared/sql" -import { useSync } from "client/db/Sync" -import { useDbQuery } from "client/db/useDbQuery" -import { useDbMutation } from "client/db/useDbMutation" -import { Button } from "client/Button/Button" +import { useSync } from "@repo/client/db/Sync" +import { useDbQuery } from "@repo/client/db/useDbQuery" +import { useDbMutation } from "@repo/client/db/useDbMutation" +import { Button } from "@repo/client/Button/Button" function Test({ name }: { name: string }) { const other = useDbQuery<{ id: string; content: string; position: number }>({ diff --git a/client/src/db/ParentTest.tsx b/client/src/db/ParentTest.tsx index 8bbaa2e..d7b9324 100644 --- a/client/src/db/ParentTest.tsx +++ b/client/src/db/ParentTest.tsx @@ -1,7 +1,7 @@ import { DBProvider as BaseDbProvider } from "@vlcn.io/react" -import schema from "assets/test-v0.sql" +import schema from "@repo/assets/test-v0.sql" import type { ReactNode } from "react" -import { useCacheManager } from "client/db/useDbQuery" +import { useCacheManager } from "@repo/client/db/useDbQuery" function ReactQueryAdapter({ name, children }: { name: string; children: ReactNode }) { useCacheManager(name) diff --git a/client/src/db/Sync.ts b/client/src/db/Sync.ts index 1000597..02ea902 100644 --- a/client/src/db/Sync.ts +++ b/client/src/db/Sync.ts @@ -1,4 +1,4 @@ -import { sql } from "shared/sql" +import { sql } from "@repo/shared/sql" import type { CtxAsync } from "@vlcn.io/react" import { encode, decode, tags, bytesToHex } from "@vlcn.io/ws-common" import { useState, useEffect } from "react" diff --git a/client/src/sw/enableServiceWorker.ts b/client/src/sw/enableServiceWorker.ts index b089d49..11f2276 100644 --- a/client/src/sw/enableServiceWorker.ts +++ b/client/src/sw/enableServiceWorker.ts @@ -1,5 +1,5 @@ import { type QueryClient } from "@tanstack/react-query" -import { SW_CACHE_KEY } from "client/sw/useServiceWorker" +import { SW_CACHE_KEY } from "@repo/client/sw/useServiceWorker" async function loadServiceWorker(client?: QueryClient, id?: string) { try { diff --git a/client/src/sw/useServiceWorker.ts b/client/src/sw/useServiceWorker.ts index 00fabd1..9be7dbc 100644 --- a/client/src/sw/useServiceWorker.ts +++ b/client/src/sw/useServiceWorker.ts @@ -1,5 +1,5 @@ import { useQuery } from "@tanstack/react-query" -import { type Message } from "shared/workerEvents" +import { type Message } from "@repo/shared/workerEvents" export const SW_CACHE_KEY = ["sw"] diff --git a/client/tsconfig.json b/client/tsconfig.json index a5a1c85..01c0c50 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -1,6 +1,5 @@ { "extends": "../tsconfig.base.json", - "compilerOptions": {}, "include": [], "files": [], "references": [ diff --git a/client/turbo.json b/client/turbo.json index 1422332..0a68137 100644 --- a/client/turbo.json +++ b/client/turbo.json @@ -14,7 +14,7 @@ "../assets/src/**" ], "outputs": ["../dist/client/**"], - "dependsOn": ["script#build"] + "dependsOn": ["@repo/script#build"] }, "tsc:tools": { "inputs": [ @@ -43,18 +43,18 @@ "tsconfig.json", "tsconfig.app.json" ], - "dependsOn": ["client#tsc:build:css"] + "dependsOn": ["@repo/client#tsc:build:css"] }, "tsc": { - "dependsOn": ["client#tsc:tools", "client#tsc:app"] + "dependsOn": ["@repo/client#tsc:tools", "@repo/client#tsc:app"] }, "test": { - "dependsOn": ["script#build"] + "dependsOn": ["@repo/script#build"] }, "dev": { "cache": false, "persistent": true, - "dependsOn": ["script#build"] + "dependsOn": ["@repo/script#build"] } } } diff --git a/client/vite.config.ts b/client/vite.config.ts index 0a645cd..b26727c 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -5,9 +5,9 @@ import { visualizer } from "rollup-plugin-visualizer" import { config } from "dotenv" import { readFile, rm, writeFile } from "node:fs/promises" import { join, resolve } from "node:path" -import { compressBuffer } from "script/compressBuffer" -import { ViteRawLoader } from "script/ViteRawLoader" -import { walkFsTree } from "script/walkFsTree" +import { compressBuffer } from "@repo/script/compressBuffer" +import { ViteRawLoader } from "@repo/script/ViteRawLoader" +import { walkFsTree } from "@repo/script/walkFsTree" config({ path: "../.env" }) @@ -142,7 +142,7 @@ export default defineConfig({ resolve: { alias: { // use alias to avoid having "client" as a package dependency of "client" - "client/": `${normalizePath(__dirname)}/src/`, + "@repo/client/": `${normalizePath(__dirname)}/src/`, }, }, server: { diff --git a/knip.ts b/knip.ts index 31f0ad4..578a065 100644 --- a/knip.ts +++ b/knip.ts @@ -1,18 +1,14 @@ -import type { KnipConfig } from 'knip' +import type { KnipConfig } from "knip" const config: KnipConfig = { - "ignoreDependencies": [ + ignoreDependencies: [ // used by fastify, with just a string reference, no import "pino-pretty", // might not be used everywhere yet - "assets", + "@repo/assets", ], - "ignore": [ - "**/*.test.ts", - "**/types/*.d.ts" - ], - "includeEntryExports": true, + ignore: ["**/*.test.ts", "**/types/*.d.ts"], + includeEntryExports: true, } -export default config; - +export default config diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f789e9e..8d2e4d7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -135,58 +135,57 @@ importers: assets: devDependencies: - script: - specifier: workspace:script@* + '@repo/script': + specifier: workspace:@repo/script@* version: link:../script client: dependencies: - assets: - specifier: workspace:assets@* + '@repo/assets': + specifier: workspace:@repo/assets@* version: link:../assets - shared: - specifier: workspace:shared@* + '@repo/shared': + specifier: workspace:@repo/shared@* version: link:../shared devDependencies: - script: - specifier: workspace:script@* + '@repo/script': + specifier: workspace:@repo/script@* version: link:../script script: {} server: dependencies: - assets: - specifier: workspace:assets@* + '@repo/assets': + specifier: workspace:@repo/assets@* version: link:../assets - shared: - specifier: workspace:shared@* - version: link:../shared - devDependencies: - script: - specifier: workspace:script@* + '@repo/script': + specifier: workspace:@repo/script@* version: link:../script + '@repo/shared': + specifier: workspace:@repo/shared@* + version: link:../shared shared: devDependencies: - script: - specifier: workspace:script@* + '@repo/script': + specifier: workspace:@repo/script@* version: link:../script worker: dependencies: - assets: - specifier: workspace:assets@* + '@repo/assets': + specifier: workspace:@repo/assets@* version: link:../assets - client: - specifier: workspace:client@* + '@repo/client': + specifier: workspace:@repo/client@* version: link:../client - shared: - specifier: workspace:shared@* + '@repo/shared': + specifier: workspace:@repo/shared@* version: link:../shared devDependencies: - script: - specifier: workspace:script@* + '@repo/script': + specifier: workspace:@repo/script@* version: link:../script packages: diff --git a/script/package.json b/script/package.json index 05728a3..0fbfade 100644 --- a/script/package.json +++ b/script/package.json @@ -1,5 +1,5 @@ { - "name": "script", + "name": "@repo/script", "version": "1.0.0", "private": true, "type": "module", diff --git a/server/esbuild.ts b/server/esbuild.ts index 24efea7..8440e4a 100644 --- a/server/esbuild.ts +++ b/server/esbuild.ts @@ -5,7 +5,7 @@ import { type ChildProcess, spawn } from "node:child_process" import { join } from "node:path" import fastify from "fastify" import proxy from "@fastify/http-proxy" -import { env } from "server/env" +import { env } from "@repo/server/env" const options: esbuild.BuildOptions = { entryPoints: ["src/app.ts"], @@ -24,10 +24,10 @@ const options: esbuild.BuildOptions = { ".js": ".mjs", }, // alias: { - // "shared": "../shared/src", - // "script": "../script/src", - // "assets": "../assets/src", - // "worker": "../worker/src", + // "@repo/shared": "../shared/src", + // "@repo/script": "../script/src", + // "@repo/assets": "../assets/src", + // "@repo/worker": "../worker/src", // }, } diff --git a/server/package.json b/server/package.json index ad1732d..f1b15b8 100644 --- a/server/package.json +++ b/server/package.json @@ -1,5 +1,5 @@ { - "name": "server", + "name": "@repo/server", "version": "1.0.0", "private": true, "type": "module", @@ -18,10 +18,11 @@ "clear": "rm -rf node_modules; rm -rf .turbo;" }, "dependencies": { - "shared": "workspace:shared@*", - "assets": "workspace:assets@*" + "@repo/shared": "workspace:@repo/shared@*", + "@repo/assets": "workspace:@repo/assets@*", + "@repo/script": "workspace:@repo/script@*" }, "devDependencies": { - "script": "workspace:script@*" + "@repo/script": "workspace:@repo/script@*" } } diff --git a/server/src/app.ts b/server/src/app.ts index f7c8c5c..a4764f3 100644 --- a/server/src/app.ts +++ b/server/src/app.ts @@ -1,11 +1,11 @@ import fastify from "fastify" -import api from "server/api" -import auth from "server/auth" -import frontend from "server/frontend" -import { env } from "server/env" -import crsqlite from "server/crsqlite" -import { DB_ROOT } from "server/utils/dbRoot" -import { fooBar } from "shared/foo/bar" +import api from "@repo/server/api" +import auth from "@repo/server/auth" +import frontend from "@repo/server/frontend" +import { env } from "@repo/server/env" +import crsqlite from "@repo/server/crsqlite" +import { DB_ROOT } from "@repo/server/utils/dbRoot" +import { fooBar } from "@repo/shared/foo/bar" fooBar() diff --git a/server/src/auth/db.ts b/server/src/auth/db.ts index 9038460..76683da 100644 --- a/server/src/auth/db.ts +++ b/server/src/auth/db.ts @@ -2,7 +2,7 @@ import Database from "better-sqlite3" import schemaContent from "./schema.sql" import path from "node:path" import type { FastifyInstance } from "fastify" -import { makeDbLogger } from "server/utils/dbLogger" +import { makeDbLogger } from "@repo/server/utils/dbLogger" export function makeAuthDb( fastify: FastifyInstance, diff --git a/server/src/auth/helpers/AuthTokens.ts b/server/src/auth/helpers/AuthTokens.ts index 2201a6e..7f8cf58 100644 --- a/server/src/auth/helpers/AuthTokens.ts +++ b/server/src/auth/helpers/AuthTokens.ts @@ -7,7 +7,7 @@ import crypto, { type CipherGCMTypes } from "node:crypto" import { type BaseSchema, type Output, parse } from "valibot" -import { env } from "server/env" +import { env } from "@repo/server/env" const ALGORITHM: CipherGCMTypes = "aes-256-gcm" const PASSWORD = env.SESSION_COOKIE_SECRET diff --git a/server/src/auth/helpers/InviteCodes.ts b/server/src/auth/helpers/InviteCodes.ts index 3c0ab83..6996672 100644 --- a/server/src/auth/helpers/InviteCodes.ts +++ b/server/src/auth/helpers/InviteCodes.ts @@ -1,4 +1,4 @@ -import { sql } from "shared/sql" +import { sql } from "@repo/shared/sql" import type BetterSqlite3 from "better-sqlite3" import wordList from "./5-letter-words.txt" diff --git a/server/src/auth/helpers/SessionStore.ts b/server/src/auth/helpers/SessionStore.ts index 4fee49c..8beab51 100644 --- a/server/src/auth/helpers/SessionStore.ts +++ b/server/src/auth/helpers/SessionStore.ts @@ -1,5 +1,5 @@ import { type SessionStore } from "@fastify/session" -import { sql } from "shared/sql" +import { sql } from "@repo/shared/sql" import type BetterSqlite3 from "better-sqlite3" import { type Session } from "fastify" diff --git a/server/src/auth/index.test.ts b/server/src/auth/index.test.ts index ccff094..47ebdc5 100644 --- a/server/src/auth/index.test.ts +++ b/server/src/auth/index.test.ts @@ -1,7 +1,7 @@ import { afterEach, beforeEach, describe, expect, it } from "vitest" import auth from "." import fastify, { type FastifyInstance, type Session } from "fastify" -import { sql } from "shared/sql" +import { sql } from "@repo/shared/sql" import crypto from "node:crypto" describe( diff --git a/server/src/auth/index.ts b/server/src/auth/index.ts index d96202e..8ad2c7d 100644 --- a/server/src/auth/index.ts +++ b/server/src/auth/index.ts @@ -2,16 +2,16 @@ import { type FastifyRequest, type FastifyInstance } from "fastify" import cookie from "@fastify/cookie" import session, { type SessionStore } from "@fastify/session" import grant from "grant" -import { grantOptions, getGrantData, type RawGrant } from "server/auth/providers" -import { makeAuthDb } from "server/auth/db" -import { makeStore } from "server/auth/helpers/SessionStore" -import { makeInviteCodes } from "server/auth/helpers/InviteCodes" +import { grantOptions, getGrantData, type RawGrant } from "@repo/server/auth/providers" +import { makeAuthDb } from "@repo/server/auth/db" +import { makeStore } from "@repo/server/auth/helpers/SessionStore" +import { makeInviteCodes } from "@repo/server/auth/helpers/InviteCodes" import { literal, maxLength, object, parse, string, union } from "valibot" -import { sql } from "shared/sql" +import { sql } from "@repo/shared/sql" import crypto from "node:crypto" -import { env } from "server/env" -import { PUBLIC_CONFIG } from "shared/env/publicConfig" -import { decrypt, encrypt } from "server/auth/helpers/AuthTokens" +import { env } from "@repo/server/env" +import { PUBLIC_CONFIG } from "@repo/shared/env/publicConfig" +import { decrypt, encrypt } from "@repo/server/auth/helpers/AuthTokens" import type BetterSqlite3 from "better-sqlite3" declare module "fastify" { diff --git a/server/src/auth/providers/discord.ts b/server/src/auth/providers/discord.ts index 9d9eeb4..337ddf6 100644 --- a/server/src/auth/providers/discord.ts +++ b/server/src/auth/providers/discord.ts @@ -1,7 +1,7 @@ import { type GrantProvider } from "grant" import { object, parse, string } from "valibot" -import { type GrantData, type RawGrant } from "server/auth/providers" -import { env } from "server/env" +import { type GrantData, type RawGrant } from "@repo/server/auth/providers" +import { env } from "@repo/server/env" export const options: GrantProvider | undefined = !env.DISCORD_CLIENT_ID ? undefined diff --git a/server/src/auth/providers/google.ts b/server/src/auth/providers/google.ts index 20d221b..5f4ee4c 100644 --- a/server/src/auth/providers/google.ts +++ b/server/src/auth/providers/google.ts @@ -1,6 +1,6 @@ import { type GrantProvider } from "grant" -import { env } from "server/env" -import { type GrantData, type RawGrant } from "server/auth/providers" +import { env } from "@repo/server/env" +import { type GrantData, type RawGrant } from "@repo/server/auth/providers" import { object, parse, string } from "valibot" export const options: GrantProvider | undefined = !env.GOOGLE_CLIENT_ID diff --git a/server/src/auth/providers/index.ts b/server/src/auth/providers/index.ts index 9adb19c..74802da 100644 --- a/server/src/auth/providers/index.ts +++ b/server/src/auth/providers/index.ts @@ -1,7 +1,7 @@ -import * as Twitch from "server/auth/providers/twitch" -import * as Google from "server/auth/providers/google" -import * as Spotify from "server/auth/providers/spotify" -import * as Discord from "server/auth/providers/discord" +import * as Twitch from "@repo/server/auth/providers/twitch" +import * as Google from "@repo/server/auth/providers/google" +import * as Spotify from "@repo/server/auth/providers/spotify" +import * as Discord from "@repo/server/auth/providers/discord" export type RawGrant = { provider: string diff --git a/server/src/auth/providers/spotify.ts b/server/src/auth/providers/spotify.ts index 2a66775..900a4b8 100644 --- a/server/src/auth/providers/spotify.ts +++ b/server/src/auth/providers/spotify.ts @@ -1,6 +1,6 @@ import { type GrantProvider } from "grant" -import { env } from "server/env" -import { type GrantData, type RawGrant } from "server/auth/providers" +import { env } from "@repo/server/env" +import { type GrantData, type RawGrant } from "@repo/server/auth/providers" import { object, parse, string } from "valibot" export const options: GrantProvider | undefined = !env.SPOTIFY_CLIENT_ID diff --git a/server/src/auth/providers/twitch.ts b/server/src/auth/providers/twitch.ts index b212dc8..8f159f4 100644 --- a/server/src/auth/providers/twitch.ts +++ b/server/src/auth/providers/twitch.ts @@ -1,6 +1,6 @@ import { type GrantProvider } from "grant" -import { env } from "server/env" -import { type GrantData, type RawGrant } from "server/auth/providers" +import { env } from "@repo/server/env" +import { type GrantData, type RawGrant } from "@repo/server/auth/providers" import { array, minLength, object, parse, string } from "valibot" export const options: GrantProvider | undefined = !env.TWITCH_CLIENT_ID diff --git a/server/src/crsqlite/db.ts b/server/src/crsqlite/db.ts index e142914..799a6c7 100644 --- a/server/src/crsqlite/db.ts +++ b/server/src/crsqlite/db.ts @@ -3,8 +3,8 @@ import path from "node:path" import type { FastifyInstance } from "fastify" import { extensionPath } from "@vlcn.io/crsqlite" import { cryb64, type Change, type Changes } from "@vlcn.io/ws-common" -import { sql } from "shared/sql" -import { makeDbLogger } from "server/utils/dbLogger" +import { sql } from "@repo/shared/sql" +import { makeDbLogger } from "@repo/server/utils/dbLogger" export type CrsqliteDatabase = Database.Database & { getChanges(sinceVersion: bigint, requestorSiteId: Uint8Array): Change[] diff --git a/server/src/crsqlite/index.ts b/server/src/crsqlite/index.ts index 532825c..ac25725 100644 --- a/server/src/crsqlite/index.ts +++ b/server/src/crsqlite/index.ts @@ -1,8 +1,8 @@ import type { FastifyInstance } from "fastify" -import { makeCrsqliteDb, type CrsqliteDatabase } from "server/crsqlite/db" +import { makeCrsqliteDb, type CrsqliteDatabase } from "@repo/server/crsqlite/db" import { encode, decode, tags, hexToBytes } from "@vlcn.io/ws-common" -import { compressBuffer } from "script/compressBuffer" -import schema from "assets/test-v0.sql" +import { compressBuffer } from "@repo/script/compressBuffer" +import schema from "@repo/assets/test-v0.sql" export default function crsqlite( fastify: FastifyInstance, diff --git a/server/src/env/index.ts b/server/src/env/index.ts index 1bfbe35..cf826ed 100644 --- a/server/src/env/index.ts +++ b/server/src/env/index.ts @@ -1,4 +1,4 @@ -import { parseServerEnv } from "shared/env/schema" +import { parseServerEnv } from "@repo/shared/env/schema" import { config } from "dotenv" config({ path: "../.env" }) diff --git a/server/turbo.json b/server/turbo.json index 9035e4e..f21efc7 100644 --- a/server/turbo.json +++ b/server/turbo.json @@ -5,7 +5,7 @@ "build": { "outputs": ["../dist/server/**"], "inputs": ["../assets/src/**", "esbuild.ts", "tsconfig.app.json", "src/**"], - "dependsOn": ["script#build"] + "dependsOn": ["@repo/script#build"] }, "tsc:tools": { "inputs": [ @@ -28,15 +28,15 @@ ] }, "tsc": { - "dependsOn": ["server#tsc:tools", "server#tsc:app"] + "dependsOn": ["@repo/server#tsc:tools", "@repo/server#tsc:app"] }, "test": { - "dependsOn": ["script#build"] + "dependsOn": ["@repo/script#build"] }, "dev": { "cache": false, "persistent": true, - "dependsOn": ["script#build"] + "dependsOn": ["@repo/script#build"] } } } diff --git a/server/vitest.config.ts b/server/vitest.config.ts index 6d9c23a..b3012a3 100644 --- a/server/vitest.config.ts +++ b/server/vitest.config.ts @@ -1,4 +1,4 @@ -import { ViteRawLoader } from "script/ViteRawLoader" +import { ViteRawLoader } from "@repo/script/ViteRawLoader" import { normalizePath } from "vite" import { defineConfig } from "vitest/config" @@ -8,7 +8,7 @@ export default defineConfig({ resolve: { alias: { // use alias to avoid having "server" as a package dependency of "server" - "server/": `${normalizePath(__dirname)}/src/`, + "@repo/server/": `${normalizePath(__dirname)}/src/`, }, }, test: { diff --git a/shared/package.json b/shared/package.json index 03110e8..3db1ebf 100644 --- a/shared/package.json +++ b/shared/package.json @@ -1,5 +1,5 @@ { - "name": "shared", + "name": "@repo/shared", "version": "1.0.0", "private": true, "type": "module", @@ -15,7 +15,7 @@ "clear": "rm -rf node_modules; rm -rf .turbo;" }, "devDependencies": { - "script": "workspace:script@*" + "@repo/script": "workspace:@repo/script@*" }, "exports": { "./*": "./src/*" diff --git a/shared/turbo.json b/shared/turbo.json index 85e28b5..11cfc67 100644 --- a/shared/turbo.json +++ b/shared/turbo.json @@ -22,10 +22,10 @@ ] }, "tsc": { - "dependsOn": ["shared#tsc:tools", "shared#tsc:lib"] + "dependsOn": ["@repo/shared#tsc:tools", "@repo/shared#tsc:lib"] }, "test": { - "dependsOn": ["script#build"] + "dependsOn": ["@repo/script#build"] } } } diff --git a/shared/vitest.config.ts b/shared/vitest.config.ts index 6dd87c9..b62df7f 100644 --- a/shared/vitest.config.ts +++ b/shared/vitest.config.ts @@ -1,4 +1,4 @@ -import { ViteRawLoader } from "script/ViteRawLoader" +import { ViteRawLoader } from "@repo/script/ViteRawLoader" import { defineConfig, normalizePath } from "vite" export default defineConfig({ @@ -7,7 +7,7 @@ export default defineConfig({ resolve: { alias: { // use alias to avoid having "shared" as a package dependency of "shared" - "shared/": `${normalizePath(__dirname)}/src/`, + "@repo/shared/": `${normalizePath(__dirname)}/src/`, }, }, test: { diff --git a/tsconfig.base.json b/tsconfig.base.json index a2258a3..8e9f816 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -9,12 +9,12 @@ "skipDefaultLibCheck": true, "lib": ["ESNext"], "paths": { - "assets/*": ["assets/src/*"], - "script/*": ["script/src/*"], - "shared/*": ["shared/src/*"], - "client/*": ["client/src/*"], - "server/*": ["server/src/*"], - "worker/*": ["worker/src/*"] + "@repo/assets/*": ["assets/src/*"], + "@repo/script/*": ["script/src/*"], + "@repo/shared/*": ["shared/src/*"], + "@repo/client/*": ["client/src/*"], + "@repo/server/*": ["server/src/*"], + "@repo/worker/*": ["worker/src/*"] }, // strict "strict": true, diff --git a/worker/esbuild.ts b/worker/esbuild.ts index 89bace3..2f66cf2 100644 --- a/worker/esbuild.ts +++ b/worker/esbuild.ts @@ -1,6 +1,6 @@ /* eslint-disable no-undef */ -import { compressBuffer } from "script/compressBuffer" +import { compressBuffer } from "@repo/script/compressBuffer" import * as esbuild from "esbuild" import { readFile, readdir, writeFile } from "node:fs/promises" import { join } from "node:path" @@ -19,10 +19,10 @@ const options: esbuild.BuildOptions = { }, tsconfig: "./tsconfig.app.json", // alias: { - // "shared": "../shared/src", + // "@repo/shared": "../shared/src", // "script": "../script/src", - // "assets": "../assets/src", - // "worker": "../worker/src", + // "@repo/assets": "../assets/src", + // "@repo/worker": "../worker/src", // }, } diff --git a/worker/package.json b/worker/package.json index 237d353..30d47c9 100644 --- a/worker/package.json +++ b/worker/package.json @@ -1,5 +1,5 @@ { - "name": "worker", + "name": "@repo/worker", "version": "1.0.0", "private": true, "type": "module", @@ -17,11 +17,11 @@ "clear": "rm -rf node_modules; rm -rf .turbo;" }, "dependencies": { - "shared": "workspace:shared@*", - "assets": "workspace:assets@*", - "client": "workspace:client@*" + "@repo/shared": "workspace:@repo/shared@*", + "@repo/assets": "workspace:@repo/assets@*", + "@repo/client": "workspace:@repo/client@*" }, "devDependencies": { - "script": "workspace:script@*" + "@repo/script": "workspace:@repo/script@*" } } diff --git a/worker/src/index.ts b/worker/src/index.ts index 78027f2..a21481a 100644 --- a/worker/src/index.ts +++ b/worker/src/index.ts @@ -1,6 +1,6 @@ -import { onFetch } from "worker/onFetch" -import { CACHES } from "worker/config" -import type { Message } from "shared/workerEvents" +import { onFetch } from "@repo/worker/onFetch" +import { CACHES } from "@repo/worker/config" +import type { Message } from "@repo/shared/workerEvents" export {} diff --git a/worker/src/onFetch/default.ts b/worker/src/onFetch/default.ts index 8a1ab0f..86b9aad 100644 --- a/worker/src/onFetch/default.ts +++ b/worker/src/onFetch/default.ts @@ -1,5 +1,5 @@ -import { CACHES } from "worker/config" -import indexHtml from "client/index.html" +import { CACHES } from "@repo/worker/config" +import indexHtml from "@repo/client/index.html" function simpleNetworkFirst(event: FetchEvent, request: Request) { return fetch(request) diff --git a/worker/src/onFetch/index.ts b/worker/src/onFetch/index.ts index 2078dfd..610ce08 100644 --- a/worker/src/onFetch/index.ts +++ b/worker/src/onFetch/index.ts @@ -1,4 +1,4 @@ -import { defaultFetch } from "worker/onFetch/default" +import { defaultFetch } from "@repo/worker/onFetch/default" export function onFetch(event: FetchEvent) { const request = event.request diff --git a/worker/turbo.json b/worker/turbo.json index a6375c4..3e5f717 100644 --- a/worker/turbo.json +++ b/worker/turbo.json @@ -12,7 +12,7 @@ "../dist/client/assets/**", "../assets/src/**" ], - "dependsOn": ["client#build", "script#build"] + "dependsOn": ["@repo/client#build", "@repo/script#build"] }, "tsc:tools": { "inputs": [ @@ -36,13 +36,13 @@ ] }, "tsc": { - "dependsOn": ["worker#tsc:tools", "worker#tsc:app"] + "dependsOn": ["@repo/worker#tsc:tools", "@repo/worker#tsc:app"] }, "dev": { "cache": false, "persistent": true, "outputs": ["../client/public/sw.js"], - "dependsOn": ["script#build"] + "dependsOn": ["@repo/script#build"] } } }