use enabledApiProposals instead of wildcard property, also update compilation units to only include d.ts-files that are needed, https://github.com/microsoft/vscode/issues/131165

2021-11-12 11:05:30 +01:00 · 2021-11-12 11:05:30 +01:00 · 09c9d4c293
parent 7ac327281a
commit 09c9d4c293
40 changed files with 130 additions and 71 deletions
--- a/extensions/css-language-features/client/tsconfig.json
+++ b/extensions/css-language-features/client/tsconfig.json
@ -5,7 +5,6 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../../src/vscode-dts/vscode.d.ts",
-		"../../../src/vscode-dts/vscode.proposed.*.d.ts",
+		"../../../src/vscode-dts/vscode.d.ts"
 	]
 }
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@ -17,7 +17,6 @@
  ],
  "main": "./client/out/node/cssClientMain",
  "browser": "./client/dist/browser/cssClientMain",
-  "enableProposedApi": true,
  "capabilities": {
    "virtualWorkspaces": true,
    "untrustedWorkspaces": {
--- a/extensions/debug-server-ready/package.json
+++ b/extensions/debug-server-ready/package.json
@ -18,7 +18,9 @@
      "supported": true
    }
  },
-  "enableProposedApi": true,
+  "enabledApiProposals": [
+    "terminalDataWriteEvent"
+  ],
  "main": "./out/extension",
  "scripts": {
    "compile": "gulp compile-extension:debug-server-ready",
--- a/extensions/debug-server-ready/tsconfig.json
+++ b/extensions/debug-server-ready/tsconfig.json
@ -10,6 +10,6 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts",
+		"../../src/vscode-dts/vscode.proposed.terminalDataWriteEvent.d.ts",
 	]
 }
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@ -9,7 +9,13 @@
    "vscode": "^1.5.0"
  },
  "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
-  "enableProposedApi": true,
+  "enabledApiProposals": [
+    "diffCommand",
+    "scmActionButton",
+    "scmSelectedProvider",
+    "scmValidation",
+    "timeline"
+  ],
  "categories": [
    "Other"
  ],
--- a/extensions/git/tsconfig.json
+++ b/extensions/git/tsconfig.json
@ -10,7 +10,11 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts",
+		"../../src/vscode-dts/vscode.proposed.diffCommand.d.ts",
+		"../../src/vscode-dts/vscode.proposed.scmActionButton.d.ts",
+		"../../src/vscode-dts/vscode.proposed.scmSelectedProvider.d.ts",
+		"../../src/vscode-dts/vscode.proposed.scmValidation.d.ts",
+		"../../src/vscode-dts/vscode.proposed.timeline.d.ts",
 		"../types/lib.textEncoder.d.ts"
 	]
 }
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@ -9,7 +9,6 @@
    "vscode": "^1.41.0"
  },
  "icon": "images/icon.png",
-  "enableProposedApi": true,
  "categories": [
    "Other"
  ],
--- a/extensions/github-authentication/tsconfig.json
+++ b/extensions/github-authentication/tsconfig.json
@ -9,7 +9,6 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../src/vscode-dts/vscode.d.ts"
 	]
 }
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@ -9,7 +9,6 @@
    "vscode": "^1.41.0"
  },
  "icon": "images/icon.png",
-  "enableProposedApi": true,
  "categories": [
    "Other"
  ],
--- a/extensions/github/tsconfig.json
+++ b/extensions/github/tsconfig.json
@ -9,7 +9,6 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../src/vscode-dts/vscode.d.ts"
 	]
 }
