From f1dc4247cb8ac210327bcc92f23cf660e0e0b93a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 12:46:10 +0000 Subject: [PATCH 1/5] chore(deps): update dependency oxlint to ^1.33.0 --- package.json | 2 +- pnpm-lock.yaml | 76 +++++++++++++++++++++++++------------------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index 69deedc20..6dd0a775a 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "husky": "^9.1.7", "lint-staged": "^16.2.7", "npm-run-all2": "^8.0.4", - "oxlint": "^1.32.0", + "oxlint": "^1.33.0", "oxlint-tsgolint": "^0.9.0", "prettier": "^3.7.4", "rimraf": "^6.1.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e8d43850a..8e4ca7ccd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -75,8 +75,8 @@ importers: specifier: ^8.0.4 version: 8.0.4 oxlint: - specifier: ^1.32.0 - version: 1.32.0(oxlint-tsgolint@0.9.0) + specifier: ^1.33.0 + version: 1.33.0(oxlint-tsgolint@0.9.0) oxlint-tsgolint: specifier: ^0.9.0 version: 0.9.0 @@ -2714,47 +2714,47 @@ packages: cpu: [x64] os: [win32] - '@oxlint/darwin-arm64@1.32.0': - resolution: {integrity: sha512-yrqPmZYu5Qb+49h0P5EXVIq8VxYkDDM6ZQrWzlh16+UGFcD8HOXs4oF3g9RyfaoAbShLCXooSQsM/Ifwx8E/eQ==} + '@oxlint/darwin-arm64@1.33.0': + resolution: {integrity: sha512-PmEQDLHAxiAdyttQ1ZWXd+5VpHLbHf3FTMJL9bg5TZamDnhNiW/v0Pamv3MTAdymnoDI3H8IVLAN/SAseV/adw==} cpu: [arm64] os: [darwin] - '@oxlint/darwin-x64@1.32.0': - resolution: {integrity: sha512-pQRZrJG/2nAKc3IuocFbaFFbTDlQsjz2WfivRsMn0hw65EEsSuM84WMFMiAfLpTGyTICeUtHZLHlrM5lzVr36A==} + '@oxlint/darwin-x64@1.33.0': + resolution: {integrity: sha512-2R9aH3kR0X2M30z5agGikv3tfNTi8/uLhU5/tYktu33VGUXpbf0OLZSlD25UEuwOKAlf3RVtzV5oDyjoq93JuQ==} cpu: [x64] os: [darwin] - '@oxlint/linux-arm64-gnu@1.32.0': - resolution: {integrity: sha512-tyomSmU2DzwcTmbaWFmStHgVfRmJDDvqcIvcw4fRB1YlL2Qg/XaM4NJ0m2bdTap38gxD5FSxSgCo0DkQ8GTolg==} + '@oxlint/linux-arm64-gnu@1.33.0': + resolution: {integrity: sha512-yb/k8GaMDgnX2LyO6km33kKItZ/n573SlbiHBBFU2HmeU7tzEHL5jHkHQXXcysUkapmqHd7UsDhOZDqPmXaQRg==} cpu: [arm64] os: [linux] libc: [glibc] - '@oxlint/linux-arm64-musl@1.32.0': - resolution: {integrity: sha512-0W46dRMaf71OGE4+Rd+GHfS1uF/UODl5Mef6871pMhN7opPGfTI2fKJxh9VzRhXeSYXW/Z1EuCq9yCfmIJq+5Q==} + '@oxlint/linux-arm64-musl@1.33.0': + resolution: {integrity: sha512-03pt9IO1C4ZfVOW6SQiOK26mzklAhLM3Kc79OXpX1kgZRlxk+rvFoMhlgCOzn7tEdrEgbePkBoxNnwDnJDFqJQ==} cpu: [arm64] os: [linux] libc: [musl] - '@oxlint/linux-x64-gnu@1.32.0': - resolution: {integrity: sha512-5+6myVCBOMvM62rDB9T3CARXUvIwhGqte6E+HoKRwYaqsxGUZ4bh3pItSgSFwHjLGPrvADS11qJUkk39eQQBzQ==} + '@oxlint/linux-x64-gnu@1.33.0': + resolution: {integrity: sha512-Z7ImLWM50FoVXzYvyxUQ+QwBkBfRyK4YdLEGonyAGMp7iT3DksonDaTK9ODnJ1qHyAyAZCvuqXD7AEDsDvzDbA==} cpu: [x64] os: [linux] libc: [glibc] - '@oxlint/linux-x64-musl@1.32.0': - resolution: {integrity: sha512-qwQlwYYgVIC6ScjpUwiKKNyVdUlJckrfwPVpIjC9mvglIQeIjKuuyaDxUZWIOc/rEzeCV/tW6tcbehLkfEzqsw==} + '@oxlint/linux-x64-musl@1.33.0': + resolution: {integrity: sha512-idb55Uzu5kkqqpMiVUfI9nP7zOqPZinQKsIRQAIU40wILcf/ijvhNZKIu3ucDMmye0n6IWOaSnxIRL5W2fNoUQ==} cpu: [x64] os: [linux] libc: [musl] - '@oxlint/win32-arm64@1.32.0': - resolution: {integrity: sha512-7qYZF9CiXGtdv8Z/fBkgB5idD2Zokht67I5DKWH0fZS/2R232sDqW2JpWVkXltk0+9yFvmvJ0ouJgQRl9M3S2g==} + '@oxlint/win32-arm64@1.33.0': + resolution: {integrity: sha512-wKKFt7cubfrLelNzdmDsNSmtBrlSUe1fWus587+uSxDZdpFbQ7liU0gsUlCbcHvym0H1Tc2O3K3cnLrgQORLPQ==} cpu: [arm64] os: [win32] - '@oxlint/win32-x64@1.32.0': - resolution: {integrity: sha512-XW1xqCj34MEGJlHteqasTZ/LmBrwYIgluhNW0aP+XWkn90+stKAq3W/40dvJKbMK9F7o09LPCuMVtUW7FIUuiA==} + '@oxlint/win32-x64@1.33.0': + resolution: {integrity: sha512-ReyR8rNHjKNnO7dxGny9RCPELRAdhm3y780FNBcA07E1wvxSCkB+Mn5db0Pa5bRmxrsU/MTZ/aaBFa+ERXDdXw==} cpu: [x64] os: [win32] @@ -6122,12 +6122,12 @@ packages: resolution: {integrity: sha512-JzZ3w7DAgf3RE3O7a4uNLtLUy8Q46r4SN4NOsfRv7lwuhLNhaXoVwOpwdPvAdfQeIJ+HSMgNkjP44vdSdC7O9A==} hasBin: true - oxlint@1.32.0: - resolution: {integrity: sha512-HYDQCga7flsdyLMUIxTgSnEx5KBxpP9VINB8NgO+UjV80xBiTQXyVsvjtneMT3ZBLMbL0SlG/Dm03XQAsEshMA==} + oxlint@1.33.0: + resolution: {integrity: sha512-4WCL0K8jiOshwJ8WrVk35VAuVaZHC0iX6asjKsrENOrynkAAGcTLLx0Urf0eXZ1Tq7r+qAe3Z9EyHMFPzVyUkg==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: - oxlint-tsgolint: '>=0.8.1' + oxlint-tsgolint: '>=0.9.0' peerDependenciesMeta: oxlint-tsgolint: optional: true @@ -10037,28 +10037,28 @@ snapshots: '@oxlint-tsgolint/win32-x64@0.9.0': optional: true - '@oxlint/darwin-arm64@1.32.0': + '@oxlint/darwin-arm64@1.33.0': optional: true - '@oxlint/darwin-x64@1.32.0': + '@oxlint/darwin-x64@1.33.0': optional: true - '@oxlint/linux-arm64-gnu@1.32.0': + '@oxlint/linux-arm64-gnu@1.33.0': optional: true - '@oxlint/linux-arm64-musl@1.32.0': + '@oxlint/linux-arm64-musl@1.33.0': optional: true - '@oxlint/linux-x64-gnu@1.32.0': + '@oxlint/linux-x64-gnu@1.33.0': optional: true - '@oxlint/linux-x64-musl@1.32.0': + '@oxlint/linux-x64-musl@1.33.0': optional: true - '@oxlint/win32-arm64@1.32.0': + '@oxlint/win32-arm64@1.33.0': optional: true - '@oxlint/win32-x64@1.32.0': + '@oxlint/win32-x64@1.33.0': optional: true '@pkgjs/parseargs@0.11.0': @@ -13980,16 +13980,16 @@ snapshots: '@oxlint-tsgolint/win32-arm64': 0.9.0 '@oxlint-tsgolint/win32-x64': 0.9.0 - oxlint@1.32.0(oxlint-tsgolint@0.9.0): + oxlint@1.33.0(oxlint-tsgolint@0.9.0): optionalDependencies: - '@oxlint/darwin-arm64': 1.32.0 - '@oxlint/darwin-x64': 1.32.0 - '@oxlint/linux-arm64-gnu': 1.32.0 - '@oxlint/linux-arm64-musl': 1.32.0 - '@oxlint/linux-x64-gnu': 1.32.0 - '@oxlint/linux-x64-musl': 1.32.0 - '@oxlint/win32-arm64': 1.32.0 - '@oxlint/win32-x64': 1.32.0 + '@oxlint/darwin-arm64': 1.33.0 + '@oxlint/darwin-x64': 1.33.0 + '@oxlint/linux-arm64-gnu': 1.33.0 + '@oxlint/linux-arm64-musl': 1.33.0 + '@oxlint/linux-x64-gnu': 1.33.0 + '@oxlint/linux-x64-musl': 1.33.0 + '@oxlint/win32-arm64': 1.33.0 + '@oxlint/win32-x64': 1.33.0 oxlint-tsgolint: 0.9.0 p-filter@2.1.0: From c4f838ca8248baa2072603d1e3798aa6afceef65 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 15 Dec 2025 13:10:55 +0000 Subject: [PATCH 2/5] Initial plan From 431373e76e01c8d01e0fcd4c48b92a5532bee291 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 15 Dec 2025 13:19:24 +0000 Subject: [PATCH 3/5] fix: replace object spread with Object.assign in map calls Co-authored-by: stipsan <81981+stipsan@users.noreply.github.com> --- packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts | 2 +- packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts b/packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts index 1a277a1d2..5ab7b8e47 100644 --- a/packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts +++ b/packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts @@ -14,7 +14,7 @@ export function resolveBuildTasks(ctx: BuildContext): BuildTask[] { const tasks: BuildTask[] = [] const exports = Object.entries(ctx.exports || {}).map( - ([_path, exp]) => ({_path, ...exp}) as PkgExport & {_path: string}, + ([_path, exp]) => Object.assign({_path}, exp) as PkgExport & {_path: string}, ) const dtsTask: DtsTask = { diff --git a/packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts b/packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts index 1053b4e80..05354d863 100644 --- a/packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts +++ b/packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts @@ -11,7 +11,7 @@ export function resolveWatchTasks(ctx: BuildContext): WatchTask[] { const tasks: WatchTask[] = [] const exports = Object.entries(ctx.exports || {}).map( - ([_path, exp]) => ({_path, ...exp}) as PkgExport & {_path: string}, + ([_path, exp]) => Object.assign({_path}, exp) as PkgExport & {_path: string}, ) const dtsTask: DtsWatchTask = { From ff7172d10025bdfc70a0ac829af3bbea264ca987 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 15 Dec 2025 13:30:48 +0000 Subject: [PATCH 4/5] refactor: swap Object.assign arguments for better performance Co-authored-by: stipsan <81981+stipsan@users.noreply.github.com> --- packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts | 2 +- packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts b/packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts index 5ab7b8e47..a14e798cb 100644 --- a/packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts +++ b/packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts @@ -14,7 +14,7 @@ export function resolveBuildTasks(ctx: BuildContext): BuildTask[] { const tasks: BuildTask[] = [] const exports = Object.entries(ctx.exports || {}).map( - ([_path, exp]) => Object.assign({_path}, exp) as PkgExport & {_path: string}, + ([_path, exp]) => Object.assign(exp, {_path}) as PkgExport & {_path: string}, ) const dtsTask: DtsTask = { diff --git a/packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts b/packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts index 05354d863..65a42ef54 100644 --- a/packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts +++ b/packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts @@ -11,7 +11,7 @@ export function resolveWatchTasks(ctx: BuildContext): WatchTask[] { const tasks: WatchTask[] = [] const exports = Object.entries(ctx.exports || {}).map( - ([_path, exp]) => Object.assign({_path}, exp) as PkgExport & {_path: string}, + ([_path, exp]) => Object.assign(exp, {_path}) as PkgExport & {_path: string}, ) const dtsTask: DtsWatchTask = { From b8514b82e2abfa5b2fc3af3a08f8ab50222fd6f3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 15 Dec 2025 13:33:27 +0000 Subject: [PATCH 5/5] refactor: use Object.assign with empty target to avoid mutation Co-authored-by: stipsan <81981+stipsan@users.noreply.github.com> --- packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts | 2 +- packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts b/packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts index a14e798cb..1a3fda9bb 100644 --- a/packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts +++ b/packages/@sanity/pkg-utils/src/node/resolveBuildTasks.ts @@ -14,7 +14,7 @@ export function resolveBuildTasks(ctx: BuildContext): BuildTask[] { const tasks: BuildTask[] = [] const exports = Object.entries(ctx.exports || {}).map( - ([_path, exp]) => Object.assign(exp, {_path}) as PkgExport & {_path: string}, + ([_path, exp]) => Object.assign({}, exp, {_path}) as PkgExport & {_path: string}, ) const dtsTask: DtsTask = { diff --git a/packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts b/packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts index 65a42ef54..dbf89316e 100644 --- a/packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts +++ b/packages/@sanity/pkg-utils/src/node/resolveWatchTasks.ts @@ -11,7 +11,7 @@ export function resolveWatchTasks(ctx: BuildContext): WatchTask[] { const tasks: WatchTask[] = [] const exports = Object.entries(ctx.exports || {}).map( - ([_path, exp]) => Object.assign(exp, {_path}) as PkgExport & {_path: string}, + ([_path, exp]) => Object.assign({}, exp, {_path}) as PkgExport & {_path: string}, ) const dtsTask: DtsWatchTask = {