Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 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
10 changes: 5 additions & 5 deletions frontend/apps/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"generate-cert": "bash src/scripts/generate-cert.sh"
},
"dependencies": {
"@endolphin/calendar": "workspace:*",
"@endolphin/core": "workspace:*",
"@endolphin/date-time": "workspace:*",
"@endolphin/theme": "workspace:*",
"@endolphin/ui": "workspace:*",
"@endolphin/calendar": "^1.0.7",
"@endolphin/core": "^1.0.5",
"@endolphin/date-time": "^1.0.5",
"@endolphin/theme": "^1.0.17",
"@endolphin/ui": "^1.0.12",
"@tanstack/react-query": "^5.66.0",
"@tanstack/react-router": "^1.109.2",
"jotai": "^2.12.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { vars } from '@endolphin/theme';
import { Flex, Pagination, Text } from '@endolphin/ui';
import { usePagination } from '@hooks/usePagination';
import { useQueryClient } from '@tanstack/react-query';
import { useState } from 'react';

Expand Down Expand Up @@ -34,7 +33,7 @@ interface OngoingScheduleListProps {
// TODO: useEffect 뺄 수 있으면 다른 걸로 대체
const OngoingScheduleList = ({ segmentOption }: OngoingScheduleListProps) => {
const queryClient = useQueryClient();
const { currentPage, handlePageChange } = usePagination(1);
const [currentPage, handlePageChange] = useState(1);
const [selectedIndex, setSelectedIndex] = useState(0);
const { data, isPending } = useOngoingQuery(currentPage, PAGE_SIZE, segmentOption.value );
if (isPending) return <div>pending...</div>;
Expand Down
51 changes: 0 additions & 51 deletions frontend/apps/client/src/hooks/useCheckbox.ts

This file was deleted.

15 changes: 0 additions & 15 deletions frontend/apps/client/src/hooks/usePagination.ts

This file was deleted.

19 changes: 1 addition & 18 deletions frontend/apps/client/tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"types": ["vitest/globals"],
Expand All @@ -9,28 +10,10 @@
"@constants/*": ["src/constants/*"],
"@components/*": ["src/components/*"]
},
"target": "ES2022",
"useDefineForClassFields": true,
"lib": ["ES2023", "DOM", "DOM.Iterable"],
"module": "ESNext",
"skipLibCheck": true,
"incremental": true,
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",

/* Bundler mode */
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"isolatedModules": true,
"moduleDetection": "force",
"noEmit": true,
"jsx": "react-jsx",

/* Linting */
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,
"noUncheckedSideEffectImports": true
},
"include": ["src"]
}
15 changes: 1 addition & 14 deletions frontend/apps/client/tsconfig.node.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,12 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"incremental": true,
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
"target": "ES2022",
"lib": ["ES2023"],
"module": "ESNext",
"skipLibCheck": true,

/* Bundler mode */
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"isolatedModules": true,
"moduleDetection": "force",
"noEmit": true,

