Merge branch 'master' into clantz/dev-container

.github/workflows/author-verified.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'microsoft/vscode-github-triage-actions'
-          ref: v19
+          ref: v22
           path: ./actions
       - name: Install Actions
         if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'author-verification-requested')

.github/workflows/classifier-apply.yml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'microsoft/vscode-github-triage-actions'
-          ref: v19
+          ref: v22
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions

.github/workflows/commands.yml

@@ -13,7 +13,7 @@ jobs:
         with:
           repository: 'microsoft/vscode-github-triage-actions'
           path: ./actions
-          ref: v19
+          ref: v22
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: Run Commands

.github/workflows/english-please.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'microsoft/vscode-github-triage-actions'
-          ref: v19
+          ref: v22
           path: ./actions
       - name: Install Actions
         if: contains(github.event.issue.labels.*.name, '*english-please')

.github/workflows/feature-request.yml

@@ -18,7 +18,7 @@ jobs:
         with:
           repository: 'microsoft/vscode-github-triage-actions'
           path: ./actions
-          ref: v19
+          ref: v22
       - name: Install Actions
         if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'feature-request')
         run: npm install --production --prefix ./actions

.github/workflows/latest-release-monitor.yml

@@ -12,7 +12,7 @@ jobs:
         with:
           repository: 'microsoft/vscode-github-triage-actions'
           path: ./actions
-          ref: v19
+          ref: v22
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: Install Storage Module

.github/workflows/locker.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           repository: 'microsoft/vscode-github-triage-actions'
           path: ./actions
-          ref: v19
+          ref: v22
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: Run Locker

.github/workflows/needs-more-info-closer.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           repository: 'microsoft/vscode-github-triage-actions'
           path: ./actions
-          ref: v19
+          ref: v22
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: Run Needs More Info Closer

.github/workflows/on-label.yml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'microsoft/vscode-github-triage-actions'
-          ref: v19
+          ref: v22
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions

.github/workflows/on-open.yml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'microsoft/vscode-github-triage-actions'
-          ref: v19
+          ref: v22
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions

.github/workflows/release-pipeline-labeler.yml

@@ -1,7 +1,7 @@
 name: "Release Pipeline Labeler"
 on:
   issues:
-    types: [closed]
+    types: [closed, reopened]
   repository_dispatch:
     types: [released-insider]
 
@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'microsoft/vscode-github-triage-actions'
-          ref: v19
+          ref: v22
           path: ./actions
       - name: Checkout Repo
         if: github.event_name != 'issues'

.github/workflows/test-plan-item-validator.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           repository: 'microsoft/vscode-github-triage-actions'
           path: ./actions
-          ref: v19
+          ref: v22
       - name: Install Actions
         if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
         run: npm install --production --prefix ./actions

.vscode/launch.json

@@ -255,6 +255,18 @@
 				"order": 3
 			}
 		},
