graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-30 09:23:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update dependencies 🚀

Browse source
This commit is contained in:
syuilo 2019-11-24 17:09:32 +09:00
parent 50598bcefb
commit f7a328d66e
21 changed files with 837 additions and 517 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gulpfile.ts
View file

@ -11,7 +11,7 @@ const cssnano = require('gulp-cssnano');
const stylus = require('gulp-stylus'); const stylus = require('gulp-stylus');
import * as uglifyComposer from 'gulp-uglify/composer'; import * as uglifyComposer from 'gulp-uglify/composer';
import * as rimraf from 'rimraf'; import * as rimraf from 'rimraf';
import chalk from 'chalk'; import * as chalk from 'chalk';
import * as rename from 'gulp-rename'; import * as rename from 'gulp-rename';
import * as mocha from 'gulp-mocha'; import * as mocha from 'gulp-mocha';
import * as replace from 'gulp-replace'; import * as replace from 'gulp-replace';

124
package.json
View file

@ -36,12 +36,12 @@
"@fortawesome/free-brands-svg-icons": "5.11.2", "@fortawesome/free-brands-svg-icons": "5.11.2",
"@fortawesome/free-regular-svg-icons": "5.11.2", "@fortawesome/free-regular-svg-icons": "5.11.2",
"@fortawesome/free-solid-svg-icons": "5.11.2", "@fortawesome/free-solid-svg-icons": "5.11.2",
"@fortawesome/vue-fontawesome": "0.1.7", "@fortawesome/vue-fontawesome": "0.1.8",
"@koa/cors": "3.0.0", "@koa/cors": "3.0.0",
"@koa/multer": "2.0.0", "@koa/multer": "2.0.1",
"@koa/router": "8.0.2", "@koa/router": "8.0.2",
"@types/bcryptjs": "2.4.2", "@types/bcryptjs": "2.4.2",
"@types/bull": "3.10.3", "@types/bull": "3.10.6",
"@types/cbor": "2.0.0", "@types/cbor": "2.0.0",
"@types/dateformat": "3.0.1", "@types/dateformat": "3.0.1",
"@types/deep-equal": "1.0.1", "@types/deep-equal": "1.0.1",
@ -56,22 +56,22 @@
"@types/js-yaml": "3.12.1", "@types/js-yaml": "3.12.1",
"@types/jsdom": "12.2.4", "@types/jsdom": "12.2.4",
"@types/katex": "0.10.2", "@types/katex": "0.10.2",
"@types/koa": "2.0.50", "@types/koa": "2.0.52",
"@types/koa-bodyparser": "5.0.2", "@types/koa-bodyparser": "4.3.0",
"@types/koa-compress": "2.0.9", "@types/koa-compress": "2.0.9",
"@types/koa-cors": "0.0.0", "@types/koa-cors": "0.0.0",
"@types/koa-favicon": "2.0.19", "@types/koa-favicon": "2.0.19",
"@types/koa-logger": "3.1.1", "@types/koa-logger": "3.1.1",
"@types/koa-mount": "4.0.0", "@types/koa-mount": "4.0.0",
"@types/koa-send": "4.1.2", "@types/koa-send": "4.1.2",
"@types/koa-views": "2.0.3", "@types/koa-views": "2.0.4",
"@types/koa__cors": "2.2.3", "@types/koa__cors": "2.2.3",
"@types/koa__multer": "2.0.0", "@types/koa__multer": "2.0.1",
"@types/koa__router": "8.0.0", "@types/koa__router": "8.0.2",
"@types/lolex": "3.1.1", "@types/lolex": "5.1.0",
"@types/mocha": "5.2.7", "@types/mocha": "5.2.7",
"@types/node": "12.7.12", "@types/node": "12.12.12",
"@types/nodemailer": "6.2.1", "@types/nodemailer": "6.2.2",
"@types/nprogress": "0.2.0", "@types/nprogress": "0.2.0",
"@types/oauth": "0.9.1", "@types/oauth": "0.9.1",
"@types/parse5": "5.0.2", "@types/parse5": "5.0.2",
@ -86,51 +86,51 @@
"@types/request": "2.48.3", "@types/request": "2.48.3",
"@types/request-promise-native": "1.0.17", "@types/request-promise-native": "1.0.17",
"@types/request-stats": "3.0.0", "@types/request-stats": "3.0.0",
"@types/rimraf": "2.0.2", "@types/rimraf": "2.0.3",
"@types/seedrandom": "2.4.28", "@types/seedrandom": "2.4.28",
"@types/sharp": "0.22.3", "@types/sharp": "0.23.0",
"@types/showdown": "1.9.3", "@types/showdown": "1.9.3",
"@types/speakeasy": "2.0.5", "@types/speakeasy": "2.0.5",
"@types/systeminformation": "3.23.1", "@types/systeminformation": "3.54.1",
"@types/tinycolor2": "1.4.2", "@types/tinycolor2": "1.4.2",
"@types/tmp": "0.1.0", "@types/tmp": "0.1.0",
"@types/uuid": "3.4.5", "@types/uuid": "3.4.6",
"@types/web-push": "3.3.0", "@types/web-push": "3.3.0",
"@types/webpack": "4.39.3", "@types/webpack": "4.41.0",
"@types/webpack-stream": "3.2.10", "@types/webpack-stream": "3.2.10",
"@types/websocket": "0.0.40", "@types/websocket": "1.0.0",
"@types/ws": "6.0.3", "@types/ws": "6.0.3",
"@typescript-eslint/parser": "2.3.3", "@typescript-eslint/parser": "2.8.0",
"agentkeepalive": "4.1.0", "agentkeepalive": "4.1.0",
"animejs": "3.1.0", "animejs": "3.1.0",
"apexcharts": "3.10.1", "apexcharts": "3.10.1",
"autobind-decorator": "2.4.0", "autobind-decorator": "2.4.0",
"autosize": "4.0.2", "autosize": "4.0.2",
"autwh": "0.1.0", "autwh": "0.1.0",
"aws-sdk": "2.548.0", "aws-sdk": "2.578.0",
"bcryptjs": "2.4.3", "bcryptjs": "2.4.3",
"bootstrap": "4.3.1", "bootstrap": "4.3.1",
"bootstrap-vue": "2.0.4", "bootstrap-vue": "2.1.0",
"bull": "3.11.0", "bull": "3.12.1",
"cafy": "15.1.1", "cafy": "15.2.0",
"cbor": "5.0.1", "cbor": "5.0.1",
"chai": "4.2.0", "chai": "4.2.0",
"chalk": "2.4.2", "chalk": "3.0.0",
"cli-highlight": "2.1.1", "cli-highlight": "2.1.4",
"commander": "3.0.2", "commander": "4.0.1",
"content-disposition": "0.5.3", "content-disposition": "0.5.3",
"crc-32": "1.2.0", "crc-32": "1.2.0",
"css-loader": "3.2.0", "css-loader": "3.2.0",
"cssnano": "4.1.10", "cssnano": "4.1.10",
"dateformat": "3.0.3", "dateformat": "3.0.3",
"deep-equal": "1.1.0", "deep-equal": "1.1.1",
"diskusage": "1.1.3", "diskusage": "1.1.3",
"double-ended-queue": "2.1.0-0", "double-ended-queue": "2.1.0-0",
"eslint": "6.5.1", "eslint": "6.7.0",
"eslint-plugin-vue": "5.2.3", "eslint-plugin-vue": "6.0.1",
"eventemitter3": "4.0.0", "eventemitter3": "4.0.0",
"feed": "4.0.0", "feed": "4.0.0",
"file-type": "12.3.0", "file-type": "12.4.0",
"fluent-ffmpeg": "2.1.2", "fluent-ffmpeg": "2.1.2",
"gulp": "4.0.2", "gulp": "4.0.2",
"gulp-cssnano": "2.1.3", "gulp-cssnano": "2.1.3",
@ -145,18 +145,18 @@
"gulp-util": "3.0.8", "gulp-util": "3.0.8",
"hard-source-webpack-plugin": "0.13.1", "hard-source-webpack-plugin": "0.13.1",
"html-minifier": "4.0.0", "html-minifier": "4.0.0",
"http-signature": "1.2.0", "http-signature": "1.3.1",
"https-proxy-agent": "3.0.0", "https-proxy-agent": "3.0.1",
"insert-text-at-cursor": "0.3.0", "insert-text-at-cursor": "0.3.0",
"is-root": "2.1.0", "is-root": "2.1.0",
"is-svg": "4.2.0", "is-svg": "4.2.0",
"js-yaml": "3.13.1", "js-yaml": "3.13.1",
"jsdom": "15.1.1", "jsdom": "15.2.1",
"json5": "2.1.1", "json5": "2.1.1",
"json5-loader": "3.0.0", "json5-loader": "3.0.0",
"jsrsasign": "8.0.12", "jsrsasign": "8.0.12",
"katex": "0.11.1", "katex": "0.11.1",
"koa": "2.10.0", "koa": "2.11.0",
"koa-bodyparser": "4.2.1", "koa-bodyparser": "4.2.1",
"koa-compress": "3.0.0", "koa-compress": "3.0.0",
"koa-favicon": "2.0.1", "koa-favicon": "2.0.1",
@ -168,21 +168,21 @@
"koa-views": "6.2.1", "koa-views": "6.2.1",
"langmap": "0.0.16", "langmap": "0.0.16",
"loader-utils": "1.2.3", "loader-utils": "1.2.3",
"lolex": "4.2.0", "lolex": "5.1.1",
"lookup-dns-cache": "2.1.0", "lookup-dns-cache": "2.1.0",
"mocha": "6.2.1", "mocha": "6.2.2",
"moji": "0.5.1", "moji": "0.5.1",
"ms": "2.1.2", "ms": "2.1.2",
"multer": "1.4.2", "multer": "1.4.2",
"nested-property": "1.0.1", "nested-property": "1.0.2",
"node-fetch": "2.6.0", "node-fetch": "2.6.0",
"nodemailer": "6.3.1", "nodemailer": "6.3.1",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"object-assign-deep": "0.4.0", "object-assign-deep": "0.4.0",
"os-utils": "0.0.14", "os-utils": "0.0.14",
"parse5": "5.1.0", "parse5": "5.1.1",
"parsimmon": "1.13.0", "parsimmon": "1.13.0",
"pg": "7.12.1", "pg": "7.14.0",
"portscanner": "2.2.0", "portscanner": "2.2.0",
"postcss-loader": "3.0.0", "postcss-loader": "3.0.0",
"prismjs": "1.17.1", "prismjs": "1.17.1",
@ -192,10 +192,10 @@
"pug": "2.0.4", "pug": "2.0.4",
"punycode": "2.1.1", "punycode": "2.1.1",
"pureimage": "0.1.6", "pureimage": "0.1.6",
"qrcode": "1.4.2", "qrcode": "1.4.4",
"random-seed": "0.3.0", "random-seed": "0.3.0",
"randomcolor": "0.5.4", "randomcolor": "0.5.4",
"ratelimiter": "3.3.1", "ratelimiter": "3.4.0",
"recaptcha-promise": "0.1.3", "recaptcha-promise": "0.1.3",
"reconnecting-websocket": "4.2.0", "reconnecting-websocket": "4.2.0",
"redis": "2.8.0", "redis": "2.8.0",
@ -203,14 +203,14 @@
"reflect-metadata": "0.1.13", "reflect-metadata": "0.1.13",
"rename": "1.0.4", "rename": "1.0.4",
"request": "2.88.0", "request": "2.88.0",
"request-promise-native": "1.0.7", "request-promise-native": "1.0.8",
"request-stats": "3.0.0", "request-stats": "3.0.0",
"require-all": "3.0.0", "require-all": "3.0.0",
"rimraf": "3.0.0", "rimraf": "3.0.0",
"rndstr": "1.0.0", "rndstr": "1.0.0",
"s-age": "1.1.2", "s-age": "1.1.2",
"seedrandom": "3.0.5", "seedrandom": "3.0.5",
"sharp": "0.23.1", "sharp": "0.23.3",
"showdown": "1.9.0", "showdown": "1.9.0",
"showdown-highlightjs-extension": "0.1.2", "showdown-highlightjs-extension": "0.1.2",
"speakeasy": "2.0.0", "speakeasy": "2.0.0",
@ -220,52 +220,52 @@
"stylus-loader": "3.0.2", "stylus-loader": "3.0.2",
"summaly": "2.3.1", "summaly": "2.3.1",
"syslog-pro": "1.0.0", "syslog-pro": "1.0.0",
"systeminformation": "4.14.11", "systeminformation": "4.15.3",
"syuilo-password-strength": "0.0.1", "syuilo-password-strength": "0.0.1",
"terser-webpack-plugin": "2.1.3", "terser-webpack-plugin": "2.2.1",
"textarea-caret": "3.1.0", "textarea-caret": "3.1.0",
"three": "0.109.0", "three": "0.110.0",
"tinycolor2": "1.4.1", "tinycolor2": "1.4.1",
"tmp": "0.1.0", "tmp": "0.1.0",
"ts-loader": "6.2.0", "ts-loader": "6.2.1",
"ts-node": "8.4.1", "ts-node": "8.5.2",
"tslint": "5.20.0", "tslint": "5.20.1",
"tslint-sonarts": "1.9.0", "tslint-sonarts": "1.9.0",
"typeorm": "0.2.19", "typeorm": "0.2.20",
"typescript": "3.6.4", "typescript": "3.7.2",
"uglify-es": "3.3.9", "uglify-es": "3.3.9",
"ulid": "2.3.0", "ulid": "2.3.0",
"url-loader": "2.2.0", "url-loader": "2.3.0",
"uuid": "3.3.3", "uuid": "3.3.3",
"v-animate-css": "0.0.3", "v-animate-css": "0.0.3",
"v-debounce": "0.1.2", "v-debounce": "0.1.2",
"vue": "2.6.10", "vue": "2.6.10",
"vue-color": "2.7.0", "vue-color": "2.7.0",
"vue-content-loading": "1.6.0", "vue-content-loading": "1.6.0",
"vue-cropperjs": "4.0.0", "vue-cropperjs": "4.0.1",
"vue-i18n": "8.14.1", "vue-i18n": "8.15.0",
"vue-js-modal": "1.3.31", "vue-js-modal": "1.3.31",
"vue-json-pretty": "1.6.2", "vue-json-pretty": "1.6.2",
"vue-loader": "15.7.1", "vue-loader": "15.7.2",
"vue-marquee-text-component": "1.1.1", "vue-marquee-text-component": "1.1.1",
"vue-prism-component": "1.1.1", "vue-prism-component": "1.1.1",
"vue-router": "3.1.3", "vue-router": "3.1.3",
"vue-sequential-entrance": "1.1.3", "vue-sequential-entrance": "1.1.3",
"vue-style-loader": "4.1.2", "vue-style-loader": "4.1.2",
"vue-svg-inline-loader": "1.3.3", "vue-svg-inline-loader": "1.4.3",
"vue-template-compiler": "2.6.10", "vue-template-compiler": "2.6.10",
"vuedraggable": "2.23.2", "vuedraggable": "2.23.2",
"vuewordcloud": "18.7.11", "vuewordcloud": "18.7.11",
"vuex": "3.1.1", "vuex": "3.1.2",
"vuex-persistedstate": "2.5.4", "vuex-persistedstate": "2.7.0",
"web-push": "3.4.0", "web-push": "3.4.1",
"webpack": "4.41.1", "webpack": "4.41.2",
"webpack-cli": "3.3.9", "webpack-cli": "3.3.10",
"websocket": "1.0.30", "websocket": "1.0.30",
"ws": "7.1.2", "ws": "7.2.0",
"xev": "2.0.1" "xev": "2.0.1"
}, },
"devDependencies": { "devDependencies": {
"@types/fluent-ffmpeg": "2.1.10" "@types/fluent-ffmpeg": "2.1.11"
} }
} }

2
src/boot/index.ts
View file

@ -1,5 +1,5 @@
import * as cluster from 'cluster'; import * as cluster from 'cluster';
import chalk from 'chalk'; import * as chalk from 'chalk';
import Xev from 'xev'; import Xev from 'xev';
import Logger from '../services/logger'; import Logger from '../services/logger';

2
src/boot/master.ts
View file

@ -1,6 +1,6 @@
import * as os from 'os'; import * as os from 'os';
import * as cluster from 'cluster'; import * as cluster from 'cluster';
import chalk from 'chalk'; import * as chalk from 'chalk';
import * as portscanner from 'portscanner'; import * as portscanner from 'portscanner';
import * as isRoot from 'is-root'; import * as isRoot from 'is-root';

2
src/misc/donwload-url.ts
View file

@ -1,7 +1,7 @@
import * as fs from 'fs'; import * as fs from 'fs';
import * as request from 'request'; import * as request from 'request';
import config from '../config'; import config from '../config';
import chalk from 'chalk'; import * as chalk from 'chalk';
import Logger from '../services/logger'; import Logger from '../services/logger';
export async function downloadUrl(url: string, path: string) { export async function downloadUrl(url: string, path: string) {

2
src/remote/resolve-user.ts
View file

@ -2,7 +2,7 @@ import webFinger from './webfinger';
import config from '../config'; import config from '../config';
import { createPerson, updatePerson } from './activitypub/models/person'; import { createPerson, updatePerson } from './activitypub/models/person';
import { remoteLogger } from './logger'; import { remoteLogger } from './logger';
import chalk from 'chalk'; import * as chalk from 'chalk';
import { User, IRemoteUser } from '../models/entities/user'; import { User, IRemoteUser } from '../models/entities/user';
import { Users } from '../models'; import { Users } from '../models';
import { toPuny } from '../misc/convert-host'; import { toPuny } from '../misc/convert-host';

2
src/server/api/api-handler.ts
View file

@ -5,7 +5,7 @@ import authenticate from './authenticate';
import call from './call'; import call from './call';
import { ApiError } from './error'; import { ApiError } from './error';
export default (endpoint: IEndpoint, ctx: Koa.BaseContext) => new Promise((res) => { export default (endpoint: IEndpoint, ctx: Koa.Context) => new Promise((res) => {
const body = ctx.request.body; const body = ctx.request.body;
const reply = (x?: any, y?: ApiError) => { const reply = (x?: any, y?: ApiError) => {

2
src/server/api/common/signin.ts
View file

@ -6,7 +6,7 @@ import { Signins } from '../../../models';
import { genId } from '../../../misc/gen-id'; import { genId } from '../../../misc/gen-id';
import { publishMainStream } from '../../../services/stream'; import { publishMainStream } from '../../../services/stream';
export default function(ctx: Koa.BaseContext, user: ILocalUser, redirect = false) { export default function(ctx: Koa.Context, user: ILocalUser, redirect = false) {
if (redirect) { if (redirect) {
//#region Cookie //#region Cookie
const expires = 1000 * 60 * 60 * 24 * 365; // One Year const expires = 1000 * 60 * 60 * 24 * 365; // One Year

2
src/server/api/private/signin.ts
View file

@ -10,7 +10,7 @@ import { ensure } from '../../../prelude/ensure';
import { verifyLogin, hash } from '../2fa'; import { verifyLogin, hash } from '../2fa';
import { randomBytes } from 'crypto'; import { randomBytes } from 'crypto';
export default async (ctx: Koa.BaseContext) => { export default async (ctx: Koa.Context) => {
ctx.set('Access-Control-Allow-Origin', config.url); ctx.set('Access-Control-Allow-Origin', config.url);
ctx.set('Access-Control-Allow-Credentials', 'true'); ctx.set('Access-Control-Allow-Credentials', 'true');

4
src/server/api/private/signup.ts
View file

@ -15,8 +15,8 @@ import { UserProfile } from '../../../models/entities/user-profile';
import { getConnection } from 'typeorm'; import { getConnection } from 'typeorm';
import { UsedUsername } from '../../../models/entities/used-username'; import { UsedUsername } from '../../../models/entities/used-username';
export default async (ctx: Koa.BaseContext) => { export default async (ctx: Koa.Context) => {
const body = ctx.request.body as any; const body = ctx.request.body;
const instance = await fetchMeta(true); const instance = await fetchMeta(true);

4
src/server/api/service/discord.ts
View file

@ -12,11 +12,11 @@ import { Users, UserProfiles } from '../../../models';
import { ILocalUser } from '../../../models/entities/user'; import { ILocalUser } from '../../../models/entities/user';
import { ensure } from '../../../prelude/ensure'; import { ensure } from '../../../prelude/ensure';
function getUserToken(ctx: Koa.BaseContext) { function getUserToken(ctx: Koa.Context) {
return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1]; return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1];
} }
function compareOrigin(ctx: Koa.BaseContext) { function compareOrigin(ctx: Koa.Context) {
function normalizeUrl(url: string) { function normalizeUrl(url: string) {
return url ? url.endsWith('/') ? url.substr(0, url.length - 1) : url : ''; return url ? url.endsWith('/') ? url.substr(0, url.length - 1) : url : '';
} }

4
src/server/api/service/github.ts
View file

@ -12,11 +12,11 @@ import { Users, UserProfiles } from '../../../models';
import { ILocalUser } from '../../../models/entities/user'; import { ILocalUser } from '../../../models/entities/user';
import { ensure } from '../../../prelude/ensure'; import { ensure } from '../../../prelude/ensure';
function getUserToken(ctx: Koa.BaseContext) { function getUserToken(ctx: Koa.Context) {
return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1]; return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1];
} }
function compareOrigin(ctx: Koa.BaseContext) { function compareOrigin(ctx: Koa.Context) {
function normalizeUrl(url: string) { function normalizeUrl(url: string) {
return url ? url.endsWith('/') ? url.substr(0, url.length - 1) : url : ''; return url ? url.endsWith('/') ? url.substr(0, url.length - 1) : url : '';
} }

4
src/server/api/service/twitter.ts
View file

@ -11,11 +11,11 @@ import { Users, UserProfiles } from '../../../models';
import { ILocalUser } from '../../../models/entities/user'; import { ILocalUser } from '../../../models/entities/user';
import { ensure } from '../../../prelude/ensure'; import { ensure } from '../../../prelude/ensure';
function getUserToken(ctx: Koa.BaseContext) { function getUserToken(ctx: Koa.Context) {
return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1]; return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1];
} }
function compareOrigin(ctx: Koa.BaseContext) { function compareOrigin(ctx: Koa.Context) {
function normalizeUrl(url: string) { function normalizeUrl(url: string) {
return url.endsWith('/') ? url.substr(0, url.length - 1) : url; return url.endsWith('/') ? url.substr(0, url.length - 1) : url;
} }

4
src/server/file/send-drive-file.ts
View file

@ -8,12 +8,12 @@ import { InternalStorage } from '../../services/drive/internal-storage';
const assets = `${__dirname}/../../server/file/assets/`; const assets = `${__dirname}/../../server/file/assets/`;
const commonReadableHandlerGenerator = (ctx: Koa.BaseContext) => (e: Error): void => { const commonReadableHandlerGenerator = (ctx: Koa.Context) => (e: Error): void => {
serverLogger.error(e); serverLogger.error(e);
ctx.status = 500; ctx.status = 500;
}; };
export default async function(ctx: Koa.BaseContext) { export default async function(ctx: Koa.Context) {
const key = ctx.params.key; const key = ctx.params.key;
// Fetch drive file // Fetch drive file

2
src/server/proxy/proxy-media.ts
View file

@ -6,7 +6,7 @@ import { createTemp } from '../../misc/create-temp';
import { downloadUrl } from '../../misc/donwload-url'; import { downloadUrl } from '../../misc/donwload-url';
import { detectMine } from '../../misc/detect-mine'; import { detectMine } from '../../misc/detect-mine';
export async function proxyMedia(ctx: Koa.BaseContext) { export async function proxyMedia(ctx: Koa.Context) {
const url = 'url' in ctx.query ? ctx.query.url : 'https://' + ctx.params.url; const url = 'url' in ctx.query ? ctx.query.url : 'https://' + ctx.params.url;
// Create temp file // Create temp file

2
src/server/web/manifest.ts
View file

@ -2,7 +2,7 @@ import * as Koa from 'koa';
import * as manifest from '../../client/assets/manifest.json'; import * as manifest from '../../client/assets/manifest.json';
import { fetchMeta } from '../../misc/fetch-meta'; import { fetchMeta } from '../../misc/fetch-meta';
module.exports = async (ctx: Koa.BaseContext) => { module.exports = async (ctx: Koa.Context) => {
const json = JSON.parse(JSON.stringify(manifest)); const json = JSON.parse(JSON.stringify(manifest));
const instance = await fetchMeta(true); const instance = await fetchMeta(true);

2
src/server/web/url-preview.ts
View file

@ -8,7 +8,7 @@ import { query } from '../../prelude/url';
const logger = new Logger('url-preview'); const logger = new Logger('url-preview');
module.exports = async (ctx: Koa.BaseContext) => { module.exports = async (ctx: Koa.Context) => {
const meta = await fetchMeta(); const meta = await fetchMeta();
logger.info(meta.summalyProxy logger.info(meta.summalyProxy

2
src/services/logger.ts
View file

@ -1,6 +1,6 @@
import * as cluster from 'cluster'; import * as cluster from 'cluster';
import * as os from 'os'; import * as os from 'os';
import chalk from 'chalk'; import * as chalk from 'chalk';
import * as dateformat from 'dateformat'; import * as dateformat from 'dateformat';
import { program } from '../argv'; import { program } from '../argv';
import { getRepository } from 'typeorm'; import { getRepository } from 'typeorm';

1
tsconfig.json
View file

@ -20,6 +20,7 @@
"experimentalDecorators": true, "experimentalDecorators": true,
"emitDecoratorMetadata": true, "emitDecoratorMetadata": true,
"resolveJsonModule": true, "resolveJsonModule": true,
"isolatedModules": true,
"typeRoots": [ "typeRoots": [
"node_modules/@types", "node_modules/@types",
"src/@types" "src/@types"

2
webpack.config.ts
View file

@ -4,7 +4,7 @@
import * as fs from 'fs'; import * as fs from 'fs';
import * as webpack from 'webpack'; import * as webpack from 'webpack';
import chalk from 'chalk'; import * as chalk from 'chalk';
const { VueLoaderPlugin } = require('vue-loader'); const { VueLoaderPlugin } = require('vue-loader');
const HardSourceWebpackPlugin = require('hard-source-webpack-plugin'); const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
const ProgressBarPlugin = require('progress-bar-webpack-plugin'); const ProgressBarPlugin = require('progress-bar-webpack-plugin');

1117
yarn.lock
View file

File diff suppressed because it is too large Load diff