mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge from vscode 2cd495805cf99b31b6926f08ff4348124b2cf73d
This commit is contained in:
committed by
AzureDataStudio
parent
a8a7559229
commit
1388493cc1
@@ -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',
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
"onFileSystem:github",
|
||||
"onDebug"
|
||||
],
|
||||
"browser": "./dist/extension",
|
||||
"browser": "./dist/browser/extension",
|
||||
"main": "./out/extension",
|
||||
"engines": {
|
||||
"vscode": "^1.25.0"
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
Reference in New Issue
Block a user