Skip to content

Commit b40d8e7

Browse files
code-asherkylecarbs
code-asher
authored and
kylecarbs
committed
Fix install and possibly Jest
1 parent 9cd81f7 commit b40d8e7

9 files changed

Lines changed: 2542 additions & 72 deletions

File tree

‎packages/package.json‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
{
22
"scripts": {
33
"build:rules": "cd ./rules && yarn build",
4-
"postinstall": "ts-node ./scripts/install-packages.ts && yarn build:rules",
4+
"postinstall": "ts-node ./scripts/src/install-packages.ts && yarn build:rules",
55
"test": "jest"
66
},
77
"devDependencies": {
88
"@types/jest": "^23.3.12",
9-
"@types/node": "10.5.2",
10-
"@types/webpack-env": "1.13.6",
119
"jest": "^23.6.0",
1210
"ts-jest": "^23.10.5",
1311
"ts-node": "^7.0.1",
14-
"tslint": "5.11.0",
15-
"tslint-language-service": "0.9.9",
16-
"typescript": "3.1.3"
12+
"tslint": "^5.12.1",
13+
"typescript-tslint-plugin": "^0.2.1"
1714
},
1815
"dependencies": {
1916
"xmlhttprequest": "1.8.0"
@@ -26,10 +23,10 @@
2623
"json"
2724
],
2825
"setupFiles": [
29-
"<rootDir>/scripts/test-setup.js"
26+
"<rootDir>/scripts/src/test-setup.js"
3027
],
3128
"moduleNameMapper": {
32-
"^.+\\.(s?css|png|svg)$": "<rootDir>/scripts/dummy.js",
29+
"^.+\\.(s?css|png|svg)$": "<rootDir>/scripts/src/dummy.js",
3330
"@coder/(.*)/testing": "<rootDir>/packages/$1/testing",
3431
"@coder/(.*)": "<rootDir>/packages/$1/src"
3532
},

packages/scripts/dummy.js renamed to packages/scripts/src/dummy.js

File renamed without changes.

packages/scripts/install-packages.ts renamed to packages/scripts/src/install-packages.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { exec } from "child_process";
22
import { existsSync, readdirSync } from "fs";
33
import { join, resolve } from "path";
4-
import { logger, field } from "../logger";
4+
import { logger, field } from "../../logger";
55

66
/**
77
* Install dependencies for a single package.

packages/scripts/test-setup.js renamed to packages/scripts/src/test-setup.js

File renamed without changes.

‎packages/tsconfig.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"extends": "../tsconfig.json",
3+
"compilerOptions": {
4+
"plugins": [
5+
{
6+
"name": "tslint-language-service"
7+
}
8+
]
9+
}
10+
}

tslint.json renamed to packages/tslint.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"rulesDirectory": "./packages/rules/dist",
2+
"rulesDirectory": "./rules/dist",
33
"rules": {
44
"only-arrow-functions": true,
55
"curly-statement-newlines": true,

‎packages/yarn.lock‎

Lines changed: 50 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,6 @@
2323
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.12.tgz#7e0ced251fa94c3bc2d1023d4b84b2992fa06376"
2424
integrity sha512-/kQvbVzdEpOq4tEWT79yAHSM4nH4xMlhJv2GrLVQt4Qmo8yYsPdioBM1QpN/2GX1wkfMnyXvdoftvLUr0LBj7Q==
2525

26-
"@types/node@10.5.2":
27-
version "10.5.2"
28-
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.2.tgz#f19f05314d5421fe37e74153254201a7bf00a707"
29-
integrity sha512-m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q==
30-
31-
"@types/webpack-env@1.13.6":
32-
version "1.13.6"
33-
resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.6.tgz#128d1685a7c34d31ed17010fc87d6a12c1de6976"
34-
integrity sha512-5Th3OsZ4gTRdr9Mho83BQ23cex4sRhOR4XTG+m+cJc0FhtUBK9Vn62hBJ+pnQYnSxoPOsKoAPOx6FcphxBC8ng==
35-
3626
abab@^2.0.0:
3727
version "2.0.0"
3828
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
@@ -504,13 +494,6 @@ cache-base@^1.0.1:
504494
union-value "^1.0.0"
505495
unset-value "^1.0.0"
506496

507-
caller-id@^0.1.0:
508-
version "0.1.0"
509-
resolved "https://registry.yarnpkg.com/caller-id/-/caller-id-0.1.0.tgz#59bdac0893d12c3871408279231f97458364f07b"
510-
integrity sha1-Wb2sCJPRLDhxQIJ5Ix+XRYNk8Hs=
511-
dependencies:
512-
stack-trace "~0.0.7"
513-
514497
callsites@^2.0.0:
515498
version "2.0.0"
516499
resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
@@ -1143,7 +1126,7 @@ gauge@~2.7.3:
11431126
strip-ansi "^3.0.1"
11441127
wide-align "^1.1.0"
11451128

1146-
get-caller-file@^1.0.1:
1129+
get-caller-file@^1.0.1, get-caller-file@^1.0.2:
11471130
version "1.0.3"
11481131
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
11491132
integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
@@ -2361,12 +2344,13 @@ mkdirp@0.x, mkdirp@^0.5.0, mkdirp@^0.5.1:
23612344
dependencies:
23622345
minimist "0.0.8"
23632346

2364-
mock-require@^2.0.2:
2365-
version "2.0.2"
2366-
resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-2.0.2.tgz#1eaa71aad23013773d127dc7e91a3fbb4837d60d"
2367-
integrity sha1-HqpxqtIwE3c9En3H6Ro/u0g31g0=
2347+
mock-require@^3.0.2:
2348+
version "3.0.2"
2349+
resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.2.tgz#7ce759b559e3b194be5f20a5b1cece0eb363f53d"
2350+
integrity sha512-aD/Y1ZFHqw5pHg3HVQ50dLbfaAAcytS6sqLuhP51Dk3TSPdFb2VkSAa3mjrHifLIlGAtwQHJHINafAyqAne7vA==
23682351
dependencies:
2369-
caller-id "^0.1.0"
2352+
get-caller-file "^1.0.2"
2353+
normalize-path "^2.1.1"
23702354

23712355
ms@2.0.0:
23722356
version "2.0.0"
@@ -3225,11 +3209,6 @@ sshpk@^1.7.0:
32253209
safer-buffer "^2.0.2"
32263210
tweetnacl "~0.14.0"
32273211

3228-
stack-trace@~0.0.7:
3229-
version "0.0.10"
3230-
resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
3231-
integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
3232-
32333212
stack-utils@^1.0.1:
32343213
version "1.0.2"
32353214
resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
@@ -3475,17 +3454,10 @@ tslib@^1.8.0, tslib@^1.8.1:
34753454
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
34763455
integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
34773456

3478-
tslint-language-service@0.9.9:
3479-
version "0.9.9"
3480-
resolved "https://registry.yarnpkg.com/tslint-language-service/-/tslint-language-service-0.9.9.tgz#f546dc38483979e6fb3cfa59584ad8525b3ad4da"
3481-
integrity sha1-9UbcOEg5eeb7PPpZWErYUls61No=
3482-
dependencies:
3483-
mock-require "^2.0.2"
3484-
3485-
tslint@5.11.0:
3486-
version "5.11.0"
3487-
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
3488-
integrity sha1-mPMMAurjzecAYgHkwzywi0hYHu0=
3457+
tslint@^5.12.1:
3458+
version "5.12.1"
3459+
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.12.1.tgz#8cec9d454cf8a1de9b0a26d7bdbad6de362e52c1"
3460+
integrity sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==
34893461
dependencies:
34903462
babel-code-frame "^6.22.0"
34913463
builtin-modules "^1.1.1"
@@ -3526,10 +3498,14 @@ type-check@~0.3.2:
35263498
dependencies:
35273499
prelude-ls "~1.1.2"
35283500

3529-
typescript@3.1.3:
3530-
version "3.1.3"
3531-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.3.tgz#01b70247a6d3c2467f70c45795ef5ea18ce191d5"
3532-
integrity sha512-+81MUSyX+BaSo+u2RbozuQk/UWx6hfG0a5gHu4ANEM4sU96XbuIyAB+rWBW1u70c6a5QuZfuYICn3s2UjuHUpA==
3501+
typescript-tslint-plugin@^0.2.1:
3502+
version "0.2.1"
3503+
resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.2.1.tgz#6a0361cd311bdc9dcec2e70c8a54cab16829e47f"
3504+
integrity sha512-j0Tn/2GlAwnaklSNMOZRNpv96j6IWkQF6RuTJ5WowfNlgdYqnJpSaVFwT22INwJiPDDGKNe/aATT0qkU0pWM4w==
3505+
dependencies:
3506+
minimatch "^3.0.4"
3507+
mock-require "^3.0.2"
3508+
vscode-languageserver "^5.1.0"
35333509

35343510
uglify-js@^3.1.4:
35353511
version "3.4.9"
@@ -3609,6 +3585,37 @@ verror@1.10.0:
36093585
core-util-is "1.0.2"
36103586
extsprintf "^1.2.0"
36113587

3588+
vscode-jsonrpc@^4.0.0:
3589+
version "4.0.0"
3590+
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
3591+
integrity sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==
3592+
3593+
vscode-languageserver-protocol@3.14.1:
3594+
version "3.14.1"
3595+
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz#b8aab6afae2849c84a8983d39a1cf742417afe2f"
3596+
integrity sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==
3597+
dependencies:
3598+
vscode-jsonrpc "^4.0.0"
3599+
vscode-languageserver-types "3.14.0"
3600+
3601+
vscode-languageserver-types@3.14.0:
3602+
version "3.14.0"
3603+
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
3604+
integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
3605+
3606+
vscode-languageserver@^5.1.0:
3607+
version "5.2.1"
3608+
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz#0d2feddd33f92aadf5da32450df498d52f6f14eb"
3609+
integrity sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==
3610+
dependencies:
3611+
vscode-languageserver-protocol "3.14.1"
3612+
vscode-uri "^1.0.6"
3613+
3614+
vscode-uri@^1.0.6:
3615+
version "1.0.6"
3616+
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"
3617+
integrity sha512-sLI2L0uGov3wKVb9EB+vIQBl9tVP90nqRvxSoJ35vI3NjxE8jfsE5DSOhWgSunHSZmKS4OCi2jrtfxK7uyp2ww==
3618+
36123619
w3c-hr-time@^1.0.1:
36133620
version "1.0.1"
36143621
resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"

‎tsconfig.json‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
"vs/*": [
1717
"./lib/vscode/src/vs/*"
1818
]
19-
},
20-
"plugins": [
21-
{
22-
"name": "tslint-language-service"
23-
}
24-
]
19+
}
2520
}
2621
}

0 commit comments

Comments
 (0)