Merge pull request #1250 from koedame/release/v2.2.1

Release/v2.2.1
koedame · Aug 27, 2022 · 44a775c · 44a775c
2 parents 0ee4215 + a7ba8fd
commit 44a775c
Show file tree

Hide file tree

Showing 34 changed files with 783 additions and 445 deletions.
diff --git a/CHANGELOGS.md b/CHANGELOGS.md
@@ -1,5 +1,35 @@
 # CHANGELOGS
 
+## v2.2.1
+
+### 変更
+
+- ファイル保存時にPrettierを実行するように設定
+- 不要なuseEffectを削除
+
+### 依存パッケージ
+
+- @babel/core from 7.18.9 to 7.18.13
+- @babel/preset-env from 7.18.9 to 7.18.10
+- @heroicons/react from 1.0.6 to 2.0.8
+- @jest/globals from 28.1.3 to 29.0.1
+- @swc/core from 1.2.220 to 1.2.244
+- @types/chrome from 0.0.193 to 0.0.195
+- @types/jest from 28.1.6 to 28.1.8
+- @types/node from 18.6.2 to 18.7.13
+- @types/webpack-env from 1.17.0 to 1.18.0
+- i18next from 21.8.14 to 21.9.1
+- jest-environment-jsdom from 28.1.3 to 29.0.0
+- node from 18.7.0-alpine to 18.8.0-alpine
+- postcss from 8.4.14 to 8.4.16
+- react-i18next from 11.18.3 to 11.18.5
+- recoil from 0.7.4 to 0.7.5
+- tailwindcss from 3.1.6 to 3.1.8
+- terser-webpack-plugin from 5.3.3 to 5.3.5
+- ts-jest from 28.0.7 to 28.0.8
+- typescript from 4.7.4 to 4.8.2
+- webpack-dev-server from 4.9.3 to 4.10.0
+
 ## v2.2.0
 
 ### 変更

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.7.0-alpine
+FROM node:18.8.0-alpine
 
 RUN mkdir /app
 WORKDIR /app

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "syncroom-plus",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "syncroom-plus",
   "license": "MIT",
   "private": true,
@@ -16,43 +16,43 @@
   },
   "dependencies": {
     "@headlessui/react": "^1.6.6",
-    "@heroicons/react": "^1.0.5",
-    "i18next": "^21.8.14",
+    "@heroicons/react": "^2.0.8",
+    "i18next": "^21.9.1",
     "luxon": "^3.0.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-flip-toolkit": "^7.0.13",
-    "react-i18next": "^11.18.3",
+    "react-i18next": "^11.18.5",
     "react-loading": "^2.0.3",
     "react-qr-code": "^2.0.2",
-    "recoil": "^0.7.4",
+    "recoil": "^0.7.5",
     "twemoji": "^14.0.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.9",
+    "@babel/core": "^7.18.13",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/preset-env": "^7.18.9",
+    "@babel/preset-env": "^7.18.10",
     "@babel/preset-react": "^7.18.6",
     "@hot-loader/react-dom": "^17.0.2",
     "@jest/expect-utils": "^28.1.3",
-    "@jest/globals": "^28.1.3",
-    "@swc/core": "^1.2.220",
+    "@jest/globals": "^29.0.1",
+    "@swc/core": "^1.2.244",
     "@swc/jest": "^0.2.22",
     "@tailwindcss/aspect-ratio": "^0.4.0",
     "@tailwindcss/forms": "^0.5.2",
     "@tailwindcss/line-clamp": "^0.4.0",
     "@tailwindcss/typography": "^0.5.4",
     "@testing-library/react-hooks": "^8.0.1",
-    "@types/chrome": "^0.0.193",
-    "@types/jest": "^28.1.6",
+    "@types/chrome": "^0.0.195",
+    "@types/jest": "^28.1.8",
     "@types/luxon": "^3.0.0",
-    "@types/node": "^18.6.2",
+    "@types/node": "^18.7.13",
     "@types/react": "^17.0.33",
     "@types/react-dom": "^17.0.10",
     "@types/recoil": "^0.0.9",
     "@types/twemoji": "^13.1.2",
     "@types/webextension-polyfill": "^0.9.0",
-    "@types/webpack-env": "^1.16.3",
+    "@types/webpack-env": "^1.18.0",
     "archiver": "^5.3.1",
     "autoprefixer": "10.4.8",
     "babel-loader": "^8.2.2",
@@ -66,23 +66,24 @@
     "html-webpack-plugin": "^5.5.0",
     "jest": "^28.1.3",
     "jest-diff": "^28.1.3",
-    "jest-environment-jsdom": "^28.1.3",
+    "jest-environment-jsdom": "^29.0.0",
     "mockzilla": "^0.13.0",
     "mockzilla-webextension": "^0.14.0",
-    "postcss": "^8.4.4",
+    "postcss": "^8.4.16",
     "postcss-loader": "^7.0.1",
     "prettier": "^2.7.1",
+    "prettier-webpack-plugin": "^1.2.0",
     "source-map-loader": "^4.0.0",
     "style-loader": "^3.3.1",
-    "tailwindcss": "^3.1.6",
-    "terser-webpack-plugin": "^5.2.4",
-    "ts-jest": "^28.0.7",
+    "tailwindcss": "^3.1.8",
+    "terser-webpack-plugin": "^5.3.5",
+    "ts-jest": "^28.0.8",
     "ts-loader": "^9.3.1",
     "ts-node": "^10.9.1",
-    "typescript": "^4.7.4",
+    "typescript": "^4.8.2",
     "webextension-polyfill": "^0.9.0",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",
-    "webpack-dev-server": "^4.9.3"
+    "webpack-dev-server": "^4.10.0"
   }
 }
