Skip to content

Commit

Permalink
Merge branch 'main' into feat/10-separate-match-model
Browse files Browse the repository at this point in the history
  • Loading branch information
laminne committed Jul 8, 2024
2 parents 0060356 + e57803f commit 66b134b
Show file tree
Hide file tree
Showing 9 changed files with 150 additions and 188 deletions.
14 changes: 0 additions & 14 deletions packages/kcms/.eslintrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion packages/kcms/eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const compat = new FlatCompat();
export default [
{
// 対象ファイル
files: ['src/**/**.ts'],
files: ['src/**/*.ts'],
},
{
// 除外ファイル
Expand Down
6 changes: 3 additions & 3 deletions packages/kcms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start": "node ./build/main.js",
"dev": "tsx ./src/main.ts",
"build": "esbuild ./src/main.ts --bundle --sourcemap --platform=node --target=node16 --format=esm --packages=external --outfile=build/main.js",
"lint": "eslint --cache 'src/**/**.ts'",
"lint": "eslint --cache \"src/**/*.ts\"",
"format": "prettier . --write",
"test": "vitest run",
"coverage": "vitest run --coverage",
Expand All @@ -28,12 +28,12 @@
},
"devDependencies": {
"@eslint/eslintrc": "^3.0.0",
"@eslint/js": "^8.56.0",
"@eslint/js": "^9.0.0",
"@types/node": "^20.10.2",
"@typescript-eslint/eslint-plugin": "^7.0.0",
"@typescript-eslint/parser": "^7.0.0",
"@vitest/coverage-v8": "^1.1.3",
"eslint": "^8.55.0",
"eslint": "^9.0.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-vitest": "^0.5.0",
"prettier": "^3.1.0",
Expand Down
18 changes: 0 additions & 18 deletions packages/kcmsf/.eslintrc.cjs

This file was deleted.

3 changes: 2 additions & 1 deletion packages/kcmsf/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ dist-ssr
*.sln
*.sw?

/coverage
/coverage
.eslintcache
47 changes: 47 additions & 0 deletions packages/kcmsf/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { FlatCompat } from "@eslint/eslintrc";
import js from "@eslint/js";
import typeScriptESLint from "@typescript-eslint/eslint-plugin";
import typeScriptESLintParser from "@typescript-eslint/parser";
import eslintConfigPrettier from "eslint-config-prettier";
import reactRefresh from "eslint-plugin-react-refresh";
import vitest from "eslint-plugin-vitest";
import globals from "globals";

const compat = new FlatCompat();

export default [
{
files: ["src/**/*.{ts,tsx}"],
},
{
ignores: ["dist/**", "node_modules/**"],
},
js.configs.recommended,
eslintConfigPrettier,
...compat.extends("plugin:@typescript-eslint/recommended"),
...compat.extends("plugin:react-hooks/recommended"),
{
languageOptions: {
parser: typeScriptESLintParser,
globals: {
...globals.browser,
},
},
},
{
plugins: {
"@typescript-eslint": typeScriptESLint,
"react-refresh": reactRefresh,
vitest,
},
},
{
rules: {
...vitest.configs.recommended.rules,
"react-refresh/only-export-components": [
"warn",
{ allowConstantExport: true },
],
},
},
];
5 changes: 3 additions & 2 deletions packages/kcmsf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives",
"lint": "eslint --cache \"src/**/*.{ts,tsx}\" --report-unused-disable-directives",
"preview": "vite preview",
"format": "prettier --write .",
"test": "vitest --watch --ui --coverage.enabled=true",
Expand Down Expand Up @@ -37,9 +37,10 @@
"@vitejs/plugin-react-swc": "^3.5.0",
"@vitest/coverage-v8": "^1.4.0",
"@vitest/ui": "^1.4.0",
"eslint": "^8.53.0",
"eslint": "^9.0.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.4",
"globals": "^15.8.0",
"jsdom": "^24.0.0",
"postcss": "^8.4.32",
"postcss-preset-mantine": "^1.11.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/kcmsf/src/hooks/useInterval.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const useInterval = (onUpdate: OnUpdate, ms: number) => {
useEffect(() => {
const intervalId = setInterval(() => onUpdateRef.current(), ms);
return () => clearInterval(intervalId);
}, []);
}, [ms]);
};

type OnUpdate = () => void;
Loading

0 comments on commit 66b134b

Please sign in to comment.