Merge pull request #23 from dzsquared/webpack

webpack conversion

Author: dzsquared

.gitignore

@@ -4,3 +4,4 @@ node_modules
 *.vsix
 secrets.txt
 apiconfig.json
+dist

.vscode/launch.json

@@ -15,7 +15,7 @@
             "name": "Extension",
             "type": "sqlopsExtensionHost",
             "request": "launch",
-            "runtimeExecutable": "azuredatastudio-insiders",
+            "runtimeExecutable": "azuredatastudio",
             "args": [
                 "--extensionDevelopmentPath=${workspaceFolder}"
             ],
@@ -28,10 +28,10 @@
             "name": "Extension Tests",
             "type": "sqlopsExtensionHost",
             "request": "launch",
-            "runtimeExecutable": "azuredatastudio-insiders",
+            "runtimeExecutable": "azuredatastudio",
             "args": [
                 "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/out/test"
+                "--extensionTestsPath=${workspaceFolder}/dist/test"
             ],
             "outFiles": [
                 "${workspaceFolder}/out/test/**/*.js"

.vscodeignore

@@ -6,4 +6,7 @@ src/**
 .gitignore
 tsconfig.json
 vsc-extension-quickstart.md
-tslint.json
+tslint.json
+out
+node_modules
+images

README.md

@@ -52,6 +52,11 @@ Can be raised here: https://github.com/dzsquared/sqlops-firstresponderkit/issues
 
 ## Release Notes
 
+### 0.5.1
+
+- Fix for changes to new editor connection changes in Azure Data Studio 1.15.0
+- Extension bundled with webpack
+
 ### 0.5.0
 
 - Improvement to version check process

package-lock.json

@@ -18,7 +18,7 @@
     "activationEvents": [
         "*"
     ],
-    "main": "./out/extension",
+    "main": "./dist/extension",
     "contributes": {
         "commands": [
             {
@@ -240,7 +240,9 @@
         ]
     },
     "scripts": {
-        "vscode:prepublish": "npm run compile",
+        "vscode:prepublish": "webpack --mode production",
+        "webpack": "webpack --mode development",
+        "webpack-dev": "webpack --mode development --watch",
         "compile": "tsc -p ./",
         "watch": "tsc -watch -p ./",
         "postinstall": "node ./node_modules/vscode/bin/install && node ./node_modules/azdata/bin/install",
@@ -250,8 +252,11 @@
         "@types/mocha": "^2.2.42",
         "@types/node": "^7.0.43",
         "azdata": "^1.0.0",
+        "ts-loader": "^6.2.1",
         "typescript": "^2.6.1",
-        "vscode": "^1.1.6"
+        "vscode": "^1.1.6",
+        "webpack": "^4.41.6",
+        "webpack-cli": "^3.3.11"
     },
     "dependencies": {
         "request": "^2.87.0",

package.json

@@ -0,0 +1,40 @@
+'use strict';
+
+const path = require('path');
+
+/**@type {import('webpack').Configuration}*/
+const config = {
+    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/
+    output: {
+        // the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/
+        path: path.resolve(__dirname, 'dist'),
+        filename: 'extension.js',
+        libraryTarget: 'commonjs2',
+        devtoolModuleFilenameTemplate: '../[resource-path]'
+    },
+    devtool: 'source-map',
+    externals: {
+        vscode: 'vscode', // the vscode-module is created on-the-fly and must be excluded. Add other modules that cannot be webpack'ed, 📖 -> https://webpack.js.org/configuration/externals/
+        azdata: 'azdata'
+    },
+    resolve: {
+        // support reading TypeScript and JavaScript files, 📖 -> https://github.com/TypeStrong/ts-loader
+        extensions: ['.ts', '.js']
+    },
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                exclude: /node_modules/,
+                use: [
+                    {
+                        loader: 'ts-loader'
+                    }
+                ]
+            }
+        ]
+    }
+};
+module.exports = config;