added shared folder

.github/workflows/ci.yaml

@@ -21,7 +21,7 @@ jobs:
 
       - uses: pnpm/action-setup@v3
         with:
-          version: 9.0.6
+          version: 9.x.x
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v4

package.json

@@ -97,21 +97,18 @@
 		"tsx": "^4.7.2",
 		"typescript": "^5.4.5",
 		"typescript-eslint": "^7.8.0",
-		"vite": "^5.2.11",
+		"vite": "^5.4.8",
 		"vitepress": "^1.2.3",
-		"vitest": "^2.0.0"
+		"vitest": "^2.1.2"
 	},
 	"type": "module",
-	"packageManager": "pnpm@9.4.0",
+	"packageManager": "pnpm@9.12.0",
 	"volta": {
-		"node": "20.15.1",
-		"pnpm": "9.4.0"
+		"node": "20.18.0",
+		"pnpm": "9.12.0"
 	},
 	"engines": {
 		"node": ">=20.0.0",
 		"pnpm": ">=9.0.0"
-	},
-	"workspaces": [
-		"services"
-	]
+	}
 }

pnpm-workspace.yaml

@@ -1,2 +1,3 @@
 packages:
   - "services"
+  - "shared"

services/package.json

@@ -10,8 +10,8 @@
 		"zod": "^3.23.5"
 	},
 	"devDependencies": {
-		"vite": "^5.2.11",
-		"vitest": "^2.0.0"
+		"vite": "^5.4.8",
+		"vitest": "^2.1.2"
 	},
 	"type": "module"
 }

services/src/project/project-service.ts

@@ -1,5 +1,5 @@
 import type { CreateProjectFormSchema } from '$components/container/projects/create-project-schema'
-import { createSlug } from '../util/slug/slug-service'
+import { createSlug } from 'shared/utils/slug/slug-service'
 import { CreateProjectNameNotUniqueError } from '../error'
 import * as repository from './project-repository'
 import { SqliteError } from 'better-sqlite3'

services/src/project/project-service.unit.test.ts

@@ -4,14 +4,14 @@ import * as repository from './project-repository'
 import { CreateProjectNameNotUniqueError } from '../error'
 import { SqliteError } from 'better-sqlite3'
 import type { CreateProjectFormSchema } from '$components/container/projects/create-project-schema'
-import { createSlug } from '../util/slug/slug-service'
+import { createSlug } from 'shared/utils/slug/slug-service'
 
 vi.mock('./project-repository', () => ({
 	createProject: vi.fn(),
 	getAllProjects: vi.fn()
 }))
 
-vi.mock('../util/slug/slug-service', () => ({
+vi.mock('shared/utils/slug/slug-service', () => ({
 	createSlug: vi.fn()
 }))
 

shared/package.json

@@ -0,0 +1,9 @@
+{
+	"name": "shared",
+	"dependencies": {},
+	"devDependencies": {
+		"vite": "^5.4.8",
+		"vitest": "^2.1.2"
+	},
+	"type": "module"
+}

src/components/container/projects/create-project-schema.ts

@@ -1,4 +1,4 @@
-import { createSlug } from 'services/util/slug/slug-service'
+import { createSlug } from 'shared/utils/slug/slug-service'
 import { z } from 'zod'
 import { type LanguageCode, availableLanguages } from '../language/languages'
 

src/components/container/projects/slug-display.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { createSlug } from 'services/util/slug/slug-service'
+	import { createSlug } from 'shared/utils/slug/slug-service'
 
 	export let name: string
 </script>

svelte.config.js

@@ -16,7 +16,8 @@ const config = {
 			$components: 'src/components',
 			$models: 'src/models',
 			$utils: 'src/utils',
-			services: 'services/src'
+			services: 'services/src',
+			shared: 'shared'
 		}
 	}
 }

tsconfig.eslint.json

@@ -13,6 +13,7 @@
 		"src/**/*.svelte",
 		"tests/**/*.ts",
 		"services/**/*.ts",
+		"shared/**/*.ts",
 		"./*.ts",
 		"./*.js",
 		"services",

vite.config.ts

@@ -3,9 +3,6 @@ import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
 	plugins: [sveltekit()],
-	test: {
-		include: ['src/**/*.{test,spec}.{js,ts}', 'services/**/*.{test,spec}.{js,ts}']
-	},
-	server: { port: 3000, fs: { allow: ['services/src/util/slug'] } }, // Add shared workspace and move slug to shared
+	server: { port: 3000, fs: { allow: ['shared'] } },
 	preview: { port: 3000 }
 })

vitest.workspace.js

@@ -3,6 +3,7 @@ import { defineWorkspace } from 'vitest/config'
 // defineWorkspace provides a nice type hinting DX
 export default defineWorkspace([
 	{
+		extends: './vite.config.ts',
 		test: {
 			include: ['src/**/*.unit.test.ts', 'services/**/*.unit.test.ts'],
 			name: 'unit'
@@ -11,7 +12,11 @@ export default defineWorkspace([
 	{
 		extends: './vite.config.ts',
 		test: {
-			include: ['src/**/*.integration.test.ts', 'services/**/*.integration.test.ts'],
+			include: [
+				'src/**/*.integration.test.ts',
+				'services/**/*.integration.test.ts',
+				'shared/**/*.integration.test.ts'
+			],
 			name: 'integration'
 		}
 	}