@cluerise/tools 5.3.4 → 5.3.6

package/dist/configs/.prettierignore

@@ -72,6 +72,9 @@ etc/
 # Tests coverage
 coverage/
 
+# Text
+*.txt
+
 # Xcode
 *.entitlements
 *.pbxproj
@@ -81,3 +84,6 @@ coverage/
 *.swift
 *.xcscheme
 *.xcstrings
+
+# XML
+*.xml

package/dist/configs/prettier.config.js

@@ -9,5 +9,11 @@ export default {
         parser: 'html',
       },
     },
+    {
+      files: ['*.json', '*.jsonc'],
+      options: {
+        trailingComma: 'none',
+      },
+    },
   ],
 };

package/dist/scripts/init/main.js

@@ -313,9 +313,8 @@ class ToolInitializer {
     return toolNameSchema.options.map((option) => option.value);
   }
   async #initCommitlint() {
-    const configName = "commitlint.config";
-    const configPath = `${configName}.ts`;
-    const configContent = `export { default } from '${this.#configPackage}/${configName}.js';
+    const configPath = "commitlint.config.ts";
+    const configContent = `export { default } from '${this.#configPackage}/${configPath}';
 `;
     await FileUtils.createFile(configPath, configContent);
   }
@@ -358,7 +357,7 @@ class ToolInitializer {
   }
   async #initPnpm() {
     const workspacePath = "pnpm-workspace.yaml";
-    const workspaceContent = "engineStrict: true\ngitChecks: false\n\npublicHoistPattern:\n  - '@commitlint/cli'\n  - eslint\n  - lint-staged\n  - prettier\n  - prettier-plugin-sh\n";
+    const workspaceContent = "engineStrict: true\ngitChecks: false\nincludeWorkspaceRoot: true\n\npublicHoistPattern:\n  - '@commitlint/cli'\n  - eslint\n  - lint-staged\n  - prettier\n  - prettier-plugin-sh\n";
     await FileUtils.createFile(workspacePath, workspaceContent);
   }
   async #initPrettier() {
@@ -409,7 +408,7 @@ export default createReleaseConfig(${JsonUtils.prettify(configParams)});
   }
   async #initVSCode() {
     const settingsPath = Path.join(".vscode", "settings.json");
-    const settingsContent = '{\n  "editor.codeActionsOnSave": {\n    "source.fixAll.eslint": "explicit"\n  },\n  "typescript.tsdk": "node_modules/typescript/lib"\n}\n';
+    const settingsContent = '{\n  "editor.codeActionsOnSave": {\n    "source.fixAll.eslint": "explicit"\n  },\n  "typescript.tsdk": "node_modules/typescript/lib",\n  "javascript.preferences.importModuleSpecifier": "relative",\n  "javascript.preferences.importModuleSpecifierEnding": "js",\n  "typescript.preferences.importModuleSpecifier": "relative",\n  "typescript.preferences.importModuleSpecifierEnding": "js",\n  "typescript.preferences.preferTypeOnlyAutoImports": true\n}\n';
     await FileUtils.createFile(settingsPath, settingsContent);
   }
   /**
@@ -498,20 +497,16 @@ class FileLinter {
     return this.#eslint.isPathIgnored(path);
   }
   async #prettierLint(patterns) {
-    const configPath = await Prettier.resolveConfigFile();
-    if (!configPath) {
-      return [];
-    }
-    const config = await Prettier.resolveConfig(configPath);
-    if (!config) {
-      return [];
-    }
     const paths = await glob(patterns, {
       nodir: true,
       ignore: "node_modules/**"
     });
     const results = await Promise.all(
       paths.map(async (path) => {
+        const config = await Prettier.resolveConfig(path);
+        if (!config) {
+          return null;
+        }
         if (await this.#isIgnoredByPrettier(path)) {
           return null;
         }

package/dist/scripts/lint/main.js

@@ -287,20 +287,16 @@ class FileLinter {
     return this.#eslint.isPathIgnored(path);
   }
   async #prettierLint(patterns) {
-    const configPath = await Prettier.resolveConfigFile();
-    if (!configPath) {
-      return [];
-    }
-    const config = await Prettier.resolveConfig(configPath);
-    if (!config) {
-      return [];
-    }
     const paths = await glob(patterns, {
       nodir: true,
       ignore: "node_modules/**"
     });
     const results = await Promise.all(
       paths.map(async (path) => {
+        const config = await Prettier.resolveConfig(path);
+        if (!config) {
+          return null;
+        }
         if (await this.#isIgnoredByPrettier(path)) {
           return null;
         }

package/dist/scripts/release/main.js

@@ -237,20 +237,16 @@ class FileLinter {
     return this.#eslint.isPathIgnored(path);
   }
   async #prettierLint(patterns) {
-    const configPath = await Prettier.resolveConfigFile();
-    if (!configPath) {
-      return [];
-    }
-    const config = await Prettier.resolveConfig(configPath);
-    if (!config) {
-      return [];
-    }
     const paths = await glob(patterns, {
       nodir: true,
       ignore: "node_modules/**"
     });
     const results = await Promise.all(
       paths.map(async (path) => {
+        const config = await Prettier.resolveConfig(path);
+        if (!config) {
+          return null;
+        }
         if (await this.#isIgnoredByPrettier(path)) {
           return null;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cluerise/tools",
-  "version": "5.3.4",
+  "version": "5.3.6",
   "description": "Tools for maintaining TypeScript projects.",
   "author": "Branislav Holý <brano@holy.am>",
   "repository": "github:cluerise/tools",