diff --git a/postcss.config.js b/postcss.config.js
@@ -2,5 +2,5 @@ module.exports = {
   plugins: {
     tailwindcss: {},
     autoprefixer: {},
-  }
-}
+  },
+};
diff --git a/src/components/ConfigPanel/BasicConfig/ResetRememberPassword/Dialog.tsx b/src/components/ConfigPanel/BasicConfig/ResetRememberPassword/Dialog.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useRef } from 'react';
 import { Dialog, Transition } from '@headlessui/react';
-import { ExclamationIcon } from '@heroicons/react/outline';
+import { ExclamationCircleIcon } from '@heroicons/react/24/outline';
 
 import { useTranslation } from '../../../../lib/i18n';
 
@@ -53,7 +53,7 @@ const Component: React.FC<Props> = ({ isOpen, onClose, onOk }: Props) => {
               <div className="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
                 <div className="sm:flex sm:items-start">
                   <div className="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10">
-                    <ExclamationIcon className="h-6 w-6 text-red-600" />
+                    <ExclamationCircleIcon className="h-6 w-6 text-red-600" />
                   </div>
                   <div className="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
                     <Dialog.Title as="h3" className="text-lg leading-6 font-medium text-gray-900">

diff --git a/src/components/ConfigPanel/BasicConfig/ResetRememberPassword/SucceedToast.tsx b/src/components/ConfigPanel/BasicConfig/ResetRememberPassword/SucceedToast.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment } from 'react';
 import { Transition } from '@headlessui/react';
-import { CheckCircleIcon } from '@heroicons/react/outline';
-import { XIcon } from '@heroicons/react/solid';
+import { CheckCircleIcon } from '@heroicons/react/24/outline';
+import { XMarkIcon } from '@heroicons/react/20/solid';
 
 import { useTranslation } from '../../../../lib/i18n';
 
@@ -43,7 +43,7 @@ const Component: React.FC<Props> = ({ isOpen, onClose }: Props) => {
                         onClose();
                       }}
                     >
-                      <XIcon className="h-5 w-5" />
+                      <XMarkIcon className="h-5 w-5" />
                     </button>
                   </div>
                 </div>

