fix for webpack svgs

package.json

@@ -18,7 +18,7 @@
     "activationEvents": [
         "*"
     ],
-    "main": "./out/extension",
+    "main": "./dist/extension",
     "contributes": {
         "commands": [
             {
@@ -30,8 +30,8 @@
                 "command": "dsk.newqueryoption",
                 "title": "QE Boost: New Query",
                 "icon": {
-                    "light": "src/media/newquery.svg",
-                    "dark": "src/media/newquery-inverse.svg"
+                    "light": "./dist/src/media/newquery.svg",
+                    "dark": "./dist/src/media/newquery-inverse.svg"
                 }
             },
             {
@@ -155,6 +155,7 @@
         "@types/mocha": "^2.2.42",
         "@types/node": "^7.0.43",
         "azdata": "1.0.0",
+        "file-loader": "^5.0.2",
         "ts-loader": "^6.2.1",
         "typescript": "^2.6.1",
         "vscode": "^1.1.6",

src/extension.ts

@@ -12,7 +12,8 @@ import { runQuerySection } from './runQuery';
 import { placeScript } from './placescript';
 import { telemetryHelper } from './telemetryHelper';
 
-// var tH: telemetryHelper;
+require('./media/newquery.svg');
+require('./media/newquery-inverse.svg');
 
 export function activate(context: vscode.ExtensionContext) {
     // query section execution keyboard shortcut setting

src/telemetryHelper.ts

@@ -1,12 +1,11 @@
 import * as vscode from 'vscode';
-
 import * as telemetryConnect from  './telemetryConnect';
-let telemetryconnect: telemetryConnect.telemetryConnect = require('../telemetryConnect.json');
 
 // extension telemetry
 import TelemetryReporter from 'vscode-extension-telemetry';
 const extensionId = 'drewsk.query-editor-boost';
 const extension = vscode.extensions.getExtension(extensionId);
+let telemetryconnect: telemetryConnect.telemetryConnect = require('../telemetryConnect.json');
 const extensionVersion = extension.packageJSON.version;
 const key = telemetryconnect.token;  
 

webpack.config.js

@@ -18,13 +18,12 @@ const config = {
   },
   devtool: 'source-map',
   externals: {
-    vscode: 'commonjs 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: 'commonjs azdata',
-    applicationinsights: 'commonjs applicationinsights'
+    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']
+    extensions: ['.ts', '.js', '.svg']
   },
   module: {
     rules: [
@@ -36,6 +35,13 @@ const config = {
             loader: 'ts-loader'
           }
         ]
+      },
+      {
+        test: /\.svg$/,
+        loader: 'file-loader',
+        options: {
+          name: '[path][name].[ext]',
+        }
       }
     ]
   }