Skip to content

Commit

Permalink
chore: partially update everything
Browse files Browse the repository at this point in the history
  • Loading branch information
Lemmmy committed Dec 4, 2023
1 parent 7d44df6 commit 931b219
Show file tree
Hide file tree
Showing 5 changed files with 990 additions and 872 deletions.
80 changes: 40 additions & 40 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"@ant-design/colors": "^7.0.0",
"@ant-design/icons": "^5.2.6",
"@ctrl/tinycolor": "^4.0.2",
"@reduxjs/toolkit": "^1.9.7",
"antd": "^5.9.4",
"@reduxjs/toolkit": "^2.0.1",
"antd": "^5.12.1",
"async-mutex": "^0.4.0",
"classnames": "^2.3.2",
"d3-array": "^3.2.4",
Expand All @@ -25,33 +25,33 @@
"dayjs": "^1.11.10",
"debug": "^4.3.4",
"dexie": "^3.2.4",
"dexie-react-hooks": "^1.1.6",
"dexie-react-hooks": "^1.1.7",
"fast-equals": "^5.0.1",
"file-saver": "^2.0.5",
"fuse.js": "^6.6.2",
"fuse.js": "^7.0.0",
"lodash-es": "^4.17.21",
"markdown-to-jsx": "^7.3.2",
"memoizee": "^0.4.15",
"p-limit": "^4.0.0",
"p-limit": "^5.0.0",
"p-queue": "^7.4.1",
"react": "^18.2.0",
"react-children-utilities": "^2.9.0",
"react-dom": "^18.2.0",
"react-error-boundary": "^4.0.11",
"react-highlight-words": "^0.20.0",
"react-hotkeys": "^2.0.0",
"react-redux": "^8.1.3",
"react-router-dom": "^6.16.0",
"react-redux": "^9.0.1",
"react-router-dom": "^6.20.1",
"react-textfit": "^1.1.1",
"react-timeago": "^7.2.0",
"react-transition-group": "^4.4.5",
"react-use-ref-effect": "^1.2.0",
"react-virtualized-auto-sizer": "^1.0.20",
"react-window": "^1.8.9",
"react-window": "^1.8.10",
"string-metric": "^0.3.3",
"svg-inline-react": "^3.2.1",
"tiny-lru": "^11.2.2",
"typescript": "^5.2.2",
"tiny-lru": "^11.2.5",
"typescript": "^5.3.2",
"use-resize-observer": "^9.1.0",
"uuid": "^9.0.1",
"web-vitals": "^3.5.0"
Expand Down Expand Up @@ -80,47 +80,47 @@
]
},
"devDependencies": {
"@redux-devtools/extension": "^3.2.5",
"@types/d3": "^7.4.1",
"@types/d3-array": "^3.0.8",
"@types/d3-time": "^3.0.1",
"@types/debug": "^4.1.9",
"@types/fast-levenshtein": "^0.0.2",
"@types/file-saver": "^2.0.5",
"@types/lodash-es": "^4.17.9",
"@types/memoizee": "^0.4.9",
"@types/node": "^20.8.2",
"@types/react": "18.2.21",
"@types/react-dom": "^18.2.8",
"@types/react-highlight-words": "^0.16.5",
"@types/react-redux": "^7.1.27",
"@types/react-timeago": "^4.1.4",
"@types/react-transition-group": "^4.4.7",
"@types/react-virtualized-auto-sizer": "^1.0.1",
"@types/react-window": "^1.8.6",
"@types/uuid": "^9.0.4",
"@typescript-eslint/eslint-plugin": "^6.7.4",
"@typescript-eslint/parser": "^6.7.4",
"@vitejs/plugin-react-swc": "^3.4.0",
"@redux-devtools/extension": "^3.2.6",
"@types/d3": "^7.4.3",
"@types/d3-array": "^3.2.1",
"@types/d3-time": "^3.0.3",
"@types/debug": "^4.1.12",
"@types/fast-levenshtein": "^0.0.4",
"@types/file-saver": "^2.0.7",
"@types/lodash-es": "^4.17.12",
"@types/memoizee": "^0.4.11",
"@types/node": "^20.10.3",
"@types/react": "18.2.42",
"@types/react-dom": "^18.2.17",
"@types/react-highlight-words": "^0.16.7",
"@types/react-redux": "^7.1.32",
"@types/react-timeago": "^4.1.6",
"@types/react-transition-group": "^4.4.9",
"@types/react-virtualized-auto-sizer": "^1.0.3",
"@types/react-window": "^1.8.8",
"@types/uuid": "^9.0.7",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"@vitejs/plugin-react-swc": "^3.5.0",
"autoprefixer": "^10.4.16",
"cross-env": "^7.0.3",
"eslint": "^8.51.0",
"eslint": "^8.55.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"eslint-plugin-react-refresh": "^0.4.5",
"eslint-plugin-tsdoc": "^0.2.17",
"postcss": "^8.4.31",
"postcss": "^8.4.32",
"progress": "^2.0.3",
"rimraf": "^5.0.5",
"tailwind-clip-path": "^1.0.0",
"tailwindcss": "^3.3.3",
"tailwindcss": "^3.3.6",
"tailwindcss-logical": "^3.0.1",
"utility-types": "^3.10.0",
"vite": "^4.4.11",
"vite-bundle-visualizer": "^0.10.0",
"vite": "^5.0.5",
"vite-bundle-visualizer": "^0.11.0",
"vite-plugin-externals": "^0.6.2",
"vite-plugin-mkcert": "^1.16.0",
"vite-plugin-pwa": "^0.16.5"
"vite-plugin-mkcert": "^1.17.1",
"vite-plugin-pwa": "^0.17.3"
},
"packageManager": "[email protected]"
}
5 changes: 3 additions & 2 deletions src/api/search/KeywordSearch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { createContext, useState, useEffect, useMemo, useContext, ReactNode } fr
import { ApiSubjectKanji, StoredSubject, StoredSubjectMap, useSubjects } from "@api";

