diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index ed80942b2d7..47414bab119 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -2,6 +2,8 @@ ## [UNRELEASED] +- Fix a bug that prevented the results view from being loaded. [#842](https://github.com/github/vscode-codeql/pull/842) + ## 1.4.6 - 21 April 2021 - Avoid showing an error popup when running a query with `@kind table` metadata. [#814](https://github.com/github/vscode-codeql/pull/814) diff --git a/extensions/ql-vscode/gulpfile.ts/webpack.config.ts b/extensions/ql-vscode/gulpfile.ts/webpack.config.ts index bbca68371e0..e6fb07203ba 100644 --- a/extensions/ql-vscode/gulpfile.ts/webpack.config.ts +++ b/extensions/ql-vscode/gulpfile.ts/webpack.config.ts @@ -15,7 +15,7 @@ export const config: webpack.Configuration = { resolve: { extensions: ['.js', '.ts', '.tsx', '.json'], fallback: { - path: false + path: require.resolve('path-browserify') } }, module: { diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index ffcef9b60a1..6ab77505491 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -16,6 +16,7 @@ "js-yaml": "^3.14.0", "minimist": "~1.2.5", "node-fetch": "~2.6.0", + "path-browserify": "^1.0.1", "react": "^16.8.6", "react-dom": "^16.8.6", "semver": "~7.3.2", @@ -2006,7 +2007,6 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", - "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -6632,7 +6632,6 @@ "dependencies": { "anymatch": "~3.1.1", "braces": "~3.0.2", - "fsevents": "~2.1.2", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -7761,6 +7760,11 @@ "node": ">=0.10.0" } }, + "node_modules/path-browserify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", + "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==" + }, "node_modules/path-dirname": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", @@ -17714,6 +17718,11 @@ "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", "dev": true }, + "path-browserify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", + "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==" + }, "path-dirname": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index 5cb56820499..3f95444a49e 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -853,6 +853,7 @@ "js-yaml": "^3.14.0", "minimist": "~1.2.5", "node-fetch": "~2.6.0", + "path-browserify": "^1.0.1", "react": "^16.8.6", "react-dom": "^16.8.6", "semver": "~7.3.2",