Bundles extension code

.azure-pipelines/common/setup.yml

@@ -6,11 +6,3 @@ steps:
 
 - task: Npm@1
   displayName: 'Install Dependencies'
-
-- script: |
-    sudo cp .azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-    sudo chmod +x /etc/init.d/xvfb
-    sudo update-rc.d xvfb defaults
-    sudo service xvfb start
-  displayName: 'Start X Virtual Frame Buffer'
-  condition: eq(variables['Agent.OS'], 'Linux')

.azure-pipelines/common/test.yml

@@ -0,0 +1,17 @@
+steps:
+- script: |
+    sudo cp .azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
+    sudo chmod +x /etc/init.d/xvfb
+    sudo update-rc.d xvfb defaults
+    sudo service xvfb start
+  displayName: 'Start X Virtual Frame Buffer'
+  condition: eq(variables['Agent.OS'], 'Linux')
+
+- task: Npm@1
+  displayName: 'Test'
+  inputs:
+    command: custom
+    customCommand: run test
+  env:
+    DISPLAY: :10 # Only necessary for linux tests
+    VSCODE_DAPR_IGNORE_BUNDLE: true

.azure-pipelines/main.yml

@@ -6,6 +6,7 @@ jobs:
   - template: common/setup.yml
   - template: common/governance.yml   # Force governance before test to avoid false-positives.
   - template: common/build.yml
+  - template: common/test.yml
 
 - job: Linux
   pool:
@@ -14,6 +15,7 @@ jobs:
   - template: common/setup.yml
   - template: common/governance.yml   # Force governance before test to avoid false-positives.
   - template: common/publish-vsix.yml # Only publish vsix from linux build since we use this to release and want to stay consistent
+  - template: common/test.yml
 
 - job: macOS
   pool:
@@ -22,3 +24,4 @@ jobs:
   - template: common/setup.yml
   - template: common/governance.yml   # Force governance before test to avoid false-positives.
   - template: common/build.yml
+  - template: common/test.yml

.eslintignore

@@ -1 +1,3 @@
 gulpfile.ts
+main.js
+webpack.config.ts

.gitignore

@@ -1,3 +1,4 @@
+dist
 out
 node_modules
 .vscode-test/

.vscode/launch.json

@@ -14,13 +14,30 @@
 				"--extensionDevelopmentPath=${workspaceFolder}"
 			],
 			"env": {
-				"DEBUGTELEMETRY": "v"
+				"DEBUGTELEMETRY": "v",
+				"VSCODE_DAPR_IGNORE_BUNDLE": "true"
 			},
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			],
 			"preLaunchTask": "${defaultBuildTask}"
 		},
+		{
+			"name": "Run Extension (Packed)",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}"
+			],
+			"env": {
+				"DEBUGTELEMETRY": "v"
+			},
+			"outFiles": [
+				"${workspaceFolder}/dist/**/*.js"
+			],
+			"preLaunchTask": "build-packed"
+		},
 		{
 			"name": "Run Extension (Pseudo)",
 			"type": "extensionHost",
@@ -31,6 +48,7 @@
 			],
 			"env": {
 				"DEBUGTELEMETRY": "v",
+				"VSCODE_DAPR_IGNORE_BUNDLE": "true",
 				"VSCODE_DAPR_LOCALE": "pseudo"
 			},
 			"sourceMaps": true,
@@ -49,6 +67,10 @@
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--extensionTestsPath=${workspaceFolder}/out/test/suite/allTests"
 			],
+			"env": {
+				"DEBUGTELEMETRY": "v",
+				"VSCODE_DAPR_IGNORE_BUNDLE": "true"
+			},
 			"outFiles": [
 				"${workspaceFolder}/out/test/**/*.js"
 			],
@@ -63,6 +85,10 @@
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--extensionTestsPath=${workspaceFolder}/out/test/suite/unitTests"
 			],
+			"env": {
+				"DEBUGTELEMETRY": "v",
+				"VSCODE_DAPR_IGNORE_BUNDLE": "true"
+			},
 			"outFiles": [
 				"${workspaceFolder}/out/test/**/*.js"
 			],

.vscode/tasks.json

@@ -14,6 +14,15 @@
 				"kind": "build",
 				"isDefault": true
 			}
