From 2316e2fecd171335fc00f3ec97b7e46cc8964153 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Sun, 12 Jun 2022 01:55:11 +0900
Subject: [PATCH] Update `linguist-language` (#12994)

* Install new `linguist-language`

* Remove `.mts` and `.cts`

* Update tests
---
 package.json                                  |  2 +-
 src/language-js/index.js                      | 14 ++++------
 .../__snapshots__/support-info.js.snap        | 26 +++++++++++++++++--
 yarn.lock                                     |  8 +++---
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index f3149c4c8a76..62e5c5545015 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "json5": "2.2.1",
     "leven": "4.0.0",
     "lines-and-columns": "2.0.3",
-    "linguist-languages": "7.15.0",
+    "linguist-languages": "7.21.0",
     "mem": "9.0.2",
     "meriyah": "4.2.1",
     "micromatch": "4.0.5",
diff --git a/src/language-js/index.js b/src/language-js/index.js
index c20b8788c195..bcf54ac649da 100644
--- a/src/language-js/index.js
+++ b/src/language-js/index.js
@@ -68,15 +68,11 @@ const languages = [
     codemirrorMimeType: "text/jsx",
     color: undefined,
   })),
-  createLanguage(
-    require("linguist-languages/data/TypeScript.json"),
-    (data) => ({
-      since: "1.4.0",
-      parsers: ["typescript", "babel-ts"],
-      vscodeLanguageIds: ["typescript"],
-      extensions: [...data.extensions, ".mts", ".cts"],
-    })
-  ),
+  createLanguage(require("linguist-languages/data/TypeScript.json"), () => ({
+    since: "1.4.0",
+    parsers: ["typescript", "babel-ts"],
+    vscodeLanguageIds: ["typescript"],
+  })),
   createLanguage(require("linguist-languages/data/TSX.json"), () => ({
     since: "1.4.0",
     parsers: ["typescript", "babel-ts"],
diff --git a/tests/integration/__tests__/__snapshots__/support-info.js.snap b/tests/integration/__tests__/__snapshots__/support-info.js.snap
index f016508d3057..8e6f7d9e0578 100644
--- a/tests/integration/__tests__/__snapshots__/support-info.js.snap
+++ b/tests/integration/__tests__/__snapshots__/support-info.js.snap
@@ -300,10 +300,13 @@ exports[`CLI --support-info (stdout) 1`] = `
         ".frag",
         ".gs",
         ".jake",
+        ".javascript",
         ".jsb",
         ".jscad",
         ".jsfl",
+        ".jslib",
         ".jsm",
+        ".jspre",
         ".jss",
         ".mjs",
         ".njs",
@@ -400,8 +403,8 @@ exports[`CLI --support-info (stdout) 1`] = `
       "aliases": ["ts"],
       "codemirrorMimeType": "application/typescript",
       "codemirrorMode": "javascript",
-      "color": "#2b7489",
-      "extensions": [".ts", ".mts", ".cts"],
+      "color": "#3178c6",
+      "extensions": [".ts", ".cts", ".mts"],
       "interpreters": ["deno", "ts-node"],
       "linguistLanguageId": 378,
       "name": "TypeScript",
@@ -415,6 +418,7 @@ exports[`CLI --support-info (stdout) 1`] = `
       "aceMode": "javascript",
       "codemirrorMimeType": "text/jsx",
       "codemirrorMode": "jsx",
+      "color": "#3178c6",
       "extensions": [".tsx"],
       "group": "TypeScript",
       "linguistLanguageId": 94901924,
@@ -427,8 +431,10 @@ exports[`CLI --support-info (stdout) 1`] = `
     },
     {
       "aceMode": "json",
+      "aliases": ["geojson", "jsonl", "topojson"],
       "codemirrorMimeType": "application/json",
       "codemirrorMode": "javascript",
+      "color": "#292929",
       "extensions": [".importmap"],
       "filenames": ["package.json", "package-lock.json", "composer.json"],
       "linguistLanguageId": 174,
@@ -441,10 +447,14 @@ exports[`CLI --support-info (stdout) 1`] = `
     },
     {
       "aceMode": "json",
+      "aliases": ["geojson", "jsonl", "topojson"],
       "codemirrorMimeType": "application/json",
       "codemirrorMode": "javascript",
+      "color": "#292929",
       "extensions": [
         ".json",
+        ".4DForm",
+        ".4DProject",
         ".avsc",
         ".geojson",
         ".gltf",
@@ -462,8 +472,11 @@ exports[`CLI --support-info (stdout) 1`] = `
       ],
       "filenames": [
         ".arcconfig",
+        ".auto-changelog",
+        ".c8rc",
         ".htmlhintrc",
         ".imgbotconfig",
+        ".nycrc",
         ".tern-config",
         ".tern-project",
         ".watchmanconfig",
@@ -484,8 +497,10 @@ exports[`CLI --support-info (stdout) 1`] = `
       "aliases": ["jsonc"],
       "codemirrorMimeType": "text/javascript",
       "codemirrorMode": "javascript",
+      "color": "#292929",
       "extensions": [
         ".jsonc",
+        ".code-snippets",
         ".sublime-build",
         ".sublime-commands",
         ".sublime-completions",
@@ -502,6 +517,7 @@ exports[`CLI --support-info (stdout) 1`] = `
       ],
       "filenames": [
         ".babelrc",
+        ".devcontainer.json",
         ".eslintrc.json",
         ".jscsrc",
         ".jshintrc",
@@ -528,6 +544,7 @@ exports[`CLI --support-info (stdout) 1`] = `
       "aceMode": "javascript",
       "codemirrorMimeType": "application/json",
       "codemirrorMode": "javascript",
+      "color": "#267CB9",
       "extensions": [".json5"],
       "linguistLanguageId": 175,
       "name": "JSON5",
@@ -553,6 +570,7 @@ exports[`CLI --support-info (stdout) 1`] = `
     },
     {
       "aceMode": "text",
+      "color": "#dc3a0c",
       "extensions": [".pcss", ".postcss"],
       "group": "CSS",
       "linguistLanguageId": 262764437,
@@ -565,6 +583,7 @@ exports[`CLI --support-info (stdout) 1`] = `
     },
     {
       "aceMode": "less",
+      "aliases": ["less-css"],
       "codemirrorMimeType": "text/css",
       "codemirrorMode": "css",
       "color": "#1d365d",
@@ -624,6 +643,7 @@ exports[`CLI --support-info (stdout) 1`] = `
       "color": "#083fa1",
       "extensions": [
         ".md",
+        ".livemd",
         ".markdown",
         ".mdown",
         ".mdwn",
@@ -685,6 +705,7 @@ exports[`CLI --support-info (stdout) 1`] = `
       "color": "#e34c26",
       "extensions": [
         ".html",
+        ".hta",
         ".htm",
         ".html.hl",
         ".inc",
@@ -750,6 +771,7 @@ exports[`CLI --support-info (stdout) 1`] = `
         ".clang-format",
         ".clang-tidy",
         ".gemrc",
+        "CITATION.cff",
         "glide.lock",
         ".prettierrc",
         ".stylelintrc"
diff --git a/yarn.lock b/yarn.lock
index 72e836b3e8d5..90f02e84bc6e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4782,10 +4782,10 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-linguist-languages@7.15.0:
-  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/linguist-languages/-/linguist-languages-7.15.0.tgz#a93bed6b93015d8133622cb05da6296890862bfa"
-  integrity sha512-qkSSNDjDDycZ2Wcw+GziNBB3nNo3ddYUInM/PL8Amgwbd9RQ/BKGj2/1d6mdxKgBFnUqZuaDbkIwkE4KUwwmtQ==
+linguist-languages@7.21.0:
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/linguist-languages/-/linguist-languages-7.21.0.tgz#da0184f622367cb092f1f8ba435937a85534f675"
+  integrity sha512-KrWJJbFOvlDhjlt5OhUipVlXg+plUfRurICAyij1ZVxQcqPt/zeReb9KiUVdGUwwhS/2KS9h3TbyfYLA5MDlxQ==
 
 load-json-file@^4.0.0:
   version "4.0.0"