Skip to content

added shared folder #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benjaminstrasser wants to merge 2 commits into
base: main
Choose a base branch
from
Open

added shared folder #123

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdf3972
added shared folder
benjaminstrasser Jul 23, 2024
27f6435
update branch with main, removes workspaces from package.json as it i…
sjaghori Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update branch with main, removes workspaces from package.json as it i… 
…s not supported by pnpm, fixes ci, updates pnpm, vitest & vite
  • Loading branch information
@sjaghori
sjaghori committed Oct 6, 2024
commit 27f6435640c3d20e2a7168fddbf27ceec1862991
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 6 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
}
108 changes: 54 additions & 54 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions services/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion services/src/project/project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
4 changes: 2 additions & 2 deletions services/src/project/project-service.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}))

Expand Down
4 changes: 2 additions & 2 deletions shared/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
0 shared/src/slug/slug-service.ts → shared/utils/slug/slug-service.ts
View file
Open in desktop
File renamed without changes.
0 shared/src/slug/slug-service.unit.test.ts → shared/utils/slug/slug-service.unit.test.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/components/container/projects/create-project-schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion src/components/container/projects/slug-display.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion svelte.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const config = {
$models: 'src/models',
$utils: 'src/utils',
services: 'services/src',
shared: 'shared/src'
shared: 'shared'
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
})