diff --git a/src/components/ConfigPanel/BlockMembers/RemoveDialog.tsx b/src/components/ConfigPanel/BlockMembers/RemoveDialog.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useRef } from 'react';
 import { Dialog, Transition } from '@headlessui/react';
-import { ExclamationIcon } from '@heroicons/react/outline';
+import { ExclamationCircleIcon } from '@heroicons/react/24/outline';
 
 import { useTranslation } from '../../../lib/i18n';
 
@@ -55,7 +55,7 @@ const Component: React.FC<Props> = ({ isOpen, onClose, onOk, memberName, isRemov
               <div className="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
                 <div className="sm:flex sm:items-start">
                   <div className="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10">
-                    <ExclamationIcon className="h-6 w-6 text-red-600" />
+                    <ExclamationCircleIcon className="h-6 w-6 text-red-600" />
                   </div>
                   <div className="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
                     <Dialog.Title as="h3" className="text-lg leading-6 font-medium text-gray-900">

diff --git a/src/components/ConfigPanel/BlockMembers/RemovedToast.tsx b/src/components/ConfigPanel/BlockMembers/RemovedToast.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment } from 'react';
 import { Transition } from '@headlessui/react';
-import { CheckCircleIcon } from '@heroicons/react/outline';
-import { XIcon } from '@heroicons/react/solid';
+import { CheckCircleIcon } from '@heroicons/react/24/outline';
+import { XMarkIcon } from '@heroicons/react/20/solid';
 
 import { useTranslation } from '../../../lib/i18n';
 
@@ -43,7 +43,7 @@ const Component: React.FC<Props> = ({ isOpen, onClose }: Props) => {
                       onClose();
                     }}
                   >
-                    <XIcon className="h-5 w-5" />
+                    <XMarkIcon className="h-5 w-5" />
                   </button>
                 </div>
               </div>

diff --git a/src/components/ConfigPanel/BlockMembers/index.tsx b/src/components/ConfigPanel/BlockMembers/index.tsx
@@ -1,5 +1,5 @@
 import React, { memo, useEffect, useState } from 'react';
-import { BanIcon } from '@heroicons/react/solid';
+import { NoSymbolIcon } from '@heroicons/react/20/solid';
 import { useTranslation } from '../../../lib/i18n';
 
 import { useSession } from '../../../hooks/useSession';
