Skip to content

Commit 29daebc

Browse files
jdxjdx
committed
fix: typescript 2.9
1 parent a1bf92f commit 29daebc

File tree

7 files changed

+40
-46
lines changed

7 files changed

+40
-46
lines changed

‎package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,31 @@
1616
"opn": "^5.3.0"
1717
},
1818
"devDependencies": {
19-
"@heroku-cli/schema": "^1.0.2",
19+
"@heroku-cli/schema": "^1.0.4",
2020
"@heroku-cli/tslint": "^1.1.4",
21-
"@oclif/command": "^1.4.30",
22-
"@oclif/config": "^1.6.19",
21+
"@oclif/command": "^1.4.31",
22+
"@oclif/config": "^1.6.21",
2323
"@oclif/tslint": "^1.1.2",
2424
"@types/ansi-styles": "^3.2.0",
2525
"@types/chai": "^4.1.3",
2626
"@types/fs-extra": "^5.0.2",
2727
"@types/mocha": "^5.2.0",
2828
"@types/nock": "^9.1.3",
29-
"@types/node": "^10.1.2",
29+
"@types/node": "^10.1.4",
3030
"@types/opn": "^5.1.0",
3131
"@types/proxyquire": "^1.3.28",
32-
"@types/sinon": "^5.0.0",
32+
"@types/sinon": "^5.0.1",
3333
"@types/supports-color": "^5.3.0",
3434
"chai": "^4.1.2",
3535
"fancy-test": "^1.0.8",
3636
"mocha": "^5.2.0",
37-
"nock": "^9.2.5",
37+
"nock": "^9.3.0",
3838
"proxyquire": "^2.0.1",
3939
"sinon": "^5.0.10",
4040
"testdouble": "^3.8.1",
4141
"ts-node": "^6.0.5",
4242
"tslint": "^5.10.0",
43-
"typescript": "^2.8.3"
43+
"typescript": "^2.9.1"
4444
},
4545
"engines": {
4646
"node": ">=6.0.0"

‎src/login.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,8 @@ export class Login {
215215
if (!Netrc.machines[host]) Netrc.machines[host] = {}
216216
Netrc.machines[host].login = entry.login
217217
Netrc.machines[host].password = entry.password
218+
delete Netrc.machines[host].method
219+
delete Netrc.machines[host].org
218220
})
219221
if (Netrc.machines._tokens) {
220222
(Netrc.machines._tokens as any).forEach((token: any) => {

‎test/api_client.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as Config from '@oclif/config'
22
import cli from 'cli-ux'
33
import base, {expect} from 'fancy-test'
4-
import * as nock from 'nock'
4+
import nock from 'nock'
55

66
import {Command as CommandBase} from '../src/command'
77

‎test/flags/app.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as Config from '@oclif/config'
22
import {expect, fancy} from 'fancy-test'
3-
import * as nock from 'nock'
3+
import nock from 'nock'
44

55
import {Command as Base} from '../../src'
66
import {Git} from '../../src/git'

‎test/git.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {expect, fancy} from 'fancy-test'
22

3-
import * as childProcess from 'child_process'
3+
import childProcess from 'child_process'
44

55
import {Git} from '../src/git'
66

‎tsconfig.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
"compilerOptions": {
33
"declaration": true,
44
"forceConsistentCasingInFileNames": true,
5+
"esModuleInterop": true,
6+
"resolveJsonModule": true,
57
"importHelpers": true,
68
"module": "commonjs",
79
"outDir": "./lib",

‎yarn.lock

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
strip-ansi "^4.0.0"
2828
supports-color "^5.4.0"
2929

30-
"@heroku-cli/schema@^1.0.2":
31-
version "1.0.2"
32-
resolved "https://registry.yarnpkg.com/@heroku-cli/schema/-/schema-1.0.2.tgz#29e3baeda0ad715759f32dc6329271663f775a49"
30+
"@heroku-cli/schema@^1.0.4":
31+
version "1.0.4"
32+
resolved "https://registry.yarnpkg.com/@heroku-cli/schema/-/schema-1.0.4.tgz#1753b101132544e28bef689a9faa56839a59d631"
3333

3434
"@heroku-cli/tslint@^1.1.4":
3535
version "1.1.4"
@@ -38,31 +38,21 @@
3838
tslint "^5.8.0"
3939
tslint-config-prettier "*"
4040

41-
"@oclif/command@^1.4.30":
42-
version "1.4.30"
43-
resolved "https://registry.yarnpkg.com/@oclif/command/-/command-1.4.30.tgz#631eb423182517dc38711d6270aecb621bfa24a9"
41+
"@oclif/command@^1.4.31":
42+
version "1.4.31"
43+
resolved "https://registry.yarnpkg.com/@oclif/command/-/command-1.4.31.tgz#14aece1d9d9e53cc5a5dc03d17cf315cd55818f9"
4444
dependencies:
45-
"@oclif/errors" "^1.1.1"
46-
"@oclif/parser" "^3.4.0"
45+
"@oclif/errors" "^1.1.2"
46+
"@oclif/parser" "^3.4.1"
4747
debug "^3.1.0"
4848
semver "^5.5.0"
4949

50-
"@oclif/config@^1.6.19":
51-
version "1.6.19"
52-
resolved "https://registry.yarnpkg.com/@oclif/config/-/config-1.6.19.tgz#727aee1e0859d18c56c0fa3e1ec08826f28a7aac"
50+
"@oclif/config@^1.6.21":
51+
version "1.6.21"
52+
resolved "https://registry.yarnpkg.com/@oclif/config/-/config-1.6.21.tgz#44cb3136758562d5441885b63ef4791aeeae0c0f"
5353
dependencies:
5454
debug "^3.1.0"
5555

56-
"@oclif/errors@^1.1.1":
57-
version "1.1.1"
58-
resolved "https://registry.yarnpkg.com/@oclif/errors/-/errors-1.1.1.tgz#2ff4ea9043491ae548e0c8545b91e260c6c0d64f"
59-
dependencies:
60-
clean-stack "^1.3.0"
61-
fs-extra "^6.0.1"
62-
indent-string "^3.2.0"
63-
strip-ansi "^4.0.0"
64-
wrap-ansi "^3.0.1"
65-
6656
"@oclif/errors@^1.1.2":
6757
version "1.1.2"
6858
resolved "https://registry.yarnpkg.com/@oclif/errors/-/errors-1.1.2.tgz#2a54aae07a7655cc4523cae270d0a50cbc5dbef3"
@@ -77,9 +67,9 @@
7767
version "1.0.0"
7868
resolved "https://registry.yarnpkg.com/@oclif/linewrap/-/linewrap-1.0.0.tgz#aedcb64b479d4db7be24196384897b5000901d91"
7969

80-
"@oclif/parser@^3.4.0":
81-
version "3.4.0"
82-
resolved "https://registry.yarnpkg.com/@oclif/parser/-/parser-3.4.0.tgz#bf61399c70f75a96070153df2fcbb7e7115c7fd9"
70+
"@oclif/parser@^3.4.1":
71+
version "3.4.1"
72+
resolved "https://registry.yarnpkg.com/@oclif/parser/-/parser-3.4.1.tgz#83942276f3cf9406a1a3dcf3eb917183d6333e1d"
8373
dependencies:
8474
"@oclif/linewrap" "^1.0.0"
8575
chalk "^2.4.1"
@@ -134,9 +124,9 @@
134124
version "10.0.4"
135125
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.0.4.tgz#130598ee56e9a1210a53f557d64935571f05390d"
136126

137-
"@types/node@^10.1.2":
138-
version "10.1.2"
139-
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.1.2.tgz#1b928a0baa408fc8ae3ac012cc81375addc147c6"
127+
"@types/node@^10.1.4":
128+
version "10.1.4"
129+
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.1.4.tgz#606651d3f8a8bec08b8cb262161aab9209f4a29d"
140130

141131
"@types/opn@^5.1.0":
142132
version "5.1.0"
@@ -148,9 +138,9 @@
148138
version "1.3.28"
149139
resolved "https://registry.yarnpkg.com/@types/proxyquire/-/proxyquire-1.3.28.tgz#05a647bb0d8fe48fc8edcc193e43cc79310faa7d"
150140

151-
"@types/sinon@^5.0.0":
152-
version "5.0.0"
153-
resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-5.0.0.tgz#e5d49a422f64b2c658bbeb8529679c9a6a0b5a3a"
141+
"@types/sinon@^5.0.1":
142+
version "5.0.1"
143+
resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-5.0.1.tgz#a15b36ec42f1f53166617491feabd1734cb03e21"
154144

155145
"@types/supports-color@^5.3.0":
156146
version "5.3.0"
@@ -710,9 +700,9 @@ nise@^1.3.3:
710700
path-to-regexp "^1.7.0"
711701
text-encoding "^0.6.4"
712702

713-
nock@^9.2.5:
714-
version "9.2.6"
715-
resolved "https://registry.yarnpkg.com/nock/-/nock-9.2.6.tgz#496ddb2c32e6d0848cda1b3ea51fbe054d4454d3"
703+
nock@^9.3.0:
704+
version "9.3.0"
705+
resolved "https://registry.yarnpkg.com/nock/-/nock-9.3.0.tgz#4dcfdd37bd249836754d05bbac5a1f05e12e0f16"
716706
dependencies:
717707
chai "^4.1.2"
718708
debug "^3.1.0"
@@ -1035,9 +1025,9 @@ type-detect@^4.0.0, type-detect@^4.0.8:
10351025
version "4.0.8"
10361026
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
10371027

1038-
typescript@^2.8.3:
1039-
version "2.8.3"
1040-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
1028+
typescript@^2.9.1:
1029+
version "2.9.1"
1030+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
10411031

10421032
universalify@^0.1.0:
10431033
version "0.1.1"

0 commit comments

Comments
 (0)