Merge branch 'master' into release

GunmaRamens · Oct 27, 2023 · 8f1edcd · 8f1edcd
2 parents 248351b + 950bcb3
commit 8f1edcd
Show file tree

Hide file tree

Showing 77 changed files with 4,028 additions and 610 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -4,15 +4,46 @@
         "es2021": true,
         "node": true
     },
-    "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"],
-    "parser": "@typescript-eslint/parser",
-    "plugins": ["prettier", "@typescript-eslint", "simple-import-sort"],
+    "extends": [
+        "eslint:recommended",
+        "plugin:react/recommended",
+        "plugin:tailwindcss/recommended",
+        "plugin:prettier/recommended"
+    ],
+    "parserOptions": {
+        "sourceType": "module"
+    },
+    "plugins": ["tailwindcss", "unused-imports", "prettier", "simple-import-sort"],
     "rules": {
         "simple-import-sort/imports": "warn",
         "simple-import-sort/exports": "warn",
-        "@typescript-eslint/no-non-null-assertion": "off",
-        "no-unused-vars": "off",
-        "@typescript-eslint/no-unused-vars": ["error"],
-        "prettier/prettier": "warn"
-    }
+        "prettier/prettier": "warn",
+        "react/react-in-jsx-scope": "off",
+        "unused-imports/no-unused-imports": "error",
+        "tailwindcss/no-custom-classname": [
+            "warn",
+            {
+                "whitelist": ["rainbow\\-bg", "rainbow\\-text", "rainbow\\-bg\\-shadow", "rainbow\\-text\\-shadow"]
+            }
+        ]
+    },
+    "root": true,
+    "settings": {
+        "react": {
+            "version": "detect"
+        }
+    },
+    "overrides": [
+        {
+            "files": ["*.ts", "*.tsx"],
+            "extends": ["plugin:@typescript-eslint/recommended"],
+            "plugins": ["@typescript-eslint"],
+            "parser": "@typescript-eslint/parser",
+            "rules": {
+                "@typescript-eslint/no-non-null-assertion": "off",
+                "no-unused-vars": "off",
+                "@typescript-eslint/no-unused-vars": ["error"]
+            }
+        }
+    ]
 }
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ permissions:
     contents: write
 
 jobs:
-    relese:
+    release:
         runs-on: ubuntu-latest
 
         steps:

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 dist
 node_modules
 .DS_Store
+.VSCodeCounter
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -0,0 +1,7 @@
+{
+    "$schema": "https://json.schemastore.org/stylelintrc.json",
+    "extends": "stylelint-config-standard",
+    "rules": {
+        "indentation": 4
+    }
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -11,6 +11,9 @@
         "source.fixAll": true
     },
     "[shellscript]": {
-        "editor.defaultFormatter": "foxundermoon.shell-format"
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[html]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
     }
 }
diff --git a/README.md b/README.md
@@ -1,5 +1,11 @@
 ## Gunma University Gaming Edition
 
