Merge pull request #1266 from shikorism/develop

Release 2024.8.3
shikorism · Aug 24, 2024 · 1f4cc81 · 1f4cc81
2 parents f50f953 + 2eabce4
commit 1f4cc81
Show file tree

Hide file tree

Showing 16 changed files with 1,059 additions and 708 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -94,16 +94,22 @@ jobs:
       - store_test_results:
           path: /tmp/php-cs-fixer
 
+      # Run tsc
+      - run:
+          name: tsc
+          command: yarn run lint:tsc
+          when: always
+
       # Run stylelint
       - run:
           name: stylelint
-          command: yarn run stylelint
+          command: yarn run lint:stylelint
           when: always
 
       # Run eslint
       - run:
           name: eslint
-          command: yarn run eslint
+          command: yarn run lint:eslint
           when: always
 
       # Run unit test

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
diff --git a/app/MetadataResolver/MelonbooksResolver.php b/app/MetadataResolver/MelonbooksResolver.php
@@ -49,7 +49,7 @@ public function resolve(string $url): Metadata
         }
 
         // 抽出
-        preg_match('~^(.+)（(.+)）の通販・購入はメロンブックス~', $metadata->title, $match);
+        preg_match('~^(.+)\((.+)\)の通販・購入はメロンブックス~', $metadata->title, $match);
         $title = $match[1];
         $maker = $match[2];
 

diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,44 @@
+import js from '@eslint/js';
+import ts from 'typescript-eslint';
+import globals from 'globals';
+import prettierRecommended from 'eslint-plugin-prettier/recommended';
+import jquery from 'eslint-plugin-jquery';
+
+export default [
+    js.configs.recommended,
+    ...ts.configs.recommended,
+    prettierRecommended,
+    {
+        files: ['**/*.js', '**/*.ts', '**/*.tsx'],
+        plugins: {
+            jquery,
+        },
+        languageOptions: {
+            sourceType: 'module',
+            ecmaVersion: 11,
+            parserOptions: {
+                ecmaFeatures: {
+                    jsx: true,
+                },
+            },
+            globals: {
+                ...globals.browser,
+                ...globals.es2020,
+                ...globals.node,
+            },
+        },
+        rules: {
+            '@typescript-eslint/explicit-module-boundary-types': 0,
+            '@typescript-eslint/no-explicit-any': 0,
+            '@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
+            'jquery/no-ajax': 2,
+            'jquery/no-ajax-events': 2,
+            'react/prop-types': 0,
+        },
+        settings: {
+            react: {
+                version: 'detect',
+            },
+        },
+    },
+];
diff --git a/package.json b/package.json
@@ -5,13 +5,16 @@
     "dev": "vite",
     "build": "vite build",
     "prod": "npm run build",
