From 4380358ce919cad8b4872c46138bba3daf1722d5 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Wed, 5 Sep 2018 14:54:18 +0200
Subject: [PATCH] Use webpack (#57680)

---
 .../extension.webpack.config.js               | 25 +++++++++++++++++++
 extensions/extension-editing/package.json     |  2 +-
 .../extension-editing/src/extensionLinter.ts  |  4 +--
 extensions/extension-editing/yarn.lock        |  6 ++---
 4 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 extensions/extension-editing/extension.webpack.config.js

diff --git a/extensions/extension-editing/extension.webpack.config.js b/extensions/extension-editing/extension.webpack.config.js
new file mode 100644
index 00000000000..ca76400f529
--- /dev/null
+++ b/extensions/extension-editing/extension.webpack.config.js
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  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');
+
+module.exports = withDefaults({
+	context: __dirname,
+	entry: {
+		extension: './src/extension.ts',
+	},
+	resolve: {
+		mainFields: ['module', 'main'],
+		extensions: ['.ts', '.js'] // support ts-files and js-files
+	},
+	externals: {
+		'../../../product.json': 'commonjs ../../../product.json',
+		'typescript': 'commonjs typescript'
+	}
+});
diff --git a/extensions/extension-editing/package.json b/extensions/extension-editing/package.json
index b386dc565f3..30152a86066 100644
--- a/extensions/extension-editing/package.json
+++ b/extensions/extension-editing/package.json
@@ -18,7 +18,7 @@
 		"watch": "gulp watch-extension:extension-editing"
 	},
 	"dependencies": {
-		"jsonc-parser": "^1.0.0",
+		"jsonc-parser": "^2.0.2",
 		"markdown-it": "^8.3.1",
 		"parse5": "^3.0.2",
 		"vscode-nls": "^3.2.4"
diff --git a/extensions/extension-editing/src/extensionLinter.ts b/extensions/extension-editing/src/extensionLinter.ts
index 5d99b406845..54af327ae07 100644
--- a/extensions/extension-editing/src/extensionLinter.ts
+++ b/extensions/extension-editing/src/extensionLinter.ts
@@ -11,9 +11,9 @@ const localize = nls.loadMessageBundle();
 import { parseTree, findNodeAtLocation, Node as JsonNode } from 'jsonc-parser';
 import * as MarkdownItType from 'markdown-it';
 
-import { languages, workspace, Disposable, TextDocument, Uri, Diagnostic, Range, DiagnosticSeverity, Position, env } from 'vscode';
+import { languages, workspace, Disposable, TextDocument, Uri, Diagnostic, Range, DiagnosticSeverity, Position } from 'vscode';
 
-const product = require(path.posix.join(env.appRoot, 'product.json'));
+const product = require('../../../product.json');
 const allowedBadgeProviders: string[] = (product.extensionAllowedBadgeProviders || []).map(s => s.toLowerCase());
 
 const httpsRequired = localize('httpsRequired', "Images must use the HTTPS protocol.");
diff --git a/extensions/extension-editing/yarn.lock b/extensions/extension-editing/yarn.lock
index b28c81dbb27..1e00b674324 100644
--- a/extensions/extension-editing/yarn.lock
+++ b/extensions/extension-editing/yarn.lock
@@ -24,9 +24,9 @@ entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
-jsonc-parser@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
+jsonc-parser@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.2.tgz#42fcf56d70852a043fadafde51ddb4a85649978d"
 
 linkify-it@^2.0.0:
   version "2.0.3"