Skip to content

Commit bf90bac

Browse files
committed
Use yarn workspaces and remove webpack for server-side code
1 parent 28c9361 commit bf90bac

Some content is hidden

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

44 files changed

+9353
-10264
lines changed

.gitignore

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1+
.DS_Store
2+
.cache
3+
.vscode
14
/lib
25
node_modules
3-
dist
46
out
5-
.DS_Store
6-
release
7-
.vscode
8-
.cache

package.json

+46-8
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@
44
"author": "Coder",
55
"license": "MIT",
66
"description": "Run VS Code remotely.",
7+
"private": true,
8+
"workspaces": ["packages/*", "packages/app/*", "lib/vscode"],
79
"scripts": {
810
"build:rules": "cd ./rules && tsc -p .",
9-
"packages:install": "cd ./packages && yarn",
10-
"postinstall": "npm-run-all --parallel packages:install build:rules",
11-
"start": "cd ./packages/server && yarn start",
11+
"preinstall": "yarn task vscode:install",
12+
"postinstall": "yarn build:rules",
13+
"watch": "yarn task watch",
14+
"build": "yarn task build",
1215
"task": "ts-node -r tsconfig-paths/register build/tasks.ts",
13-
"test": "cd ./packages && yarn test"
16+
"test": "jest"
1417
},
1518
"devDependencies": {
1619
"@types/fs-extra": "^5.0.4",
@@ -28,6 +31,7 @@
2831
"html-webpack-plugin": "^3.2.0",
2932
"http-browserify": "^1.7.0",
3033
"ignore-loader": "^0.1.2",
34+
"jest": "^23.6.0",
3135
"mini-css-extract-plugin": "^0.5.0",
3236
"node-sass": "^4.11.0",
3337
"npm-run-all": "^4.1.5",
@@ -38,13 +42,14 @@
3842
"style-loader": "^0.23.1",
3943
"tar": "^4.4.8",
4044
"terser-webpack-plugin": "^1.2.3",
41-
"ts-loader": "^5.3.3",
45+
"ts-jest": "^23.10.5",
46+
"ts-loader": "^6.0.0",
4247
"ts-node": "^7.0.1",
4348
"tsconfig-paths": "^3.8.0",
4449
"tslib": "^1.9.3",
45-
"tslint": "^5.12.1",
46-
"typescript": "^3.2.2",
47-
"typescript-tslint-plugin": "^0.2.1",
50+
"tslint": "^5.16.0",
51+
"typescript": "^3.4.5",
52+
"typescript-tslint-plugin": "^0.3.1",
4853
"uglifyjs-webpack-plugin": "^2.1.1",
4954
"url-loader": "^1.1.2",
5055
"util": "^0.11.1",
@@ -66,5 +71,38 @@
6671
"node-pty": "0.8.1",
6772
"spdlog": "0.8.1",
6873
"webpack-merge": "^4.2.1"
74+
},
75+
"jest": {
76+
"globals": {
77+
"ts-jest": {
78+
"diagnostics": false
79+
}
80+
},
81+
"moduleFileExtensions": [
82+
"ts",
83+
"tsx",
84+
"js",
85+
"json"
86+
],
87+
"setupFiles": [
88+
"<rootDir>/../scripts/test-setup.js"
89+
],
90+
"moduleNameMapper": {
91+
"^.+\\.(s?css|png|svg)$": "<rootDir>/../scripts/dummy.js",
92+
"@coder/ide/src/fill/evaluation": "<rootDir>/ide/src/fill/evaluation",
93+
"@coder/ide/src/fill/client": "<rootDir>/ide/src/fill/client",
94+
"@coder/(.*)/test": "<rootDir>/$1/test",
95+
"@coder/(.*)": "<rootDir>/$1/src",
96+
"vs/(.*)": "<rootDir>/../lib/vscode/src/vs/$1",
97+
"vszip": "<rootDir>/../lib/vscode/src/vs/base/node/zip.ts"
98+
},
99+
"transform": {
100+
"^.+\\.tsx?$": "ts-jest"
101+
},
102+
"testPathIgnorePatterns": [
103+
"/node_modules/",
104+
"/logger/"
105+
],
106+
"testRegex": ".*\\.test\\.tsx?"
69107
}
70108
}

packages/app/browser/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "@coder/app",
3+
"version": "1.0.0",
34
"scripts": {
45
"start": "node ../../../node_modules/webpack-dev-server/bin/webpack-dev-server.js --config ./webpack.config.js",
56
"build": "node ../../../node_modules/webpack/bin/webpack.js --config ./webpack.config.js"

0 commit comments

Comments
 (0)