Merge from vscode 2cd495805cf99b31b6926f08ff4348124b2cf73d

This commit is contained in:
ADS Merger
2020-06-30 04:40:21 +00:00
committed by AzureDataStudio
parent a8a7559229
commit 1388493cc1
602 changed files with 16375 additions and 12940 deletions

View File

@@ -7,11 +7,10 @@
'use strict';
const path = require('path');
const withDefaults = require('../shared.webpack.config');
const withBrowserDefaults = require('../shared.webpack.config').browser;
module.exports = withDefaults({
module.exports = withBrowserDefaults({
context: __dirname,
target: 'webworker',
node: false,
entry: {
extension: './src/extension.ts',

View File

@@ -11,7 +11,7 @@
"onFileSystem:github",
"onDebug"
],
"browser": "./dist/extension",
"browser": "./dist/browser/extension",
"main": "./out/extension",
"engines": {
"vscode": "^1.25.0"

View File

@@ -15,10 +15,10 @@
import * as vscode from 'vscode';
import { MemFS } from './memfs';
declare const window: unknown;
declare const navigator: unknown;
export function activate(context: vscode.ExtensionContext) {
if (typeof window !== 'undefined') { // do not run under node.js
if (typeof navigator === 'object') { // do not run under node.js
const memFs = enableFs(context);
if (vscode.workspace.workspaceFolders?.some(f => f.uri.scheme === MemFS.scheme)) {