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

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

@@ -1,4 +1,5 @@
-import type {PackageJSON, PkgBundle, PkgExport} from '../../core'
+import type {PkgBundle, PkgExport} from '../../core/config/types'
+import type {PackageJSON} from '../../core/pkg/types'
 
 /** @internal */
 export const fileEnding = /\.[mc]?js$/
@@ -66,7 +67,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/dts/printDiagnostic.ts

@@ -1,8 +1,6 @@
 import path from 'node:path'
-
 import chalk from 'chalk'
 import ts from 'typescript'
-
 import type {Logger} from '../../logger'
 
 export function printDiagnostic(options: {

package/src/node/tasks/index.ts

@@ -1,5 +1,7 @@
-import {dtsTask, dtsWatchTask} from './dts'
-import {rollupTask, rollupWatchTask} from './rollup'
+import {dtsTask} from './dts/dtsTask'
+import {dtsWatchTask} from './dts/dtsWatchTask'
+import {rollupTask} from './rollup/rollupTask'
+import {rollupWatchTask} from './rollup/rollupWatchTask'
 import type {BuildTaskHandlers, WatchTaskHandlers} from './types'
 
 export * from './dts'

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,10 @@ 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} from '../../core/config/resolveConfigProperty'
+import type {BuildContext} from '../../core/contexts/buildContext'
+import type {PackageJSON} from '../../core/pkg/types'
 import type {RollupTask, RollupWatchTask} from '../types'
 
 export interface RollupConfig {
@@ -59,8 +59,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 +68,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 +81,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 +218,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

@@ -1,11 +1,9 @@
 import path from 'node:path'
-
 import chalk from 'chalk'
 import {rollup} from 'rollup'
 import {Observable} from 'rxjs'
-
 import {createConsoleSpy} from '../../consoleSpy'
-import type {BuildContext} from '../../core'
+import type {BuildContext} from '../../core/contexts/buildContext'
 import type {RollupTask, TaskHandler} from '../types'
 import {resolveRollupConfig} from './resolveRollupConfig'
 
@@ -66,7 +64,6 @@ export const rollupTask: TaskHandler<RollupTask> = {
     //
   },
   error: (_ctx, _task, err) => {
-    // eslint-disable-next-line no-console
     console.error(err)
   },
 }

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

@@ -1,9 +1,7 @@
 import path from 'node:path'
-
 import chalk from 'chalk'
-import {type RollupWatcherEvent, type RollupWatchOptions, watch as rollupWatch} from 'rollup'
+import {watch as rollupWatch, type RollupWatcherEvent, type RollupWatchOptions} from 'rollup'
 import {Observable} from 'rxjs'
-
 import type {RollupWatchTask, TaskHandler} from '../types'
 import {resolveRollupConfig} from './resolveRollupConfig'
 

package/src/node/tasks/types.ts

@@ -1,8 +1,8 @@
 import type {RollupWatcherEvent} from 'rollup'
 import type {Observable} from 'rxjs'
-
-import type {BuildContext, PkgRuntime} from '../core'
-import type {DtsResult, DtsTask, DtsWatchTask} from './dts'
+import type {PkgRuntime} from '../core/config/types'
+import type {BuildContext} from '../core/contexts/buildContext'
+import type {DtsResult, DtsTask, DtsWatchTask} from './dts/types'
 
 /** @internal */
 export interface RollupTaskEntry {

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

@@ -1,19 +1,14 @@
 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 {
-  defineTemplateOption,
-  isRecord,
-  type PackageJSON,
-  type PkgTemplate,
-  type PkgTemplateFile,
-} from '../../core'
+import {format, type Config as PrettierConfig} from 'prettier'
+import {isRecord} from '../../core/isRecord'
+import type {PackageJSON} from '../../core/pkg/types'
+import {defineTemplateOption} from '../../core/template/define'
+import {type PkgTemplate, type PkgTemplateFile} from '../../core/template/types'
 
 const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/i
 
@@ -262,7 +257,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 +318,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 +349,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 +365,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 +382,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 +397,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 +415,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 +432,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 +446,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 +466,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 +495,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 +507,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/watch.ts

@@ -1,12 +1,11 @@
 import path from 'node:path'
-
 import {switchMap} from 'rxjs'
-
 import {loadConfig, loadPkgWithReporting} from './core'
 import {createLogger} from './logger'
 import {resolveBuildContext} from './resolveBuildContext'
 import {resolveWatchTasks} from './resolveWatchTasks'
-import {type TaskHandler, type WatchTask, watchTaskHandlers} from './tasks'
+import {watchTaskHandlers} from './tasks'
+import {type TaskHandler, type WatchTask} from './tasks/types'
 import {watchConfigFiles} from './watchConfigFiles'
 
 /** @public */

package/src/node/watchConfigFiles.ts

@@ -1,8 +1,6 @@
 import path from 'node:path'
-
 import type {Observable} from 'rxjs'
 import {distinctUntilChanged, scan, startWith} from 'rxjs/operators'
-
 import {globFiles} from './globFiles'
 import type {Logger} from './logger'
 import {watchFiles} from './watchFiles'

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'