diff --git a/cspell.json b/cspell.json index 246432cdd..5d459210f 100644 --- a/cspell.json +++ b/cspell.json @@ -167,6 +167,7 @@ "Masad", "Matejka", "Mateusz", + "mcmod", "mdast", "Memberish", "meriyah", @@ -222,6 +223,7 @@ "picocolors", "PierzchaƂa", "Pieter", + "Pipfile", "pnpapi", "posix", "precache", diff --git a/package.json b/package.json index 72ed4a1a3..f60de3b72 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "jest-docblock": "30.0.0-alpha.7", "json5": "2.2.3", "leven": "4.0.0", - "linguist-languages": "7.29.0", + "linguist-languages": "7.30.0", "meriyah": "6.0.6", "micromatch": "4.0.8", "minimist": "1.2.8", diff --git a/src/language-json/languages.evaluate.js b/src/language-json/languages.evaluate.js index 02a88eb00..437588141 100644 --- a/src/language-json/languages.evaluate.js +++ b/src/language-json/languages.evaluate.js @@ -1,6 +1,18 @@ import linguistLanguages from "linguist-languages"; import createLanguage from "../utils/create-language.js"; +const ignoredFilenames = new Set([ + // These are generated files, we don't want format them by default + "MODULE.bazel.lock", + "Package.resolved", + "Pipfile.lock", + "bun.lock", + "composer.lock", + "deno.lock", + "flake.lock", + "mcmod.info", +]); + const languages = [ createLanguage(linguistLanguages.JSON, () => ({ name: "JSON.stringify", @@ -14,7 +26,7 @@ const languages = [ vscodeLanguageIds: ["json"], extensions: data.extensions.filter((extension) => extension !== ".jsonl"), filenames: [ - ...data.filenames, + ...data.filenames.filter((filename) => !ignoredFilenames.has(filename)), ".babelrc", ".jscsrc", ".jshintrc", diff --git a/src/language-yaml/languages.evaluate.js b/src/language-yaml/languages.evaluate.js index a98642485..99bdbfa8e 100644 --- a/src/language-yaml/languages.evaluate.js +++ b/src/language-yaml/languages.evaluate.js @@ -1,6 +1,12 @@ import linguistLanguages from "linguist-languages"; import createLanguage from "../utils/create-language.js"; +const ignoredFilenames = new Set([ + // `yarn.lock` is not YAML in Yarn v1: https://github.com/yarnpkg/yarn/issues/5629 + // and it's a generated file, we don't want format it by default + "yarn.lock", +]); + const languages = [ createLanguage(linguistLanguages.YAML, (data) => ({ parsers: ["yaml"], @@ -11,9 +17,8 @@ const languages = [ "github-actions-workflow", "home-assistant", ], - // yarn.lock is not YAML: https://github.com/yarnpkg/yarn/issues/5629 filenames: [ - ...data.filenames.filter((filename) => filename !== "yarn.lock"), + ...data.filenames.filter((filename) => !ignoredFilenames.has(filename)), ".prettierrc", ".stylelintrc", ".lintstagedrc", diff --git a/tests/integration/__tests__/__snapshots__/support-info.js.snap b/tests/integration/__tests__/__snapshots__/support-info.js.snap index 1f829af67..35ab299dd 100644 --- a/tests/integration/__tests__/__snapshots__/support-info.js.snap +++ b/tests/integration/__tests__/__snapshots__/support-info.js.snap @@ -512,12 +512,6 @@ exports[`CLI --support-info 1`] = ` ".tern-config", ".tern-project", ".watchmanconfig", - "MODULE.bazel.lock", - "Pipfile.lock", - "composer.lock", - "deno.lock", - "flake.lock", - "mcmod.info", ".babelrc", ".jscsrc", ".jshintrc", @@ -748,7 +742,7 @@ exports[`CLI --support-info 1`] = ` "codemirrorMode": "javascript", "color": "#3178c6", "extensions": [".ts", ".cts", ".mts"], - "interpreters": ["deno", "ts-node", "tsx"], + "interpreters": ["bun", "deno", "ts-node", "tsx"], "linguistLanguageId": 378, "name": "TypeScript", "parsers": ["typescript", "babel-ts"], diff --git a/yarn.lock b/yarn.lock index 729d17256..cee43d09d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6093,10 +6093,10 @@ __metadata: languageName: node linkType: hard -"linguist-languages@npm:7.29.0": - version: 7.29.0 - resolution: "linguist-languages@npm:7.29.0" - checksum: 10/ee7edf50bfca28b8c2a0b3fc092d41fdc5ff4a537a9fd6fcec5edb4fa3b3ad9cc54be3d78b6ce1649298a2a1c912ac6f4e44fa192f63da97e66783aab2b48f47 +"linguist-languages@npm:7.30.0": + version: 7.30.0 + resolution: "linguist-languages@npm:7.30.0" + checksum: 10/80f4298f8802f085b30b5500c6031aea42ef7e3b971f2e31d094e513c2a8718030a71bf06dda259bc80cf417aeaa04832e9e90d1d8f1a4af2c7f882523155269 languageName: node linkType: hard @@ -7060,7 +7060,7 @@ __metadata: json5: "npm:2.2.3" knip: "npm:5.50.5" leven: "npm:4.0.0" - linguist-languages: "npm:7.29.0" + linguist-languages: "npm:7.30.0" magic-string: "npm:0.30.17" meriyah: "npm:6.0.6" micromatch: "npm:4.0.8"