Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae

extensions/configuration-editing/.vscodeignore

@@ -3,4 +3,5 @@ src/**
 tsconfig.json
 out/**
 extension.webpack.config.js
+extension-browser.webpack.config.js
 yarn.lock

extensions/configuration-editing/extension-browser.webpack.config.js

@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. 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 clientConfig = withDefaults({
+	target: 'webworker',
+	context: __dirname,
+	entry: {
+		extension: './src/configurationEditingMain.ts'
+	},
+	output: {
+		filename: 'configurationEditingMain.js'
+	},
+	performance: {
+		hints: false
+	},
+	resolve: {
+		alias: {
+			'vscode-nls': path.resolve(__dirname, '../../build/polyfills/vscode-nls.js')
+		}
+	}
+});
+clientConfig.module.rules[0].use.shift(); // remove nls loader
+
+module.exports = clientConfig;

extensions/configuration-editing/extension.webpack.config.js

@@ -12,7 +12,10 @@ const withDefaults = require('../shared.webpack.config');
 module.exports = withDefaults({
 	context: __dirname,
 	entry: {
-		extension: './src/extension.ts',
+		extension: './src/configurationEditingMain.ts',
+	},
+	output: {
+		filename: 'configurationEditingMain.js'
 	},
 	resolve: {
 		mainFields: ['module', 'main']

extensions/configuration-editing/package.json

@@ -12,7 +12,8 @@
     "onLanguage:json",
     "onLanguage:jsonc"
   ],
-  "main": "./out/extension",
+  "main": "./out/configurationEditingMain",
+  "browser": "./dist/configurationEditingMain",
   "scripts": {
     "compile": "gulp compile-extension:configuration-editing",
     "watch": "gulp watch-extension:configuration-editing"

extensions/configuration-editing/schemas/attachContainer.schema.json

@@ -45,6 +45,16 @@
 						"pattern": "^([a-z0-9A-Z][a-z0-9\\-A-Z]*)\\.([a-z0-9A-Z][a-z0-9\\-A-Z]*)$",
 						"errorMessage": "Expected format '${publisher}.${name}'. Example: 'vscode.csharp'."
 					}
+				},
+				"postAttachCommand": {
+					"type": [
+						"string",
+						"array"
+					],
+					"description": "A command to run after attaching to the container. If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"items": {
+						"type": "string"
+					}
 				}
 			}
 		}

extensions/configuration-editing/schemas/devContainer.schema.json

@@ -68,9 +68,33 @@
 						"type": "string"
 					}
 				},
+				"postStartCommand": {
+					"type": [
+						"string",
+						"array"
+					],
+					"description": "A command to run after starting the container. If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"items": {
+						"type": "string"
+					}
+				},
+				"postAttachCommand": {
+					"type": [
+						"string",
+						"array"
+					],
+					"description": "A command to run after attaching to the container. If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"items": {
+						"type": "string"
+					}
+				},
 				"devPort": {
 					"type": "integer",
 					"description": "The port VS Code can use to connect to its backend."
+				},
+				"codespaces": {
+					"type": "object",
+					"description": "Codespaces-specific configuration."
 				}
 			}
 		},