diff --git a/.github/workflows/cli-test.yml b/.github/workflows/cli-test.yml index db05ecf9b..fb8908d5c 100644 --- a/.github/workflows/cli-test.yml +++ b/.github/workflows/cli-test.yml @@ -62,7 +62,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7246f429a..389d519b0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json @@ -64,7 +64,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json @@ -110,7 +110,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json @@ -149,7 +149,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json @@ -183,7 +183,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json @@ -251,7 +251,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aca4d563e..964983b18 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' - name: Install dependencies run: | diff --git a/docs/node-version.md b/docs/node-version.md index 4cda91155..bdd5aafcf 100644 --- a/docs/node-version.md +++ b/docs/node-version.md @@ -21,6 +21,7 @@ The following files will need to be updated: - `extensions/ql-vscode/.nvmrc` - this will enable nvm to automatically switch to the correct node version when you're in the project folder - `extensions/ql-vscode/package-lock.json` - the "engines.node: '[VERSION]'" setting - `extensions/ql-vscode/package.json` - the "engines.node: '[VERSION]'" setting +- `extensions/ql-vscode/package.json` - the "@types/node: '[VERSION]'" dependency ## Node.js version used in tests diff --git a/extensions/ql-vscode/.nvmrc b/extensions/ql-vscode/.nvmrc index e0325e5ad..e048c8ca1 100644 --- a/extensions/ql-vscode/.nvmrc +++ b/extensions/ql-vscode/.nvmrc @@ -1 +1 @@ -v16.17.1 +v18.15.0 diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index 9fce88b27..d2c09b7bc 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -81,7 +81,7 @@ "@types/jest": "^29.0.2", "@types/js-yaml": "^4.0.6", "@types/nanoid": "^3.0.0", - "@types/node": "^16.11.25", + "@types/node": "18.15.0", "@types/node-fetch": "^2.5.2", "@types/react": "^18.0.28", "@types/react-dom": "^18.0.11", @@ -147,9 +147,9 @@ "webpack-cli": "^5.0.1" }, "engines": { - "node": "^16.17.1", + "node": "^18.15.0", "npm": ">=7.20.6", - "vscode": "^1.67.0" + "vscode": "^1.82.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -6248,6 +6248,12 @@ } } }, + "node_modules/@storybook/builder-webpack5/node_modules/@types/node": { + "version": "16.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz", + "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==", + "dev": true + }, "node_modules/@storybook/channels": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.3.1.tgz", @@ -6885,6 +6891,12 @@ "url": "https://opencollective.com/storybook" } }, + "node_modules/@storybook/core-common/node_modules/@types/node": { + "version": "16.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz", + "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==", + "dev": true + }, "node_modules/@storybook/core-common/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -7147,6 +7159,12 @@ "url": "https://opencollective.com/storybook" } }, + "node_modules/@storybook/core-server/node_modules/@types/node": { + "version": "16.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz", + "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==", + "dev": true + }, "node_modules/@storybook/core-server/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -7324,6 +7342,12 @@ "url": "https://opencollective.com/storybook" } }, + "node_modules/@storybook/core-webpack/node_modules/@types/node": { + "version": "16.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz", + "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==", + "dev": true + }, "node_modules/@storybook/csf": { "version": "0.1.1", "integrity": "sha512-4hE3AlNVxR60Wc5KSC68ASYzUobjPqtSKyhV6G+ge0FIXU55N5nTY7dXGRZHQGDBPq+XqchMkIdlkHPRs8nTHg==", @@ -7537,6 +7561,12 @@ } } }, + "node_modules/@storybook/preset-react-webpack/node_modules/@types/node": { + "version": "16.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz", + "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==", + "dev": true + }, "node_modules/@storybook/preview": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/@storybook/preview/-/preview-7.3.1.tgz", @@ -7772,6 +7802,18 @@ } } }, + "node_modules/@storybook/react-webpack5/node_modules/@types/node": { + "version": "16.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz", + "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==", + "dev": true + }, + "node_modules/@storybook/react/node_modules/@types/node": { + "version": "16.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz", + "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==", + "dev": true + }, "node_modules/@storybook/react/node_modules/acorn": { "version": "7.4.1", "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", @@ -9158,8 +9200,9 @@ } }, "node_modules/@types/node": { - "version": "16.11.25", - "integrity": "sha512-NrTwfD7L1RTc2qrHQD4RTTy4p0CO2LatKBEKEds3CaVuhoM/+DJzmWZl5f+ikR8cm8F5mfJxK+9rQq07gRiSjQ==" + "version": "18.15.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.0.tgz", + "integrity": "sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w==" }, "node_modules/@types/node-fetch": { "version": "2.6.4", @@ -16794,7 +16837,6 @@ "node_modules/events": { "version": "3.3.0", "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, "engines": { "node": ">=0.8.x" } @@ -36214,6 +36256,14 @@ "webpack-dev-middleware": "^6.1.1", "webpack-hot-middleware": "^2.25.1", "webpack-virtual-modules": "^0.5.0" + }, + "dependencies": { + "@types/node": { + "version": "16.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz", + "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==", + "dev": true + } } }, "@storybook/channels": { @@ -36675,6 +36725,12 @@ "ts-dedent": "^2.0.0" }, "dependencies": { + "@types/node": { + "version": "16.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz", + "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==", + "dev": true + }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -36870,6 +36926,12 @@ "ws": "^8.2.3" }, "dependencies": { + "@types/node": { + "version": "16.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz", + "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==", + "dev": true + }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -36997,6 +37059,14 @@ "@storybook/types": "7.3.1", "@types/node": "^16.0.0", "ts-dedent": "^2.0.0" + }, + "dependencies": { + "@types/node": { + "version": "16.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz", + "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==", + "dev": true + } } }, "@storybook/csf": { @@ -37147,6 +37217,14 @@ "react-refresh": "^0.11.0", "semver": "^7.3.7", "webpack": "5" + }, + "dependencies": { + "@types/node": { + "version": "16.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz", + "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==", + "dev": true + } } }, "@storybook/preview": { @@ -37206,6 +37284,12 @@ "util-deprecate": "^1.0.2" }, "dependencies": { + "@types/node": { + "version": "16.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz", + "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==", + "dev": true + }, "acorn": { "version": "7.4.1", "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", @@ -37315,6 +37399,14 @@ "@storybook/preset-react-webpack": "7.3.1", "@storybook/react": "7.3.1", "@types/node": "^16.0.0" + }, + "dependencies": { + "@types/node": { + "version": "16.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz", + "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==", + "dev": true + } } }, "@storybook/router": { @@ -38412,8 +38504,9 @@ } }, "@types/node": { - "version": "16.11.25", - "integrity": "sha512-NrTwfD7L1RTc2qrHQD4RTTy4p0CO2LatKBEKEds3CaVuhoM/+DJzmWZl5f+ikR8cm8F5mfJxK+9rQq07gRiSjQ==" + "version": "18.15.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.0.tgz", + "integrity": "sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w==" }, "@types/node-fetch": { "version": "2.6.4", @@ -43916,8 +44009,7 @@ }, "events": { "version": "3.3.0", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" }, "execa": { "version": "7.2.0", diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index 3b0e26da8..c9bfc966d 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -13,8 +13,8 @@ "url": "https://github.com/github/vscode-codeql" }, "engines": { - "vscode": "^1.67.0", - "node": "^16.17.1", + "vscode": "^1.82.0", + "node": "^18.15.0", "npm": ">=7.20.6" }, "categories": [ @@ -2141,7 +2141,7 @@ "@types/jest": "^29.0.2", "@types/js-yaml": "^4.0.6", "@types/nanoid": "^3.0.0", - "@types/node": "^16.11.25", + "@types/node": "18.15.0", "@types/node-fetch": "^2.5.2", "@types/react": "^18.0.28", "@types/react-dom": "^18.0.11",