Combining SDK extension and uninstall script webpack

build.ps1

@@ -39,19 +39,6 @@ if (! $?)
 }
 popd
 
-#################### Compile uninstall library ####################
-pushd vscode-dotnet-uninstall-library
-if (Test-Path node_modules) { rm -r -force node_modules }
-npm install
-npm run compile
-
-if (! $?)
-{
-    Write-Host "`nBuild failed!" -ForegroundColor $errorColor
-    exit 1
-}
-popd
-
 #################### Compile runtime extension ####################
 pushd vscode-dotnet-runtime-extension
 if (Test-Path node_modules) { rm -r -force node_modules }

build.sh

@@ -34,22 +34,6 @@ then
 fi
 popd
 
-echo ""
-echo "----------- Compiling vscode-dotnet-uninstall-library -----------"
-echo ""
-pushd vscode-dotnet-uninstall-library
-rm -rf node_modules
-npm install
-npm run compile
-
-if [ $? -ne 0 ];
-then
-    echo ""
-    echo "${RED}Build failed!${NC}"
-    exit 1
-fi
-popd
-
 echo ""
 echo "----------- Compiling vscode-dotnet-runtime-extension -----------"
 echo ""

vscode-dotnet-runtime.code-workspace

@@ -11,9 +11,6 @@
         },
         {
             "path": "vscode-dotnet-runtime-library"
-        },
-        {
-            "path": "vscode-dotnet-uninstall-library"
         }
     ],
     "settings": {}

vscode-dotnet-sdk-extension/package.json

@@ -60,13 +60,13 @@
 		}
 	},
 	"scripts": {
-		"vscode:prepublish": "npm run compile-all && npm install && cd ../vscode-dotnet-uninstall-library && webpack --mode production && cd ../vscode-dotnet-sdk-extension && webpack --mode production",
+		"vscode:prepublish": "npm run compile-all && npm install && webpack --mode production",
 		"vscode:uninstall": "node ./dist/ExtensionUninstall",
 		"compile": "npm run clean && tsc -p ./",
 		"watch": "npm run compile && tsc -watch -p ./",
 		"test": "npm run compile --silent && node ./dist/test/functional/runTest.js",
 		"clean": "rimraf dist",
-		"compile-all": "cd ../vscode-dotnet-runtime-library && npm install && npm run compile && cd ../vscode-dotnet-sdk-extension && cd ../vscode-dotnet-uninstall-library && npm install && npm run compile && cd ../vscode-dotnet-sdk-extension && npm install && npm run compile",
+		"compile-all": "cd ../vscode-dotnet-runtime-library && npm install && npm run compile && cd ../vscode-dotnet-sdk-extension && npm install && npm run compile",
 		"lint": "tslint -c ../tslint.json '../vscode-dotnet-runtime-library/src/**/*.ts' '../vscode-dotnet-sdk-extension/src/**/*.ts'",
 		"webpack": "webpack --mode development"
 	},
@@ -90,7 +90,6 @@
 		"tslint": "^5.20.1",
 		"typescript": "3.4.5",
 		"vscode-dotnet-runtime-library": "file:../vscode-dotnet-runtime-library",
-		"vscode-dotnet-uninstall-library": "file:../vscode-dotnet-uninstall-library",
 		"vscode-test": "^1.3.0"
 	},
 	"devDependencies": {

vscode-dotnet-uninstall-library/src/ExtensionUninstall.ts → vscode-dotnet-sdk-extension/src/ExtensionUninstall.ts

@@ -3,9 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 import * as fs from 'fs';
-import rimraf = require('rimraf');
-import * as path from 'path';
 import * as os from 'os';
+import * as path from 'path';
+import rimraf = require('rimraf');
 
 export function uninstallSDKExtension() {
     if (os.platform() === 'win32' && process.env.APPDATA) {

vscode-dotnet-sdk-extension/src/test/functional/DotnetCoreAcquisitionExtension.test.ts

@@ -16,10 +16,8 @@ import {
   MockTelemetryReporter,
   MockWindowDisplayWorker,
 } from 'vscode-dotnet-runtime-library';
-import {
-  uninstallSDKExtension,
-} from 'vscode-dotnet-uninstall-library';
 import * as extension from '../../extension';
+import { uninstallSDKExtension } from '../../ExtensionUninstall';
 const assert = chai.assert;
 /* tslint:disable:no-any */
 

vscode-dotnet-sdk-extension/webpack.config.js

@@ -6,7 +6,7 @@ const path = require('path');
 const CopyPlugin = require('copy-webpack-plugin');
 
 /**@type {import('webpack').Configuration}*/
-const config = {
+const extensionConfig = {
   target: 'node', // vscode extensions run in a Node.js-context 📖 -> https://webpack.js.org/configuration/node/
 
   entry: './/src/extension.ts', // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
@@ -45,9 +45,31 @@ const config = {
   plugins: [
     new CopyPlugin({ patterns: [
       { from: path.resolve(__dirname, '../vscode-dotnet-runtime-library/install scripts'), to: path.resolve(__dirname, 'dist', 'install scripts') },
-      { from: path.resolve(__dirname, '../images'), to: path.resolve(__dirname, 'images') },
-      { from: path.resolve(__dirname, '../vscode-dotnet-uninstall-library/dist'), to: path.resolve(__dirname, 'dist') }
+      { from: path.resolve(__dirname, '../images'), to: path.resolve(__dirname, 'images') }
   ]}),
   ]
 };
-module.exports = config;
+const uninstallConfig = {
+  entry: './src/ExtensionUninstall.ts',
+  module: {
+    rules: [
+      {
+        test: /\.tsx?$/,
+        use: 'ts-loader',
+        exclude: /node_modules/,
+      },
+    ],
+  },
+  resolve: {
+    extensions: ['.ts', '.js'],
+  },
+  output: {
+    filename: 'ExtensionUninstall.js',
+    path: path.resolve(__dirname, 'dist'),
+  },
+  target: 'node',
+};
+module.exports = [
+  extensionConfig, 
+  uninstallConfig
+];