diff options
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | public/js/index.js | 3 | ||||
| -rw-r--r-- | webpack.common.js | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
4 files changed, 8 insertions, 7 deletions
diff --git a/package.json b/package.json index 3710c98a..2bbd1534 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,7 @@ "shortid": "2.2.16", "socket.io": "^2.1.1", "socket.io-client": "^2.1.1", - "spin.js": "^2.3.2", + "spin.js": "^4.0.0", "sqlite3": "^5.0.0", "store": "^2.0.12", "string": "^3.3.3", diff --git a/public/js/index.js b/public/js/index.js index 92acd130..adc95461 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1,6 +1,6 @@ /* eslint-env browser, jquery */ /* eslint no-console: ["error", { allow: ["warn", "error", "debug"] }] */ -/* global CodeMirror, Cookies, moment, Spinner, Idle, serverurl, +/* global CodeMirror, Cookies, moment, Idle, serverurl, key, Dropbox, ot, hex2rgb, Visibility */ import TurndownService from 'turndown' @@ -10,6 +10,7 @@ import randomColor from 'randomcolor' import store from 'store' import hljs from 'highlight.js' import url from 'wurl' +import { Spinner } from 'spin.js' import _ from 'lodash' diff --git a/webpack.common.js b/webpack.common.js index 35fdba08..3883ea2a 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -239,6 +239,7 @@ module.exports = { path.join(__dirname, 'node_modules/codemirror/theme/one-dark.css'), path.join(__dirname, 'node_modules/codemirror/mode/tiddlywiki/tiddlywiki.css'), path.join(__dirname, 'node_modules/codemirror/mode/mediawiki/mediawiki.css'), + path.join(__dirname, 'node_modules/spin.js/spin.css'), path.join(__dirname, 'public/css/github-extract.css'), path.join(__dirname, 'public/vendor/showup/showup.css'), path.join(__dirname, 'public/css/mermaid.css'), @@ -253,7 +254,6 @@ module.exports = { ], 'index-pack': [ 'babel-polyfill', - 'expose-loader?exposes=Spinner!spin.js', 'script-loader!jquery-ui-resizable', 'bootstrap-validator', 'expose-loader?exposes=jsyaml!js-yaml', @@ -10223,10 +10223,10 @@ spdx-license-ids@^3.0.0: resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65" integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== -spin.js@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/spin.js/-/spin.js-2.3.2.tgz#6caa56d520673450fd5cfbc6971e6d0772c37a1a" - integrity sha1-bKpW1SBnNFD9XPvGlx5tB3LDeho= +spin.js@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/spin.js/-/spin.js-4.1.0.tgz#afcf12738fafd5f6aa0a385a5b4cec45c86a3555" + integrity sha512-WI8O1OdJlKjialIhB9Z5RfFFM4pI7Hohik76bB3N4Ep3N/vTDPZiRU8QeefyLbmpI5n2bFQXgticl2g+/KiKYA== split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" |