github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-26 03:33:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #885 from hedgedoc/renovate/master-spin.js-4.x

Browse source
This commit is contained in:
David Mehren 2021-02-12 23:57:34 +01:00 committed by GitHub
commit f3b733dd40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -121,7 +121,7 @@
"shortid": "2.2.16", "shortid": "2.2.16",
"socket.io": "^2.1.1", "socket.io": "^2.1.1",
"socket.io-client": "^2.1.1", "socket.io-client": "^2.1.1",
"spin.js": "^2.3.2", "spin.js": "^4.0.0",
"sqlite3": "^5.0.0", "sqlite3": "^5.0.0",
"store": "^2.0.12", "store": "^2.0.12",
"string": "^3.3.3", "string": "^3.3.3",

3
public/js/index.js
View file

@ -1,6 +1,6 @@
/* eslint-env browser, jquery */ /* eslint-env browser, jquery */
/* eslint no-console: ["error", { allow: ["warn", "error", "debug"] }] */ /* 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 */ key, Dropbox, ot, hex2rgb, Visibility */
import TurndownService from 'turndown' import TurndownService from 'turndown'
@ -10,6 +10,7 @@ import randomColor from 'randomcolor'
import store from 'store' import store from 'store'
import hljs from 'highlight.js' import hljs from 'highlight.js'
import url from 'wurl' import url from 'wurl'
import { Spinner } from 'spin.js'
import _ from 'lodash' import _ from 'lodash'

2
webpack.common.js
View file

@ -239,6 +239,7 @@ module.exports = {
path.join(__dirname, 'node_modules/codemirror/theme/one-dark.css'), 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/tiddlywiki/tiddlywiki.css'),
path.join(__dirname, 'node_modules/codemirror/mode/mediawiki/mediawiki.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/css/github-extract.css'),
path.join(__dirname, 'public/vendor/showup/showup.css'), path.join(__dirname, 'public/vendor/showup/showup.css'),
path.join(__dirname, 'public/css/mermaid.css'), path.join(__dirname, 'public/css/mermaid.css'),
@ -253,7 +254,6 @@ module.exports = {
], ],
'index-pack': [ 'index-pack': [
'babel-polyfill', 'babel-polyfill',
'expose-loader?exposes=Spinner!spin.js',
'script-loader!jquery-ui-resizable', 'script-loader!jquery-ui-resizable',
'bootstrap-validator', 'bootstrap-validator',
'expose-loader?exposes=jsyaml!js-yaml', 'expose-loader?exposes=jsyaml!js-yaml',

8
yarn.lock
View file

@ -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" resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
spin.js@^2.3.2: spin.js@^4.0.0:
version "2.3.2" version "4.1.0"
resolved "https://registry.yarnpkg.com/spin.js/-/spin.js-2.3.2.tgz#6caa56d520673450fd5cfbc6971e6d0772c37a1a" resolved "https://registry.yarnpkg.com/spin.js/-/spin.js-4.1.0.tgz#afcf12738fafd5f6aa0a385a5b4cec45c86a3555"
integrity sha1-bKpW1SBnNFD9XPvGlx5tB3LDeho= integrity sha512-WI8O1OdJlKjialIhB9Z5RfFFM4pI7Hohik76bB3N4Ep3N/vTDPZiRU8QeefyLbmpI5n2bFQXgticl2g+/KiKYA==
split-string@^3.0.1, split-string@^3.0.2: split-string@^3.0.1, split-string@^3.0.2:
version "3.1.0" version "3.1.0"