update branch with main, removes workspaces from package.json as it is not supported by pnpm, fixes ci, updates pnpm, vitest & vite

sjaghori · sjaghori · commit 27f6435640c3 · 2024-10-06T14:50:00.000+02:00
diff --git a/.github/workflows/ci.yaml b/.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
diff --git a/package.json b/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"
-	]
+	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/services/package.json b/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"
 }
diff --git a/services/src/project/project-service.ts b/services/src/project/project-service.ts
@@ -1,5 +1,5 @@
 import type { CreateProjectFormSchema } from '$components/container/projects/create-project-schema'
-import { createSlug } from 'shared/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'
diff --git a/services/src/project/project-service.unit.test.ts b/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 'shared/slug/slug-service'
+import { createSlug } from 'shared/utils/slug/slug-service'
 
 vi.mock('./project-repository', () => ({
 	createProject: vi.fn(),
 	getAllProjects: vi.fn()
 }))
 
-vi.mock('shared/slug/slug-service', () => ({
+vi.mock('shared/utils/slug/slug-service', () => ({
 	createSlug: vi.fn()
 }))
 
diff --git a/shared/package.json b/shared/package.json
@@ -2,8 +2,8 @@
 	"name": "shared",
 	"dependencies": {},
 	"devDependencies": {
-		"vite": "^5.2.11",
-		"vitest": "^2.0.0"
+		"vite": "^5.4.8",
+		"vitest": "^2.1.2"
 	},
 	"type": "module"
 }
diff --git a/shared/utils/slug/slug-service.ts b/shared/utils/slug/slug-service.ts
diff --git a/shared/utils/slug/slug-service.unit.test.ts b/shared/utils/slug/slug-service.unit.test.ts
diff --git a/src/components/container/projects/create-project-schema.ts b/src/components/container/projects/create-project-schema.ts
@@ -1,4 +1,4 @@
-import { createSlug } from 'shared/slug/slug-service'
+import { createSlug } from 'shared/utils/slug/slug-service'
 import { z } from 'zod'
 import { type LanguageCode, availableLanguages } from '../language/languages'
 
diff --git a/src/components/container/projects/slug-display.svelte b/src/components/container/projects/slug-display.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { createSlug } from 'shared/slug/slug-service'
+	import { createSlug } from 'shared/utils/slug/slug-service'
 
 	export let name: string
 </script>
diff --git a/svelte.config.js b/svelte.config.js
@@ -17,7 +17,7 @@ const config = {
 			$models: 'src/models',
 			$utils: 'src/utils',
 			services: 'services/src',
-			shared: 'shared/src'
+			shared: 'shared'
 		}
 	}
 }
diff --git a/vite.config.ts b/vite.config.ts
@@ -3,6 +3,6 @@ import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
 	plugins: [sveltekit()],
-	server: { port: 3000, fs: { allow: ['shared/src'] } },
+	server: { port: 3000, fs: { allow: ['shared'] } },
 	preview: { port: 3000 }
 })

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { createSlug } from 'shared/slug/slug-service'`
	`1`	`+import { createSlug } from 'shared/utils/slug/slug-service'`
`2`	`2`	`import { z } from 'zod'`
`3`	`3`	`import { type LanguageCode, availableLanguages } from '../language/languages'`
`4`	`4`