--- a/extensions/html-language-features/client/tsconfig.json
+++ b/extensions/html-language-features/client/tsconfig.json
@ -5,7 +5,6 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../../src/vscode-dts/vscode.d.ts",
-		"../../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../../src/vscode-dts/vscode.d.ts"
 	]
 }
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@ -1,5 +1,4 @@
 {
-  "enableProposedApi": true,
  "name": "html-language-features",
  "displayName": "%displayName%",
  "description": "%description%",
--- a/extensions/image-preview/package.json
+++ b/extensions/image-preview/package.json
@ -9,7 +9,6 @@
  "version": "1.0.0",
  "publisher": "vscode",
  "icon": "icon.png",
-  "enableProposedApi": true,
  "license": "MIT",
  "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
  "engines": {
--- a/extensions/image-preview/tsconfig.json
+++ b/extensions/image-preview/tsconfig.json
@ -6,7 +6,6 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../src/vscode-dts/vscode.d.ts"
 	]
 }
--- a/extensions/ipynb/package.json
+++ b/extensions/ipynb/package.json
@ -8,7 +8,10 @@
 	"engines": {
 		"vscode": "^1.57.0"
 	},
-  "enableProposedApi": true,
+	"enabledApiProposals": [
+		"notebookEditor",
+		"notebookEditorEdit"
+	],
 	"activationEvents": [
 		"onNotebook:jupyter-notebook"
 	],
@ -36,16 +39,16 @@
 				]
 			}
 		],
-    "grammars": [
-      {
-        "language": "jupyter",
-        "scopeName": "source.jupyter",
-        "path": "./syntaxes/jupyter.tmLanguage.json",
-        "embeddedLanguages": {
-          "source.json": "json"
-        }
-      }
-    ],
+		"grammars": [
+			{
+				"language": "jupyter",
+				"scopeName": "source.jupyter",
+				"path": "./syntaxes/jupyter.tmLanguage.json",
+				"embeddedLanguages": {
+					"source.json": "json"
+				}
+			}
+		],
 		"notebooks": [
 			{
 				"type": "jupyter-notebook",
@ -59,10 +62,10 @@
 			}
 		]
 	},
-  "scripts": {
-    "compile": "npx gulp compile-extension:ipynb",
-    "watch": "npx gulp watch-extension:ipynb"
-  },
+	"scripts": {
+		"compile": "npx gulp compile-extension:ipynb",
+		"watch": "npx gulp watch-extension:ipynb"
+	},
 	"dependencies": {
 		"@enonic/fnv-plus": "^1.3.0",
 		"detect-indent": "^6.0.0",
@ -72,8 +75,8 @@
 		"@jupyterlab/coreutils": "^3.1.0",
 		"@types/uuid": "^8.3.1"
 	},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/microsoft/vscode.git"
-  }
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/microsoft/vscode.git"
+	}
 }
--- a/extensions/ipynb/tsconfig.json
+++ b/extensions/ipynb/tsconfig.json
@ -9,6 +9,7 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../src/vscode-dts/vscode.proposed.notebookEditor.d.ts",
+		"../../src/vscode-dts/vscode.proposed.notebookEditorEdit.d.ts",
 	]
 }
--- a/extensions/json-language-features/client/tsconfig.json
+++ b/extensions/json-language-features/client/tsconfig.json
@ -5,7 +5,6 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../../src/vscode-dts/vscode.d.ts",
-		"../../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../../src/vscode-dts/vscode.d.ts"
 	]
 }
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@ -16,7 +16,6 @@
  ],
  "main": "./client/out/node/jsonClientMain",
  "browser": "./client/dist/browser/jsonClientMain",
-  "enableProposedApi": true,
  "capabilities": {
    "virtualWorkspaces": true,
    "untrustedWorkspaces": {
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@ -5,7 +5,6 @@
  "version": "1.0.0",
  "icon": "icon.png",
  "publisher": "vscode",
-  "enableProposedApi": true,
  "license": "MIT",
  "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
  "engines": {
--- a/extensions/markdown-language-features/tsconfig.json
+++ b/extensions/markdown-language-features/tsconfig.json
@ -5,7 +5,6 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../src/vscode-dts/vscode.d.ts"
 	]
 }
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@ -12,7 +12,6 @@
  "categories": [
    "Other"
  ],
-  "enableProposedApi": true,
  "activationEvents": [
    "onAuthenticationRequest:microsoft"
  ],
--- a/extensions/microsoft-authentication/tsconfig.json
+++ b/extensions/microsoft-authentication/tsconfig.json
@ -18,7 +18,6 @@
 	],
 	"include": [
 		"src/**/*",
-		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../src/vscode-dts/vscode.d.ts"
 	]
 }
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@ -8,7 +8,6 @@
  "engines": {
    "vscode": "0.10.x"
  },
