[VsCoq1] Webpack Client and Server

.gitignore

@@ -7,3 +7,4 @@ backup.sh
 start-env.ps1
 **/npm-debug.log
 *.tsbuildinfo
+*.vsix

.vscode/launch.json

@@ -8,20 +8,20 @@
 			"name": "Launch Client",
 			"runtimeExecutable": "${execPath}",
 			"args": ["--extensionDevelopmentPath=${workspaceRoot}"],
-			"outFiles": ["${workspaceRoot}/out/client/**/*.js"],
-			"preLaunchTask": {
-				"type": "npm",
-				"script": "compile"
-			}
+			"outFiles": ["${workspaceRoot}/client/out/**/*.js"],
+			"sourceMaps": true,
+			"preLaunchTask": "npm: watch" //The new vscode window still needs to be reloaded after changes (Ctrl+Shift+F5 in the debugger)
 		},
 		{
 			"type": "node",
 			"request": "attach",
 			"protocol": "inspector",
+			"address": "localhost",
 			"name": "Attach to Server",
 			"port": 6009,
 			"restart": true,
-			"outFiles": ["${workspaceRoot}/out/server/**/*.js"]
+			"sourceMaps": true,
+			"outFiles": ["${workspaceRoot}/server/out/**/*.js"]
         }
 	],
 	"compounds": [

.vscode/tasks.json

@@ -3,14 +3,24 @@
 	"tasks": [
 		{
 			"type": "npm",
-			"script": "compile",
+			"script": "watch",
+			"promptOnClose": true,
+			"isBackground": true,
 			"group": {
 				"kind": "build",
 				"isDefault": true
 			},
-			"problemMatcher": [
-				"$tsc"
-			]
+			"presentation": {
+				"reveal": "never",
+				"panel": "dedicated"
+			},
+			"problemMatcher": "$ts-webpack-watch",
+		},
+		{
+			"type": "npm",
+			"script": "compile",
+			"group":  "build",
+			"problemMatcher": "$ts-webpack-watch",
 		},
 	]
 }

.vscodeignore

@@ -1,13 +1,27 @@
+**/.gitignore
+shared.webpack.config.js
+webpack.*.config.js
+**/*.ts
+**/*.map
+**/webpack.config.js
+**/tsconfig.json
+**/tsconfig.base.json
+**/tslint.json
 .vscode/**
-out/client/test/**
+node_modules
+tsconfig.tsbuildinfo
+
+
+# The client is partially web packed. So only ship extension.js
 client/test/**
 client/src/**
-client/server/installServerIntoExtension.cmd
-client/server/installServerIntoExtension
-client/**/*.map
-.gitignore
-client/tsconfig.json
+client/out/**
+!client/out/extension.js
+
+# The html_views are partially web packed.
+html_views/src
+html_views/typing
+
+# The server is web packed. So only ship server.js
 server/**
-html_views/**
-out/**/*.js.map
-out/server/test
+!server/out/server.js

Makefile

@@ -1,10 +1,10 @@
-world: compile
+world: node_modules
 	node_modules/.bin/vsce package
 
 clean:
-	rm -rf node_modules out
+	rm -rf node_modules client/out server/out html_views/out
 
-node_modules:
+node_modules: package.json
 	npm install
 
 compile: node_modules

client/src/CoqLanguageServer.ts

