Revamp loading

.gitignore

@@ -1,8 +1,7 @@
+.DS_Store
+.cache
+.vscode
 /lib
 node_modules
-dist
 out
-.DS_Store
 release
-.vscode
-.cache

.travis.yml

@@ -8,20 +8,20 @@ matrix:
   - os: linux
     dist: trusty
     env:
-      - VSCODE_VERSION="1.33.1" MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER-vsc$VSCODE_VERSION" TARGET="centos"
+      - MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="centos"
   - os: linux
     dist: trusty
     env:
-      - VSCODE_VERSION="1.33.1" MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER-vsc$VSCODE_VERSION" TARGET="alpine"
+      - MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="alpine"
   - os: osx
     env:
-      - VSCODE_VERSION="1.33.1" MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER-vsc$VSCODE_VERSION"
+      - MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
 before_install:
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libxkbfile-dev
   libsecret-1-dev; fi
 - npm install -g [email protected]
 script:
-- scripts/build.sh
+- scripts/build.bash
 before_deploy:
 - echo "$VERSION" "$TRAVIS_COMMIT"
 - git config --local user.name "$USER_NAME"

Dockerfile

@@ -13,7 +13,7 @@ COPY . .
 
 # In the future, we can use https://github.com/yarnpkg/rfcs/pull/53 to make yarn use the node_modules
 # directly which should be fast as it is slow because it populates its own cache every time.
-RUN yarn && NODE_ENV=production yarn task build:server:binary
+RUN yarn && yarn build
 
 # We deploy with ubuntu so that devs have a familiar environment.
 FROM ubuntu:18.04

package.json

@@ -4,13 +4,20 @@
   "author": "Coder",
   "license": "MIT",
   "description": "Run VS Code remotely.",
+  "private": true,
+  "workspaces": ["packages/*", "packages/app/*"],
   "scripts": {
+    "postinstall": "yarn build:rules",
+    "build": "yarn task build",
+    "bundle": "yarn task bundle",
+    "package": "yarn task package",
+    "start": "npm-run-all --parallel watch build:run",
+    "watch": "yarn task build true",
+    "build:run": "cd ./out && node ./packages/server/src/cli # TODO: restart on change",
     "build:rules": "cd ./rules && tsc -p .",
-    "packages:install": "cd ./packages && yarn",
-    "postinstall": "npm-run-all --parallel packages:install build:rules",
-    "start": "cd ./packages/server && yarn start",
-    "task": "ts-node -r tsconfig-paths/register build/tasks.ts",
-    "test": "cd ./packages && yarn test"
+    "lint": "tslint --project .",
+    "task": "ts-node -r tsconfig-paths/register scripts/tasks.ts",
+    "test": "jest"
   },
   "devDependencies": {
     "@types/fs-extra": "^5.0.4",
@@ -22,41 +29,28 @@
     "crypto-browserify": "^3.12.0",
     "css-loader": "^2.1.0",
     "file-loader": "^3.0.1",
-    "fork-ts-checker-webpack-plugin": "^0.5.2",
     "fs-extra": "^7.0.1",
     "happypack": "^5.0.1",
-    "html-webpack-plugin": "^3.2.0",
     "http-browserify": "^1.7.0",
     "ignore-loader": "^0.1.2",
+    "jest": "^23.6.0",
     "mini-css-extract-plugin": "^0.5.0",
     "node-sass": "^4.11.0",
     "npm-run-all": "^4.1.5",
     "path-browserify": "^1.0.0",
-    "preload-webpack-plugin": "^3.0.0-beta.2",
     "sass-loader": "^7.1.0",
     "string-replace-loader": "^2.1.1",
     "style-loader": "^0.23.1",
     "tar": "^4.4.8",
-    "terser-webpack-plugin": "^1.2.3",
-    "ts-loader": "^5.3.3",
+    "ts-jest": "^23.10.5",
+    "ts-loader": "^6.0.0",
     "ts-node": "^7.0.1",
-    "tsconfig-paths": "^3.8.0",
     "tslib": "^1.9.3",
-    "tslint": "^5.12.1",
-    "typescript": "^3.2.2",
-    "typescript-tslint-plugin": "^0.2.1",
-    "uglifyjs-webpack-plugin": "^2.1.1",
+    "tslint": "^5.16.0",
+    "typescript": "^3.4.5",
+    "typescript-tslint-plugin": "^0.3.1",
     "url-loader": "^1.1.2",
-    "util": "^0.11.1",
-    "webpack": "^4.28.4",
-    "webpack-bundle-analyzer": "^3.0.3",
-    "webpack-cli": "^3.2.1",
-    "webpack-dev-middleware": "^3.5.0",
-    "webpack-dev-server": "^3.1.14",
-    "webpack-hot-middleware": "^2.24.3",
-    "webpack-pwa-manifest": "^4.0.0",
-    "workbox-webpack-plugin": "^4.1.0",
-    "write-file-webpack-plugin": "^4.5.0"
+    "util": "^0.11.1"
   },
   "resolutions": {
     "bindings": "1.3.0"
@@ -65,6 +59,39 @@
     "node-loader": "^0.6.0",
     "node-pty": "0.8.1",
     "spdlog": "0.8.1",
-    "webpack-merge": "^4.2.1"
+    "tsconfig-paths": "^3.8.0"
+  },
+  "jest": {
+    "globals": {
+      "ts-jest": {
+        "diagnostics": false
+      }
+    },
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js",
+      "json"
+    ],
+    "setupFiles": [
+      "<rootDir>/../scripts/test-setup.js"
+    ],
+    "moduleNameMapper": {
+      "^.+\\.(s?css|png|svg)$": "<rootDir>/../scripts/dummy.js",
+      "@coder/ide/src/fill/evaluation": "<rootDir>/ide/src/fill/evaluation",
+      "@coder/ide/src/fill/client": "<rootDir>/ide/src/fill/client",
+      "@coder/(.*)/test": "<rootDir>/$1/test",
+      "@coder/(.*)": "<rootDir>/$1/src",
+      "vs/(.*)": "<rootDir>/../lib/vscode/src/vs/$1",
+      "vszip": "<rootDir>/../lib/vscode/src/vs/base/node/zip.ts"
+    },
+    "transform": {
+      "^.+\\.tsx?$": "ts-jest"
+    },
+    "testPathIgnorePatterns": [
+      "/node_modules/",
+      "/logger/"
+    ],
+    "testRegex": ".*\\.test\\.tsx?"
   }
 }

packages/app/browser/package.json

@@ -1,5 +1,6 @@
 {
 	"name": "@coder/app",
+	"version": "1.0.0",
 	"scripts": {
 		"start": "node ../../../node_modules/webpack-dev-server/bin/webpack-dev-server.js --config ./webpack.config.js",
 		"build": "node ../../../node_modules/webpack/bin/webpack.js --config ./webpack.config.js"