Merge pull request #1260 from github/aeisenberg/source-map-support

Add source map support and clean test dependencies

Author: aeisenberg

extensions/ql-vscode/package-lock.json

@@ -1202,6 +1202,7 @@
     "proxyquire": "~2.1.3",
     "sinon": "~13.0.1",
     "sinon-chai": "~3.5.0",
+    "source-map-support": "^0.5.21",
     "style-loader": "~0.23.1",
     "through2": "^4.0.2",
     "ts-loader": "^8.1.0",

extensions/ql-vscode/package.json

@@ -1,3 +1,4 @@
+import 'source-map-support/register';
 import {
   CancellationToken,
   CancellationTokenSource,

extensions/ql-vscode/src/extension.ts

@@ -1,6 +1,5 @@
 import * as path from 'path';
 import { extensions } from 'vscode';
-import 'mocha';
 
 import { CodeQLCliServer } from '../../cli';
 import { CodeQLExtensionInterface } from '../../extension';

extensions/ql-vscode/src/vscode-tests/cli-integration/helpers.test.ts

@@ -1,7 +1,9 @@
+import 'source-map-support/register';
 import { runTestsInDirectory } from '../index-template';
 import 'mocha';
 import * as sinonChai from 'sinon-chai';
 import * as chai from 'chai';
+import 'chai/register-should';
 import * as chaiAsPromised from 'chai-as-promised';
 chai.use(chaiAsPromised);
 chai.use(sinonChai);

extensions/ql-vscode/src/vscode-tests/cli-integration/index.ts

@@ -1,6 +1,5 @@
 import * as sinon from 'sinon';
 import { extensions, window } from 'vscode';
-import 'mocha';
 import * as path from 'path';
 
 import * as pq from 'proxyquire';

extensions/ql-vscode/src/vscode-tests/cli-integration/packaging.test.ts

@@ -3,7 +3,6 @@ import { CancellationToken, commands, ExtensionContext, extensions, Uri } from '
 import * as sinon from 'sinon';
 import * as path from 'path';
 import * as fs from 'fs-extra';
-import 'mocha';
 import { expect } from 'chai';
 import * as yaml from 'js-yaml';
 

extensions/ql-vscode/src/vscode-tests/cli-integration/queries.test.ts

@@ -1,6 +1,5 @@
 import { expect } from 'chai';
 import * as fs from 'fs-extra';
-import 'mocha';
 import * as path from 'path';
 import * as tmp from 'tmp';
 import * as url from 'url';

extensions/ql-vscode/src/vscode-tests/cli-integration/query.test.ts

@@ -2,7 +2,6 @@ import { assert, expect } from 'chai';
 import * as path from 'path';
 import * as sinon from 'sinon';
 import { CancellationToken, extensions, QuickPickItem, Uri, window } from 'vscode';
-import 'mocha';
 import * as fs from 'fs-extra';
 import * as os from 'os';
 import * as yaml from 'js-yaml';

extensions/ql-vscode/src/vscode-tests/cli-integration/run-remote-query.test.ts

@@ -1,13 +1,8 @@
 import * as assert from 'assert';
-import * as chai from 'chai';
-import * as chaiAsPromised from 'chai-as-promised';
-import 'mocha';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import * as determiningSelectedQueryTest from './determining-selected-query-test';
 
-chai.use(chaiAsPromised);
-
 describe('launching with a minimal workspace', async () => {
 
   const ext = vscode.extensions.getExtension('GitHub.vscode-codeql');