@@ -39,7 +39,7 @@ export class CoqLanguageServer implements vscode.Disposable {
 
   private constructor(context: ExtensionContext) {
     // The server is implemented in node
-    let serverModule = context.asAbsolutePath(path.join('out', 'server', 'src', 'server.js'));
+    let serverModule = context.asAbsolutePath(path.join('server', 'out', 'server.js'));
     // The debug options for the server
     let debugOptions = ["--nolazy", "--inspect=6009"];
 

client/src/Decorations.ts

@@ -1,9 +1,9 @@
 'use strict';
 import * as vscode from 'vscode';
 
-const STM_FOCUS_IMAGE = "out/images/stm-focus.svg";
-const STM_FOCUS_IMAGE_BEFORE = "out/images/stm-focus-before.svg";
-const STM_FOCUS_IMAGE_PROOF_VIEW = "out/images/stm-focus-proof-view.svg";
+const STM_FOCUS_IMAGE = "client/images/stm-focus.svg";
+const STM_FOCUS_IMAGE_BEFORE = "client/images/stm-focus-before.svg";
+const STM_FOCUS_IMAGE_PROOF_VIEW = "client/images/stm-focus-proof-view.svg";
 
 interface DecorationsInternal extends Decorations {
   parsing: vscode.TextEditorDecorationType;

client/src/HtmlCoqView.ts

@@ -47,7 +47,7 @@ type ProofViewProtocol = GoalUpdate | SettingsUpdate;
 const VIEW_PATH = 'html_views';
 
 function proofViewFile(file: string = "") {
-  return vscode.Uri.file(extensionContext.asAbsolutePath(path.join('out', VIEW_PATH, file)));
+  return vscode.Uri.file(extensionContext.asAbsolutePath(path.join(VIEW_PATH, 'static', file)));
 }
 
 function proofViewHtmlPath() {
@@ -131,7 +131,7 @@ export class HtmlCoqView implements view.CoqView {
         },
         {
           enableScripts: true,
-          localResourceRoots: [vscode.Uri.file(path.join(extensionContext.extensionPath, 'out', VIEW_PATH))]
+          localResourceRoots: [vscode.Uri.file(path.join(extensionContext.extensionPath, VIEW_PATH))]
         }
       );
 
@@ -142,10 +142,10 @@ export class HtmlCoqView implements view.CoqView {
 
       let doc = await vscode.workspace.openTextDocument(this.coqViewUri);
 
-      let csspath = path.join(extensionContext.extensionPath, 'out', VIEW_PATH, 'proof-view.css');
+      let csspath = path.join(extensionContext.extensionPath, VIEW_PATH, 'static', 'proof-view.css');
       let csspasthAsVscodeResource = this.panel.webview.asWebviewUri(vscode.Uri.file(csspath));
 
-      let jspath = path.join(extensionContext.extensionPath, 'out', VIEW_PATH, 'goals.js');
+      let jspath = path.join(extensionContext.extensionPath, VIEW_PATH, 'out', 'goals.js');
       let jspathAsVscodeResource = this.panel.webview.asWebviewUri(vscode.Uri.file(jspath));
 
       this.panel.webview.html = mustache.render(doc.getText(), {

client/tsconfig.json

@@ -1,6 +1,13 @@
 {
-  "extends": "../tsconfig",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
+    "module": "commonjs",
+    "target": "es6",
+    "outDir": "out",
+    "tsBuildInfoFile": "out/tsconfig.tsBuildInfoFile",
+    "rootDir": "src",
+    "lib": ["es6", "dom"],
+    "sourceMap": true,
     "composite": true,
     "forceConsistentCasingInFileNames": true,
     "noImplicitAny": true,

html_views/src/ltacprof/ltacprof.ts

@@ -205,11 +205,11 @@ function updateResults() {
     });
     $('#local-column').on("click",(ev:JQueryEventObject) => {
       if(ev.target === $('#local-column').get(0))
-        $('#local-unit option:selected').prop('selected',false).cycleNext().prop('selected', true); $('#local-unit').change()
+        ($('#local-unit option:selected').prop('selected',false) as any).cycleNext().prop('selected', true); $('#local-unit').change()
     });
     $('#total-column').on("click",(ev:JQueryEventObject) => {
       if(ev.target === $('#total-column').get(0))
-        $('#total-unit option:selected').prop('selected',false).cycleNext().prop('selected', true); $('#total-unit').change()
+        ($('#total-unit option:selected').prop('selected',false) as any).cycleNext().prop('selected', true); $('#total-unit').change()
     });
   }
   loadResultsTable(currentResults, tbody);

html_views/tsconfig.json

@@ -1,8 +1,10 @@
 {
-  "extends": "../tsconfig",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
-    "outDir": "../out/html_views",
+    "outDir": "out",
+    "tsBuildInfoFile": "out/tsconfig.tsBuildInfoFile",
+    "rootDir": "src",
     "forceConsistentCasingInFileNames": true,
     "noImplicitAny": true,
     "noImplicitReturns": true