@bfra.me/prettier-config 0.4.1 → 0.5.0

package/120-proof.d.ts

@@ -1,39 +1,6 @@
+import type {Config} from 'prettier'
 /**
  * Shared Prettier configuration for bfra.me projects with `printWidth` set to 120 characters.
  */
-declare const config: {
-  printWidth: number
-  overrides?: Array<{
-    files: string | string[]
-    excludeFiles?: string | string[]
-    options?: import('prettier').Options
-  }>
-  semi?: boolean
-  singleQuote?: boolean
-  jsxSingleQuote?: boolean
-  trailingComma?: 'none' | 'es5' | 'all'
-  bracketSpacing?: boolean
-  bracketSameLine?: boolean
-  rangeStart?: number
-  rangeEnd?: number
-  parser?: import('prettier').LiteralUnion<import('prettier').BuiltInParserName>
-  filepath?: string
-  requirePragma?: boolean
-  insertPragma?: boolean
-  proseWrap?: 'always' | 'never' | 'preserve'
-  arrowParens?: 'avoid' | 'always'
-  plugins?: Array<string | import('prettier').Plugin>
-  htmlWhitespaceSensitivity?: 'css' | 'strict' | 'ignore'
-  endOfLine?: 'auto' | 'lf' | 'crlf' | 'cr'
-  quoteProps?: 'as-needed' | 'consistent' | 'preserve'
-  vueIndentScriptAndStyle?: boolean
-  embeddedLanguageFormatting?: 'auto' | 'off'
-  singleAttributePerLine?: boolean
-  experimentalTernaries?: boolean
-  jsxBracketSameLine?: boolean
-  tabWidth?: number
-  useTabs?: boolean
-  parentParser?: string | undefined
-  __embeddedInHtml?: boolean | undefined
-}
+declare const config: Config
 export default config

package/120-proof.ts

@@ -1,9 +1,10 @@
 import prettierConfig from '@bfra.me/prettier-config'
+import type {Config} from 'prettier'
 
 /**
  * Shared Prettier configuration for bfra.me projects with `printWidth` set to 120 characters.
  */
