Skip to content
This repository has been archived by the owner on Aug 22, 2023. It is now read-only.

Commit

Permalink
fix: typescript 2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdx
jdx committed Jan 31, 2018
1 parent 6ba6bbb commit 582a9d8
Show file tree
Hide file tree
Showing 3 changed files with 109 additions and 99 deletions.
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"author": "Jeff Dickey @jdxcode",
"bugs": "https://github.com/anycli/config/issues",
"dependencies": {
"cli-ux": "^3.3.8",
"cli-ux": "^3.3.10",
"debug": "^3.1.0",
"fs-extra": "^5.0.0",
"load-json-file": "^4.0.0",
"lodash": "^4.17.4",
"read-pkg": "^3.0.0"
},
"devDependencies": {
"@anycli/tslint": "^0.1.3",
"@commitlint/cli": "^6.0.2",
"@commitlint/config-conventional": "^6.0.2",
"@anycli/tslint": "^0.2.0",
"@commitlint/cli": "^6.0.5",
"@commitlint/config-conventional": "^6.0.4",
"@dxcli/command": "^0.2.8",
"@dxcli/config": "^0.1.40",
"@heroku-cli/config-edit": "^1.0.4",
Expand All @@ -38,7 +38,7 @@
"nps": "^5.7.1",
"nps-utils": "^1.5.0",
"ts-node": "^4.1.0",
"typescript": "^2.6.2"
"typescript": "^2.7.1"
},
"engines": {
"node": ">=8.0.0"
Expand Down
34 changes: 17 additions & 17 deletions src/config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,33 +179,33 @@ export class Config implements IConfig {
*/
readonly _base = _base
arch: ArchTypes
bin: string
cacheDir: string
configDir: string
dataDir: string
dirname: string
errlog: string
home: string
name: string
bin!: string
cacheDir!: string
configDir!: string
dataDir!: string
dirname!: string
errlog!: string
home!: string
name!: string
pjson: any
platform: PlatformTypes
root: string
shell: string
version: string
root!: string
shell!: string
version!: string
windows: boolean
userAgent: string
userAgent!: string
commandsDir: string | undefined
commandsDirTS: string | undefined
pluginsModule: string | undefined
pluginsModuleTS: string | undefined
tsconfig: TSConfig | undefined
debug: number = 0
hooks: {[k: string]: string[]}
hooks!: {[k: string]: string[]}
hooksTS?: {[k: string]: string[]}
engine: IEngine
npmRegistry: string
engine!: IEngine
npmRegistry!: string
legacy = false
topics: ITopic[]
topics!: ITopic[]

constructor() {
this.arch = (os.arch() === 'ia32' ? 'x86' : os.arch() as any)
Expand Down Expand Up @@ -334,7 +334,7 @@ export class Config implements IConfig {
for (let [k, h] of Object.entries(this.pjson.anycli.hooks)) {
hooks[k] = []
for (let m of _.castArray(h)) {
const ts = await this._tsPath(m)
const ts = await this._tsPath(m as string)
if (!ts) return
hooks[k].push(ts)
}
Expand Down
164 changes: 87 additions & 77 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
version "0.0.3"
resolved "https://registry.yarnpkg.com/@anycli/screen/-/screen-0.0.3.tgz#f0afd970c3ed725702948a45a874ede1fdd9362e"

"@anycli/tslint@^0.1.3":
version "0.1.4"
resolved "https://registry.yarnpkg.com/@anycli/tslint/-/tslint-0.1.4.tgz#9c8d73e07198633a1afdca69cda4b5b844ab3a72"
"@anycli/tslint@^0.2.0":
version "0.2.0"
resolved "https://registry.yarnpkg.com/@anycli/tslint/-/tslint-0.2.0.tgz#192a612e3664f7a18fe6ed693de94de6d4563882"
dependencies:
tslint "^5.9.1"
tslint-xo "^0.5.0"
tslint-xo "^0.6.0"

"@cli-engine/command@^12.1.1":
version "12.1.1"
Expand All @@ -29,79 +29,79 @@
version "0.0.0"
resolved "https://registry.yarnpkg.com/@cli-engine/screen/-/screen-0.0.0.tgz#c2e847c7d4d998490c9097282bf21637d5162116"

"@commitlint/cli@^6.0.2":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-6.0.2.tgz#378d37e92c4d97346e84c3a3d6677a62e9471d66"
"@commitlint/cli@^6.0.5":
version "6.0.5"
resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-6.0.5.tgz#c159c41434d24167c2f52c29e81cffc1959a6d0f"
dependencies:
"@commitlint/core" "^6.0.2"
"@commitlint/core" "^6.0.5"
babel-polyfill "6.26.0"
chalk "2.3.0"
get-stdin "5.0.1"
lodash.merge "4.6.0"
lodash.pick "4.4.0"
meow "3.7.0"

"@commitlint/config-conventional@^6.0.2":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-6.0.2.tgz#8ef87a6facb75b3377b2760b0e91097f8ec64db4"

"@commitlint/core@^6.0.2":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@commitlint/core/-/core-6.0.2.tgz#8e79e18d57ea3d30ca4bbfdf028d5f5d0cd3e422"
dependencies:
"@commitlint/execute-rule" "^6.0.2"
"@commitlint/is-ignored" "^6.0.2"
"@commitlint/parse" "^6.0.2"
"@commitlint/resolve-extends" "^6.0.2"
"@commitlint/rules" "^6.0.2"
"@commitlint/top-level" "^6.0.2"
"@commitlint/config-conventional@^6.0.4":
version "6.0.4"
resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-6.0.4.tgz#f5332c3aaf5423f2fa62287849859a9b769484f3"

"@commitlint/core@^6.0.5":
version "6.0.5"
resolved "https://registry.yarnpkg.com/@commitlint/core/-/core-6.0.5.tgz#a0f174f08a377eb9e5571bf31c2c9f60964a6ed9"
dependencies:
"@commitlint/execute-rule" "^6.0.4"
"@commitlint/is-ignored" "^6.0.4"
"@commitlint/parse" "^6.0.4"
"@commitlint/resolve-extends" "^6.0.4"
"@commitlint/rules" "^6.0.4"
"@commitlint/top-level" "^6.0.5"
"@marionebl/sander" "^0.6.0"
babel-runtime "^6.23.0"
chalk "^2.0.1"
cosmiconfig "^3.0.1"
cosmiconfig "^4.0.0"
git-raw-commits "^1.3.0"
lodash.merge "4.6.0"
lodash.mergewith "4.6.0"
lodash.pick "4.4.0"
lodash.topairs "4.3.0"
resolve-from "4.0.0"

"@commitlint/ensure@^6.0.2":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-6.0.2.tgz#31611fac3d3e67d574ae3808a3a91467fa83e3f4"
"@commitlint/ensure@^6.0.4":
version "6.0.4"
resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-6.0.4.tgz#c5ae6d0a24797e58caceee61608c6ac9ced64691"
dependencies:
lodash.camelcase "4.3.0"
lodash.kebabcase "4.1.1"
lodash.snakecase "4.1.1"
lodash.startcase "4.4.0"
lodash.upperfirst "4.3.1"

"@commitlint/execute-rule@^6.0.2":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-6.0.2.tgz#764a10a5ad7055e5c1508f1c80be85a3d2c8668a"
"@commitlint/execute-rule@^6.0.4":
version "6.0.4"
resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-6.0.4.tgz#5db080be51b2cc057028ce24a1cd9142283774fc"
dependencies:
babel-runtime "6.26.0"

"@commitlint/is-ignored@^6.0.2":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-6.0.2.tgz#3c48bd8473da6471259bb8fd5dbc49ac3ee5b150"
"@commitlint/is-ignored@^6.0.4":
version "6.0.4"
resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-6.0.4.tgz#cc4cde7be8d101e848fa70b37381687fa837c417"
dependencies:
semver "5.4.1"
semver "5.5.0"

"@commitlint/message@^6.0.2":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-6.0.2.tgz#7003156700e14c692cbbc26ada8c5b5cb5986805"
"@commitlint/message@^6.0.4":
version "6.0.4"
resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-6.0.4.tgz#80fe320285cab5f0f4ab3847e8d3b98a3fd1e389"

"@commitlint/parse@^6.0.2":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-6.0.2.tgz#1978de35bd2e620a892511c4642779a83ad2400e"
"@commitlint/parse@^6.0.4":
version "6.0.4"
resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-6.0.4.tgz#3d7403b024200d32d66e913ee464eaf46bbac075"
dependencies:
conventional-changelog-angular "^1.3.3"
conventional-commits-parser "^2.1.0"

"@commitlint/resolve-extends@^6.0.2":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-6.0.2.tgz#1937640053f3a865490aeac97b2efac66dbe9a96"
"@commitlint/resolve-extends@^6.0.4":
version "6.0.4"
resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-6.0.4.tgz#8cce624e856df7582d5621c882e83f69b44c18c4"
dependencies:
babel-runtime "6.26.0"
lodash.merge "4.6.0"
Expand All @@ -110,22 +110,22 @@
resolve-from "^4.0.0"
resolve-global "^0.1.0"

"@commitlint/rules@^6.0.2":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-6.0.2.tgz#11fee4bc134ba6e9da261685a1653d86fcae7771"
"@commitlint/rules@^6.0.4":
version "6.0.4"
resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-6.0.4.tgz#6891d7e37908d6438dc3b382f193774ab4a36479"
dependencies:
"@commitlint/ensure" "^6.0.2"
"@commitlint/message" "^6.0.2"
"@commitlint/to-lines" "^6.0.2"
"@commitlint/ensure" "^6.0.4"
"@commitlint/message" "^6.0.4"
"@commitlint/to-lines" "^6.0.4"
babel-runtime "^6.23.0"

"@commitlint/to-lines@^6.0.2":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-6.0.2.tgz#be76792eae6f2446de1d9e15b20b3e3b990c838b"
"@commitlint/to-lines@^6.0.4":
version "6.0.4"
resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-6.0.4.tgz#c0bb6ca0b5c5f565f18d9747de12067cb2c4cc34"

"@commitlint/top-level@^6.0.2":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-6.0.2.tgz#fffc584d7275868b884439e5ab02969dee3d62f5"
"@commitlint/top-level@^6.0.5":
version "6.0.5"
resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-6.0.5.tgz#01cac031f7452c0bebfda75d6ef7fb79d1714f81"
dependencies:
find-up "^2.1.0"

Expand Down Expand Up @@ -552,6 +552,26 @@ cli-ux@^2.0.21:
supports-color "^5.1.0"
ts-lodash "^4.0.8"

cli-ux@^3.3.10:
version "3.3.10"
resolved "https://registry.yarnpkg.com/cli-ux/-/cli-ux-3.3.10.tgz#54fad2bc9e1fcb56cdbd7d41682373e0fb7ce447"
dependencies:
"@anycli/screen" "^0.0.3"
"@heroku/linewrap" "^1.0.0"
ansi-styles "^3.2.0"
cardinal "^1.0.0"
chalk "^2.3.0"
clean-stack "^1.3.0"
extract-stack "^1.0.0"
fs-extra "^5.0.0"
indent-string "^3.2.0"
lodash "^4.17.4"
node-notifier "^5.2.1"
password-prompt "^1.0.4"
semver "^5.5.0"
strip-ansi "^4.0.0"
supports-color "^5.1.0"

cli-ux@^3.3.8:
version "3.3.9"
resolved "https://registry.yarnpkg.com/cli-ux/-/cli-ux-3.3.9.tgz#b3d09bb9057d2ef75cfd492d58359dd923c0a16b"
Expand Down Expand Up @@ -683,13 +703,13 @@ core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"

cosmiconfig@^3.0.1:
version "3.1.0"
resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-3.1.0.tgz#640a94bf9847f321800403cd273af60665c73397"
cosmiconfig@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
dependencies:
is-directory "^0.3.1"
js-yaml "^3.9.0"
parse-json "^3.0.0"
parse-json "^4.0.0"
require-from-string "^2.0.1"

cp-file@^3.1.0:
Expand Down Expand Up @@ -1890,12 +1910,6 @@ parse-json@^2.2.0:
dependencies:
error-ex "^1.2.0"

parse-json@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-3.0.0.tgz#fa6f47b18e23826ead32f263e744d0e1e847fb13"
dependencies:
error-ex "^1.3.1"

parse-json@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
Expand Down Expand Up @@ -2186,18 +2200,14 @@ safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"

"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
"semver@2 || 3 || 4 || 5", semver@5.5.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"

semver@5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"

semver@5.4.1:
version "5.4.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"

set-blocking@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
Expand Down Expand Up @@ -2516,19 +2526,19 @@ tslint-eslint-rules@^4.1.1:
tslib "^1.0.0"
tsutils "^1.4.0"

tslint-microsoft-contrib@^5.0.1:
tslint-microsoft-contrib@^5.0.2:
version "5.0.2"
resolved "https://registry.yarnpkg.com/tslint-microsoft-contrib/-/tslint-microsoft-contrib-5.0.2.tgz#ecc2a797f777a12f0066944cec0c81a9e7c59ee9"
dependencies:
tsutils "^2.12.1"

tslint-xo@^0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/tslint-xo/-/tslint-xo-0.5.0.tgz#56e591dcd2731de35e7462a0dfa1214731ba9f27"
tslint-xo@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/tslint-xo/-/tslint-xo-0.6.0.tgz#95a05b8dcac7aaa1f4d6ca1397a3c4c45a8b848e"
dependencies:
tslint-consistent-codestyle "^1.11.0"
tslint-eslint-rules "^4.1.1"
tslint-microsoft-contrib "^5.0.1"
tslint-microsoft-contrib "^5.0.2"

tslint@^5.9.1:
version "5.9.1"
Expand Down Expand Up @@ -2577,9 +2587,9 @@ typedarray@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"

typescript@^2.6.2:
version "2.6.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
typescript@^2.7.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.1.tgz#bb3682c2c791ac90e7c6210b26478a8da085c359"

universalify@^0.1.0:
version "0.1.1"
Expand Down

0 comments on commit 582a9d8

Please sign in to comment.