@bfra.me/prettier-config 0.2.2 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bfra.me/prettier-config",
-  "version": "0.2.2",
+  "version": "0.3.1",
   "description": "Shared Prettier configuration for bfra.me",
   "license": "MIT",
   "author": "Marcus R. Brown <contact@bfra.me>",
@@ -14,8 +14,8 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": "./prettier.config.js",
-      "types": "./prettier.config.d.ts"
+      "types": "./prettier.config.d.ts",
+      "import": "./prettier.config.js"
     },
     "./package.json": "./package.json"
   },
@@ -26,15 +26,15 @@
   ],
   "types": "prettier.config.d.ts",
   "dependencies": {
-    "prettier-package-json": "2.8.0"
+    "@bfra.me/prettier-plugins": "0.1.1"
   },
   "peerDependencies": {
     "prettier": "^3.0.0"
   },
   "devDependencies": {
     "prettier": "3.2.5",
-    "@bfra.me/prettier-config": "0.2.2",
-    "@bfra.me/tsconfig": "0.3.1"
+    "@bfra.me/prettier-config": "0.3.1",
+    "@bfra.me/tsconfig": "0.4.0"
   },
   "keywords": [
     "bfra.me",
@@ -49,6 +49,7 @@
     "provenance": true
   },
   "scripts": {
-    "build": "tsc && prettier --log-level silent --ignore-unknown --write prettier.config.*"
+    "build": "tsc --build && pnpm run format",
+    "format": "prettier --log-level error --ignore-unknown --write prettier.config.*"
   }
 }

package/prettier.config.js

@@ -1,6 +1,5 @@
-import {parsers} from 'prettier/plugins/babel'
-import {format} from 'prettier-package-json'
-const jsonStringifyParser = parsers['json-stringify']
+import {createRequire} from 'module'
+const {resolve} = createRequire(import.meta.url)
 /**
  * Shared Prettier configuration for bfra.me projects.
  */
@@ -60,28 +59,7 @@ const config = {
       },
     },
   ],
-  plugins: [
-    {
-      parsers: {
-        'json-stringify': {
-          ...jsonStringifyParser,
-          preprocess(text, options) {
-            if (jsonStringifyParser.preprocess) {
-              text = jsonStringifyParser.preprocess(text, options)
-            }
-            if (/package.*json$/u.test(options.filepath)) {
-              text = format(JSON.parse(text), {
-                tabWidth: options.tabWidth,
-                useTabs: options.useTabs === true,
-                ...(options['prettier-package-json'] ?? {}),
-              })
-            }
-            return text
-          },
-        },
-      },
-    },
-  ],
+  plugins: ['@bfra.me/prettier-plugins/package-json'].map(plugin => resolve(plugin)),
 }
 export default config
 //# sourceMappingURL=prettier.config.js.map

package/prettier.config.ts

@@ -1,8 +1,7 @@
-import type {Config, ParserOptions} from 'prettier'
-import {parsers} from 'prettier/plugins/babel'
-import {format, type Options as PrettierPackageJsonOptions} from 'prettier-package-json'
+import {createRequire} from 'module'
+import type {Config} from 'prettier'
 
-const jsonStringifyParser = parsers['json-stringify']
+const {resolve} = createRequire(import.meta.url)
 
 /**
  * Shared Prettier configuration for bfra.me projects.
@@ -69,30 +68,7 @@ const config: Config = {
     },
   ],
 
-  plugins: [
-    {
-      parsers: {
-        'json-stringify': {
-          ...jsonStringifyParser,
-
-          preprocess(text: string, options: ParserOptions) {
-            if (jsonStringifyParser.preprocess) {
-              text = jsonStringifyParser.preprocess(text, options)
-            }
-            if (/package.*json$/u.test(options.filepath)) {
-              text = format(JSON.parse(text), {
-                tabWidth: options.tabWidth,
-                useTabs: options.useTabs === true,
-                ...((options['prettier-package-json'] ??
-                  {}) as Partial<PrettierPackageJsonOptions>),
-              })
-            }
-            return text
-          },
-        },
-      },
-    },
-  ],
+  plugins: ['@bfra.me/prettier-plugins/package-json'].map(plugin => resolve(plugin)),
 }
 
 export default config