-const config = {
+const config: Config = {
   ...prettierConfig,
   printWidth: 120,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bfra.me/prettier-config",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Shared Prettier configuration for bfra.me",
   "keywords": [
     "bfra.me",
@@ -37,12 +37,12 @@
     "!*.map"
   ],
   "dependencies": {
-    "@bfra.me/prettier-plugins": "0.2.1"
+    "@bfra.me/prettier-plugins": "0.3.0"
   },
   "devDependencies": {
     "prettier": "3.3.3",
     "@bfra.me/tsconfig": "0.6.0",
-    "@bfra.me/prettier-config": "0.4.1"
+    "@bfra.me/prettier-config": "0.5.0"
   },
   "peerDependencies": {
     "prettier": "^3.0.0"

package/plugins.d.ts

@@ -0,0 +1,10 @@
+import type {Plugin} from 'prettier'
+export type InteropDefault<T> = T extends {
+  default: infer U
+}
+  ? U
+  : T
+export declare const resolve: <T extends Plugin>(
+  resolver: (id: string) => string,
+  plugin: string,
+) => string | T

package/plugins.js

@@ -0,0 +1,17 @@
+function interopDefault(m) {
+  return m.default || m
+}
+import {default as pluginPackageJson} from '@bfra.me/prettier-plugins/package-json'
+const resolvedPlugins = {
+  '@bfra.me/prettier-plugins/package-json': interopDefault(pluginPackageJson),
+}
+export const resolve = (resolver, plugin) => {
+  try {
+    if (resolvedPlugins[plugin]) {
+      return resolvedPlugins[plugin]
+    }
+    return resolver(plugin)
+  } finally {
+    return plugin
+  }
+}

package/plugins.ts

@@ -0,0 +1,26 @@
+import type {Plugin} from 'prettier'
+
+export type InteropDefault<T> = T extends {default: infer U} ? U : T
+
+function interopDefault<T>(m: T): InteropDefault<T> {
+  return (m as any).default || m
+}
+
+import {default as pluginPackageJson} from '@bfra.me/prettier-plugins/package-json'
+const resolvedPlugins: Record<string, Plugin> = {
+  '@bfra.me/prettier-plugins/package-json': interopDefault(pluginPackageJson),
+}
+
+export const resolve = <T extends Plugin>(
+  resolver: (id: string) => string,
+  plugin: string,
+): string | T => {
+  try {
+    if (resolvedPlugins[plugin]) {
+      return resolvedPlugins[plugin] as unknown as T
+    }
+    return resolver(plugin)
+  } finally {
+    return plugin
+  }
+}

package/prettier.config.js

@@ -1,5 +1,7 @@
+import {resolve} from './plugins.js'
 import {createRequire} from 'module'
-const {resolve} = createRequire(import.meta.url)
+const require = createRequire(import.meta.url)
+const resolvePlugin = resolve.bind(null, require.resolve)
 /**
  * Shared Prettier configuration for bfra.me projects.
  */
@@ -11,24 +13,6 @@ const config = {
   semi: false,
   singleQuote: true,
   overrides: [
-    // VS Code configuration files:
-    // Use 4 spaces for indentation to match the default VS Code settings.
-    {
-      files: ['.vscode/*.json', '.devcontainer/**/devcontainer*.json'],
-      options: {
-        tabWidth: 4,
-      },
-    },
-    // Markdown:
-    // - Disable single quotes for Markdown files.
-    // - Disable `proseWrap` to avoid wrapping prose.
-    {
-      files: ['*.md'],
-      options: {
-        proseWrap: 'never',
-        singleQuote: false,
-      },
-    },
     // Adapted from https://github.com/sxzz/prettier-config/blob/1e5cc3021e5816aceebe0b90af1d530239442ecf/index.js.
     // Require a pragma for paths typically not under version control or written by build tools.
     {
@@ -38,28 +22,52 @@ const config = {
         '**/lib/**',
         '**/coverage/**',
         '**/out/**',
+        '**/temp/**',
         '**/.idea/**',
+        '**/.next/**',
         '**/.nuxt/**',
+        '**/.output/**',
         '**/.vercel/**',
         '**/.vitepress/cache/**',
         '**/.vite-inspect/**',
         '**/__snapshots__/**',
+        '**/auto-import?(s).d.ts',
         '**/.changeset/*.md',
         '**/CHANGELOG*.md',
         '**/changelog*.md',
+        '**/components.d.ts',
         '**/devcontainer-lock.json',
         '**/LICENSE*',
         '**/license*',
         '**/*.min.*',
-        'package-lock.json',
-        'pnpm-lock.yaml',
-        'yarn.lock',
+        '**/package-lock.json',
+        '**/pnpm-lock.yaml',
+        '**/typed-router.d.ts',
+        '**/yarn.lock',
       ],
       options: {
         requirePragma: true,
       },
     },
+    // VS Code configuration files:
+    // Use 4 spaces for indentation to match the default VS Code settings.
+    {
+      files: ['.vscode/*.json', '.devcontainer/**/devcontainer*.json'],
+      options: {
+        tabWidth: 4,
+      },
+    },
+    // Markdown:
+    // - Disable single quotes for Markdown files.
+    // - Disable `proseWrap` to avoid wrapping prose.
+    {
+      files: ['*.md'],
+      options: {
+        proseWrap: 'never',
+        singleQuote: false,
+      },
+    },
   ],
-  plugins: ['@bfra.me/prettier-plugins/package-json'].map(plugin => resolve(plugin)),
+  plugins: ['@bfra.me/prettier-plugins/package-json'].map(resolvePlugin),
 }
 export default config

package/prettier.config.ts

@@ -1,7 +1,10 @@
-import {createRequire} from 'module'
+import {resolve} from './plugins.js'
 import type {Config} from 'prettier'
 
-const {resolve} = createRequire(import.meta.url)
+import {createRequire} from 'module'
+
+const require = createRequire(import.meta.url)
+const resolvePlugin = resolve.bind(null, require.resolve)
 
 /**
  * Shared Prettier configuration for bfra.me projects.
@@ -15,26 +18,6 @@ const config: Config = {
   singleQuote: true,
 
   overrides: [
-    // VS Code configuration files:
-    // Use 4 spaces for indentation to match the default VS Code settings.
-    {
-      files: ['.vscode/*.json', '.devcontainer/**/devcontainer*.json'],
-      options: {
-        tabWidth: 4,
-      },
-    },
-
-    // Markdown:
-    // - Disable single quotes for Markdown files.
-    // - Disable `proseWrap` to avoid wrapping prose.
-    {
-      files: ['*.md'],
-      options: {
-        proseWrap: 'never',
-        singleQuote: false,
-      },
-    },
-
     // Adapted from https://github.com/sxzz/prettier-config/blob/1e5cc3021e5816aceebe0b90af1d530239442ecf/index.js.
     // Require a pragma for paths typically not under version control or written by build tools.
     {
@@ -44,32 +27,57 @@ const config: Config = {
         '**/lib/**',
         '**/coverage/**',
         '**/out/**',
+        '**/temp/**',
         '**/.idea/**',
+        '**/.next/**',
         '**/.nuxt/**',
+        '**/.output/**',
         '**/.vercel/**',
         '**/.vitepress/cache/**',
         '**/.vite-inspect/**',
         '**/__snapshots__/**',
 
+        '**/auto-import?(s).d.ts',
         '**/.changeset/*.md',
         '**/CHANGELOG*.md',
         '**/changelog*.md',
+        '**/components.d.ts',
         '**/devcontainer-lock.json',
         '**/LICENSE*',
         '**/license*',
         '**/*.min.*',
-
-        'package-lock.json',
-        'pnpm-lock.yaml',
-        'yarn.lock',
+        '**/package-lock.json',
+        '**/pnpm-lock.yaml',
+        '**/typed-router.d.ts',
+        '**/yarn.lock',
       ],
       options: {
         requirePragma: true,
       },
     },
+
+    // VS Code configuration files:
+    // Use 4 spaces for indentation to match the default VS Code settings.
+    {
+      files: ['.vscode/*.json', '.devcontainer/**/devcontainer*.json'],
+      options: {
+        tabWidth: 4,
+      },
+    },
+
+    // Markdown:
+    // - Disable single quotes for Markdown files.
+    // - Disable `proseWrap` to avoid wrapping prose.
+    {
+      files: ['*.md'],
+      options: {
+        proseWrap: 'never',
+        singleQuote: false,
+      },
+    },
   ],
 
-  plugins: ['@bfra.me/prettier-plugins/package-json'].map(plugin => resolve(plugin)),
+  plugins: ['@bfra.me/prettier-plugins/package-json'].map(resolvePlugin),
 }
 
 export default config