Skip to content

Commit 5c59222

Browse files
committed
Remove the rest of webpack and get server-side loading
1 parent bf90bac commit 5c59222

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+612
-9369
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/lib
55
node_modules
66
out
7+
release

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ matrix:
88
- os: linux
99
dist: trusty
1010
env:
11-
- VSCODE_VERSION="1.33.1" MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER-vsc$VSCODE_VERSION" TARGET="centos"
11+
- MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="centos"
1212
- os: linux
1313
dist: trusty
1414
env:
15-
- VSCODE_VERSION="1.33.1" MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER-vsc$VSCODE_VERSION" TARGET="alpine"
15+
- MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="alpine"
1616
- os: osx
1717
env:
18-
- VSCODE_VERSION="1.33.1" MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER-vsc$VSCODE_VERSION"
18+
- MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
1919
before_install:
2020
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libxkbfile-dev
2121
libsecret-1-dev; fi

build/tasks.ts

-211
This file was deleted.

package.json

+11-23
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,17 @@
55
"license": "MIT",
66
"description": "Run VS Code remotely.",
77
"private": true,
8-
"workspaces": ["packages/*", "packages/app/*", "lib/vscode"],
8+
"workspaces": ["packages/*", "packages/app/*"],
99
"scripts": {
10-
"build:rules": "cd ./rules && tsc -p .",
11-
"preinstall": "yarn task vscode:install",
12-
"postinstall": "yarn build:rules",
13-
"watch": "yarn task watch",
10+
"postinstall": "npm-run-all --parallel vscode:install build:rules",
1411
"build": "yarn task build",
15-
"task": "ts-node -r tsconfig-paths/register build/tasks.ts",
12+
"start": "npm-run-all --parallel watch build:run",
13+
"watch": "yarn task build true",
14+
"build:run": "cd ./out && node ./packages/server/src/cli # TODO: restart on change",
15+
"build:rules": "cd ./rules && tsc -p .",
16+
"vscode:install": "yarn task vscode:install",
17+
"lint": "tslint --project .",
18+
"task": "ts-node -r tsconfig-paths/register scripts/tasks.ts",
1619
"test": "jest"
1720
},
1821
"devDependencies": {
@@ -25,43 +28,28 @@
2528
"crypto-browserify": "^3.12.0",
2629
"css-loader": "^2.1.0",
2730
"file-loader": "^3.0.1",
28-
"fork-ts-checker-webpack-plugin": "^0.5.2",
2931
"fs-extra": "^7.0.1",
3032
"happypack": "^5.0.1",
31-
"html-webpack-plugin": "^3.2.0",
3233
"http-browserify": "^1.7.0",
3334
"ignore-loader": "^0.1.2",
3435
"jest": "^23.6.0",
3536
"mini-css-extract-plugin": "^0.5.0",
3637
"node-sass": "^4.11.0",
3738
"npm-run-all": "^4.1.5",
3839
"path-browserify": "^1.0.0",
39-
"preload-webpack-plugin": "^3.0.0-beta.2",
4040
"sass-loader": "^7.1.0",
4141
"string-replace-loader": "^2.1.1",
4242
"style-loader": "^0.23.1",
4343
"tar": "^4.4.8",
44-
"terser-webpack-plugin": "^1.2.3",
4544
"ts-jest": "^23.10.5",
4645
"ts-loader": "^6.0.0",
4746
"ts-node": "^7.0.1",
48-
"tsconfig-paths": "^3.8.0",
4947
"tslib": "^1.9.3",
5048
"tslint": "^5.16.0",
5149
"typescript": "^3.4.5",
5250
"typescript-tslint-plugin": "^0.3.1",
53-
"uglifyjs-webpack-plugin": "^2.1.1",
5451
"url-loader": "^1.1.2",
55-
"util": "^0.11.1",
56-
"webpack": "^4.28.4",
57-
"webpack-bundle-analyzer": "^3.0.3",
58-
"webpack-cli": "^3.2.1",
59-
"webpack-dev-middleware": "^3.5.0",
60-
"webpack-dev-server": "^3.1.14",
61-
"webpack-hot-middleware": "^2.24.3",
62-
"webpack-pwa-manifest": "^4.0.0",
63-
"workbox-webpack-plugin": "^4.1.0",
64-
"write-file-webpack-plugin": "^4.5.0"
52+
"util": "^0.11.1"
6553
},
6654
"resolutions": {
6755
"bindings": "1.3.0"
@@ -70,7 +58,7 @@
7058
"node-loader": "^0.6.0",
7159
"node-pty": "0.8.1",
7260
"spdlog": "0.8.1",
73-
"webpack-merge": "^4.2.1"
61+
"tsconfig-paths": "^3.8.0"
7462
},
7563
"jest": {
7664
"globals": {

packages/app/browser/webpack.config.js

-16
This file was deleted.

packages/app/chrome/src/chome.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ts-ignore
2-
import { TcpHost, TcpServer, TcpConnection } from "@coder/app/common/src/app";
3-
import { Event, Emitter } from "@coder/events/src";
2+
import { Event, Emitter } from "@coder/events";
3+
import { TcpHost, TcpServer, TcpConnection } from "../../common/src/app";
44

55
export const tcpHost: TcpHost = {
66
listen(host: string, port: number): Promise<TcpServer> {

packages/app/chrome/src/content.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { create } from "@coder/app/common/src/app";
21
import { tcpHost } from "./chome";
2+
import { create } from "../../common/src/app";
33

44
create({
55
storage: {

packages/app/chrome/webpack.config.js

-37
This file was deleted.

packages/ide/src/client.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { field, logger, time, Time } from "@coder/logger";
2-
import { SharedProcessData } from "@coder/protocol";
3-
import { retry } from "./retry";
2+
import { INotificationService, IProgressService, retry, SharedProcessData } from "@coder/protocol";
43
import { upload } from "./upload";
54
import { client } from "./fill/client";
65
import { clipboard } from "./fill/clipboard";
7-
import { INotificationService, IProgressService } from "./fill/notification";
86
import "./fill/os"; // Ensure it fills before anything else waiting on initData.
97

108
/**

0 commit comments

Comments
 (0)