+		},
+		{
+			"label": "build-packed",
+			"type": "npm",
+			"script": "build-packed",
+			"problemMatcher": "$gulp-tsc",
+			"presentation": {
+				"reveal": "never"
+			}
 		}
 	]
 }

.vscodeignore

@@ -2,11 +2,13 @@
 .eslintignore
 .vscode/**
 .vscode-test/**
-out/test/**
+node_modules/**
+out/**
 samples/**
 src/**
 .gitignore
 vsc-extension-quickstart.md
+webpack.config.ts
 **/tsconfig.json
 **/tslint.json
 **/*.map

gulpfile.ts

@@ -9,15 +9,26 @@ import * as nls from 'vscode-nls-dev';
 import * as sourcemaps from 'gulp-sourcemaps';
 import * as ts from 'gulp-typescript';
 import * as vsce from 'vsce';
+import * as webpack from 'webpack';
+
+import { config as webpackConfig } from './webpack.config';
 
 const languages: nls.Language[] = [
     { folderName: 'jpn', id: 'ja' }
 ];
 
 const tsProject = ts.createProject('./tsconfig.json');
 
+function getDistDir(): string {
+    if (!webpackConfig.output?.path) {
+        throw new Error('path is not defined in webpack.config.ts');
+    }
+
+    return webpackConfig.output.path;
+}
+
 function getOutDir(): string {
-    if (!tsProject.options.outDir) {
+    if (!tsProject.options?.outDir) {
         throw new Error('outDir is not defined in tsconfig.json.');
     }
 
@@ -29,7 +40,7 @@ function wrapThroughStream(stream: nls.ThroughStream): NodeJS.ReadWriteStream {
 }
 
 function cleanTask(): Promise<string[]> {
-    return del([getOutDir(), 'package.nls.*.json', 'vscode-dapr-*.vsix']);
+    return del([getDistDir(), getOutDir(), 'package.nls.*.json', 'vscode-dapr-*.vsix']);
 }
 
 function lintTaskFactory(warningsAsErrors?: boolean) {
@@ -65,6 +76,36 @@ function compileTask(): NodeJS.ReadWriteStream {
         .pipe(gulp.dest(outDir));
 }
 
+function compilePackedTaskFactory(mode: 'production' | 'development'): () => Promise<void> {
+    return function compilePackedTask() {
+        return new Promise(
+            (resolve, reject) => {
+                webpack(
+                    {
+                        ...webpackConfig,
+                        mode
+                    },
+                    (err, stats) => {
+                        if (err) {
+                            return reject(err);
+                        }
+
+                        const info = stats.toJson();
+
+                        if (stats.hasErrors()) {
+                            return reject(new Error(info.errors.join('\n')));
+                        }
+
+                        if (stats.hasWarnings()) {
+                            info.warnings.forEach(warning => console.warn(warning));
+                        }
+
+                        return resolve();
+                    });
+            });
+    }
+}
+
 function addI18nTask() {
     return gulp.src(['package.nls.json'])
         .pipe(wrapThroughStream(nls.createAdditionalLanguageFiles(languages, 'i18n')))
@@ -85,14 +126,16 @@ function vscePackageTask() {
 
 const buildTask = gulp.series(cleanTask, compileTask, addI18nTask);
 
-const ciBuildTask = gulp.series(buildTask, lintTaskFactory(/* warningsAsErrors: */ true), testTask);
+const ciBuildTask = gulp.series(cleanTask, compilePackedTaskFactory('production'), lintTaskFactory(/* warningsAsErrors: */ true));
 
 gulp.task('clean', cleanTask);
 
 gulp.task('lint', lintTaskFactory());
 
 gulp.task('build', buildTask);
 
+gulp.task('build-packed', gulp.series(cleanTask, compilePackedTaskFactory('development')));
+
 gulp.task('unit-test', gulp.series(buildTask, unitTestTask));
 
 gulp.task('test', gulp.series(buildTask, testTask));

main.js

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+
+const ignoreBundle = !/^(false|0)?$/i.test(process.env.VSCODE_DAPR_IGNORE_BUNDLE || '');
+const extensionPath = ignoreBundle ? "./out/src/extension" : "./dist/extension";
+const extension = require(extensionPath);
+
+function activate(ctx) {
+    return extension.activate(ctx);
+}
+
+function deactivate(ctx) {
+    return extension.deactivate(ctx);
+}
+
+exports.activate = activate;
+exports.deactivate = deactivate;