Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

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.

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

Already on GitHub?Sign in to your account

Open
benjaminstrasser wants to merge2 commits intomain
base:main
Choose a base branch
Loading
fromshared-folder
Open
Show file tree
Hide file tree
Changes fromall commits
Commits
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
2 changes: 1 addition & 1 deletion.github/workflows/ci.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff 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 deletionspackage.json
View file
Open in desktop
Original file line numberDiff line numberDiff 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"
]
}
}
109 changes: 59 additions & 50 deletionspnpm-lock.yaml
View file
Open in desktop

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

1 change: 1 addition & 0 deletionspnpm-workspace.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
packages:
- "services"
- "shared"
4 changes: 2 additions & 2 deletionsservices/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff 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 deletionservices/src/project/project-service.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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'
Expand Down
4 changes: 2 additions & 2 deletionsservices/src/project/project-service.unit.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff 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 '../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()
}))

Expand Down
9 changes: 9 additions & 0 deletionsshared/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
{
"name": "shared",
"dependencies": {},
"devDependencies": {
"vite": "^5.4.8",
"vitest": "^2.1.2"
},
"type": "module"
}
File renamed without changes.
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletionsrc/components/container/projects/slug-display.svelte
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down
3 changes: 2 additions & 1 deletionsvelte.config.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,8 @@ const config = {
$components: 'src/components',
$models: 'src/models',
$utils: 'src/utils',
services: 'services/src'
services: 'services/src',
shared: 'shared'
}
}
}
Expand Down
1 change: 1 addition & 0 deletionstsconfig.eslint.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
"src/**/*.svelte",
"tests/**/*.ts",
"services/**/*.ts",
"shared/**/*.ts",
"./*.ts",
"./*.js",
"services",
Expand Down
5 changes: 1 addition & 4 deletionsvite.config.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }
})
7 changes: 6 additions & 1 deletionvitest.workspace.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import { defineWorkspace } from 'vitest/config'
// defineWorkspace provides a nice type hinting DX
exportdefaultdefineWorkspace([
{
extends:'./vite.config.ts',
test:{
include:['src/**/*.unit.test.ts','services/**/*.unit.test.ts'],
name:'unit'
Expand All@@ -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'
}
}
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp