mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-27 04:13:09 +02:00
resolve conflict
This commit is contained in:
syuilo
commit
281b388e39
1 changed files with 29 additions and 27 deletions
56
package.json
56
package.json
|
|
@ -2,6 +2,7 @@
|
|||
"name": "misskey",
|
||||
"author": "syuilo <i@syuilo.com>",
|
||||
"version": "0.0.4224",
|
||||
"codename": "nighthike",
|
||||
"license": "MIT",
|
||||
"description": "A miniblog-based SNS",
|
||||
"bugs": "https://github.com/syuilo/misskey/issues",
|
||||
|
|
@ -15,6 +16,7 @@
|
|||
"swagger": "node ./swagger.js",
|
||||
"build": "node --max_old_space_size=16384 ./node_modules/webpack/bin/webpack.js && gulp build",
|
||||
"webpack": "node --max_old_space_size=16384 ./node_modules/webpack/bin/webpack.js",
|
||||
"watch": "node --max_old_space_size=16384 ./node_modules/webpack/bin/webpack.js --watch",
|
||||
"gulp": "gulp build",
|
||||
"rebuild": "gulp rebuild",
|
||||
"clean": "gulp clean",
|
||||
|
|
@ -44,11 +46,11 @@
|
|||
"@types/express": "4.11.1",
|
||||
"@types/gm": "1.17.33",
|
||||
"@types/gulp": "3.8.36",
|
||||
"@types/gulp-htmlmin": "1.3.31",
|
||||
"@types/gulp-mocha": "0.0.31",
|
||||
"@types/gulp-htmlmin": "1.3.32",
|
||||
"@types/gulp-mocha": "0.0.32",
|
||||
"@types/gulp-rename": "0.0.33",
|
||||
"@types/gulp-replace": "0.0.31",
|
||||
"@types/gulp-uglify": "3.0.4",
|
||||
"@types/gulp-uglify": "3.0.5",
|
||||
"@types/gulp-util": "3.0.34",
|
||||
"@types/inquirer": "0.0.38",
|
||||
"@types/is-root": "1.0.0",
|
||||
|
|
@ -56,13 +58,13 @@
|
|||
"@types/js-yaml": "3.10.1",
|
||||
"@types/license-checker": "15.0.0",
|
||||
"@types/mkdirp": "0.5.2",
|
||||
"@types/mocha": "2.2.48",
|
||||
"@types/mongodb": "3.0.8",
|
||||
"@types/mocha": "5.0.0",
|
||||
"@types/mongodb": "3.0.9",
|
||||
"@types/monk": "6.0.0",
|
||||
"@types/morgan": "1.7.35",
|
||||
"@types/ms": "0.7.30",
|
||||
"@types/multer": "1.3.6",
|
||||
"@types/node": "9.4.7",
|
||||
"@types/node": "9.6.0",
|
||||
"@types/proxy-addr": "2.0.0",
|
||||
"@types/pug": "2.0.4",
|
||||
"@types/qrcode": "0.8.1",
|
||||
|
|
@ -76,13 +78,13 @@
|
|||
"@types/speakeasy": "2.0.2",
|
||||
"@types/tmp": "0.0.33",
|
||||
"@types/uuid": "3.4.3",
|
||||
"@types/webpack": "4.1.1",
|
||||
"@types/webpack": "4.1.2",
|
||||
"@types/webpack-stream": "3.2.10",
|
||||
"@types/websocket": "0.0.38",
|
||||
"@types/ws": "4.0.1",
|
||||
"accesses": "2.5.0",
|
||||
"animejs": "2.2.0",
|
||||
"autosize": "4.0.0",
|
||||
"autosize": "4.0.1",
|
||||
"autwh": "0.0.1",
|
||||
"bcryptjs": "2.4.3",
|
||||
"body-parser": "1.18.2",
|
||||
|
|
@ -101,7 +103,7 @@
|
|||
"deepcopy": "0.6.3",
|
||||
"diskusage": "0.2.4",
|
||||
"elasticsearch": "14.2.1",
|
||||
"element-ui": "2.2.2",
|
||||
"element-ui": "2.3.0",
|
||||
"emojilib": "2.2.12",
|
||||
"escape-regexp": "0.0.1",
|
||||
"eslint": "4.19.1",
|
||||
|
|
@ -114,7 +116,7 @@
|
|||
"fuckadblock": "3.2.1",
|
||||
"gm": "1.23.1",
|
||||
"gulp": "3.9.1",
|
||||
"gulp-cssnano": "2.1.2",
|
||||
"gulp-cssnano": "2.1.3",
|
||||
"gulp-htmlmin": "4.0.0",
|
||||
"gulp-imagemin": "4.1.0",
|
||||
"gulp-mocha": "5.0.0",
|
||||
|
|
@ -124,33 +126,33 @@
|
|||
"gulp-sourcemaps": "2.6.4",
|
||||
"gulp-stylus": "2.7.0",
|
||||
"gulp-tslint": "8.1.3",
|
||||
"gulp-typescript": "4.0.1",
|
||||
"gulp-typescript": "4.0.2",
|
||||
"gulp-uglify": "3.0.0",
|
||||
"gulp-util": "3.0.8",
|
||||
"hard-source-webpack-plugin": "0.6.4",
|
||||
"highlight.js": "9.12.0",
|
||||
"html-minifier": "3.5.12",
|
||||
"inquirer": "5.1.0",
|
||||
"inquirer": "5.2.0",
|
||||
"is-root": "2.0.0",
|
||||
"is-url": "1.2.3",
|
||||
"is-url": "1.2.4",
|
||||
"js-yaml": "3.11.0",
|
||||
"jsdom": "^11.6.2",
|
||||
"kue": "^0.11.6",
|
||||
"jsdom": "11.6.2",
|
||||
"kue": "0.11.6",
|
||||
"license-checker": "18.0.0",
|
||||
"loader-utils": "1.1.0",
|
||||
"mecab-async": "0.1.2",
|
||||
"mkdirp": "0.5.1",
|
||||
"mocha": "5.0.4",
|
||||
"mocha": "5.0.5",
|
||||
"moji": "0.5.1",
|
||||
"mongodb": "3.0.4",
|
||||
"mongodb": "3.0.5",
|
||||
"monk": "6.0.5",
|
||||
"morgan": "1.9.0",
|
||||
"ms": "2.1.1",
|
||||
"multer": "1.3.0",
|
||||
"nan": "^2.10.0",
|
||||
"node-sass": "4.7.2",
|
||||
"node-sass-json-importer": "3.1.5",
|
||||
"nopt": "^4.0.1",
|
||||
"nopt": "4.0.1",
|
||||
"nan": "2.10.0",
|
||||
"node-sass": "4.8.3",
|
||||
"node-sass-json-importer": "3.1.6",
|
||||
"nprogress": "0.2.0",
|
||||
"object-assign-deep": "0.3.1",
|
||||
"on-build-webpack": "0.1.0",
|
||||
|
|
@ -159,7 +161,7 @@
|
|||
"prominence": "0.2.0",
|
||||
"proxy-addr": "2.0.3",
|
||||
"pug": "2.0.3",
|
||||
"punycode": "^2.1.0",
|
||||
"punycode": "2.1.0",
|
||||
"qrcode": "1.2.0",
|
||||
"ratelimiter": "3.0.3",
|
||||
"recaptcha-promise": "0.1.3",
|
||||
|
|
@ -183,10 +185,10 @@
|
|||
"tcp-port-used": "0.1.2",
|
||||
"textarea-caret": "3.1.0",
|
||||
"tmp": "0.0.33",
|
||||
"ts-loader": "4.0.1",
|
||||
"ts-loader": "4.1.0",
|
||||
"ts-node": "5.0.1",
|
||||
"tslint": "5.9.1",
|
||||
"typescript": "2.7.2",
|
||||
"typescript": "2.8.1",
|
||||
"typescript-eslint-parser": "14.0.0",
|
||||
"uglify-es": "3.3.9",
|
||||
"url-loader": "1.0.1",
|
||||
|
|
@ -197,13 +199,13 @@
|
|||
"vue-cropperjs": "2.2.0",
|
||||
"vue-js-modal": "1.3.12",
|
||||
"vue-json-tree-view": "2.1.3",
|
||||
"vue-loader": "14.2.1",
|
||||
"vue-loader": "14.2.2",
|
||||
"vue-router": "3.0.1",
|
||||
"vue-template-compiler": "2.5.16",
|
||||
"vuedraggable": "2.16.0",
|
||||
"web-push": "3.3.0",
|
||||
"webfinger.js": "^2.6.6",
|
||||
"webpack": "4.2.0",
|
||||
"webfinger.js": "2.6.6",
|
||||
"webpack": "4.3.0",
|
||||
"webpack-cli": "2.0.13",
|
||||
"webpack-replace-loader": "1.3.0",
|
||||
"websocket": "1.0.25",
|
||||
|
|
|
|||
Loading…
Reference in a new issue