diff --git a/package.json b/package.json index 7b367a84dc..842cb6c60c 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lint:eslint:fix": "yarn lint:eslint --fix", "lint:prettier": "prettier --ignore-unknown --cache --check .", "lint:prettier:fix": "prettier --ignore-unknown --cache --write .", - "lint:ox": "oxlint --deny-warnings -D correctness -D nursery -D prefer-array-some -D no-useless-promise-resolve-reject -A no-undef -A consistent-type-exports -A default -A named -A ban-ts-comment", + "lint:ox": "oxlint --import-plugin --deny-warnings -D correctness -D nursery -D prefer-array-some -D no-useless-promise-resolve-reject -D perf -A no-undef -A consistent-type-exports -A default -A named -A ban-ts-comment -A export", "lint": "yarn lint:eslint && yarn lint:prettier", "lint:fix": "yarn lint:eslint:fix && yarn lint:prettier:fix", "test": "vitest --run", @@ -97,7 +97,7 @@ "nx": "^17.1.3", "nx-cloud": "^16.5.2", "nyc": "^15.1.0", - "oxlint": "0.0.21", + "oxlint": "0.0.22", "prettier": "^3.1.0", "semver": "^7.5.4", "serve": "^14.2.1", diff --git a/packages/frontend/core/src/components/affine/onboarding/articles/index.tsx b/packages/frontend/core/src/components/affine/onboarding/articles/index.tsx index 1671220a71..484b2bfba0 100644 --- a/packages/frontend/core/src/components/affine/onboarding/articles/index.tsx +++ b/packages/frontend/core/src/components/affine/onboarding/articles/index.tsx @@ -244,8 +244,7 @@ const states: Partial> = { export const articles: Record = ids.reduce( (acc, id) => { - return { - ...acc, + return Object.assign(acc, { [id]: { id, location: paperLocations[id], @@ -254,7 +253,7 @@ export const articles: Record = ids.reduce( blocks: contents[id], initState: states[id], } satisfies ArticleOption, - }; + }); }, {} as Record ); diff --git a/packages/frontend/i18n/src/index.ts b/packages/frontend/i18n/src/index.ts index 848548ef51..d7966aa781 100644 --- a/packages/frontend/i18n/src/index.ts +++ b/packages/frontend/i18n/src/index.ts @@ -45,10 +45,9 @@ export function useI18N() { return i18n; } -const resources = LOCALES.reduce( - (acc, { tag, res }) => ({ ...acc, [tag]: { translation: res } }), - {} -); +const resources = LOCALES.reduce((acc, { tag, res }) => { + return Object.assign(acc, { [tag]: { translation: res } }); +}, {}); const fallbackLng = 'en'; const standardizeLocale = (language: string) => { diff --git a/packages/frontend/i18n/src/scripts/utils.ts b/packages/frontend/i18n/src/scripts/utils.ts index 1eb9e58a47..00689866f7 100644 --- a/packages/frontend/i18n/src/scripts/utils.ts +++ b/packages/frontend/i18n/src/scripts/utils.ts @@ -27,9 +27,9 @@ export const flattenTranslation = ( if (!(obj instanceof Object)) return { [path ?? '']: obj }; return Object.keys(obj).reduce((output, key) => { - return { - ...output, - ...flattenTranslation(obj[key], path ? path + '.' + key : key), - }; + return Object.assign( + output, + flattenTranslation(obj[key], path ? path + '.' + key : key) + ); }, {}); }; diff --git a/packages/frontend/workspace/src/impl/cloud/awareness.ts b/packages/frontend/workspace/src/impl/cloud/awareness.ts index 7c2be0dc63..396108b907 100644 --- a/packages/frontend/workspace/src/impl/cloud/awareness.ts +++ b/packages/frontend/workspace/src/impl/cloud/awareness.ts @@ -42,10 +42,9 @@ export function createCloudAwarenessProvider( return; } - const changedClients = Object.values(changes).reduce((res, cur) => [ - ...res, - ...cur, - ]); + const changedClients = Object.values(changes).reduce((res, cur) => + res.concat(cur) + ); const update = encodeAwarenessUpdate(awareness, changedClients); uint8ArrayToBase64(update) diff --git a/packages/frontend/workspace/src/impl/local/awareness.ts b/packages/frontend/workspace/src/impl/local/awareness.ts index b012333bd4..4472479808 100644 --- a/packages/frontend/workspace/src/impl/local/awareness.ts +++ b/packages/frontend/workspace/src/impl/local/awareness.ts @@ -23,10 +23,9 @@ export function createBroadcastChannelAwarenessProvider( return; } - const changedClients = Object.values(changes).reduce((res, cur) => [ - ...res, - ...cur, - ]); + const changedClients = Object.values(changes).reduce((res, cur) => + res.concat(cur) + ); const update = encodeAwarenessUpdate(awareness, changedClients); channel.postMessage({ diff --git a/yarn.lock b/yarn.lock index 2fc0297c01..af4caa01b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -582,7 +582,7 @@ __metadata: nx: "npm:^17.1.3" nx-cloud: "npm:^16.5.2" nyc: "npm:^15.1.0" - oxlint: "npm:0.0.21" + oxlint: "npm:0.0.22" prettier: "npm:^3.1.0" semver: "npm:^7.5.4" serve: "npm:^14.2.1" @@ -9328,44 +9328,44 @@ __metadata: languageName: node linkType: hard -"@oxlint/darwin-arm64@npm:0.0.21": - version: 0.0.21 - resolution: "@oxlint/darwin-arm64@npm:0.0.21" +"@oxlint/darwin-arm64@npm:0.0.22": + version: 0.0.22 + resolution: "@oxlint/darwin-arm64@npm:0.0.22" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@oxlint/darwin-x64@npm:0.0.21": - version: 0.0.21 - resolution: "@oxlint/darwin-x64@npm:0.0.21" +"@oxlint/darwin-x64@npm:0.0.22": + version: 0.0.22 + resolution: "@oxlint/darwin-x64@npm:0.0.22" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@oxlint/linux-arm64@npm:0.0.21": - version: 0.0.21 - resolution: "@oxlint/linux-arm64@npm:0.0.21" +"@oxlint/linux-arm64@npm:0.0.22": + version: 0.0.22 + resolution: "@oxlint/linux-arm64@npm:0.0.22" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"@oxlint/linux-x64@npm:0.0.21": - version: 0.0.21 - resolution: "@oxlint/linux-x64@npm:0.0.21" +"@oxlint/linux-x64@npm:0.0.22": + version: 0.0.22 + resolution: "@oxlint/linux-x64@npm:0.0.22" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"@oxlint/win32-arm64@npm:0.0.21": - version: 0.0.21 - resolution: "@oxlint/win32-arm64@npm:0.0.21" +"@oxlint/win32-arm64@npm:0.0.22": + version: 0.0.22 + resolution: "@oxlint/win32-arm64@npm:0.0.22" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@oxlint/win32-x64@npm:0.0.21": - version: 0.0.21 - resolution: "@oxlint/win32-x64@npm:0.0.21" +"@oxlint/win32-x64@npm:0.0.22": + version: 0.0.22 + resolution: "@oxlint/win32-x64@npm:0.0.22" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -28564,16 +28564,16 @@ __metadata: languageName: node linkType: hard -"oxlint@npm:0.0.21": - version: 0.0.21 - resolution: "oxlint@npm:0.0.21" +"oxlint@npm:0.0.22": + version: 0.0.22 + resolution: "oxlint@npm:0.0.22" dependencies: - "@oxlint/darwin-arm64": "npm:0.0.21" - "@oxlint/darwin-x64": "npm:0.0.21" - "@oxlint/linux-arm64": "npm:0.0.21" - "@oxlint/linux-x64": "npm:0.0.21" - "@oxlint/win32-arm64": "npm:0.0.21" - "@oxlint/win32-x64": "npm:0.0.21" + "@oxlint/darwin-arm64": "npm:0.0.22" + "@oxlint/darwin-x64": "npm:0.0.22" + "@oxlint/linux-arm64": "npm:0.0.22" + "@oxlint/linux-x64": "npm:0.0.22" + "@oxlint/win32-arm64": "npm:0.0.22" + "@oxlint/win32-x64": "npm:0.0.22" dependenciesMeta: "@oxlint/darwin-arm64": optional: true @@ -28589,7 +28589,7 @@ __metadata: optional: true bin: oxlint: bin/oxlint - checksum: 8de4a2d5252a459c0ef59634ba6bc4546da65e3c80f91c11e0d65c7df8ebb2f280e7256ef5997d5b1c18d8d98da87c6babc93fc88dd280c147c05eef93935411 + checksum: 9d780f3293b08c83e45996187c8098e2ef8323ed02427c7a15d5cfa542f967b0e7862f76814ef3b8c4b94badd2f21eb92130de7f2f8f0dfec91e4a3a3797c63f languageName: node linkType: hard