Fix test & debug launch configurations

These were broken by the move to webpack

.vscode/launch.json

@@ -15,7 +15,7 @@
       "outFiles": [
         "${workspaceRoot}/{out, node_modules}/**/*.js"
       ],
-      "preLaunchTask": "gulp: build",
+      "preLaunchTask": "gulp: build-dev",
       "internalConsoleOptions": "openOnSessionStart",
     },
     {
@@ -46,7 +46,7 @@
       "outFiles": [
         "${workspaceRoot}/{out, node_modules}/**/*.js"
       ],
-      "preLaunchTask": "gulp: build",
+      "preLaunchTask": "gulp: prepare-test",
       "internalConsoleOptions": "openOnSessionStart"
     }
   ]

gulpfile.js

@@ -10,6 +10,7 @@ var gulp = require('gulp'),
   path = require('path'),
   webpack_stream = require('webpack-stream'),
   webpack_config = require('./webpack.config.js');
+webpack_dev_config = require('./webpack.dev.js');
 
 const exec = require('child_process').exec;
 const spawn = require('child_process').spawn;
@@ -163,6 +164,10 @@ gulp.task('webpack', function () {
   return gulp.src('./extension.ts').pipe(webpack_stream(webpack_config)).pipe(gulp.dest('out'));
 });
 
+gulp.task('webpack-dev', function () {
+  return gulp.src('./extension.ts').pipe(webpack_stream(webpack_dev_config)).pipe(gulp.dest('out'));
+});
+
 gulp.task('tslint', function () {
   const program = require('tslint').Linter.createProgram('./tsconfig.json');
   return gulp
@@ -246,6 +251,10 @@ gulp.task('run-test', function (done) {
 });
 
 gulp.task('build', gulp.series('prettier', gulp.parallel('webpack', 'tslint'), 'commit-hash'));
+gulp.task(
+  'build-dev',
+  gulp.series('prettier', gulp.parallel('webpack-dev', 'tslint'), 'commit-hash')
+);
 gulp.task('prepare-test', gulp.parallel('tsc', copyPackageJson));
 gulp.task('test', gulp.series('prepare-test', 'run-test'));
 gulp.task('changelog', gulp.series(validateArgs, createChangelog));

package-lock.json

@@ -7479,6 +7479,21 @@
           "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
           "dev": true
         },
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
         "mocha": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
@@ -7494,6 +7509,7 @@
             "growl": "1.10.5",
             "he": "1.1.1",
             "minimatch": "3.0.4",
+            "mkdirp": "0.5.1",
             "supports-color": "5.4.0"
           },
           "dependencies": {
@@ -7973,6 +7989,15 @@
         }
       }
     },
+    "webpack-merge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.15"
+      }
+    },
     "webpack-sources": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",

package.json

@@ -978,6 +978,7 @@
     "vscode": "1.1.37",
     "webpack": "4.43.0",
     "webpack-cli": "3.3.11",
+    "webpack-merge": "4.2.2",
     "webpack-stream": "5.2.1"
   }
 }

webpack.dev.js

@@ -0,0 +1,7 @@
+const merge = require('webpack-merge');
+const prod_config = require('./webpack.config.js');
+
+module.exports = merge(prod_config, {
+  mode: 'development',
+  devtool: 'inline-source-map',
+});