diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-01-27 20:09:03 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-01-27 20:09:03 +0900 |
| commit | c69d57a064f08e9a3074b16c4da3141378896cec (patch) | |
| tree | 4b90fd713c86dce6fc22e7ddaa4e14059393a111 | |
| parent | [Client] Fix #4008 (diff) | |
| parent | Module 'nprogress' as import syntax (#4012) (diff) | |
| download | misskey-c69d57a064f08e9a3074b16c4da3141378896cec.tar.gz misskey-c69d57a064f08e9a3074b16c4da3141378896cec.tar.bz2 misskey-c69d57a064f08e9a3074b16c4da3141378896cec.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | src/client/app/common/scripts/loading.ts | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/package.json b/package.json index b0c3cc2c66..2a4ee43fae 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,7 @@ "@types/ms": "0.7.30", "@types/node": "10.12.18", "@types/nodemailer": "4.6.5", + "@types/nprogress": "0.0.29", "@types/oauth": "0.9.1", "@types/parsimmon": "1.10.0", "@types/portscanner": "2.1.0", diff --git a/src/client/app/common/scripts/loading.ts b/src/client/app/common/scripts/loading.ts index c48e626648..70a3a4c85e 100644 --- a/src/client/app/common/scripts/loading.ts +++ b/src/client/app/common/scripts/loading.ts @@ -1,4 +1,4 @@ -const NProgress = require('nprogress'); +import * as NProgress from 'nprogress'; NProgress.configure({ trickleSpeed: 500, showSpinner: false |