import type Fuse from "fuse.js";
import { FuseResult, IFuseOptions } from "fuse.js";
import { toKana } from "@comp/PseudoIme";

import Debug from "debug";
Expand All @@ -20,7 +21,7 @@ export interface IndexedSubject {
readings: string[];
}

export type KeywordSearchResult = Fuse.FuseResult<IndexedSubject>;
export type KeywordSearchResult = FuseResult<IndexedSubject>;
export type PerformSearchFn = (query: string, limit?: number) =>
KeywordSearchResult[];
const emptyPerformSearch: PerformSearchFn = () => [];
Expand All @@ -35,7 +36,7 @@ export const KeywordSearchContext = createContext<KeywordSearchCtxRes>({
performSearch: emptyPerformSearch
});

const FUSE_OPTS: Fuse.IFuseOptions<IndexedSubject> = {
const FUSE_OPTS: IFuseOptions<IndexedSubject> = {
keys: ["id", "characters", "meanings", "readings"],
findAllMatches: true,
minMatchCharLength: 0
Expand Down
5 changes: 2 additions & 3 deletions src/store/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Full details: https://github.com/Lemmmy/KanjiSchool/blob/master/LICENSE

import { TypedUseSelectorHook, useSelector } from "react-redux";
import { configureStore } from "@reduxjs/toolkit";
import { configureStore, EnhancedStore } from "@reduxjs/toolkit";

import assignmentsReducer, { AssignmentsSliceState } from "@store/slices/assignmentsSlice.ts";
import authReducer, { AuthSliceState } from "./slices/authSlice.ts";
Expand All @@ -18,7 +18,6 @@ import subjectsReducer, { SubjectsSliceState } from "./slices/subjectsSlice.ts";
import syncReducer, { SyncSliceState } from "./slices/syncSlice.ts";

import { devToolsOptions } from "./devTools.ts";
import { ToolkitStore } from "@reduxjs/toolkit/dist/configureStore";

export interface RootState {
assignments : AssignmentsSliceState;
Expand All @@ -34,7 +33,7 @@ export interface RootState {
sync : SyncSliceState;
}

export let store: ToolkitStore<RootState>;
export let store: EnhancedStore<RootState>;

export function initStore(): void {
if (store) return;
Expand Down
3 changes: 0 additions & 3 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ export default defineConfig({
...parseTsAliases(),
},
},
server: {
https: true,
},
plugins: [
react(),
mkcert(),
Expand Down
Loading

0 comments on commit 931b219

Please sign in to comment.