diff --git a/package.json b/package.json index 08043e40cf908..2daccab72cb21 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "@types/common-tags": "^1.8.0", "@types/eslint": "^6.8.1", "@types/express": "^4.17.3", - "@types/fast-levenshtein": "^0.0.1", "@types/fs-extra": "^8.1.1", "@types/got": "^9.6.11", "@types/jaeger-client": "^3.15.4", diff --git a/packages/gatsby-theme/gatsby-theme-debug.js b/packages/gatsby-theme/gatsby-theme-debug.js index d87aa3c352c9c..2c49fe953b741 100644 --- a/packages/gatsby-theme/gatsby-theme-debug.js +++ b/packages/gatsby-theme/gatsby-theme-debug.js @@ -3,7 +3,7 @@ const path = require('path') const globby = require('globby') const { sortBy, uniq } = require("lodash"); const loadThemes = require("gatsby/dist/bootstrap/load-themes"); -const { get: levenshtein } = require('fast-levenshtein') +const { distance: levenshtein } = require('fastest-levenshtein') let errorsFound = [] diff --git a/packages/gatsby-theme/package.json b/packages/gatsby-theme/package.json index 540bb26b9e64e..6e1ba8a7c7af7 100644 --- a/packages/gatsby-theme/package.json +++ b/packages/gatsby-theme/package.json @@ -18,7 +18,7 @@ "@babel/helper-plugin-utils": "^7.10.4", "@babel/plugin-syntax-jsx": "^7.10.4", "commander": "^2.20.3", - "fast-levenshtein": "^2.0.6", + "fastest-levenshtein": "^1.0.12", "glob": "^7.1.6", "globby": "^10.0.2", "inquirer": "^6.5.2", diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index cb82aec4f2ea7..f5d9a924fda28 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -71,7 +71,7 @@ "execa": "^4.0.3", "express": "^4.17.1", "express-graphql": "^0.9.0", - "fast-levenshtein": "^2.0.6", + "fastest-levenshtein": "^1.0.12", "file-loader": "^1.1.11", "find-cache-dir": "^3.3.1", "fs-exists-cached": "1.0.0", diff --git a/packages/gatsby/src/bootstrap/get-config-file.ts b/packages/gatsby/src/bootstrap/get-config-file.ts index 1af0d0a8ad6f8..c99e7e8164c14 100644 --- a/packages/gatsby/src/bootstrap/get-config-file.ts +++ b/packages/gatsby/src/bootstrap/get-config-file.ts @@ -1,4 +1,4 @@ -import levenshtein from "fast-levenshtein" +import { distance as levenshtein } from "fastest-levenshtein" import fs from "fs-extra" import { testRequireError } from "../utils/test-require-error" import report from "gatsby-cli/lib/reporter" @@ -11,7 +11,7 @@ function isNearMatch( distance: number ): boolean { if (!fileName) return false - return levenshtein.get(fileName, configName) <= distance + return levenshtein(fileName, configName) <= distance } export async function getConfigFile( diff --git a/packages/gatsby/src/query/graphql-errors.js b/packages/gatsby/src/query/graphql-errors.js index 80bc0e6edb1ed..e61ed69868da2 100644 --- a/packages/gatsby/src/query/graphql-errors.js +++ b/packages/gatsby/src/query/graphql-errors.js @@ -3,7 +3,7 @@ const fs = require(`fs-extra`) import { print, visit, getLocation } from "graphql" import { codeFrameColumns } from "@babel/code-frame" -const levenshtein = require(`fast-levenshtein`) +const { distance: levenshtein } = require(`fastest-levenshtein`) import _ from "lodash" import report from "gatsby-cli/lib/reporter" const { locInGraphQlToLocInFile } = require(`./error-parser`) @@ -238,7 +238,7 @@ export function unknownFragmentError({ const name = node.name.value const closestFragment = fragmentNames .map(f => { - return { fragment: f, score: levenshtein.get(name, f) } + return { fragment: f, score: levenshtein(name, f) } }) .filter(f => f.score < 10) .sort((a, b) => a.score > b.score)[0]?.fragment diff --git a/yarn.lock b/yarn.lock index 976a30859f001..83832fab29252 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3626,11 +3626,6 @@ "@types/express-serve-static-core" "*" "@types/serve-static" "*" -"@types/fast-levenshtein@^0.0.1": - version "0.0.1" - resolved "https://registry.yarnpkg.com/@types/fast-levenshtein/-/fast-levenshtein-0.0.1.tgz#3a3615cf173645c8fca58d051e4e32824e4bd286" - integrity sha1-OjYVzxc2Rcj8pY0FHk4ygk5L0oY= - "@types/fs-extra@^8.1.1": version "8.1.1" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068" @@ -10219,6 +10214,11 @@ fast-text-encoding@^1.0.0: resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz#3e5ce8293409cfaa7177a71b9ca84e1b1e6f25ef" integrity sha512-R9bHCvweUxxwkDwhjav5vxpFvdPGlVngtqmx4pIZfSUhM/Q4NiIUHB456BAf+Q1Nwu3HEZYONtu+Rya+af4jiQ== +fastest-levenshtein@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" + integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== + fastparse@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"