From 87c2a14de2b3eb2851b4080668998b0607f9337d Mon Sep 17 00:00:00 2001 From: Darius Kazemi Date: Wed, 31 Jul 2024 08:34:26 -0400 Subject: [PATCH 1/2] Fix lodash.omit import This had been loading omit via `lodash` but not via `lodash.omit`, which was causing some problems in downstream dependencies. --- package-lock.json | 19 +++++++++++++++++++ package.json | 3 ++- src/2020.ts | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 91ab830..c7a01da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "@rollup/plugin-node-resolve": "^13.1.2", "@types/jest": "^27.0.2", "@types/lodash": "^4.14.178", + "@types/lodash.omit": "^4.5.9", "@types/node": "^16.11.7", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", @@ -1247,6 +1248,15 @@ "integrity": "sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==", "dev": true }, + "node_modules/@types/lodash.omit": { + "version": "4.5.9", + "resolved": "https://registry.npmjs.org/@types/lodash.omit/-/lodash.omit-4.5.9.tgz", + "integrity": "sha512-zuAVFLUPJMOzsw6yawshsYGgq2hWUHtsZgeXHZmSFhaQQFC6EQ021uDKHkSjOpNhSvtNSU9165/o3o/Q51GpTw==", + "dev": true, + "dependencies": { + "@types/lodash": "*" + } + }, "node_modules/@types/node": { "version": "16.11.14", "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.14.tgz", @@ -6739,6 +6749,15 @@ "integrity": "sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==", "dev": true }, + "@types/lodash.omit": { + "version": "4.5.9", + "resolved": "https://registry.npmjs.org/@types/lodash.omit/-/lodash.omit-4.5.9.tgz", + "integrity": "sha512-zuAVFLUPJMOzsw6yawshsYGgq2hWUHtsZgeXHZmSFhaQQFC6EQ021uDKHkSjOpNhSvtNSU9165/o3o/Q51GpTw==", + "dev": true, + "requires": { + "@types/lodash": "*" + } + }, "@types/node": { "version": "16.11.14", "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.14.tgz", diff --git a/package.json b/package.json index 36f2da1..257e0a6 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "@rollup/plugin-node-resolve": "^13.1.2", "@types/jest": "^27.0.2", "@types/lodash": "^4.14.178", + "@types/lodash.omit": "^4.5.9", "@types/node": "^16.11.7", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", @@ -79,4 +80,4 @@ "lodash.omit": "^4.5.0", "ts-pattern": "^3.3.4" } -} \ No newline at end of file +} diff --git a/src/2020.ts b/src/2020.ts index f3e5f53..e848600 100644 --- a/src/2020.ts +++ b/src/2020.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import deepmerge from "deepmerge"; import { access } from "fs"; -import omit from "lodash/omit"; +import omit from "lodash.omit"; type TypeName = "string" | "number" | "integer" | "boolean" | "object" | "array" | "null"; From 6f68ae93249b70ce4657dc04640cb8ba0a07b132 Mon Sep 17 00:00:00 2001 From: Darius Kazemi Date: Wed, 31 Jul 2024 09:11:18 -0400 Subject: [PATCH 2/2] Removing lodash type dependency since we no longer require it implicitly --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 257e0a6..97d8763 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,6 @@ "@rollup/plugin-commonjs": "^21.0.1", "@rollup/plugin-node-resolve": "^13.1.2", "@types/jest": "^27.0.2", - "@types/lodash": "^4.14.178", "@types/lodash.omit": "^4.5.9", "@types/node": "^16.11.7", "@typescript-eslint/eslint-plugin": "^5.8.1",