From 99d337aef55bf619358131e73f45050f764957dc Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Mon, 8 Jan 2024 13:04:04 +0000 Subject: [PATCH] Revert "Update checked-in dependencies" This reverts commit d6286c6fdb2ff807cfc1402c7f1091a2fc4efcf2. --- node_modules/.package-lock.json | 2 +- node_modules/@types/node/package.json | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index f193cdadd..ae4e1add2 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,6 +1,6 @@ { "name": "codeql", - "version": "2.22.12", + "version": "3.22.12", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/node_modules/@types/node/package.json b/node_modules/@types/node/package.json index 331cc70fd..bd84e4121 100755 --- a/node_modules/@types/node/package.json +++ b/node_modules/@types/node/package.json @@ -213,13 +213,32 @@ ], "main": "", "types": "index.d.ts", +<<<<<<< HEAD + "typesVersions": { + "<=4.8": { + "*": [ + "ts4.8/*" + ] + } + }, +======= +>>>>>>> parent of f2d0c2e7a (upgrade node type definitions) "repository": { "type": "git", "url": "https://github.com/DefinitelyTyped/DefinitelyTyped.git", "directory": "types/node" }, "scripts": {}, +<<<<<<< HEAD + "dependencies": { + "undici-types": "~5.26.4" + }, + "typesPublisherContentHash": "a1b366d7b3bf1afaa88e038010565763e234c0e5fa8044db8b0d7c44995bfbf8", + "typeScriptVersion": "4.5", + "nonNpm": true +======= "dependencies": {}, "typesPublisherContentHash": "57a94e60cf640ea4d81b4fa914f3fb5929a63ae0b4d5141d7daf250c569e7d10", "typeScriptVersion": "3.8" -} \ No newline at end of file +>>>>>>> parent of f2d0c2e7a (upgrade node type definitions) +}