From d4115ef87a2e4391227d8517e864360bda2c1e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Thu, 25 Jan 2024 10:34:55 -0800 Subject: [PATCH 1/5] fix: dependabot alert for lodash.set --- .projen/deps.json | 22 +----------- .projen/tasks.json | 2 +- .projenrc.js | 4 +-- package-lock.json | 85 +++------------------------------------------- package.json | 22 +++++------- 5 files changed, 17 insertions(+), 118 deletions(-) diff --git a/.projen/deps.json b/.projen/deps.json index f03fdd6..ba170da 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -19,14 +19,6 @@ "name": "@types/jest", "type": "build" }, - { - "name": "@types/lodash.get", - "type": "build" - }, - { - "name": "@types/lodash.set", - "type": "build" - }, { "name": "@types/node", "version": "^14.17.6", @@ -93,11 +85,7 @@ "type": "bundled" }, { - "name": "lodash.get", - "type": "bundled" - }, - { - "name": "lodash.set", + "name": "lodash", "type": "bundled" }, { @@ -129,14 +117,6 @@ "version": "10.0.0", "type": "runtime" }, - { - "name": "lodash.get", - "type": "runtime" - }, - { - "name": "lodash.set", - "type": "runtime" - }, { "name": "uuid", "type": "runtime" diff --git a/.projen/tasks.json b/.projen/tasks.json index cb26941..457627e 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -312,7 +312,7 @@ "exec": "npm install" }, { - "exec": "npm update aws-cdk-lib constructs @types/fs-extra @types/jest @types/lodash.get @types/lodash.set @types/node @types/uuid jest jest-junit jsii jsii-diff jsii-docgen jsii-pacmak npm-check-updates standard-version ts-jest typescript yaml fs-extra lodash.get lodash.set uuid fs-extra lodash.get lodash.set uuid" + "exec": "npm update aws-cdk-lib constructs @types/fs-extra @types/jest @types/node @types/uuid jest jest-junit jsii jsii-diff jsii-docgen jsii-pacmak npm-check-updates standard-version ts-jest typescript yaml fs-extra lodash uuid fs-extra lodash uuid" }, { "exec": "npx projen" diff --git a/.projenrc.js b/.projenrc.js index 38d9edb..147e5b8 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -2,7 +2,7 @@ const { awscdk , javascript } = require('projen'); const { stringify } = require('yaml'); -const dependencies = ['fs-extra@10.0.0', 'lodash.get', 'lodash.set', 'uuid']; +const dependencies = ['fs-extra@10.0.0', 'lodash', 'uuid']; const project = new awscdk.AwsCdkConstructLibrary({ author: 'Amazon Web Services', authorAddress: 'amplify-cli@amazon.com', @@ -16,8 +16,6 @@ const project = new awscdk.AwsCdkConstructLibrary({ devDeps: [ '@types/fs-extra@^8.1.1', '@types/jest', - '@types/lodash.get', - '@types/lodash.set', '@types/node', '@types/uuid', 'yaml', diff --git a/package-lock.json b/package-lock.json index 0c18e6a..03be98a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,7 @@ "version": "0.0.0", "bundleDependencies": [ "fs-extra", - "lodash.get", - "lodash.set", + "lodash", "uuid" ], "license": "Apache-2.0", @@ -18,15 +17,12 @@ "aws-cdk-lib": "^2.80.0", "constructs": "^10.1.139", "fs-extra": "10.1.0", - "lodash.get": "^4.4.2", - "lodash.set": "^4.3.2", + "lodash": "^4.17.21", "uuid": "^8.3.2" }, "devDependencies": { "@types/fs-extra": "^8.1.2", "@types/jest": "^27.5.2", - "@types/lodash.get": "^4.4.7", - "@types/lodash.set": "^4.3.7", "@types/node": "^14.18.21", "@types/uuid": "^8.3.4", "aws-cdk-lib": "2.80.0", @@ -1528,30 +1524,6 @@ "pretty-format": "^27.0.0" } }, - "node_modules/@types/lodash": { - "version": "4.14.182", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", - "dev": true - }, - "node_modules/@types/lodash.get": { - "version": "4.4.7", - "resolved": "https://registry.npmjs.org/@types/lodash.get/-/lodash.get-4.4.7.tgz", - "integrity": "sha512-af34Mj+KdDeuzsJBxc/XeTtOx0SZHZNLd+hdrn+PcKGQs0EG2TJTzQAOTCZTgDJCArahlCzLWSy8c2w59JRz7Q==", - "dev": true, - "dependencies": { - "@types/lodash": "*" - } - }, - "node_modules/@types/lodash.set": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/@types/lodash.set/-/lodash.set-4.3.7.tgz", - "integrity": "sha512-bS5Wkg/nrT82YUfkNYPSccFrNZRL+irl7Yt4iM6OTSQ0VZJED2oUIVm15NkNtUAQ8SRhCe+axqERUV6MJgkeEg==", - "dev": true, - "dependencies": { - "@types/lodash": "*" - } - }, "node_modules/@types/minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", @@ -6232,14 +6204,8 @@ }, "node_modules/lodash": { "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "resolved": "http://localhost:4873/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "node_modules/lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", "inBundle": true }, "node_modules/lodash.ismatch": { @@ -6254,12 +6220,6 @@ "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", "dev": true }, - "node_modules/lodash.set": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz", - "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==", - "inBundle": true - }, "node_modules/log4js": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz", @@ -12246,30 +12206,6 @@ "pretty-format": "^27.0.0" } }, - "@types/lodash": { - "version": "4.14.182", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", - "dev": true - }, - "@types/lodash.get": { - "version": "4.4.7", - "resolved": "https://registry.npmjs.org/@types/lodash.get/-/lodash.get-4.4.7.tgz", - "integrity": "sha512-af34Mj+KdDeuzsJBxc/XeTtOx0SZHZNLd+hdrn+PcKGQs0EG2TJTzQAOTCZTgDJCArahlCzLWSy8c2w59JRz7Q==", - "dev": true, - "requires": { - "@types/lodash": "*" - } - }, - "@types/lodash.set": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/@types/lodash.set/-/lodash.set-4.3.7.tgz", - "integrity": "sha512-bS5Wkg/nrT82YUfkNYPSccFrNZRL+irl7Yt4iM6OTSQ0VZJED2oUIVm15NkNtUAQ8SRhCe+axqERUV6MJgkeEg==", - "dev": true, - "requires": { - "@types/lodash": "*" - } - }, "@types/minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", @@ -15780,14 +15716,8 @@ }, "lodash": { "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==" + "resolved": "http://localhost:4873/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash.ismatch": { "version": "4.4.0", @@ -15801,11 +15731,6 @@ "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", "dev": true }, - "lodash.set": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz", - "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==" - }, "log4js": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz", diff --git a/package.json b/package.json index 01abc1d..d075c96 100644 --- a/package.json +++ b/package.json @@ -35,14 +35,12 @@ "organization": true }, "devDependencies": { - "aws-cdk-lib": "2.80.0", - "constructs": "10.1.139", "@types/fs-extra": "^8.1.2", "@types/jest": "^27.5.2", - "@types/lodash.get": "^4.4.7", - "@types/lodash.set": "^4.3.7", "@types/node": "^14.18.21", "@types/uuid": "^8.3.4", + "aws-cdk-lib": "2.80.0", + "constructs": "10.1.139", "jest": "^27.5.1", "jest-junit": "^12", "jsii": "^1.63.0", @@ -64,16 +62,9 @@ "aws-cdk-lib": "^2.80.0", "constructs": "^10.1.139", "fs-extra": "10.1.0", - "lodash.get": "^4.4.2", - "lodash.set": "^4.3.2", + "lodash": "^4.17.21", "uuid": "^8.3.2" }, - "bundledDependencies": [ - "fs-extra", - "lodash.get", - "lodash.set", - "uuid" - ], "keywords": [ "amplify", "amplify-cli", @@ -155,5 +146,10 @@ "integ-test/*" ] }, - "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." + "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\".", + "bundleDependencies": [ + "fs-extra", + "lodash", + "uuid" + ] } From e9848aead0560d8ce0cffcf9a3af0cbcafa5c1f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Thu, 25 Jan 2024 10:43:21 -0800 Subject: [PATCH 2/5] fix: module 'lodash' --- .projen/deps.json | 4 ++++ .projen/tasks.json | 2 +- .projenrc.js | 1 + package-lock.json | 11 +++++++++++ package.json | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.projen/deps.json b/.projen/deps.json index ba170da..ad0ac7c 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -19,6 +19,10 @@ "name": "@types/jest", "type": "build" }, + { + "name": "@types/lodash", + "type": "build" + }, { "name": "@types/node", "version": "^14.17.6", diff --git a/.projen/tasks.json b/.projen/tasks.json index 457627e..d3bbf96 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -312,7 +312,7 @@ "exec": "npm install" }, { - "exec": "npm update aws-cdk-lib constructs @types/fs-extra @types/jest @types/node @types/uuid jest jest-junit jsii jsii-diff jsii-docgen jsii-pacmak npm-check-updates standard-version ts-jest typescript yaml fs-extra lodash uuid fs-extra lodash uuid" + "exec": "npm update aws-cdk-lib constructs @types/fs-extra @types/jest @types/lodash @types/node @types/uuid jest jest-junit jsii jsii-diff jsii-docgen jsii-pacmak npm-check-updates standard-version ts-jest typescript yaml fs-extra lodash uuid fs-extra lodash uuid" }, { "exec": "npx projen" diff --git a/.projenrc.js b/.projenrc.js index 147e5b8..5f3e3c8 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -16,6 +16,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ devDeps: [ '@types/fs-extra@^8.1.1', '@types/jest', + '@types/lodash', '@types/node', '@types/uuid', 'yaml', diff --git a/package-lock.json b/package-lock.json index 03be98a..f2bbcb2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ ], "license": "Apache-2.0", "dependencies": { + "@types/lodash": "^4.14.202", "aws-cdk-lib": "^2.80.0", "constructs": "^10.1.139", "fs-extra": "10.1.0", @@ -1524,6 +1525,11 @@ "pretty-format": "^27.0.0" } }, + "node_modules/@types/lodash": { + "version": "4.14.202", + "resolved": "http://localhost:4873/@types/lodash/-/lodash-4.14.202.tgz", + "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==" + }, "node_modules/@types/minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", @@ -12206,6 +12212,11 @@ "pretty-format": "^27.0.0" } }, + "@types/lodash": { + "version": "4.14.202", + "resolved": "http://localhost:4873/@types/lodash/-/lodash-4.14.202.tgz", + "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==" + }, "@types/minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", diff --git a/package.json b/package.json index d075c96..6eceebf 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "constructs": "^10.1.139" }, "dependencies": { + "@types/lodash": "^4.14.202", "aws-cdk-lib": "^2.80.0", "constructs": "^10.1.139", "fs-extra": "10.1.0", From 22eaa1eaafe6ac3de47085e28455f5a45c57ef46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Thu, 25 Jan 2024 10:53:07 -0800 Subject: [PATCH 3/5] move bundleDependencies --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 6eceebf..1369a68 100644 --- a/package.json +++ b/package.json @@ -66,6 +66,11 @@ "lodash": "^4.17.21", "uuid": "^8.3.2" }, + "bundleDependencies": [ + "fs-extra", + "lodash", + "uuid" + ], "keywords": [ "amplify", "amplify-cli", @@ -147,10 +152,5 @@ "integ-test/*" ] }, - "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\".", - "bundleDependencies": [ - "fs-extra", - "lodash", - "uuid" - ] + "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." } From be4ecd59e493257a8606ee45e33438bd426b9eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Thu, 25 Jan 2024 11:05:42 -0800 Subject: [PATCH 4/5] fix: @types/lodash --- package-lock.json | 8 +++++--- package.json | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index f2bbcb2..8e9124a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,6 @@ ], "license": "Apache-2.0", "dependencies": { - "@types/lodash": "^4.14.202", "aws-cdk-lib": "^2.80.0", "constructs": "^10.1.139", "fs-extra": "10.1.0", @@ -24,6 +23,7 @@ "devDependencies": { "@types/fs-extra": "^8.1.2", "@types/jest": "^27.5.2", + "@types/lodash": "^4.14.202", "@types/node": "^14.18.21", "@types/uuid": "^8.3.4", "aws-cdk-lib": "2.80.0", @@ -1528,7 +1528,8 @@ "node_modules/@types/lodash": { "version": "4.14.202", "resolved": "http://localhost:4873/@types/lodash/-/lodash-4.14.202.tgz", - "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==" + "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==", + "dev": true }, "node_modules/@types/minimatch": { "version": "3.0.5", @@ -12215,7 +12216,8 @@ "@types/lodash": { "version": "4.14.202", "resolved": "http://localhost:4873/@types/lodash/-/lodash-4.14.202.tgz", - "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==" + "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==", + "dev": true }, "@types/minimatch": { "version": "3.0.5", diff --git a/package.json b/package.json index 1369a68..1cb99bb 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "devDependencies": { "@types/fs-extra": "^8.1.2", "@types/jest": "^27.5.2", + "@types/lodash": "^4.14.202", "@types/node": "^14.18.21", "@types/uuid": "^8.3.4", "aws-cdk-lib": "2.80.0", @@ -59,7 +60,6 @@ "constructs": "^10.1.139" }, "dependencies": { - "@types/lodash": "^4.14.202", "aws-cdk-lib": "^2.80.0", "constructs": "^10.1.139", "fs-extra": "10.1.0", From 91f8a29bd8170b2c7d4244d5a01fa17b3bafd662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Thu, 25 Jan 2024 11:26:19 -0800 Subject: [PATCH 5/5] fix: @types/lodash --- .projen/deps.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.projen/deps.json b/.projen/deps.json index ad0ac7c..446826a 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -121,6 +121,10 @@ "version": "10.0.0", "type": "runtime" }, + { + "name": "lodash", + "type": "runtime" + }, { "name": "uuid", "type": "runtime"