@@ -37,7 +37,7 @@ const Component: React.FC<Props> = ({}: Props) => {
         {myProfile?.blockedUsers.length === 0 ? (
           <div className="bg-yellow-50 text-sm text-yellow-700 rounded p-4">
             {t('missing_blocks1')}
-            <BanIcon className="h-4 w-4 text-yellow-600 inline-block" />
+            <NoSymbolIcon className="h-4 w-4 text-yellow-600 inline-block" />
             {t('missing_blocks2')}
           </div>
         ) : (

diff --git a/src/components/ConfigPanel/FavoritesMembers/RemoveDialog.tsx b/src/components/ConfigPanel/FavoritesMembers/RemoveDialog.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useRef } from 'react';
 import { Dialog, Transition } from '@headlessui/react';
-import { ExclamationIcon } from '@heroicons/react/outline';
+import { ExclamationCircleIcon } from '@heroicons/react/24/outline';
 
 import { useTranslation } from '../../../lib/i18n';
 
@@ -55,7 +55,7 @@ const Component: React.FC<Props> = ({ isOpen, onClose, onOk, memberName, isRemov
               <div className="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
                 <div className="sm:flex sm:items-start">
                   <div className="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10">
-                    <ExclamationIcon className="h-6 w-6 text-red-600" />
+                    <ExclamationCircleIcon className="h-6 w-6 text-red-600" />
                   </div>
                   <div className="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
                     <Dialog.Title as="h3" className="text-lg leading-6 font-medium text-gray-900">

diff --git a/src/components/ConfigPanel/FavoritesMembers/RemovedToast.tsx b/src/components/ConfigPanel/FavoritesMembers/RemovedToast.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment } from 'react';
 import { Transition } from '@headlessui/react';
-import { CheckCircleIcon } from '@heroicons/react/outline';
-import { XIcon } from '@heroicons/react/solid';
+import { CheckCircleIcon } from '@heroicons/react/24/outline';
+import { XMarkIcon } from '@heroicons/react/20/solid';
 
 import { useTranslation } from '../../../lib/i18n';
 
@@ -42,7 +42,7 @@ const Component: React.FC<Props> = ({ isOpen, onClose }: Props) => {
                       onClose();
                     }}
                   >
-                    <XIcon className="h-5 w-5" />
+                    <XMarkIcon className="h-5 w-5" />
                   </button>
                 </div>
               </div>

diff --git a/src/components/ConfigPanel/FavoritesMembers/index.tsx b/src/components/ConfigPanel/FavoritesMembers/index.tsx
@@ -1,5 +1,5 @@
 import React, { memo, useEffect, useState } from 'react';
-import { StarIcon } from '@heroicons/react/solid';
+import { StarIcon } from '@heroicons/react/20/solid';
 import { useTranslation } from '../../../lib/i18n';
 
 import { useSession } from '../../../hooks/useSession';

diff --git a/src/components/ConfigPanel/OnlineNotifications/RemoveDialog.tsx b/src/components/ConfigPanel/OnlineNotifications/RemoveDialog.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useRef } from 'react';
 import { Dialog, Transition } from '@headlessui/react';
-import { ExclamationIcon } from '@heroicons/react/outline';
+import { ExclamationCircleIcon } from '@heroicons/react/24/outline';
 
 import { useTranslation } from '../../../lib/i18n';
 
@@ -54,7 +54,7 @@ const Component: React.FC<Props> = ({ isOpen, onClose, onOk, memberName }: Props
               <div className="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
                 <div className="sm:flex sm:items-start">
                   <div className="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10">
-                    <ExclamationIcon className="h-6 w-6 text-red-600" />
+                    <ExclamationCircleIcon className="h-6 w-6 text-red-600" />
                   </div>
                   <div className="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
                     <Dialog.Title as="h3" className="text-lg leading-6 font-medium text-gray-900">

diff --git a/src/components/ConfigPanel/OnlineNotifications/RemovedToast.tsx b/src/components/ConfigPanel/OnlineNotifications/RemovedToast.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment } from 'react';
 import { Transition } from '@headlessui/react';
-import { CheckCircleIcon } from '@heroicons/react/outline';
-import { XIcon } from '@heroicons/react/solid';
+import { CheckCircleIcon } from '@heroicons/react/24/outline';
+import { XMarkIcon } from '@heroicons/react/20/solid';
 
 import { useTranslation } from '../../../lib/i18n';
 
@@ -42,7 +42,7 @@ const Component: React.FC<Props> = ({ isOpen, onClose }: Props) => {
                       onClose();
                     }}
                   >
-                    <XIcon className="h-5 w-5" />
+                    <XMarkIcon className="h-5 w-5" />
                   </button>
                 </div>
               </div>

diff --git a/src/components/ConfigPanel/OnlineNotifications/index.tsx b/src/components/ConfigPanel/OnlineNotifications/index.tsx
@@ -1,5 +1,5 @@
 import React, { memo, useEffect, useState } from 'react';
-import { BellIcon } from '@heroicons/react/solid';
+import { BellIcon } from '@heroicons/react/20/solid';
 
 import { useTranslation } from '../../../lib/i18n';
 import { useNotificationOnlineMemberIds } from '../../../hooks/useNotificationOnlineMembers';

diff --git a/src/components/ConfigPanel/index.tsx b/src/components/ConfigPanel/index.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment, memo, useState } from 'react';
 import { Dialog, Transition } from '@headlessui/react';
-import { XIcon } from '@heroicons/react/outline';
+import { XMarkIcon } from '@heroicons/react/24/outline';
 
 import Basic from './BasicConfig';
 import Favorites from './FavoritesMembers';