+![](https://img.shields.io/github/actions/workflow/status/GunmaRamens/gaming-gundai/check.yml?style=flat-square)
+![](https://img.shields.io/github/release-date-pre/GunmaRamens/gaming-gundai?style=flat-square)
+![](https://img.shields.io/github/license/GunmaRamens/gaming-gundai?style=flat-square)
+![](https://img.shields.io/chrome-web-store/v/fifbnlkbedonackjjbegkjmekchdcfhk?style=flat-square)
+
+
 関東の最も辺境の地にある緑あふれる群馬大学。
 
 せめてウェブサービスだけでも綺羅びやかにしようではないかという、とある学部生のささやかなプロジェクト。
@@ -51,11 +57,16 @@ You can choose one of the following licenses.
 ## Technology Stack
 
 - core-js
+- daisy UI (React)
 - ESLint
 - Node.js
 - pnpm
+- PostCSS
 - Prettier
+- React
 - Sass
+- Stylelint
+- Tailwind CSS
 - TypeScript
 - Volta
 - Webpack

diff --git a/REFER.md b/REFER.md
@@ -13,3 +13,7 @@
 -   [javascriptでthisがundefinedになる実例が分からない](https://teratail.com/questions/331287)
 -   ['this' is undefined in JavaScript class methods \- Stack Overflow](https://stackoverflow.com/questions/4011793/this-is-undefined-in-javascript-class-methods)
 -   [JavaScript の this を理解する多分一番分かりやすい説明 \#JavaScript \- Qiita](https://qiita.com/takkyun/items/c6e2f2cf25327299cf03)
+-   [Tailwind CSSの導入方法（Webpack環境）](https://zenn.dev/kazuma_r5/articles/e6ca05ad2a30dd)
+-   [postcss\-loader \| webpack](https://webpack.js.org/loaders/postcss-loader/)
+-   [PostCSSをwebpackでサクッと動かせるサンプル \#CSS \- Qiita](https://qiita.com/okumurakengo/items/a10f6fa4b77b5b088cb9)
+-   [webpackでJS,React×JS,React×TSの開発環境を1から構築してみた](https://zenn.dev/spacemarket/articles/23e5401a074ccc#2.-react%E3%82%92%E5%B0%8E%E5%85%A5%E3%81%99%E3%82%8B)
diff --git a/Todo.md b/Todo.md
@@ -12,3 +12,7 @@
 -   [ ] [webpack-chrome-extension-reloader](https://www.npmjs.com/package/webpack-chrome-extension-reloader)でホットリロードに対応する
 -   [ ] SCSSで直にスタイルを書き込んだ場合に無効化できない問題を修正する
 -   [ ] リロードなしで有効化/無効化できるようにする
+-   [ ] Reactコンポーネントを最適化する
+-   [ ] テストを書く
+-   [ ] ドキュメントを書く
+-   [ ] 設定を開いている間はポップアップを無効化する
diff --git a/babel.config.json b/babel.config.json
@@ -1,11 +1,12 @@
 {
     "presets": [
         [
-            "@babel/env",
+            "@babel/preset-env",
             {
                 "useBuiltIns": "usage",
                 "corejs": "3"
             }
-        ]
+        ],
+        "@babel/preset-react"
     ]
 }
diff --git a/devtools.sh b/devtools.sh
@@ -13,18 +13,18 @@ print_usage() {
     echo
 }
 
-init_command(){
+init_command() {
     echo "Setup GitHooks" >&2
     git config core.hooksPath .githooks
 
-    if ! which volta 2>/dev/null 1>&2; then
+    if ! which volta 2> /dev/null 1>&2; then
         echo "Please install Volta at first" >&2
         echo "https://volta.sh/" >&2
         exit 1
     fi
 
     echo "Install Node.js" >&2
-    volta install node
+    volta install node@lts
 
     echo "Install dependencies" >&2
     volta install pnpm
@@ -35,39 +35,40 @@ main() {
     _short="" _long="" _noarg=""
     while true; do
         case "${1-""}" in
-        "-h" | "--help")
-            print_usage
-            shift 1
-            exit 0
-            ;;
-        "")
-            break
-            ;;
-        *)
-            _noarg="${_noarg-""}${1} "
-            shift 1
-            ;;
+            "-h" | "--help")
+                print_usage
+                shift 1
+                exit 0
+                ;;
+            "")
+                break
+                ;;
+            *)
+                _noarg="${_noarg-""}${1} "
+                shift 1
+                ;;
         esac
     done
     eval set -- "${_noarg}"
     while true; do
         case "${1-""}" in
-        "init")
-            init_command
-            shift 1
-            ;;
-        "help")
-            print_usage
-            shift 1
-            exit 0
-            ;;
-        "")
-            break
-            ;;
-        *)
-            echo "Unknown option: $1" >&2
-            print_usage >&2
-            exit 1
+            "init")
+                init_command
+                shift 1
+                ;;
+            "help")
+                print_usage
+                shift 1
+                exit 0
+                ;;
+            "")
+                break
+                ;;
+            *)
+                echo "Unknown option: $1" >&2
+                print_usage >&2
+                exit 1
+                ;;
         esac
     done
 }

