Skip to content

Commit dc3ab30

Browse files
authored
fix: Move typescript to deps. Move types and Commitizen to dev deps. (#20)
This change moves typescript to deps to to fix a bug where typescript could not be resolved when graphql-usage was installed globally. This change also cleans up dependencies for types and Commitizen. --ignore-engines has also been added to the install step on CI to prevent Commitzen to cause yarn to throw errors when using Node 8.
1 parent 20de75c commit dc3ab30

3 files changed

Lines changed: 29 additions & 30 deletions

File tree

.circleci/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ jobs:
1313
- v1-npm-{{checksum ".circleci/config.yml"}}
1414
- run: &install_dependencies
1515
name: Install dependencies
16-
command: yarn
16+
# --ignore-engines is necessary for Commitizen to install with Node 8
17+
command: yarn install --ignore-engines
1718
- run: ./bin/run --version
1819
- run: ./bin/run --help
1920
- run:

package.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,36 @@
1313
"@oclif/command": "^1",
1414
"@oclif/config": "^1",
1515
"@oclif/plugin-help": "^2",
16-
"@types/express": "^4.17.0",
17-
"@types/listr": "^0.14.1",
1816
"express": "^4.17.1",
1917
"fast-glob": "^3.0.4",
2018
"graphql": "^14.4.2",
2119
"listr": "^0.14.3",
2220
"open": "^6.4.0",
2321
"ramda": "^0.26.1",
24-
"tslib": "^1"
22+
"tslib": "^1",
23+
"typescript": "^3.6.3"
2524
},
2625
"devDependencies": {
2726
"@babel/types": "^7.4.4",
2827
"@oclif/test": "^1.2.4",
2928
"@oclif/tslint": "^3",
29+
"@types/express": "^4.17.1",
3030
"@types/graphql": "^14.2.2",
3131
"@types/jest": "^24.0.13",
32+
"@types/listr": "^0.14.2",
3233
"@types/node": "^12.0.8",
3334
"@types/nodegit": "^0.24.8",
3435
"@types/ramda": "^0.26.15",
3536
"chai": "^4.2.0",
37+
"commitizen": "^4.0.3",
38+
"cz-conventional-changelog": "3.0.2",
3639
"jest": "^24.8.0",
3740
"prettier": "^1.18.2",
3841
"semantic-release": "^15.13.24",
3942
"ts-jest": "^24.0.2",
4043
"ts-node": "^8",
4144
"tslint": "^5",
42-
"tslint-config-prettier": "^1.18.0",
43-
"typescript": "^3.3"
45+
"tslint-config-prettier": "^1.18.0"
4446
},
4547
"engines": {
4648
"node": ">=8.0.0"
@@ -74,9 +76,5 @@
7476
"commitizen": {
7577
"path": "./node_modules/cz-conventional-changelog"
7678
}
77-
},
78-
"optionalDependencies": {
79-
"commitizen": "^4.0.3",
80-
"cz-conventional-changelog": "^3.0.2"
8179
}
8280
}

yarn.lock

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -533,8 +533,8 @@
533533
"@babel/types" "^7.3.0"
534534

535535
"@types/body-parser@*":
536-
version "1.17.0"
537-
resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
536+
version "1.17.1"
537+
resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.1.tgz#18fcf61768fb5c30ccc508c21d6fd2e8b3bf7897"
538538
dependencies:
539539
"@types/connect" "*"
540540
"@types/node" "*"
@@ -554,15 +554,15 @@
554554
resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
555555

556556
"@types/express-serve-static-core@*":
557-
version "4.16.7"
558-
resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.7.tgz#50ba6f8a691c08a3dd9fa7fba25ef3133d298049"
557+
version "4.16.9"
558+
resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.9.tgz#69e00643b0819b024bdede95ced3ff239bb54558"
559559
dependencies:
560560
"@types/node" "*"
561561
"@types/range-parser" "*"
562562

563-
"@types/express@^4.17.0":
564-
version "4.17.0"
565-
resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.0.tgz#49eaedb209582a86f12ed9b725160f12d04ef287"
563+
"@types/express@^4.17.1":
564+
version "4.17.1"
565+
resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.1.tgz#4cf7849ae3b47125a567dfee18bfca4254b88c5c"
566566
dependencies:
567567
"@types/body-parser" "*"
568568
"@types/express-serve-static-core" "*"
@@ -607,9 +607,9 @@
607607
dependencies:
608608
"@types/jest-diff" "*"
609609

610-
"@types/listr@^0.14.1":
611-
version "0.14.1"
612-
resolved "https://registry.yarnpkg.com/@types/listr/-/listr-0.14.1.tgz#ed55e083589c289774893fe1d582c3452eb11ca5"
610+
"@types/listr@^0.14.2":
611+
version "0.14.2"
612+
resolved "https://registry.yarnpkg.com/@types/listr/-/listr-0.14.2.tgz#2e5f80fbc3ca8dceb9940ce9bf8e3113ab452545"
613613
dependencies:
614614
"@types/node" "*"
615615
rxjs "^6.5.1"
@@ -641,8 +641,8 @@
641641
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.8.tgz#e469b4bf9d1c9832aee4907ba8a051494357c12c"
642642

643643
"@types/node@^12.0.2":
644-
version "12.7.4"
645-
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.4.tgz#64db61e0359eb5a8d99b55e05c729f130a678b04"
644+
version "12.7.5"
645+
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.5.tgz#e19436e7f8e9b4601005d73673b6dc4784ffcc2f"
646646

647647
"@types/nodegit@^0.24.8":
648648
version "0.24.8"
@@ -667,8 +667,8 @@
667667
resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
668668

669669
"@types/serve-static@*":
670-
version "1.13.2"
671-
resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
670+
version "1.13.3"
671+
resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz#eb7e1c41c4468272557e897e9171ded5e2ded9d1"
672672
dependencies:
673673
"@types/express-serve-static-core" "*"
674674
"@types/mime" "*"
@@ -1653,7 +1653,7 @@ cz-conventional-changelog@3.0.1:
16531653
optionalDependencies:
16541654
"@commitlint/load" ">6.1.1"
16551655

1656-
cz-conventional-changelog@^3.0.2:
1656+
cz-conventional-changelog@3.0.2:
16571657
version "3.0.2"
16581658
resolved "https://registry.yarnpkg.com/cz-conventional-changelog/-/cz-conventional-changelog-3.0.2.tgz#f6b9a406177ab07f9a3a087e06103a045b376260"
16591659
dependencies:
@@ -5687,13 +5687,13 @@ run-queue@^1.0.0, run-queue@^1.0.3:
56875687
dependencies:
56885688
aproba "^1.1.1"
56895689

5690-
rxjs@^6.3.3, rxjs@^6.5.1:
5690+
rxjs@^6.3.3:
56915691
version "6.5.2"
56925692
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
56935693
dependencies:
56945694
tslib "^1.9.0"
56955695

5696-
rxjs@^6.4.0:
5696+
rxjs@^6.4.0, rxjs@^6.5.1:
56975697
version "6.5.3"
56985698
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
56995699
dependencies:
@@ -6532,9 +6532,9 @@ typedarray@^0.0.6:
65326532
version "0.0.6"
65336533
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
65346534

6535-
typescript@^3.3:
6536-
version "3.5.3"
6537-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
6535+
typescript@^3.6.3:
6536+
version "3.6.3"
6537+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da"
65386538

65396539
uglify-js@^3.1.4:
65406540
version "3.6.0"

0 commit comments

Comments
 (0)