@@ -64,7 +64,7 @@ const Component: React.FC<Props> = ({ isOpen, onClose }: Props) => {
                             onClose();
                           }}
                         >
-                          <XIcon className="h-6 w-6" />
+                          <XMarkIcon className="h-6 w-6" />
                         </button>
                       </div>
                     </div>
@@ -151,7 +151,7 @@ const Component: React.FC<Props> = ({ isOpen, onClose }: Props) => {
                         onClose();
                       }}
                     >
-                      <XIcon className="h-5 w-5 mr-2" />
+                      <XMarkIcon className="h-5 w-5 mr-2" />
                       {t('close')}
                     </button>
                   </div>

diff --git a/src/components/LoginRequired/Dialog.tsx b/src/components/LoginRequired/Dialog.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Fragment, useRef } from 'react';
 import { Dialog, Transition } from '@headlessui/react';
-import { ShieldCheckIcon } from '@heroicons/react/solid';
+import { ShieldCheckIcon } from '@heroicons/react/20/solid';
 import { useTranslation } from 'react-i18next';
 
 import { atom, useRecoilState } from 'recoil';

diff --git a/src/components/Messages/LoginMessage.tsx b/src/components/Messages/LoginMessage.tsx
@@ -1,6 +1,6 @@
 import React, { memo } from 'react';
-import { InformationCircleIcon } from '@heroicons/react/solid';
-import { ChevronRightIcon } from '@heroicons/react/outline';
+import { InformationCircleIcon } from '@heroicons/react/20/solid';
+import { ChevronRightIcon } from '@heroicons/react/24/outline';
 import { useSession } from '../../hooks/useSession';
 import { useTranslation } from 'react-i18next';
 

diff --git a/src/components/Messages/ServiceNotification.tsx b/src/components/Messages/ServiceNotification.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import { DateTime } from 'luxon';
-import { ExclamationIcon, XCircleIcon, CheckCircleIcon, InformationCircleIcon } from '@heroicons/react/solid';
+import { ExclamationCircleIcon, XCircleIcon, CheckCircleIcon, InformationCircleIcon } from '@heroicons/react/20/solid';
 import { useServiceNotification } from '../../hooks/useServiceNotification';
 
 interface Props {}
@@ -39,7 +39,7 @@ const Component: React.VFC<Props> = ({}: Props) => {
             <div className="flex-shrink-0">
               {serviceNotification.notification_type === 'info' && <InformationCircleIcon className={`h-5 w-5 text-${color}-400`} />}
               {serviceNotification.notification_type === 'success' && <CheckCircleIcon className={`h-5 w-5 text-${color}-400`} />}
-              {serviceNotification.notification_type === 'warning' && <ExclamationIcon className={`h-5 w-5 text-${color}-400`} />}
+              {serviceNotification.notification_type === 'warning' && <ExclamationCircleIcon className={`h-5 w-5 text-${color}-400`} />}
               {serviceNotification.notification_type === 'danger' && <XCircleIcon className={`h-5 w-5 text-${color}-400`} />}
             </div>
             <div className="ml-3 w-full">

diff --git a/src/components/MyProfile/index.tsx b/src/components/MyProfile/index.tsx
@@ -1,5 +1,5 @@
 import { Dialog, Transition } from '@headlessui/react';
-import { XIcon } from '@heroicons/react/outline';
+import { XMarkIcon } from '@heroicons/react/24/outline';
 import { useTranslation } from '../../lib/i18n';
 
 import React, { Fragment, memo, useEffect, useState } from 'react';
@@ -168,7 +168,7 @@ const Component: React.FC<Props> = ({}: Props) => {
                   className="bg-white rounded-md text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
                   onClick={() => closeMyProfileForm()}
                 >
-                  <XIcon className="h-6 w-6" />
+                  <XMarkIcon className="h-6 w-6" />
                 </button>
               </div>
               <div className="pb-20">