Add build script to package vsix

The current build process includes **everything** in the project, which
leads to ~25mb of payload for the extension. By isolating the files that
are actually needed, including node_modules, this could be reduced to
about 460kb.

Next step: use rollup to bundle the entire server, so that node_modules
don't have to be included at all.

Author: Keen Yee Liau

.vscode/settings.json

@@ -1,6 +1,6 @@
-{
-	"editor.insertSpaces": false,
-	"tslint.enable": true,
-	"typescript.tsc.autoDetect": "off",
-	"typescript.preferences.quoteStyle": "single"
-}
+{
+  "editor.insertSpaces": true,
+  "tslint.enable": true,
+  "typescript.tsc.autoDetect": "off",
+  "typescript.preferences.quoteStyle": "single"
+}

client/src/extension.ts

@@ -4,24 +4,34 @@ import { workspace, ExtensionContext } from 'vscode';
 import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, RevealOutputChannelOn } from 'vscode-languageclient';
 
 export function activate(context: ExtensionContext) {
-  // The server is implemented in node
-  const serverModule = context.asAbsolutePath(path.join('server', 'out', 'src', 'server.js'));
-  const options = {
-    module: serverModule,
-    transport: TransportKind.ipc,
-    options: {
-      env: {
-        // Force TypeScript to use the non-polling version of the file watchers.
-        TSC_NONPOLLING_WATCHER: true,
-      },
-    },
-  };
 
   // If the extension is launched in debug mode then the debug server options are used
   // Otherwise the run options are used
   const serverOptions: ServerOptions = {
-    run : options,
-    debug: options,
+    run : {
+      module: context.asAbsolutePath(path.join('server', 'server.js')),
+      transport: TransportKind.ipc,
+      options: {
+        env: {
+          // Force TypeScript to use the non-polling version of the file watchers.
+          TSC_NONPOLLING_WATCHER: true,
+        },
+      },
+    },
+    debug: {
+      module: context.asAbsolutePath(path.join('server', 'out', 'server.js')),
+      transport: TransportKind.ipc,
+      options: {
+        env: {
+          // Force TypeScript to use the non-polling version of the file watchers.
+          TSC_NONPOLLING_WATCHER: true,
+          NG_DEBUG: true,
+        },
+        execArgv: [
+          "--inspect=6009",	// If this is changed, update .vscode/launch.json as well
+        ]
+      },
+    },
   }
 
   // Options to control the language client

client/tsconfig.json

@@ -1,12 +1,8 @@
 {
+  "extends": "../tsconfig.json",
   "compilerOptions": {
-    "module": "commonjs",
-    "target": "es2015",
-    "outDir": "out",
-    "rootDir": "src",
-    "sourceMap": true,
-    "strict": true
+    "outDir": "out"
   },
   "include": ["src"],
-  "exclude": ["node_modules", ".vscode-test"]
+  "exclude": ["node_modules"]
 }

integration/smoke_spec.ts

@@ -9,7 +9,7 @@ class ResponseEmitter extends EventEmitter {}
 describe('Angular Language Service', () => {
   jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000; /* 10 seconds */
   const PROJECT_PATH = resolve(__dirname, '../project');
-  const SERVER_PATH = resolve(__dirname, '../../server/out/src/server.js');
+  const SERVER_PATH = resolve(__dirname, '../../server/out/server.js');
   const responseEmitter = new ResponseEmitter();
   let server: ChildProcess;
 

package.json

@@ -22,19 +22,20 @@
   ],
   "main": "./client/out/extension",
   "scripts": {
-    "vscode:prepublish": "cd client && yarn update-vscode && cd .. && yarn compile",
     "compile": "tsc -b",
     "watch": "tsc -b -w",
     "postinstall": "cd client && yarn && cd ../server && yarn && cd ..",
     "package": "rm -rf dist && node scripts/package.js",
-    "test": "tsc -b server/tests && jasmine server/out/tests/*_spec.js",
+    "test": "tsc -b server/src/tests && jasmine server/out/tests/*_spec.js",
     "test:integration": "tsc -b integration && jasmine integration/out/*_spec.js"
   },
+  "dependencies": {
+    "typescript": "~3.5.3"
+  },
   "devDependencies": {
     "@types/jasmine": "^3.4.0",
     "@types/node": "^10.9.4",
     "jasmine": "^3.4.0",
-    "typescript": "~3.5.3",
     "vsce": "^1.66.0",
     "vscode-jsonrpc": "^4.0.0"
   },

scripts/build.sh

@@ -8,3 +8,29 @@ rm -rf server/out
 
 # Build the client and server
 yarn run compile
+
+rm -rf dist
+mkdir dist
+cp package.json yarn.lock angular.png README.md dist
+mkdir dist/client
+cp client/package.json client/yarn.lock dist/client
+cp client/out/*.js dist/client
+mkdir dist/server
+cp server/package.json server/yarn.lock dist/server
+cp server/out/*.js dist/server
+
+pushd dist
+yarn install --production --ignore-scripts
+
+pushd client
+yarn install --production --ignore-scripts
+popd
+
+pushd server
+yarn install --production --ignore-scripts
+popd
+
+sed -i -e 's#./client/out/extension#./client/extension#' package.json
+../node_modules/.bin/vsce package --yarn --out ngls.vsix
+
+popd

scripts/cleanup.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -ex -o pipefail
+
+# Clean up from last build
+rm -rf client/out
+rm -rf server/out

server/tests/editorServices_spec.ts renamed to server/src/tests/editorServices_spec.ts

@@ -1,4 +1,4 @@
-import {LineIndexSnapshot, ProjectService, ScriptInfo} from '../src/editorServices';
+import {LineIndexSnapshot, ProjectService, ScriptInfo} from '../editorServices';
 
 import * as u from './test_utils';
 import {QUICKSTART} from './test_data';

server/tests/test_data.ts renamed to server/src/tests/test_data.ts

@@ -1,5 +1,5 @@
 import * as ts from 'typescript';
-import {Logger, ProjectServiceHost} from '../src/editorServices';
+import {Logger, ProjectServiceHost} from '../editorServices';
 
 export type MockData = string | MockDirectory;