-    "eslint": "eslint --ext .js,.ts,.tsx resources/",
-    "stylelint": "stylelint resources/assets/sass/**/*",
+    "lint": "run-s lint:*",
+    "lint:tsc": "tsc --noEmit",
+    "lint:eslint": "eslint resources/",
+    "lint:stylelint": "stylelint resources/assets/sass/**/*",
     "doc": "redocly build-docs -o public/apidoc.html openapi.yaml",
     "doc-watch": "chokidar openapi.yaml --initial -c \"npm run doc\"",
     "prepare": "husky"
   },
   "devDependencies": {
+    "@eslint/js": "^9.9.0",
     "@redocly/cli": "^1.19.0",
     "@tabler/icons-webfont": "^3.6.0",
     "@tanstack/react-query": "^4.0.0",
@@ -25,8 +28,6 @@
     "@types/qs": "^6.9.15",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "@typescript-eslint/eslint-plugin": "^5.28.0",
-    "@typescript-eslint/parser": "^5.30.7",
     "@vitejs/plugin-react": "^4.3.1",
     "bootstrap": "^4.5.0",
     "cal-heatmap": "^4.2.4",
@@ -35,16 +36,18 @@
     "classnames": "^2.5.1",
     "clipboard": "^2.0.11",
     "date-fns": "^2.28.0",
-    "eslint": "^8.3.0",
+    "eslint": "^9.9.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-jquery": "^1.5.1",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.35.0",
+    "globals": "^15.9.0",
     "husky": "^9.1.4",
     "jquery": "^3.7.1",
     "js-cookie": "^3.0.5",
     "laravel-vite-plugin": "^1.0.5",
     "lint-staged": "^10.5.3",
+    "npm-run-all2": "^6.2.2",
     "popper.js": "^1.14.7",
     "postcss": "^8.4.41",
     "postcss-scss": "^4.0.9",
@@ -58,7 +61,8 @@
     "sass": "^1.77.8",
     "stylelint": "^14.16.1",
     "stylelint-config-recess-order": "^3.1.0",
-    "typescript": "^4.7.2",
+    "typescript": "^5.5.4",
+    "typescript-eslint": "^8.1.0",
     "vite": "^5.3.5"
   },
   "stylelint": {

diff --git a/resources/assets/js/components/TagInput.tsx b/resources/assets/js/components/TagInput.tsx
@@ -14,7 +14,7 @@ export const TagInput: React.FC<TagInputProps> = ({ id, name, values, isInvalid,
     const containerClass = classNames('form-control', 'h-auto', { 'is-invalid': isInvalid });
     const inputRef = useRef<HTMLInputElement>(null);
     const removeTag = (index: number) => {
-        onChange && onChange(values.filter((v, i) => i != index));
+        onChange?.(values.filter((v, i) => i != index));
     };
     const onKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
         if (buffer.trim() !== '') {
@@ -46,7 +46,7 @@ export const TagInput: React.FC<TagInputProps> = ({ id, name, values, isInvalid,
     const commitBuffer = () => {
         const newTag = buffer.trim().replace(/\s+/g, '_');
         if (newTag.length === 0) return;
-        onChange && onChange(values.concat(newTag));
+        onChange?.(values.concat(newTag));
         setBuffer('');
     };
 

diff --git a/resources/assets/js/components/collections/AddToCollectionButton.tsx b/resources/assets/js/components/collections/AddToCollectionButton.tsx
@@ -85,7 +85,7 @@ export const AddToCollectionButton: React.FC<AddToCollectionButtonProps> = ({
                 await response.json();
                 showToast('作成して追加しました', { color: 'success', delay: 5000 });
                 setShowCreateModal(false);
-                onCreateCollection && onCreateCollection();
+                onCreateCollection?.();
                 return;
             }
             throw new ResponseError(response);

diff --git a/resources/assets/js/components/collections/CollectionEditModal.tsx b/resources/assets/js/components/collections/CollectionEditModal.tsx
@@ -18,13 +18,8 @@ export class CollectionFormValidationError extends Error {
 
     constructor(errors: CollectionFormErrors, ...rest: any) {
         super(...rest);
-        if (Error.captureStackTrace) {
-            Error.captureStackTrace(this, CollectionFormValidationError);
-        }
-
         this.name = 'CollectionFormValidationError';
         this.errors = errors;
-        Object.setPrototypeOf(this, new.target.prototype);
     }
 }
 

diff --git a/resources/assets/js/fetch.ts b/resources/assets/js/fetch.ts
@@ -61,12 +61,7 @@ export class ResponseError extends Error {
 
     constructor(response: Response, ...rest: any) {
         super(...rest);
-        if (Error.captureStackTrace) {
-            Error.captureStackTrace(this, ResponseError);
-        }
-
         this.name = 'ResponseError';
         this.response = response;
-        Object.setPrototypeOf(this, new.target.prototype);
     }
 }
diff --git a/resources/assets/js/home.ts b/resources/assets/js/home.ts
@@ -3,12 +3,9 @@ import { Chart, BarController, BarElement, CategoryScale, LinearScale, Legend, T
 Chart.register([BarController, BarElement, CategoryScale, LinearScale, Legend, Tooltip]);
 
 const graph = document.getElementById('global-count-graph') as HTMLCanvasElement;
-// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 const labels = JSON.parse(document.getElementById('global-count-labels')!.textContent as string);
-// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 const data = JSON.parse(document.getElementById('global-count-data')!.textContent as string);
 
-// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 new Chart(graph.getContext('2d')!, {
     type: 'bar',
     data: {

diff --git a/resources/assets/js/user/profile.ts b/resources/assets/js/user/profile.ts
@@ -35,14 +35,12 @@ if (document.getElementById('cal-heatmap')) {
             },
         },
         [
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
             [LegendLite],
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
             [
                 Tooltip,
                 {
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-ignore
                     text: (timestamp: number, value: number, dayjsDate: Dayjs) =>
                         `${dayjsDate.format('YYYY/MM/DD')} - ${value || 0}回`,
                 },

diff --git a/resources/assets/js/user/stats.ts b/resources/assets/js/user/stats.ts
@@ -33,12 +33,10 @@ Chart.register([
     Tooltip,
 ]);
 
-// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 const graphData = JSON.parse(document.getElementById('graph-data')!.textContent as string);
 
 function createLineGraph(id: string, labels: string[], data: any) {
     const context = (document.getElementById(id) as HTMLCanvasElement).getContext('2d');
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     return new Chart(context!, {
         type: 'line',
         data: {
@@ -79,7 +77,6 @@ function createLineGraph(id: string, labels: string[], data: any) {
 
 function createBarGraph(id: string, labels: string[], data: any) {
     const context = (document.getElementById(id) as HTMLCanvasElement).getContext('2d');
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     new Chart(context!, {
         type: 'bar',
         data: {
@@ -161,14 +158,12 @@ if (document.getElementById('cal-heatmap')) {
             },
         },
         [
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
             [LegendLite],
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
             [
                 CHTooltip,
                 {
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-ignore
                     text: (timestamp: number, value: number, dayjsDate: Dayjs) =>
                         `${dayjsDate.format('YYYY/MM/DD')} - ${value || 0}回`,
                 },