diff --git a/e2e/__helpers__/test-case/runtime.ts b/e2e/__helpers__/test-case/runtime.ts index 8cdf76fbc7..a49c35a684 100644 --- a/e2e/__helpers__/test-case/runtime.ts +++ b/e2e/__helpers__/test-case/runtime.ts @@ -22,7 +22,7 @@ import { writeFileSync, } from 'fs-extra' import { stringify as stringifyJson5 } from 'json5' -import merge = require('lodash.merge') +import merge = require('lodash/merge') import * as Paths from '../../../scripts/lib/paths' diff --git a/package-lock.json b/package-lock.json index 734a703dce..f63add38be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1715,33 +1715,6 @@ "integrity": "sha512-lRnAtKnxMXcYYXqOiotTmJd74uawNWuPnsnPrrO7HiFuE3npE2iQhfABatbYDyxTNqZNuXzcKGhw37R7RjBFLg==", "dev": true }, - "@types/lodash.memoize": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@types/lodash.memoize/-/lodash.memoize-4.1.6.tgz", - "integrity": "sha512-mYxjKiKzRadRJVClLKxS4wb3Iy9kzwJ1CkbyKiadVxejnswnRByyofmPMscFKscmYpl36BEEhCMPuWhA1R/1ZQ==", - "dev": true, - "requires": { - "@types/lodash": "*" - } - }, - "@types/lodash.merge": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.6.tgz", - "integrity": "sha512-IB90krzMf7YpfgP3u/EvZEdXVvm4e3gJbUvh5ieuI+o+XqiNEt6fCzqNRaiLlPVScLI59RxIGZMQ3+Ko/DJ8vQ==", - "dev": true, - "requires": { - "@types/lodash": "*" - } - }, - "@types/lodash.set": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@types/lodash.set/-/lodash.set-4.3.6.tgz", - "integrity": "sha512-ZeGDDlnRYTvS31Laij0RsSaguIUSBTYIlJFKL3vm3T2OAZAQj2YpSvVWJc0WiG4jqg9fGX6PAPGvDqBcHfSgFg==", - "dev": true, - "requires": { - "@types/lodash": "*" - } - }, "@types/micromatch": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.1.tgz", @@ -7845,8 +7818,7 @@ "lodash": { "version": "4.17.19", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", - "dev": true + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" }, "lodash._reinterpolate": { "version": "3.0.0", @@ -7866,23 +7838,6 @@ "integrity": "sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=", "dev": true }, - "lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=" - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "lodash.set": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz", - "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=", - "dev": true - }, "lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", diff --git a/package.json b/package.json index df7ddec90e..4aa72f2aff 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "fast-json-stable-stringify": "2.x", "jest-util": "next", "json5": "2.x", - "lodash.memoize": "4.x", + "lodash": "4.x", "make-error": "1.x", "mkdirp": "1.x", "semver": "7.x", @@ -88,9 +88,7 @@ "@types/fs-extra": "latest", "@types/js-yaml": "latest", "@types/json5": "latest", - "@types/lodash.memoize": "4.x", - "@types/lodash.merge": "4.x", - "@types/lodash.set": "4.x", + "@types/lodash": "4.x", "@types/micromatch": "4.x", "@types/mkdirp": "latest", "@types/node": "14.x", @@ -115,8 +113,6 @@ "jest": "next", "js-yaml": "latest", "lint-staged": "latest", - "lodash.merge": "4.x", - "lodash.set": "4.x", "npm-run-all": "latest", "prettier": "2.x", "source-map": "latest", diff --git a/src/compiler/ts-compiler.ts b/src/compiler/ts-compiler.ts index fd629335ba..85e8c6b258 100644 --- a/src/compiler/ts-compiler.ts +++ b/src/compiler/ts-compiler.ts @@ -1,7 +1,7 @@ import { basename, normalize, relative } from 'path' import { LogContexts, Logger, LogLevels } from 'bs-logger' -import memoize from 'lodash.memoize' +import memoize from 'lodash/memoize' import { EmitOutput, LanguageService, diff --git a/src/utils/backports.spec.ts b/src/utils/backports.spec.ts index c547c1de78..24851d3530 100644 --- a/src/utils/backports.spec.ts +++ b/src/utils/backports.spec.ts @@ -1,7 +1,7 @@ import { inspect } from 'util' import { testing } from 'bs-logger' -import set = require('lodash.set') +import set = require('lodash/set') import { backportJestConfig } from './backports'