/* Linting */
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,
"noUncheckedSideEffectImports": true
},
"include": ["vite.config.ts"]
}
40 changes: 32 additions & 8 deletions frontend/endolphin.code-workspace
Original file line number Diff line number Diff line change
@@ -1,13 +1,37 @@
{
"folders": [
{ "path": "." },
{ "path": "apps/client" },
{ "path": "apps/server" },
{ "path": "packages/core" },
{ "path": "packages/ui" },
{ "path": "packages/theme" },
{ "path": "packages/calendar" },
{ "path": "packages/date-time" }
{
"name": "frontend",
"path": "."
},
{
"name": "client",
"path": "apps/client"
},
{
"name": "server",
"path": "apps/server"
},
{
"name": "core",
"path": "packages/core"
},
{
"name": "ui",
"path": "packages/ui"
},
{
"name": "theme",
"path": "packages/theme"
},
{
"name": "calendar",
"path": "packages/calendar"
},
{
"name": "date-time",
"path": "packages/date-time"
}
],
"settings": {
"editor.codeActionsOnSave": {
Expand Down
15 changes: 9 additions & 6 deletions frontend/packages/calendar/package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
{
"name": "@endolphin/calendar",
"version": "1.0.5",
"main": "dist/src/index.js",
"module": "dist/src/index.js",
"types": "dist/src/index.d.ts",
"version": "1.0.7",
"type": "module",
"main": "dist/index.js",
"module": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
"dist"
],
"scripts": {
"build": "tsc -b && tsc-alias"
"build": "tsup --clean",
"start": "tsup --watch"
},
"publishConfig": {
"access": "public"
},
"dependencies": {
"@endolphin/core": "^1.0.5",
"@endolphin/ui": "^1.0.2"
"@endolphin/ui": "^1.0.12",
"@endolphin/theme": "^1.0.17"
Comment on lines +20 to +21
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix peer dependency version mismatch.

There's a version mismatch between the regular dependency @endolphin/theme: ^1.0.17 and the peer dependency @endolphin/theme: ^1.0.4 (line 26). This could lead to dependency resolution issues.

  "peerDependencies": {
    "react": "^19.0.0",
    "react-dom": "^19.0.0",
-    "@endolphin/theme": "^1.0.4",
+    "@endolphin/theme": "^1.0.17",
    "@vanilla-extract/css": "^1.17.0",
    "@vanilla-extract/dynamic": "^2.1.2",
    "@vanilla-extract/recipes": "^0.5.5"
  }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
"@endolphin/ui": "^1.0.12",
"@endolphin/theme": "^1.0.17"
"peerDependencies": {
"react": "^19.0.0",
"react-dom": "^19.0.0",
"@endolphin/theme": "^1.0.17",
"@vanilla-extract/css": "^1.17.0",
"@vanilla-extract/dynamic": "^2.1.2",
"@vanilla-extract/recipes": "^0.5.5"
}
🤖 Prompt for AI Agents
In frontend/packages/calendar/package.json around lines 20 to 26, the version of
the dependency "@endolphin/theme" is "^1.0.17" while the peer dependency version
is "^1.0.4", causing a mismatch. To fix this, align the version of
"@endolphin/theme" in the dependencies section to match the peer dependency
version "^1.0.4" to avoid resolution conflicts.

},
"peerDependencies": {
"react": "^19.0.0",
Expand Down
28 changes: 7 additions & 21 deletions frontend/packages/calendar/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,21 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "./dist",
"baseUrl": ".",
"rootDir": ".",
"types": ["vitest/globals"],
"paths": {
"@/*": ["src/*"],
"@constants/*": ["src/constants/*"],
"@components/*": ["src/components/*"],
"@hooks/*": ["src/hooks/*"],
"@utils/*": ["src/utils/*"],
"@theme/*": ["src/theme/*"],
"@components/*": ["src/components/*"],
},
"target": "ES2020",
"useDefineForClassFields": true,
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"skipLibCheck": true,
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",

/* Bundler mode */
"moduleResolution": "bundler",
"moduleDetection": "force",
"composite": true,
"jsx": "react-jsx",

/* Linting */
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,
"noUncheckedSideEffectImports": true
/* Module Resolution */
"composite": false,
"outDir": "./dist",
},
"include": ["src"],
"include": ["src", "bundle.js"],
}
14 changes: 14 additions & 0 deletions frontend/packages/calendar/tsup.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { vanillaExtractPlugin } from '@vanilla-extract/esbuild-plugin';
import { defineConfig } from 'tsup';

export default defineConfig({
format: ['esm'],
entry: ['src/index.ts'],
outDir: 'dist',
esbuildPlugins: [vanillaExtractPlugin()],
dts: true,
external: ['@endolphin/theme'],
banner: {
js: 'import \'./index.css\';',
},
});
16 changes: 1 addition & 15 deletions frontend/packages/core/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"types": ["vitest/globals"],
Expand All @@ -8,26 +9,11 @@
"@hooks/*": ["src/hooks/*"],
"@utils/*": ["src/utils/*"],
},
"target": "ES2020",
"useDefineForClassFields": true,
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",

/* Module Resolution */
"composite": true,
"outDir": "./dist",

/* Bundler mode */
"moduleResolution": "bundler",
"moduleDetection": "force",
"jsx": "react-jsx",

/* Linting */
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,
"noUncheckedSideEffectImports": true
},
"include": ["src"],
}
11 changes: 6 additions & 5 deletions frontend/packages/date-time/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "@endolphin/date-time",
"version": "1.0.5",
"main": "dist/src/index.js",
"module": "dist/src/index.js",
"types": "dist/src/index.d.ts",
"version": "1.0.6",
"type": "module",
"main": "dist/index.js",
"module": "dist/index.js",
"types": "dist/index.d.ts",
"files": ["dist"],
"scripts": {
"build": "tsc -b && tsc-alias"
"build": "tsup --clean"
},
"publishConfig": {
"access": "public"
Expand Down
12 changes: 2 additions & 10 deletions frontend/packages/date-time/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"paths": {
Expand All @@ -8,20 +9,11 @@
"@utils/*": ["src/utils/*"],
"@theme/*": ["src/theme/*"]
},
"target": "ES2020",
"useDefineForClassFields": true,

/* Module Resolution */
"composite": true,
// "composite": true,
"outDir": "./dist",
"types": [],

/* Linting */
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,
"noUncheckedSideEffectImports": true
},
"include": ["src"]
}
8 changes: 8 additions & 0 deletions frontend/packages/date-time/tsup.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { defineConfig } from 'tsup';

export default defineConfig({
format: ['esm'],
entry: ['src/index.ts'],
outDir: 'dist',
dts: true,
});
Loading