Skip to content

VSCODE-172: Bump mongosh version to 0.4.0 #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 1, 2020
Merged

VSCODE-172: Bump mongosh version to 0.4.0 #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ac07a21
Bump mongosh, update vscode, update test stub interfaces
Sep 10, 2020
7839b73
Bump mongosh and add acorn plugins as externals to fix webpack resolv…
Sep 24, 2020
7624114
Update stub with new interface
Sep 24, 2020
8132de4
revert webpack changes
Sep 28, 2020
22dddfd
remove webpack changes
Sep 28, 2020
b3e0a64
Use 0.4.2 mongosh with dependency fix
Oct 1, 2020
d33565e
Add skip minimize on language server and worker for shell api signatu…
Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10,001 changes: 4,766 additions & 5,235 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,9 +807,9 @@
"@fortawesome/free-solid-svg-icons": "^5.13.0",
"@fortawesome/react-fontawesome": "^0.1.9",
"@leafygreen-ui/toggle": "^3.0.1",
"@mongosh/browser-runtime-electron": "0.0.1-alpha.19",
"@mongosh/service-provider-server": "0.0.1-alpha.19",
"@mongosh/shell-api": "0.0.1-alpha.19",
"@mongosh/browser-runtime-electron": "^0.4.2",
"@mongosh/service-provider-server": "^0.4.2",
"@mongosh/shell-api": "^0.4.2",
"analytics-node": "^3.4.0-beta.1",
"bson": "^4.0.3",
"classnames": "^2.2.6",
Expand Down
6 changes: 3 additions & 3 deletions src/explorer/explorerTreeController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { sortTreeItemsByLabel } from './treeItemUtils';
const log = createLogger('explorer controller');

export default class ExplorerTreeController
implements vscode.TreeDataProvider<vscode.TreeItem> {
implements vscode.TreeDataProvider<vscode.TreeItem> {
private _connectionController: ConnectionController;
private _connectionTreeItems: { [key: string]: ConnectionTreeItem };
contextValue = 'explorerTreeController';
Expand Down Expand Up @@ -120,13 +120,13 @@ export default class ExplorerTreeController
readonly onDidChangeTreeData: vscode.Event<any>;

public refresh = (): Promise<boolean> => {
this._onDidChangeTreeData.fire();
this._onDidChangeTreeData.fire(null);

return Promise.resolve(true);
};

public onTreeItemUpdate(): void {
this._onDidChangeTreeData.fire();
this._onDidChangeTreeData.fire(null);
}

getTreeItem(element: vscode.TreeItem): vscode.TreeItem {
Expand Down
4 changes: 2 additions & 2 deletions src/explorer/playgroundsTree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,13 @@ implements vscode.TreeDataProvider<vscode.TreeItem> {
.getConfiguration('mdb')
.get('excludeFromPlaygroundsSearch') || [];

this._onDidChangeTreeData.fire();
this._onDidChangeTreeData.fire(null);

return Promise.resolve(true);
};

public onTreeItemUpdate(): void {
this._onDidChangeTreeData.fire();
this._onDidChangeTreeData.fire(null);
}

public getTreeItem(element: PlaygroundsTreeHeader): vscode.TreeItem {
Expand Down
16 changes: 7 additions & 9 deletions src/language/mongoDBService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,7 @@ export default class MongoDBService {

await worker.terminate();

this._connection.console.log(
`MONGOSH found ${result.length} databases`
);
this._connection.console.log(`MONGOSH found ${result.length} databases`);
this.updateCurrentSessionDatabases(result);
});
}
Expand Down Expand Up @@ -329,12 +327,12 @@ export default class MongoDBService {
const shellSymbols = {};

Object.keys(signatures).map((symbol) => {
shellSymbols[symbol] = Object.keys(signatures[symbol].attributes).map(
(item) => ({
label: item,
kind: CompletionItemKind.Method
})
);
shellSymbols[symbol] = Object.keys(
signatures[symbol].attributes || {}
).map((item) => ({
label: item,
kind: CompletionItemKind.Method
}));
});

return shellSymbols;
Expand Down
9 changes: 8 additions & 1 deletion src/test/suite/stubs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ class TestExtensionContext implements vscode.ExtensionContext {
_globalState = {};
extensionPath: string;
storagePath: string;
extensionUri;
environmentVariableCollection;
extensionMode;
storageUri;
globalStorageUri;
logUri;

asAbsolutePath(relativePath: string): string {
return relativePath;
Expand Down Expand Up @@ -158,7 +164,8 @@ const mockVSCodeTextDocument = {
undefined,
validateRange: (range: vscode.Range): vscode.Range => mockRange,

validatePosition: (position: vscode.Position): vscode.Position => mockPosition
validatePosition: (position: vscode.Position): vscode.Position =>
mockPosition
};

class MockLanguageServerController {
Expand Down
10 changes: 10 additions & 0 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ const languageServerConfig = {
entry: {
languageServer: './src/language/server.ts'
},
optimization: {
// Don't minimize in order to preserve
// the signature names from @mongosh/shell-api.
minimize: false
},
resolve: {
extensions: ['.js', '.ts', '.json']
},
Expand Down Expand Up @@ -97,6 +102,11 @@ const languageServerWorkerConfig = {
entry: {
languageServerWorker: './src/language/worker.ts'
},
optimization: {
// Don't minimize in order to preserve
// the signature names from @mongosh/shell-api.
minimize: false
},
resolve: {
extensions: ['.js', '.ts', '.json']
},
Expand Down