-  "enableProposedApi": true,
  "icon": "images/npm_icon.png",
  "categories": [
    "Other"
--- a/extensions/npm/tsconfig.json
+++ b/extensions/npm/tsconfig.json
@ -8,7 +8,6 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../src/vscode-dts/vscode.d.ts"
 	]
 }
--- a/extensions/php-language-features/package.json
+++ b/extensions/php-language-features/package.json
@ -9,7 +9,6 @@
  "engines": {
    "vscode": "0.10.x"
  },
-  "enableProposedApi": true,
  "activationEvents": [
    "onLanguage:php"
  ],
--- a/extensions/php-language-features/tsconfig.json
+++ b/extensions/php-language-features/tsconfig.json
@ -8,7 +8,6 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../src/vscode-dts/vscode.d.ts"
 	]
 }
--- a/extensions/search-result/package.json
+++ b/extensions/search-result/package.json
@ -3,7 +3,6 @@
  "displayName": "%displayName%",
  "description": "%description%",
  "version": "1.0.0",
-  "enableProposedApi": true,
  "publisher": "vscode",
  "license": "MIT",
  "icon": "images/icon.png",
--- a/extensions/search-result/tsconfig.json
+++ b/extensions/search-result/tsconfig.json
@ -5,7 +5,6 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../src/vscode-dts/vscode.d.ts"
 	]
 }
--- a/extensions/simple-browser/package.json
+++ b/extensions/simple-browser/package.json
@ -2,7 +2,9 @@
  "name": "simple-browser",
  "displayName": "%displayName%",
  "description": "%description%",
-  "enableProposedApi": true,
+  "enabledApiProposals": [
+    "externalUriOpener"
+  ],
  "version": "1.0.0",
  "icon": "media/icon.png",
  "publisher": "vscode",
--- a/extensions/simple-browser/tsconfig.json
+++ b/extensions/simple-browser/tsconfig.json
@ -7,6 +7,6 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../src/vscode-dts/vscode.proposed.externalUriOpener.d.ts",
 	]
 }
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@ -7,9 +7,11 @@
  "publisher": "vscode",
  "license": "MIT",
  "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
-  "enableProposedApi": true,
  "enabledApiProposals": [
-    "languageStatus"
+    "inlayHints",
+    "languageStatus",
+    "resolvers",
+    "workspaceTrust"
  ],
  "capabilities": {
    "virtualWorkspaces": {
--- a/extensions/typescript-language-features/tsconfig.json
+++ b/extensions/typescript-language-features/tsconfig.json
@ -10,7 +10,9 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
+		"../../src/vscode-dts/vscode.proposed.inlayHints.d.ts",
 		"../../src/vscode-dts/vscode.proposed.languageStatus.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../src/vscode-dts/vscode.proposed.resolvers.d.ts",
+		"../../src/vscode-dts/vscode.proposed.workspaceTrust.d.ts",
 	]
 }
--- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json
@ -4,7 +4,54 @@
  "version": "0.0.1",
  "publisher": "vscode",
  "license": "MIT",
