Minify bundles (#40)

PhilippeChab · web-flow · commit f37f986caba1 · 2022-08-13T22:05:50.000-04:00
* Use webpack to minify bundles
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,8 +1,12 @@
 name: Build
 
 on:
-  pull_request:
   push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
   release:
     types: published
 
@@ -61,7 +65,7 @@ jobs:
           generate_release_notes: true
           body: |
             # Summary
-            See [changelog](https://github.com/PhilippeChab/nwscript-ee-language-server/blob/main/CHANGELOG.md)
+            See the [Changelog](https://github.com/PhilippeChab/nwscript-ee-language-server/blob/main/CHANGELOG.md).
           name: ${{ github.ref_name }}
           fail_on_unmatched_files: true
           files: ${{ needs.build.outputs.vsixPath }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -3,6 +3,9 @@ name: Tests
 on:
   pull_request:
   push:
+    branches:
+      - main
+
 jobs:
   tests:
     name: Tests
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@ dist
 node_modules
 tsconfig.tsbuildinfo
 *.vsix
-server/resources/nwscript.nss
+server/scripts/nwscript.nss
 yarn-error.log
 .DS_Store
 TODO.txt
diff --git a/.vscodeignore b/.vscodeignore
@@ -1,15 +1,19 @@
 .vscode/**
-client/src/**
-server/src/**
-!server/src/resources
+.github/**
 .gitignore
 .yarnrc
-webpack.config.js
 **/tsconfig.json
 **/.eslintrc.json
-test/**
-server/resources/nwscript.nss
-server/scripts
-server/test
+**/*.ts
+**/*.map
+shared.webpack.config.js
 images/**
 TODO.txt
+*.vsix
+
+client/**
+server/**
+!client/out/extension.js
+!server/out/server.js
+!server/out/indexer.js
+!server/resources/**
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,3 +35,7 @@ All notable changes to the "nwscript-ee-language-server" extension will be docum
 ## [1.4.2]
 
 - Fixed a few issues with the tokenizer
+
+## [1.5.0]
+
+- The extension size has been lowered from 14.7 to 4.8 MB.
diff --git a/README.md b/README.md
@@ -3,7 +3,6 @@
 ![Build](https://github.com/PhilippeChab/nwscript-ee-language-server/actions/workflows/build.yml/badge.svg)
 ![Tests](https://github.com/PhilippeChab/nwscript-ee-language-server/actions/workflows/tests.yml/badge.svg)
 
-
 NWScript: EE Language Server is a Visual Studio Code extension LSP for the NWScript language.
 
 While it seems to work well, even in bigger and older code bases, it is still an early project and there might be some unintended behaviours.
@@ -74,7 +73,7 @@ Notes:
 
 Notes:
 
-- The executable setting must either bet set to you path executable's identifier, or its absolute path.
+- The executable setting must either bet set to your path executable's identifier, or its absolute path.
 - The style object must respect clang-format [rules](https://clang.llvm.org/docs/ClangFormatStyleOptions.html).
 
 ### Diagnostics
@@ -114,7 +113,7 @@ I personally use the [One Dark Pro](https://marketplace.visualstudio.com/items?i
 
 ### Generating the language library definitions
 
-Replace `server/resources/nwscript.nss` by its new version and execute `yarn run generate-lib-defs` in the server root directory.
+Replace `server/scripts/nwscript.nss` by its new version and execute `yarn run generate-lib-defs` in the server root directory.
 
 ## Issues
 
diff --git a/client/tsconfig.json b/client/tsconfig.json
@@ -12,4 +12,4 @@
   },
   "include": ["src"],
   "exclude": ["node_modules"]
-}
+}
diff --git a/client/webpack.config.js b/client/webpack.config.js
@@ -0,0 +1,18 @@
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+const path = require('path');
+
+module.exports = withDefaults({
+	context: path.join(__dirname),
+	entry: {
+		extension: './src/extension.ts',
+	},
+	resolve: {
+		symlinks: false
+	},
+	output: {
+		filename: 'extension.js',
+		path: path.join(__dirname, 'out')
+	}
+});
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "url": "https://github.com/PhilippeChab/nwscript-ee-language-server"
   },
   "license": "MIT",
-  "version": "1.4.3",
+  "version": "1.5.0",
   "author": {
     "name": "Philippe Chabot"
   },
@@ -134,20 +134,29 @@
     }
   },
   "scripts": {
-    "vscode:prepublish": "yarn package",
+    "vscode:prepublish": "yarn webpack",
+    "webpack": "yarn clean && webpack --mode production --config ./client/webpack.config.js && webpack --mode production --config ./server/webpack.config.js",
+    "webpack:dev": "yarn clean && webpack --mode none --config ./client/webpack.config.js && webpack --mode none --config ./server/webpack.config.js",
     "compile": "tsc -b",
+    "compile:client": "tsc -b ./client/tsconfig.json",
+    "compile:server": "tsc -b ./server/tsconfig.json",
     "watch": "tsc -b -w",
-    "package": "yarn compile",
     "lint": "eslint ./client/src ./server/src --ext .ts",
     "postinstall": "cd client && yarn install && cd ../server && yarn install && cd ..",
-    "test": "cd server && yarn test"
+    "test": "cd server && yarn test && cd ..",
+    "clean": "rimraf client/out && rimraf server/out"
   },
   "devDependencies": {
     "@types/node": "14.x",
     "@typescript-eslint/eslint-plugin": "^5.21.0",
     "@typescript-eslint/parser": "^5.21.0",
     "eslint": "^8.14.0",
+    "merge-options": "^3.0.4",
     "prettier": "^2.6.2",
-    "typescript": "^4.6.4"
+    "rimraf": "^3.0.2",
+    "ts-loader": "^9.3.1",
+    "typescript": "^4.6.4",
+    "webpack": "^5.74.0",
+    "webpack-cli": "^4.10.0"
   }
 }
diff --git a/server/package.json b/server/package.json
@@ -27,16 +27,14 @@
     "vscode-languageserver": "^7.0.0",
     "vscode-languageserver-textdocument": "^1.0.4",
     "vscode-oniguruma": "^1.6.1",
-    "vscode-textmate": "^7.0.1",
-    "zeromq": "6.0.0-beta.6"
+    "vscode-textmate": "^7.0.1"
   },
   "devDependencies": {
     "@types/chai": "^4.3.3",
     "@types/glob": "^7.2.0",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.35",
     "@types/sax": "^1.2.4",
-    "@types/zeromq": "^5.2.1",
     "chai": "^4.3.6",
     "mocha": "^10.0.0",
     "ts-node": "^10.7.0"
diff --git a/server/scripts/GenerateLibDefinitions.ts b/server/scripts/GenerateLibDefinitions.ts
@@ -4,9 +4,9 @@ import { Tokenizer } from "../src/Tokenizer";
 import { TokenizedScope } from "../src/Tokenizer/Tokenizer";
 
 const generateDefinitions = async () => {
-  const tokenizer = await new Tokenizer().loadGrammar();
+  const tokenizer = await new Tokenizer(true).loadGrammar();
 
-  const lib = readFileSync(normalize(join(__dirname, "../resources/nwscript.nss"))).toString();
+  const lib = readFileSync(normalize(join(__dirname, "./nwscript.nss"))).toString();
 
   const definitions = tokenizer.tokenizeContent(lib, TokenizedScope.global);
   writeFileSync(normalize(join(__dirname, "../resources/standardLibDefinitions.json")), JSON.stringify(definitions, null, 4));
diff --git a/server/src/Documents/DocumentsCollection.ts b/server/src/Documents/DocumentsCollection.ts
@@ -15,7 +15,7 @@ export default class DocumentsCollection extends Dictionnary<string, Document> {
     super();
 
     this.standardLibComplexTokens = JSON.parse(
-      WorkspaceFilesSystem.readFileSync(join(__dirname, "..", "..", "resources", "standardLibDefinitions.json")).toString()
+      WorkspaceFilesSystem.readFileSync(join(__dirname, "..", "resources", "standardLibDefinitions.json")).toString()
     ).complexTokens as ComplexToken[];
   }
 
diff --git a/server/src/Documents/DocumentsIndexer.ts b/server/src/Documents/DocumentsIndexer.ts
@@ -1,15 +1,14 @@
 import { exit } from "process";
-import { Request } from "zeromq";
 
 import { Tokenizer } from "../Tokenizer";
 import { TokenizedScope } from "../Tokenizer/Tokenizer";
 import { WorkspaceFilesSystem } from "../WorkspaceFilesSystem";
-import { SOCKET_ADRESS } from "../server";
-
-const socket = new Request();
-socket.connect(SOCKET_ADRESS);
 
 const generateTokens = async (filesPath: string[]) => {
+  if (filesPath.length === 1 && !Boolean(filesPath[0])) {
+    exit(0);
+  }
+
   const tokenizer = await new Tokenizer().loadGrammar();
 
   for (let i = 0; i < filesPath.length; i++) {
@@ -21,11 +20,9 @@ const generateTokens = async (filesPath: string[]) => {
     const fileContent = WorkspaceFilesSystem.readFileSync(filePath).toString();
     const globalScope = tokenizer.tokenizeContent(fileContent, TokenizedScope.global);
 
-    await socket.send(JSON.stringify({ filePath, globalScope }));
-    await socket.receive();
+    process?.send!(JSON.stringify({ filePath, globalScope }));
   }
 
-  socket.close();
   exit(0);
 };
 
diff --git a/server/src/Providers/DiagnosticsProvider.ts b/server/src/Providers/DiagnosticsProvider.ts
@@ -57,11 +57,11 @@ export default class DiagnoticsProvider extends Provider {
   private getExecutablePath() {
     switch (type()) {
       case OS.linux:
-        return "../../resources/compiler/linux/nwnsc";
+        return "../resources/compiler/linux/nwnsc";
       case OS.mac:
-        return "../../resources/compiler/mac/nwnsc";
+        return "../resources/compiler/mac/nwnsc";
       case OS.windows:
-        return "../../resources/compiler/windows/nwnsc.exe";
+        return "../resources/compiler/windows/nwnsc.exe";
       default:
         return "";
     }
diff --git a/server/src/ServerManager/ServerManager.ts b/server/src/ServerManager/ServerManager.ts
@@ -42,7 +42,7 @@ export default class ServerManger {
   }
 
   public async initialize() {
-    this.tokenizer = await new Tokenizer(this.logger).loadGrammar();
+    this.tokenizer = await new Tokenizer().loadGrammar();
     this.documentsCollection = new DocumentsCollection();
     this.registerProviders();
     this.registerLiveDocumentsEvents();
diff --git a/server/src/Tokenizer/Tokenizer.ts b/server/src/Tokenizer/Tokenizer.ts
@@ -1,8 +1,7 @@
 import type { IGrammar } from "vscode-textmate";
 import type { Position } from "vscode-languageserver-textdocument";
-import { Registry, INITIAL, parseRawGrammar, IToken, ITokenizeLineResult } from "vscode-textmate";
-import { loadWASM, OnigScanner, OnigString } from "vscode-oniguruma";
-import { CompletionItemKind, Diagnostic, DiagnosticSeverity } from "vscode-languageserver";
+import { Registry, INITIAL, parseRawGrammar, IToken } from "vscode-textmate";
+import { CompletionItemKind } from "vscode-languageserver";
 import { join } from "path";
 
 import type {
@@ -13,21 +12,8 @@ import type {
   VariableComplexToken,
 } from "./types";
 import { WorkspaceFilesSystem } from "../WorkspaceFilesSystem";
-import { Logger } from "../Logger";
 import { LanguageTypes, LanguageScopes } from "./constants";
-
-const wasmBin = WorkspaceFilesSystem.readFileSync(join(__dirname, "..", "..", "resources", "onig.wasm")).buffer;
-
-const vscodeOnigurumaLib = loadWASM(wasmBin).then(() => {
-  return {
-    createOnigScanner(patterns: string[]) {
-      return new OnigScanner(patterns);
-    },
-    createOnigString(string: string) {
-      return new OnigString(string);
-    },
-  };
-});
+import onigLib from "../onigLib";
 
 export enum TokenizedScope {
   global = "global",
@@ -50,14 +36,14 @@ export default class Tokenizer {
   private grammar: IGrammar | null = null;
   private localScopeCache: (IToken[] | undefined)[] | null = null;
 
-  constructor(private readonly logger: Logger | null = null) {
+  constructor(localPath = false) {
     this.registry = new Registry({
-      onigLib: vscodeOnigurumaLib,
+      onigLib,
       loadGrammar: (scopeName) => {
         return new Promise((resolve, reject) => {
           if (scopeName === "source.nss") {
             return WorkspaceFilesSystem.readFileAsync(
-              join(__dirname, "..", "..", "..", "syntaxes", "nwscript-ee.tmLanguage")
+              join(__dirname, "..", "..", localPath ? ".." : "", "syntaxes", "nwscript-ee.tmLanguage")
             ).then((data) => resolve(parseRawGrammar((data as Buffer).toString())));
           }
 
diff --git a/server/src/onigLib.ts b/server/src/onigLib.ts
@@ -0,0 +1,16 @@
+import { join } from "path";
+import { loadWASM, OnigScanner, OnigString } from "vscode-oniguruma";
+import { WorkspaceFilesSystem } from "./WorkspaceFilesSystem";
+
+const wasmBin = WorkspaceFilesSystem.readFileSync(join(__dirname, "..", "resources", "onig.wasm")).buffer;
+
+export default loadWASM(wasmBin).then(() => {
+  return {
+    createOnigScanner(patterns: string[]) {
+      return new OnigScanner(patterns);
+    },
+    createOnigString(string: string) {
+      return new OnigString(string);
+    },
+  };
+});
diff --git a/server/src/server.ts b/server/src/server.ts
diff --git a/server/test/tokenization_test.ts b/server/test/tokenization_test.ts
diff --git a/server/webpack.config.js b/server/webpack.config.js
diff --git a/server/yarn.lock b/server/yarn.lock
diff --git a/shared.webpack.config.js b/shared.webpack.config.js
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/yarn.lock b/yarn.lock