diff --git a/package.json b/package.json
@@ -2,42 +2,75 @@
     "name": "gunma-univ-gaming-edition",
     "description": "The browser extension of Gunma University Gaming Edition",
     "license": "MIT",
-    "version": "1.2.1",
+    "version": "2.0.0",
     "scripts": {
-        "build": "pnpm webpack --mode production",
-        "watch": "pnpm webpack --mode development --watch",
+        "build": "pnpm webpack --mode production --config webpack.prod.js",
+        "build:dev": "pnpm webpack --mode development --config webpack.dev.js",
+        "watch": "pnpm webpack --mode development --watch --config webpack.dev.js",
+        "fmt": "prettier --write '**/*.{js,json,md,html,sh}'",
         "lint": "prettier --check . && eslint . ",
-        "lint:fix": "prettier --write . && eslint . --fix"
+        "lint:fix": "pnpm fmt && eslint . --fix"
     },
     "devDependencies": {
         "@babel/core": "^7.23.2",
         "@babel/preset-env": "^7.23.2",
+        "@babel/preset-react": "^7.22.15",
         "@babel/register": "^7.22.15",
-        "@types/chrome": "^0.0.246",
-        "@types/node": "^20.8.4",
-        "@types/webpack": "^5.28.3",
-        "@typescript-eslint/eslint-plugin": "^6.7.5",
-        "@typescript-eslint/parser": "^6.7.5",
+        "@tailwindcss/typography": "^0.5.10",
+        "@types/chrome": "^0.0.248",
+        "@types/node": "^20.8.9",
+        "@types/react": "^18.2.32",
+        "@types/react-dom": "^18.2.14",
+        "@types/webpack": "^5.28.4",
+        "@typescript-eslint/eslint-plugin": "^6.9.0",
+        "@typescript-eslint/parser": "^6.9.0",
+        "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
-        "core-js": "^3.33.0",
+        "core-js": "^3.33.1",
         "css-loader": "^6.8.1",
-        "eslint": "^8.51.0",
+        "css-minimizer-webpack-plugin": "^5.0.1",
+        "daisyui": "^3.9.3",
+        "eslint": "^8.52.0",
         "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-prettier": "^5.0.1",
+        "eslint-plugin-react": "^7.33.2",
         "eslint-plugin-simple-import-sort": "^10.0.0",
+        "eslint-plugin-tailwindcss": "^3.13.0",
+        "eslint-plugin-unused-imports": "^3.0.0",
         "eslint-webpack-plugin": "^4.0.1",
+        "html-webpack-plugin": "^5.5.3",
+        "postcss": "^8.4.31",
+        "postcss-import": "^15.1.0",
+        "postcss-loader": "^7.3.3",
+        "postcss-nested": "^6.0.1",
+        "postcss-scss": "^4.0.9",
         "prettier": "^3.0.3",
-        "sass": "^1.69.3",
+        "prettier-plugin-sh": "^0.13.1",
+        "sass": "^1.69.4",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
+        "stylelint": "^15.11.0",
+        "stylelint-config-standard": "^34.0.0",
+        "stylelint-prettier": "^4.0.2",
+        "tailwindcss": "^3.3.5",
         "ts-loader": "^9.5.0",
         "ts-node": "^10.9.1",
         "typescript": "^5.2.2",
-        "webpack": "^5.88.2",
-        "webpack-cli": "^5.1.4"
+        "webpack": "^5.89.0",
+        "webpack-cli": "^5.1.4",
+        "webpack-merge": "^5.10.0"
     },
     "volta": {
         "node": "18.18.1"
+    },
+    "dependencies": {
+        "classnames": "^2.3.2",
+        "jotai": "^2.5.0",
+        "react": "^18.2.0",
+        "react-daisyui": "^4.1.2",
+        "react-dom": "^18.2.0",
+        "react-icons": "^4.11.0",
+        "react-router-dom": "^6.17.0"
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ permissions: @@
         contents: write
     jobs:
-        relese:
+        release:
             runs-on: ubuntu-latest
             steps:
@@ Expand Down @@