From 6de130f8904f6ca22260117900545d71e857758e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Jul 2026 12:43:56 +0000 Subject: [PATCH 1/4] chore(deps-dev): bump the npm-dependencies group with 4 updates Bumps the npm-dependencies group with 4 updates: [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js), [date-fns](https://github.com/date-fns/date-fns), [eslint](https://github.com/eslint/eslint) and [moment-timezone](https://github.com/moment/moment-timezone). Updates `@eslint/js` from 9.39.4 to 10.0.1 - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](https://github.com/eslint/eslint/commits/v10.0.1/packages/js) Updates `date-fns` from 2.30.0 to 4.4.0 - [Release notes](https://github.com/date-fns/date-fns/releases) - [Commits](https://github.com/date-fns/date-fns/compare/v2.30.0...v4.4.0) Updates `eslint` from 9.39.4 to 10.6.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](https://github.com/eslint/eslint/compare/v9.39.4...v10.6.0) Updates `moment-timezone` from 0.5.48 to 0.6.2 - [Release notes](https://github.com/moment/moment-timezone/releases) - [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md) - [Commits](https://github.com/moment/moment-timezone/compare/0.5.48...0.6.2) --- updated-dependencies: - dependency-name: "@eslint/js" dependency-version: 10.0.1 dependency-type: direct:development update-type: version-update:semver-major dependency-group: npm-dependencies - dependency-name: date-fns dependency-version: 4.4.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: npm-dependencies - dependency-name: eslint dependency-version: 10.6.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: npm-dependencies - dependency-name: moment-timezone dependency-version: 0.6.2 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-dependencies ... Signed-off-by: dependabot[bot] --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 71663f894..65fbc03a1 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "clsx": "^2.1.1" }, "devDependencies": { - "@eslint/js": "^9.39.4", + "@eslint/js": "^10.0.1", "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.4", "@testing-library/dom": "^10.4.1", @@ -130,10 +130,10 @@ "@types/react": "^19.2.17", "@types/react-dom": "^19.2.3", "cross-env": "^10.1.0", - "date-fns": "2.x", + "date-fns": "4.x", "dayjs": "1.x", "dumi": "^2.4.38", - "eslint": "^9.39.4", + "eslint": "^10.6.0", "eslint-config-prettier": "^10.1.8", "eslint-plugin-jest": "^29.15.4", "eslint-plugin-react": "^7.37.5", @@ -148,7 +148,7 @@ "luxon": "3.x", "mockdate": "^3.0.2", "moment": "^2.24.0", - "moment-timezone": "^0.5.45", + "moment-timezone": "^0.6.2", "prettier": "^3.9.4", "rc-test": "^7.1.3", "react": "^19.2.7", From d3da0f056da3c66ac9d7dca6b494a78dd16e7823 Mon Sep 17 00:00:00 2001 From: afc163 Date: Sun, 5 Jul 2026 15:39:09 +0800 Subject: [PATCH 2/4] fix: support eslint 10 dependency update --- .github/workflows/surge-preview.yml | 2 +- eslint.config.mjs | 5 +++-- package.json | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/surge-preview.yml b/.github/workflows/surge-preview.yml index 4c2f17edc..d8b2f581a 100644 --- a/.github/workflows/surge-preview.yml +++ b/.github/workflows/surge-preview.yml @@ -37,7 +37,7 @@ jobs: - name: Build preview if: ${{ steps.surge-token.outputs.enabled == 'true' }} run: | - npm install + npm install --legacy-peer-deps npm run build - uses: afc163/surge-preview@bf90a5a86111f6311ca42f0a5a0f80fb0fb03cec if: ${{ steps.surge-token.outputs.enabled == 'true' }} diff --git a/eslint.config.mjs b/eslint.config.mjs index 40f08ec94..a298e8e02 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,4 +1,5 @@ import js from '@eslint/js'; +import { fixupConfigRules } from '@eslint/compat'; import { defineConfig } from 'eslint/config'; import { dirname } from 'node:path'; import { fileURLToPath } from 'node:url'; @@ -40,8 +41,8 @@ export default defineConfig([ files: ['**/*.{js,jsx,ts,tsx}'], extends: [ js.configs.recommended, - react.configs.flat.recommended, - react.configs.flat['jsx-runtime'], + ...fixupConfigRules(react.configs.flat.recommended), + ...fixupConfigRules(react.configs.flat['jsx-runtime']), prettier, ], plugins: { diff --git a/package.json b/package.json index 65fbc03a1..136642785 100644 --- a/package.json +++ b/package.json @@ -119,6 +119,7 @@ }, "devDependencies": { "@eslint/js": "^10.0.1", + "@eslint/compat": "^2.1.0", "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.4", "@testing-library/dom": "^10.4.1", From db4982240d1b41f1beefa79b8c79cdd1646846e6 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 6 Jul 2026 09:33:25 +0800 Subject: [PATCH 3/4] fix: resolve eslint 10 lint errors --- src/hooks/useLocale.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/hooks/useLocale.ts b/src/hooks/useLocale.ts index 751c4d167..ec232b326 100644 --- a/src/hooks/useLocale.ts +++ b/src/hooks/useLocale.ts @@ -8,8 +8,6 @@ export function fillTimeFormat( showMillisecond: boolean, showMeridiem: boolean, ) { - let timeFormat = ''; - // Base HH:mm:ss const cells = []; @@ -23,7 +21,7 @@ export function fillTimeFormat( cells.push('ss'); } - timeFormat = cells.join(':'); + let timeFormat = cells.join(':'); // Millisecond if (showMillisecond) { From eaa493903a8f7c5d9873a813f177264f27974ce9 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 6 Jul 2026 09:47:25 +0800 Subject: [PATCH 4/4] fix: support date-fns typed localizers --- src/generate/dateFns.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/generate/dateFns.ts b/src/generate/dateFns.ts index 5156450bb..c1c97d91c 100644 --- a/src/generate/dateFns.ts +++ b/src/generate/dateFns.ts @@ -24,7 +24,9 @@ import { setYear, startOfWeek, getMilliseconds, + type Day, type Locale, + type Month, } from 'date-fns'; import * as locales from 'date-fns/locale'; import type { GenerateConfig } from '.'; @@ -112,12 +114,14 @@ const generateConfig: GenerateConfig = { }, getShortWeekDays: (locale) => { const clone = getLocale(locale); - return Array.from({ length: 7 }).map((_, i) => clone.localize.day(i, { width: 'short' })); + return Array.from({ length: 7 }).map((_, i) => + clone.localize.day(i as Day, { width: 'short' }), + ); }, getShortMonths: (locale) => { const clone = getLocale(locale); return Array.from({ length: 12 }).map((_, i) => - clone.localize.month(i, { width: 'abbreviated' }), + clone.localize.month(i as Month, { width: 'abbreviated' }), ); }, format: (locale, date, format) => {