@1adybug/prettier 0.0.8 → 0.0.10

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+import { PluginConfig } from "@1adybug/prettier-plugin-sort-imports";
 import { Plugin } from "prettier";
+export declare const config: PluginConfig;
 export declare const plugin: Plugin<any>;
 export default plugin;

package/dist/index.js

@@ -94,13 +94,13 @@ function getResolvedPathDir(resolvedPath) {
     }
     return resolvedPath;
 }
-const src_plugin = createPlugin({
+const config = {
     getGroup ({ path, filepath }) {
         if (filepath) src_resolveAlias ??= getResolveAlias(filepath);
         const type = getModuleType(path);
         let dir = "";
         if ("absolute" === type) dir = getResolvedPathDir(src_resolveAlias(path));
-        if ("relative" === type && !!filepath) dir = getResolvedPathDir(resolve(filepath, path));
+        if ("relative" === type && !!filepath) dir = getResolvedPathDir(resolve(filepath, "../", path));
         const info = {
             type,
             dir
@@ -108,11 +108,12 @@ const src_plugin = createPlugin({
         return JSON.stringify(info);
     },
     sortGroup (a, b) {
-        return Number(a.isSideEffect) - Number(b.isSideEffect) || compareGroupName(a.name, b.name);
+        return Number(a.isExport) - Number(b.isExport) || Number(a.isSideEffect) - Number(b.isSideEffect) || compareGroupName(a.name, b.name);
     },
     separator: "",
     sortSideEffect: true,
     otherPlugins
-});
+};
+const src_plugin = createPlugin(config);
 const src = src_plugin;
-export { src as default, src_plugin as plugin };
+export { config, src as default, src_plugin as plugin };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1adybug/prettier",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "推荐的 Prettier 配置",
   "keywords": [
     "prettier",
@@ -38,9 +38,9 @@
   "dependencies": {
     "prettier-plugin-tailwindcss": "^0.7.1",
     "tsconfig-paths": "^4.2.0",
-    "@1adybug/prettier-plugin-block-padding": "0.0.11",
-    "@1adybug/prettier-plugin-sort-imports": "0.0.19",
-    "@1adybug/prettier-plugin-remove-braces": "0.0.5"
+    "@1adybug/prettier-plugin-remove-braces": "0.0.6",
+    "@1adybug/prettier-plugin-sort-imports": "0.0.20",
+    "@1adybug/prettier-plugin-block-padding": "0.0.12"
   },
   "devDependencies": {
     "@rslib/core": "^0.18.2",