diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index ca6595fd7..3434fb32c 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,6 +1,6 @@ { "name": "codeql", - "version": "2.24.2", + "version": "3.24.2", "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) +} diff --git a/package-lock.json b/package-lock.json index ff71c51cb..e5c5ecd26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "codeql", - "version": "2.24.2", + "version": "3.24.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "codeql", - "version": "2.24.2", + "version": "3.24.2", "license": "MIT", "dependencies": { "@actions/artifact": "^1.1.2", @@ -42,8 +42,13 @@ "@types/adm-zip": "^0.5.5", "@types/get-folder-size": "^2.0.0", "@types/js-yaml": "^4.0.9", +<<<<<<< HEAD "@types/node": "16.11.22", + "@types/semver": "^7.5.6", +======= + "@types/node": "20.9.0", "@types/semver": "^7.5.7", +>>>>>>> origin/releases/v3 "@types/sinon": "^17.0.3", "@typescript-eslint/eslint-plugin": "^6.21.0", "@typescript-eslint/parser": "^6.21.0",