Merge pull request #1223 from microsoft/nat/fixNightly

Export ext from extension.bundle to fix nightly tests

extension.bundle.ts

@@ -17,6 +17,7 @@ export { activateInternal, deactivateInternal } from './src/extension';
 //
 // The tests should import '../extension.bundle.ts'. At design-time they live in tests/ and so will pick up this file (extension.bundle.ts).
 // At runtime the tests live in dist/tests and will therefore pick up the main webpack bundle at dist/extension.bundle.js.
+export * from 'vscode-azureextensionui';
 export { ext } from './src/extensionVariables';
 export * from './src/utils/array';
 export { AttachedAccountsTreeItem, MONGO_CONNECTION_EXPECTED } from './src/tree/AttachedAccountsTreeItem';

package-lock.json

@@ -9674,9 +9674,9 @@
 			}
 		},
 		"vscode-azureextensionui": {
-			"version": "0.28.1",
-			"resolved": "https://registry.npmjs.org/vscode-azureextensionui/-/vscode-azureextensionui-0.28.1.tgz",
-			"integrity": "sha512-DbMTC8HB1HRwUIBvbvbYmm7OAzo6CzQE7FoiiL9TuC1YIJPX5T9DYyjzesZqw53iL6Zn/PmvSwXkHW17vxkLEA==",
+			"version": "0.28.2",
+			"resolved": "https://registry.npmjs.org/vscode-azureextensionui/-/vscode-azureextensionui-0.28.2.tgz",
+			"integrity": "sha512-WP0xORMfOX4IIk8BhfM0q+otda2uRzbMZnJa3SCv8qLQpy0YWGxkhL+fS2RCtFoyEtVhI2VKJYSKpkdjzODjng==",
 			"requires": {
 				"azure-arm-resource": "^3.0.0-preview",
 				"azure-arm-storage": "^3.1.0",

package.json

@@ -916,7 +916,7 @@
 		"ts-node": "^7.0.1",
 		"tslint": "^5.7.0",
 		"tslint-microsoft-contrib": "5.0.1",
-		"typescript": "^3.2.2",
+		"typescript": "^3.6.2",
 		"vsce": "^1.37.5",
 		"vscode": "^1.1.18",
 		"vscode-azureextensiondev": "^0.2.3",
@@ -935,11 +935,12 @@
 		"mongodb": "^3.3.2",
 		"mongodb-extended-json": "^1.10.0",
 		"ms-rest": "^2.2.1",
+		"ms-rest-azure": "^2.3.1",
 		"node-uuid": "1.4.8",
 		"socket.io": "^1.7.3",
 		"socket.io-client": "^1.7.3",
 		"underscore": "^1.8.3",
-		"vscode-azureextensionui": "0.28.1",
+		"vscode-azureextensionui": "0.28.2",
 		"vscode-json-languageservice": "^3.0.8",
 		"vscode-languageclient": "^4.4.0",
 		"vscode-languageserver": "^4.4.0",

src/extension.ts

@@ -42,13 +42,13 @@ export async function activateInternal(context: vscode.ExtensionContext, perfSta
     context.subscriptions.push(ext.outputChannel);
     registerUIExtensionVariables(ext);
 
-    await callWithTelemetryAndErrorHandling('cosmosDB.activate', (activateContext: IActionContext) => {
+    await callWithTelemetryAndErrorHandling('cosmosDB.activate', async (activateContext: IActionContext) => {
         activateContext.telemetry.properties.isActivationEvent = 'true';
         activateContext.telemetry.measurements.mainFileLoad = (perfStats.loadEndTime - perfStats.loadStartTime) / 1000;
 
-        const azureAccountNode: AzureAccountTreeItemWithAttached = new AzureAccountTreeItemWithAttached();
-        context.subscriptions.push(azureAccountNode);
-        ext.tree = new AzExtTreeDataProvider(azureAccountNode, 'cosmosDB.loadMore');
+        ext.azureAccountTreeItem = new AzureAccountTreeItemWithAttached();
+        context.subscriptions.push(ext.azureAccountTreeItem);
+        ext.tree = new AzExtTreeDataProvider(ext.azureAccountTreeItem, 'cosmosDB.loadMore');
         ext.treeView = vscode.window.createTreeView('cosmosDBExplorer', { treeDataProvider: ext.tree });
         context.subscriptions.push(ext.treeView);
 

test/nightly/global.resource.test.ts

@@ -7,10 +7,9 @@ import { ResourceManagementClient } from 'azure-arm-resource';
 import { CosmosDBManagementClient } from 'azure-arm-cosmosdb';
 import { IHookCallbackContext } from 'mocha';
 import * as vscode from 'vscode';
-import { ext, AzureAccountTreeItemWithAttached } from '../../extension.bundle';
-import { longRunningTestsEnabled } from '../global.test';
-import { AzExtTreeDataProvider, createAzureClient } from 'vscode-azureextensionui';
 import { TestAzureAccount } from 'vscode-azureextensiondev';
+import { AzExtTreeDataProvider, AzureAccountTreeItemWithAttached, createAzureClient, ext } from '../../extension.bundle';
+import { longRunningTestsEnabled } from '../global.test';
 
 export let testAccount: TestAzureAccount;
 export let client: CosmosDBManagementClient;

tsconfig.json

@@ -26,6 +26,7 @@
 	},
 	"exclude": [
 		"node_modules",
-		".vscode-test"
+		".vscode-test",
+		"gulpfile.ts"
 	]
 }