From 2ec1cb816c871602a2ca7545fbf5bf0a1967f1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Paku=C5=82a?= Date: Fri, 29 Sep 2023 23:18:14 +0200 Subject: [PATCH 1/2] Remove lodash from production dependencies --- package.json | 2 +- yarn.lock | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 62be0e23..da430608 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,8 @@ "prettier": "2.8.7" }, "dependencies": { + "@types/lodash.clonedeep": "^4.5.7", "ajv": "^8.11.0", - "lodash": "4.17.21", "request-light": "^0.5.7", "vscode-json-languageservice": "4.1.8", "vscode-languageserver": "^7.0.0", diff --git a/yarn.lock b/yarn.lock index fd794ffd..1bd29f7d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -415,6 +415,18 @@ resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== +"@types/lodash.clonedeep@^4.5.7": + version "4.5.7" + resolved "https://registry.yarnpkg.com/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.7.tgz#0e119f582ed6f9e6b373c04a644651763214f197" + integrity sha512-ccNqkPptFIXrpVqUECi60/DFxjNKsfoQxSQsgcBJCX/fuX1wgyQieojkcWH/KpE3xzLoWN/2k+ZeGqIN3paSvw== + dependencies: + "@types/lodash" "*" + +"@types/lodash@*": + version "4.14.199" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.199.tgz#c3edb5650149d847a277a8961a7ad360c474e9bf" + integrity sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg== + "@types/mocha@8.2.2": version "8.2.2" resolved "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz" @@ -2163,7 +2175,7 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash@4.17.21, lodash@^4.17.14: +lodash@^4.17.14: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== From 917a8c0245b3379b6b731de34ddbce109e8ec4e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Paku=C5=82a?= Date: Sat, 30 Sep 2023 17:27:55 +0200 Subject: [PATCH 2/2] Do not include entire lodash --- package.json | 1 + src/languageservice/services/yamlCodeActions.ts | 4 ++-- yarn.lock | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index da430608..f73da06a 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "dependencies": { "@types/lodash.clonedeep": "^4.5.7", "ajv": "^8.11.0", + "lodash": "4.17.21", "request-light": "^0.5.7", "vscode-json-languageservice": "4.1.8", "vscode-languageserver": "^7.0.0", diff --git a/src/languageservice/services/yamlCodeActions.ts b/src/languageservice/services/yamlCodeActions.ts index c0ef20b5..c7677084 100644 --- a/src/languageservice/services/yamlCodeActions.ts +++ b/src/languageservice/services/yamlCodeActions.ts @@ -26,7 +26,7 @@ import { CST, isMap, isSeq, YAMLMap } from 'yaml'; import { yamlDocumentsCache } from '../parser/yaml-documents'; import { FlowStyleRewriter } from '../utils/flow-style-rewriter'; import { ASTNode } from '../jsonASTTypes'; -import * as _ from 'lodash'; +import cloneDeep from '@types/lodash.clonedeep'; import { SourceToken } from 'yaml/dist/parse/cst'; interface YamlDiagnosticData { @@ -247,7 +247,7 @@ export class YamlCodeActions { node = node.parent; } if (node && isMap(node.internalNode)) { - const sorted: YAMLMap = _.cloneDeep(node.internalNode); + const sorted: YAMLMap = cloneDeep(node.internalNode); if ( (sorted.srcToken.type === 'block-map' || sorted.srcToken.type === 'flow-collection') && (node.internalNode.srcToken.type === 'block-map' || node.internalNode.srcToken.type === 'flow-collection') diff --git a/yarn.lock b/yarn.lock index 1bd29f7d..a6ced428 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2175,7 +2175,7 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash@^4.17.14: +lodash@4.17.21, lodash@^4.17.14: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==