+		{
+			"type": "pwa-msedge",
+			"request": "launch",
+			"name": "VS Code (Web, Edge)",
+			"url": "http://localhost:8080",
+			"pauseForSourceMap": false,
+			"preLaunchTask": "Run web",
+			"presentation": {
+				"group": "0_vscode",
+				"order": 3
+			}
+		},
 		{
 			"type": "node",
 			"request": "launch",

.vscode/searches/es6.code-search

@@ -79,8 +79,8 @@ src/vs/base/common/strings.ts:
   170   */
   171  export function endsWith(haystack: string, needle: string): boolean {
 
-  853  
-  854  /**
-  855:  * @deprecated ES6
-  856   */
-  857  export function repeat(s: string, count: number): string {
+  861  
+  862  /**
+  863:  * @deprecated ES6
+  864   */
+  865  export function repeat(s: string, count: number): string {

.vscode/tasks.json

@@ -75,7 +75,7 @@
 		},
 		{
 			"type": "shell",
-			"command": "yarn web -- --no-launch",
+			"command": "yarn web --no-launch",
 			"label": "Run web",
 			"isBackground": true,
 			"problemMatcher": {

extensions/css-language-features/.vscodeignore

@@ -16,4 +16,6 @@ server/.npmignore
 yarn.lock
 server/extension.webpack.config.js
 extension.webpack.config.js
-CONTRIBUTING.md
+server/extension-browser.webpack.config.js
+extension-browser.webpack.config.js
+CONTRIBUTING.md

extensions/css-language-features/extension-browser.webpack.config.js

@@ -30,19 +30,4 @@ const clientConfig = withDefaults({
 clientConfig.plugins[1] = vscodeNlsReplacement; // replace nls bundler
 clientConfig.module.rules[0].use.shift(); // remove nls loader
 
-const serverConfig = withDefaults({
-	target: 'webworker',
-	context: path.join(__dirname, 'server'),
-	entry: {
-		extension: './src/browser/cssServerMain.ts',
-	},
-	output: {
-		filename: 'cssServerMain.js',
-		path: path.join(__dirname, 'server', 'dist', 'browser'),
-		libraryTarget: 'var'
-	}
-});
-serverConfig.plugins[1] = vscodeNlsReplacement; // replace nls bundler
-serverConfig.module.rules[0].use.shift(); // remove nls loader
-
-module.exports = [clientConfig, serverConfig];
+module.exports = clientConfig;

extensions/css-language-features/server/extension-browser.webpack.config.js

@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../../shared.webpack.config');
+const path = require('path');
+const webpack = require('webpack');
+
+const vscodeNlsReplacement = new webpack.NormalModuleReplacementPlugin(
+	/vscode\-nls[\\/]lib[\\/]main\.js/,
+	path.join(__dirname, '../client/out/browser/vscodeNlsShim.js')
+);
+
+const serverConfig = withDefaults({
+	target: 'webworker',
+	context: __dirname,
+	entry: {
+		extension: './src/browser/cssServerMain.ts',
+	},
+	output: {
+		filename: 'cssServerMain.js',
+		path: path.join(__dirname, 'dist', 'browser'),
+		libraryTarget: 'var'
+	}
+});
+serverConfig.plugins[1] = vscodeNlsReplacement; // replace nls bundler
+serverConfig.module.rules[0].use.shift(); // remove nls loader
+
+module.exports = serverConfig;

extensions/github-authentication/extension-browser.webpack.config.js

@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const path = require('path');
+const withDefaults = require('../shared.webpack.config');
+
+module.exports = withDefaults({
+	context: __dirname,
+	target: 'webworker',
+	node: false,
+	entry: {
+		extension: './src/extension.ts',
+	},
+	externals: {
+		'keytar': 'commonjs keytar',
+	},
+	// TODO@eamodio Deal with nls properly for the browser
+	// Specify module here, so we can stop the vscode-nls-dev loader from overwriting nls calls
+	module: {
+		rules: [{
+			test: /\.ts$/,
+			exclude: /node_modules/,
+			use: [{
+				// configure TypeScript loader:
+				// * enable sources maps for end-to-end source maps
+				loader: 'ts-loader',
+				options: {
+					compilerOptions: {
+						'sourceMap': true,
+					}
+				}
+			}]
+		}]
+	},
+	resolve: {
+		alias: {
+			'node-fetch': path.resolve(__dirname, 'node_modules/node-fetch/browser.js'),
+			'vscode-extension-telemetry': path.resolve(__dirname, 'polyfills/vscode-extension-telemetry.js'),
+			'vscode-nls': path.resolve(__dirname, 'polyfills/vscode-nls.js'),
+			'uuid': path.resolve(__dirname, 'node_modules/uuid/dist/esm-browser/index.js')
+		},
+	}
+});

extensions/github-authentication/package.json

@@ -32,20 +32,25 @@
   },
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
   "main": "./out/extension.js",
+  "browser": "./dist/extension.js",
   "scripts": {
-    "vscode:prepublish": "npm run compile",
     "compile": "gulp compile-extension:github-authentication",
-    "watch": "gulp watch-extension:github-authentication"
+    "compile-web": "npx webpack-cli --config extension-browser.webpack.config --mode none",
+    "watch": "gulp watch-extension:github-authentication",
+    "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose",
+    "vscode:prepublish": "npm run compile"
   },
   "dependencies": {
-    "uuid": "^3.3.3",
+    "node-fetch": "2.6.0",
+    "uuid": "8.1.0",
     "vscode-extension-telemetry": "0.1.1",
     "vscode-nls": "^4.1.2"
   },
   "devDependencies": {
     "@types/keytar": "^4.4.2",
     "@types/node": "^10.12.21",
-    "@types/uuid": "^3.4.6",
+    "@types/node-fetch": "2.5.7",
+    "@types/uuid": "8.0.0",
     "typescript": "^3.7.5"
   }
 }

extensions/github-authentication/polyfills/vscode-extension-telemetry.js

@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+
+let TelemetryReporter = (function () {
+	function TelemetryReporter(extensionId, extensionVersion, key) {
+	}
+	TelemetryReporter.prototype.updateUserOptIn = function (key) {
+	};
+	TelemetryReporter.prototype.createAppInsightsClient = function (key) {
+	};
+	TelemetryReporter.prototype.getCommonProperties = function () {
+	};
+	TelemetryReporter.prototype.sendTelemetryEvent = function (eventName, properties, measurements) {
+	};
+	TelemetryReporter.prototype.dispose = function () {
+	};
+	TelemetryReporter.TELEMETRY_CONFIG_ID = 'telemetry';
+	TelemetryReporter.TELEMETRY_CONFIG_ENABLED_ID = 'enableTelemetry';
+	return TelemetryReporter;
+}());
+exports.default = TelemetryReporter;