@sanity/pkg-utils 7.2.7 → 7.2.8-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/pkg-utils",
-  "version": "7.2.7",
+  "version": "7.2.8-canary.0",
   "description": "Simple utilities for modern npm packages.",
   "keywords": [
     "sanity-io",
@@ -59,13 +59,15 @@
     ]
   },
   "lint-staged": {
+    "*.{js,jsx,ts,tsx,mjs,cjs}": [
+      "prettier --cache --write",
+      "oxlint --fix --quiet"
+    ],
     "*": [
-      "prettier --write --cache --ignore-unknown",
-      "eslint --ext .cjs,.js,.ts,.tsx --fix"
+      "prettier --write --cache --ignore-unknown"
     ]
   },
   "browserslist": "extends @sanity/browserslist-config",
-  "prettier": "@sanity/prettier-config",
   "dependencies": {
     "@babel/core": "^7.27.4",
     "@babel/preset-typescript": "^7.27.1",
@@ -111,6 +113,7 @@
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
+    "@ianvs/prettier-plugin-sort-imports": "^4.4.2",
     "@sanity/prettier-config": "^1.0.4",
     "@types/babel__core": "^7.20.5",
     "@types/cpx": "^1.5.5",
@@ -122,27 +125,21 @@
     "@types/semver": "^7.5.8",
     "@types/treeify": "^1.0.3",
     "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.34.1",
-    "@typescript-eslint/parser": "^8.34.1",
     "browserslist-to-esbuild": "2.1.1",
     "commitizen": "^4.3.1",
     "cpx": "^1.5.0",
     "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^8.57.1",
-    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-prettier": "^5.5.0",
-    "eslint-plugin-simple-import-sort": "^12.1.1",
     "husky": "^8.0.3",
     "lint-staged": "^15.0.2",
     "npm-run-all2": "^8.0.4",
     "outdent": "^0.8.0",
+    "oxlint": "^1.1.0",
     "rollup-plugin-visualizer": "^6.0.3",
     "semver": "^7.6.0",
     "ts-node": "^10.9.2",
     "typescript": "5.8.3",
     "vitest": "^3.2.4",
-    "@sanity/pkg-utils": "7.2.7"
+    "@sanity/pkg-utils": "7.2.8-canary.0"
   },
   "peerDependencies": {
     "babel-plugin-react-compiler": "*",
@@ -167,8 +164,8 @@
     "clean": "rimraf dist test/env/__tmp__",
     "commit": "cz",
     "extract": "sanity-tsdoc etl --outDir etc/api/@sanity/pkg-utils --tsconfig tsconfig.dist.json",
-    "format": "prettier --write --cache --ignore-unknown . && eslint . --ext .cjs,.js,.ts,.tsx --fix --quiet",
-    "lint": "eslint . --ext .cjs,.js,.ts,.tsx",
+    "format": "prettier --write --cache --ignore-unknown . && oxlint --fix --quiet",
+    "lint": "oxlint",
     "playground:build": "pnpm --filter './playground/**' build",
     "playground:clean": "pnpm --filter './playground/**' --silent clean",
     "pretest": "run-s playground:clean",

package/src/cli/handleError.ts

@@ -1,5 +1,3 @@
-/* eslint-disable no-console */
-
 import chalk from 'chalk'
 
 export function handleError(err: unknown): void {

package/src/cli/index.ts

@@ -1,5 +1,4 @@
-import cac from 'cac'
-
+import {cac} from 'cac'
 import {version} from '../../package.json'
 
 const cli = cac()

package/src/global.ts

@@ -1,5 +1,4 @@
 declare global {
-  // eslint-disable-next-line no-var
   var __DEV__: boolean
 }
 

package/src/node/build.ts

@@ -1,13 +1,11 @@
 import path from 'node:path'
-
-import rimraf from 'rimraf'
-
+import {rimraf} from 'rimraf'
 import {loadConfig, loadPkgWithReporting} from './core'
 import {createLogger} from './logger'
 import {resolveBuildContext} from './resolveBuildContext'
 import {resolveBuildTasks} from './resolveBuildTasks'
 import {createSpinner} from './spinner'
-import {type BuildTask, buildTaskHandlers, type TaskHandler} from './tasks'
+import {buildTaskHandlers, type BuildTask, type TaskHandler} from './tasks'
 
 /**
  * Build the distribution files of a npm package.

package/src/node/check.ts

@@ -120,7 +120,6 @@ async function checkExports(
     }
 
     const esbuildWarnings = esbuildResult.warnings.filter((msg) => {
-      // eslint-disable-next-line @typescript-eslint/no-unused-expressions
       !(msg.detail || msg.text).includes(`does not affect esbuild's own target setting`)
     })
 

package/src/node/consoleSpy.ts

@@ -1,5 +1,3 @@
-/* eslint-disable no-console */
-
 export interface ConsoleSpyMsg {
   type: 'log' | 'warn' | 'error'
   code?: string

package/src/node/core/config/loadConfig.ts

@@ -31,7 +31,6 @@ export async function loadConfig(options: {cwd: string}): Promise<PkgConfigOptio
 
   const {unregister} = globalThis.__DEV__ ? {unregister: () => undefined} : register(esbuildOptions)
 
-  // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports
   const mod = require(configFile)
 
   unregister()

package/src/node/core/template/types.ts

@@ -11,7 +11,6 @@ export interface PkgTemplateStringOption<T = string> {
   name: string
   type: 'string'
   description: string
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   initial?: T | ((options: Record<string, any>) => T)
   parse?: (v: string) => T | null
   validate?: (v: string) => string | true
@@ -22,7 +21,6 @@ export type PkgTemplateOption<T = string> = PkgTemplateStringOption<T>
 
 /** @public */
 export interface PkgTemplateDefinition {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   options: PkgTemplateStringOption<any>[]
   features: {
     name: string
@@ -30,7 +28,6 @@ export interface PkgTemplateDefinition {
     initial: boolean
   }[]
   getFiles: (
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     options: Record<string, any>,
     features: Record<string, boolean>,
   ) => Promise<PkgTemplateFile[]>

package/src/node/logger.ts

@@ -1,3 +1,4 @@
+// oxlint-disable no-console
 import chalk from 'chalk'
 
 /** @internal */
@@ -12,7 +13,6 @@ export interface Logger {
 /** @internal */
 export function createLogger(): Logger {
   return {
-    /* eslint-disable no-console */
     log: (...args) => {
       console.log(...args)
     },
@@ -28,6 +28,5 @@ export function createLogger(): Logger {
     success: (...args) => {
       console.log(chalk.green('[success]'), ...args)
     },
-    /* eslint-enable no-console */
   }
 }

package/src/node/printPackageTree.ts

@@ -22,7 +22,6 @@ export function printPackageTree(ctx: BuildContext): void {
 
   logger.log(`${chalk.blue(pkg.name)}@${chalk.green(pkg.version)}`)
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const tree: Record<string, unknown> = {}
 
   if (pkg.type) {
@@ -93,6 +92,5 @@ export function printPackageTree(ctx: BuildContext): void {
       }),
   )
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   logger.log(treeify.asTree(tree as Record<string, any>, true, true))
 }

package/src/node/resolveBuildContext.ts

@@ -1,17 +1,15 @@
 import path from 'node:path'
-
 import browserslistToEsbuild from 'browserslist-to-esbuild'
-
 import {
-  type BuildContext,
   DEFAULT_BROWSERSLIST_QUERY,
   loadTSConfig,
-  type PackageJSON,
   parseExports,
+  resolveConfigProperty,
+  type BuildContext,
+  type PackageJSON,
   type PkgConfigOptions,
   type PkgExports,
   type PkgRuntime,
-  resolveConfigProperty,
 } from './core'
 import {findCommonDirPath, pathContains} from './core/findCommonPath'
 import type {Logger} from './logger'
@@ -40,7 +38,6 @@ export async function resolveBuildContext(options: {
   const tsconfig = await loadTSConfig({cwd, tsconfigPath})
   const strictOptions = parseStrictOptions(config?.strictOptions ?? {})
 
-  /* eslint-disable padding-line-between-statements */
   let browserslist = pkg.browserslist
   if (!browserslist) {
     if (strict && strictOptions.noImplicitBrowsersList !== 'off') {
@@ -58,7 +55,6 @@ export async function resolveBuildContext(options: {
     browserslist = DEFAULT_BROWSERSLIST_QUERY
   }
   const targetVersions = browserslistToEsbuild(browserslist)
-  /* eslint-enable padding-line-between-statements */
 
   if (
     strict &&
@@ -98,10 +94,8 @@ export async function resolveBuildContext(options: {
     strict,
     strictOptions,
     logger,
-  }).reduce<PkgExports>((acc, x) => {
-    const {_path: exportPath, ...exportEntry} = x
-
-    return {...acc, [exportPath]: exportEntry}
+  }).reduce<PkgExports>((acc, {_path: exportPath, ...exportEntry}) => {
+    return Object.assign(acc, {[exportPath]: exportEntry})
   }, {})
 
   const exports = resolveConfigProperty(config?.exports, parsedExports)
@@ -118,9 +112,7 @@ export async function resolveBuildContext(options: {
       : resolveConfigProperty(config?.external, parsedExternal)
   // Merge bundledPackages with dev deps, replace if it's a function
   const externalWithTypes = new Set([pkg.name, ...external, ...external.map(transformPackageName)])
-  const bundledDependencies = [
-    ...(pkg.devDependencies ? Object.keys(pkg.devDependencies) : []),
-  ].filter(
+  const bundledDependencies = (pkg.devDependencies ? Object.keys(pkg.devDependencies) : []).filter(
     // Do not bundle anything that is marked as external
     (_) => !externalWithTypes.has(_),
   )

package/src/node/spinner.ts

@@ -1,5 +1,4 @@
-/* eslint-disable no-console */
-
+// oxlint-disable no-console
 import chalk from 'chalk'
 
 export function createSpinner(msg: string): {complete: () => void; error: () => void} {

package/src/node/tasks/dts/doExtract.ts

@@ -1,8 +1,6 @@
 import path from 'node:path'
-
 import type {ExtractorMessage} from '@microsoft/api-extractor'
-import rimraf from 'rimraf'
-
+import {rimraf} from 'rimraf'
 import type {BuildContext} from '../../core'
 import {buildTypes} from './buildTypes'
 import {DtsError} from './DtsError'

package/src/node/tasks/dts/dtsWatchTask.ts

@@ -1,11 +1,9 @@
 import path from 'node:path'
-
 import type {ExtractorMessage} from '@microsoft/api-extractor'
 import chalk from 'chalk'
-import rimraf from 'rimraf'
+import * as rimraf from 'rimraf'
 import {Observable} from 'rxjs'
 import ts from 'typescript'
-
 import {printExtractMessages} from '../../printExtractMessages'
 import type {TaskHandler} from '../types'
 import {buildTypes} from './buildTypes'

package/src/node/tasks/dts/extractTypes.ts

@@ -1,6 +1,5 @@
 import fs from 'node:fs/promises'
 import path from 'node:path'
-
 import {
   Extractor,
   ExtractorConfig,
@@ -8,9 +7,8 @@ import {
   type ExtractorResult,
 } from '@microsoft/api-extractor'
 import {mkdirp} from 'mkdirp'
-import prettier from 'prettier'
+import * as prettier from 'prettier'
 import type ts from 'typescript'
-
 import type {BuildFile, PkgConfigOptions} from '../../core'
 import {createApiExtractorConfig} from './createApiExtractorConfig'
 import {createTSDocConfig} from './createTSDocConfig'

package/src/node/tasks/dts/getTargetPaths.ts

@@ -66,7 +66,6 @@ export function getTargetPaths(
   return Array.from(set)
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isPkgExport(exp: any): exp is PkgExport {
   return exp?.browser || exp?.node || exp?.default
 }

package/src/node/tasks/rollup/resolveRollupConfig.ts

@@ -1,5 +1,4 @@
 import path from 'node:path'
-
 import type {PluginItem} from '@babel/core'
 import {optimizeLodashImports} from '@optimize-lodash/rollup-plugin'
 import alias from '@rollup/plugin-alias'
@@ -11,9 +10,8 @@ import replace from '@rollup/plugin-replace'
 import terser from '@rollup/plugin-terser'
 import type {InputOptions, OutputOptions, Plugin} from 'rollup'
 import esbuild from 'rollup-plugin-esbuild'
-
 import {pkgExtMap as extMap} from '../../../node/core/pkg/pkgExt'
-import {type BuildContext, type PackageJSON, resolveConfigProperty} from '../../core'
+import {resolveConfigProperty, type BuildContext, type PackageJSON} from '../../core'
 import type {RollupTask, RollupWatchTask} from '../types'
 
 export interface RollupConfig {
@@ -59,8 +57,8 @@ export function resolveRollupConfig(
   const defaultPlugins = [
     replace({
       preventAssignment: true,
-      values: {
-        ...(pkg.name === '@sanity/pkg-utils'
+      values:
+        pkg.name === '@sanity/pkg-utils'
           ? {...replacements}
           : {
               'process.env.PKG_FILE_PATH': (arg) => {
@@ -68,7 +66,6 @@ export function resolveRollupConfig(
                 const entry = entries.find((e) => e.source === sourcePath)
 
                 if (!entry) {
-                  // eslint-disable-next-line no-console
                   console.error(`could not find source entry: ${sourcePath}`)
 
                   return 'null'
@@ -82,8 +79,7 @@ export function resolveRollupConfig(
               'process.env.PKG_RUNTIME': JSON.stringify(runtime),
               'process.env.PKG_VERSION': JSON.stringify(process.env['PKG_VERSION'] || pkg.version),
               ...replacements,
-            }),
-      },
+            },
     }),
     alias({
       entries: {...pathAliases},
@@ -220,9 +216,10 @@ export function resolveRollupConfig(
         return false
       },
 
-      input: entries.reduce<{[entryAlias: string]: string}>((acc, entry) => {
-        return {...acc, [entry.name]: entry.source}
-      }, {}),
+      input: entries.reduce<{[entryAlias: string]: string}>(
+        (acc, entry) => Object.assign(acc, {[entry.name]: entry.source}),
+        {},
+      ),
 
       watch: {
         chokidar: {

package/src/node/tasks/rollup/rollupTask.ts

@@ -66,7 +66,6 @@ export const rollupTask: TaskHandler<RollupTask> = {
     //
   },
   error: (_ctx, _task, err) => {
-    // eslint-disable-next-line no-console
     console.error(err)
   },
 }

package/src/node/templates/default/template.ts

@@ -1,12 +1,10 @@
 import {execSync} from 'node:child_process'
 import {resolve} from 'node:path'
-
 import prettierConfig from '@sanity/prettier-config'
 import getLatestVersion from 'get-latest-version'
 import gitUrlParse from 'git-url-parse'
 import {outdent} from 'outdent'
-import prettier, {type Config as PrettierConfig} from 'prettier'
-
+import {format, type Config as PrettierConfig} from 'prettier'
 import {
   defineTemplateOption,
   isRecord,
@@ -262,7 +260,6 @@ export const defaultTemplate: PkgTemplate = async ({cwd, logger, packagePath}) =
       }
 
       if (features['eslint']) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const eslintConfig: any = {
           root: true,
           env: {
@@ -324,7 +321,6 @@ export const defaultTemplate: PkgTemplate = async ({cwd, logger, packagePath}) =
             '@typescript-eslint/parser': '^7',
           }
 
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
           const eslintConfigOverride: any = {
             files: ['**/*.ts', '**/*.tsx'],
             parser: '@typescript-eslint/parser',
@@ -356,7 +352,7 @@ export const defaultTemplate: PkgTemplate = async ({cwd, logger, packagePath}) =
 
         files.push({
           name: '.eslintrc.cjs',
-          contents: await format(
+          contents: await prettierFormat(
             resolve(packagePath, '.eslintrc.cjs'),
             outdent`
             'use strict'
@@ -372,7 +368,7 @@ export const defaultTemplate: PkgTemplate = async ({cwd, logger, packagePath}) =
       if (features['typescript']) {
         files.push({
           name: 'tsconfig.settings.json',
-          contents: await format(
+          contents: await prettierFormat(
             resolve(packagePath, 'tsconfig.settings.json'),
             outdent`
             {
@@ -389,7 +385,7 @@ export const defaultTemplate: PkgTemplate = async ({cwd, logger, packagePath}) =
 
         files.push({
           name: 'tsconfig.dist.json',
-          contents: await format(
+          contents: await prettierFormat(
             resolve(packagePath, 'tsconfig.dist.json'),
             outdent`
             {
@@ -404,7 +400,7 @@ export const defaultTemplate: PkgTemplate = async ({cwd, logger, packagePath}) =
 
         files.push({
           name: 'tsconfig.json',
-          contents: await format(
+          contents: await prettierFormat(
             resolve(packagePath, 'tsconfig.json'),
             outdent`
             {
@@ -422,7 +418,7 @@ export const defaultTemplate: PkgTemplate = async ({cwd, logger, packagePath}) =
       if (features['typescript']) {
         files.push({
           name: 'package.config.ts',
-          contents: await format(
+          contents: await prettierFormat(
             resolve(packagePath, 'package.config.ts'),
             outdent`
             import {defineConfig} from '@sanity/pkg-utils'
@@ -439,7 +435,7 @@ export const defaultTemplate: PkgTemplate = async ({cwd, logger, packagePath}) =
 
         files.push({
           name: 'src/index.ts',
-          contents: await format(
+          contents: await prettierFormat(
             resolve(packagePath, 'src/index.ts'),
             outdent`
             /** @public */
@@ -453,7 +449,7 @@ export const defaultTemplate: PkgTemplate = async ({cwd, logger, packagePath}) =
       } else {
         files.push({
           name: 'package.config.js',
-          contents: await format(
+          contents: await prettierFormat(
             resolve(packagePath, 'package.config.js'),
             outdent`
             import {defineConfig} from '@sanity/pkg-utils'
@@ -473,7 +469,7 @@ export const defaultTemplate: PkgTemplate = async ({cwd, logger, packagePath}) =
 
         files.push({
           name: 'src/index.js',
-          contents: await format(
+          contents: await prettierFormat(
             resolve(packagePath, 'src/index.js'),
             outdent`
             /** @public */
@@ -502,7 +498,7 @@ export const defaultTemplate: PkgTemplate = async ({cwd, logger, packagePath}) =
 
       files.push({
         name: 'package.json',
-        contents: await format(
+        contents: await prettierFormat(
           resolve(packagePath, 'package.json'),
           JSON.stringify(pkgJson, null, 2),
           prettierConfig,
@@ -514,8 +510,12 @@ export const defaultTemplate: PkgTemplate = async ({cwd, logger, packagePath}) =
   }
 }
 
-function format(filepath: string, input: string, prettierOptions: PrettierConfig | undefined) {
-  return prettier.format(input, {...prettierOptions, plugins: [], filepath})
+function prettierFormat(
+  filepath: string,
+  input: string,
+  prettierOptions: PrettierConfig | undefined,
+) {
+  return format(input, {...prettierOptions, plugins: [], filepath})
 }
 
 async function resolveLatestDeps(deps: Record<string, string | undefined>) {

package/src/node/watchFiles.ts

@@ -1,4 +1,4 @@
-import chokidar from 'chokidar'
+import * as chokidar from 'chokidar'
 import type {EventName} from 'chokidar/handler.js'
 import {Observable} from 'rxjs'