-  "enableProposedApi": true,
+  "enabledApiProposals": [
+    "authSession",
+    "customEditorMove",
+    "diffCommand",
+    "documentFiltersExclusive",
+    "editorInsets",
+    "extensionRuntime",
+    "externalUriOpener",
+    "fileSearchProvider",
+    "findTextInFiles",
+    "fsChunks",
+    "inlayHints",
+    "inlineCompletions",
+    "languageStatus",
+    "notebookCellExecutionState",
+    "notebookConcatTextDocument",
+    "notebookContentProvider",
+    "notebookControllerKind",
+    "notebookDebugOptions",
+    "notebookDeprecated",
+    "notebookEditor",
+    "notebookEditorDecorationType",
+    "notebookEditorEdit",
+    "notebookLiveShare",
+    "notebookMessaging",
+    "notebookMime",
+    "portsAttributes",
+    "quickPickSortByLabel",
+    "resolvers",
+    "scmActionButton",
+    "scmSelectedProvider",
+    "scmValidation",
+    "tabs",
+    "taskPresentationGroup",
+    "terminalDataWriteEvent",
+    "terminalDimensions",
+    "terminalLocation",
+    "terminalNameChangeEvent",
+    "testCoverage",
+    "testObserver",
+    "textDocumentNotebook",
+    "textSearchProvider",
+    "timeline",
+    "tokenInformation",
+    "treeViewDragAndDrop",
+    "treeViewReveal",
+    "workspaceTrust"
+  ],
  "private": true,
  "activationEvents": [],
  "main": "./out/extension",
--- a/extensions/vscode-colorize-tests/package.json
+++ b/extensions/vscode-colorize-tests/package.json
@ -9,7 +9,6 @@
    "onLanguage:json"
  ],
  "main": "./out/colorizerTestMain",
-  "enableProposedApi": true,
  "engines": {
    "vscode": "*"
  },
--- a/extensions/vscode-colorize-tests/tsconfig.json
+++ b/extensions/vscode-colorize-tests/tsconfig.json
@ -8,7 +8,6 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../src/vscode-dts/vscode.d.ts"
 	]
 }
--- a/extensions/vscode-custom-editor-tests/package.json
+++ b/extensions/vscode-custom-editor-tests/package.json
@ -9,7 +9,6 @@
    "onCustomEditor:testWebviewEditor.abc"
  ],
  "main": "./out/extension",
-  "enableProposedApi": true,
  "engines": {
    "vscode": "^1.48.0"
  },
--- a/extensions/vscode-notebook-tests/package.json
+++ b/extensions/vscode-notebook-tests/package.json
@ -9,7 +9,20 @@
    "*"
  ],
  "main": "./out/extension",
-  "enableProposedApi": true,
+  "enabledApiProposals": [
+    "notebookCellExecutionState",
+    "notebookConcatTextDocument",
+    "notebookContentProvider",
+    "notebookControllerKind",
+    "notebookDebugOptions",
+    "notebookDeprecated",
+    "notebookEditor",
+    "notebookEditorDecorationType",
+    "notebookEditorEdit",
+    "notebookLiveShare",
+    "notebookMessaging",
+    "notebookMime"
+  ],
  "engines": {
    "vscode": "^1.25.0"
  },
--- a/extensions/vscode-notebook-tests/tsconfig.json
+++ b/extensions/vscode-notebook-tests/tsconfig.json
@ -9,6 +9,6 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../src/vscode-dts/vscode.proposed.notebook*.d.ts"
 	]
 }
--- a/extensions/vscode-test-resolver/package.json
+++ b/extensions/vscode-test-resolver/package.json
@ -4,7 +4,9 @@
  "version": "0.0.1",
  "publisher": "vscode",
  "license": "MIT",
-  "enableProposedApi": true,
+  "enabledApiProposals": [
+    "resolvers"
+  ],
  "private": true,
  "engines": {
    "vscode": "^1.25.0"
--- a/extensions/vscode-test-resolver/tsconfig.json
+++ b/extensions/vscode-test-resolver/tsconfig.json
@ -9,6 +9,6 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.*.d.ts"
+		"../../src/vscode-dts/vscode.proposed.resolvers.d.ts"
 	]
 }