+ 
+ 
diff --git a/src/client/scripts/room/room.ts b/src/client/scripts/room/room.ts
index 45ccd59b7..8fe3ebdeb 100644
--- a/src/client/scripts/room/room.ts
+++ b/src/client/scripts/room/room.ts
@@ -340,7 +340,7 @@ export class Room {
@autobind
private loadRoom() {
const type = this.roomInfo.roomType;
- new GLTFLoader().load(`/assets/room/rooms/${type}/${type}.glb`, gltf => {
+ new GLTFLoader().load(`/static-assets/room/rooms/${type}/${type}.glb`, gltf => {
gltf.scene.traverse(child => {
if (!(child instanceof THREE.Mesh)) return;
@@ -375,7 +375,7 @@ export class Room {
const def = furnitureDefs.find(d => d.id === furniture.type);
return new Promise((res, rej) => {
const loader = new GLTFLoader();
- loader.load(`/assets/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => {
+ loader.load(`/static-assets/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => {
const model = gltf.scene;
// Load animation
diff --git a/src/client/scripts/sound.ts b/src/client/scripts/sound.ts
index 176d2b68b..bb4cfee06 100644
--- a/src/client/scripts/sound.ts
+++ b/src/client/scripts/sound.ts
@@ -16,7 +16,7 @@ export function playFile(file: string, volume: number) {
if (cache.has(file)) {
audio = cache.get(file);
} else {
- audio = new Audio(`/assets/sounds/${file}.mp3`);
+ audio = new Audio(`/static-assets/sounds/${file}.mp3`);
cache.set(file, audio);
}
audio.volume = masterVolume - ((1 - volume) * masterVolume);
diff --git a/src/server/api/openapi/gen-spec.ts b/src/server/api/openapi/gen-spec.ts
index 78e481037..8fc634d69 100644
--- a/src/server/api/openapi/gen-spec.ts
+++ b/src/server/api/openapi/gen-spec.ts
@@ -13,7 +13,7 @@ export function genOpenapiSpec(lang = 'ja-JP') {
version: 'v1',
title: 'Misskey API',
description: getDescription(lang),
- 'x-logo': { url: '/assets/api-doc.png' }
+ 'x-logo': { url: '/static-assets/api-doc.png' }
},
externalDocs: {
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index a1d79100a..27fa495f8 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -28,7 +28,8 @@ const markdown = MarkdownIt({
html: true
});
-const client = `${__dirname}/../../client/`;
+const staticAssets = `${__dirname}/../../../assets/`;
+const assets = `${__dirname}/../../assets/`;
// Init app
const app = new Koa();
@@ -57,24 +58,31 @@ const router = new Router();
//#region static assets
+router.get('/static-assets/(.*)', async ctx => {
+ await send(ctx as any, ctx.path.replace('/static-assets/', ''), {
+ root: staticAssets,
+ maxage: ms('7 days'),
+ });
+});
+
router.get('/assets/(.*)', async ctx => {
- await send(ctx as any, ctx.path, {
- root: client,
+ await send(ctx as any, ctx.path.replace('/assets/', ''), {
+ root: assets,
maxage: ms('7 days'),
});
});
// Apple touch icon
router.get('/apple-touch-icon.png', async ctx => {
- await send(ctx as any, '/assets/apple-touch-icon.png', {
- root: client
+ await send(ctx as any, '/apple-touch-icon.png', {
+ root: assets
});
});
// ServiceWorker
router.get('/sw.js', async ctx => {
- await send(ctx as any, `/assets/sw.${config.version}.js`, {
- root: client
+ await send(ctx as any, `/sw.${config.version}.js`, {
+ root: assets
});
});
@@ -82,8 +90,8 @@ router.get('/sw.js', async ctx => {
router.get('/manifest.json', require('./manifest'));
router.get('/robots.txt', async ctx => {
- await send(ctx as any, '/assets/robots.txt', {
- root: client
+ await send(ctx as any, '/robots.txt', {
+ root: assets
});
});
@@ -91,8 +99,8 @@ router.get('/robots.txt', async ctx => {
// Docs
router.get('/api-doc', async ctx => {
- await send(ctx as any, '/assets/redoc.html', {
- root: client
+ await send(ctx as any, '/redoc.html', {
+ root: assets
});
});
diff --git a/src/server/web/manifest.ts b/src/server/web/manifest.ts
index 36c901d26..a1c937703 100644
--- a/src/server/web/manifest.ts
+++ b/src/server/web/manifest.ts
@@ -1,5 +1,5 @@
import * as Koa from 'koa';
-import * as manifest from '../../client/assets/manifest.json';
+import * as manifest from '../../../src/client/assets/manifest.json';
import { fetchMeta } from '../../misc/fetch-meta';
module.exports = async (ctx: Koa.Context) => {
diff --git a/src/server/web/views/info.pug b/src/server/web/views/info.pug
index eed69fc99..323dce974 100644
--- a/src/server/web/views/info.pug
+++ b/src/server/web/views/info.pug
@@ -66,7 +66,7 @@ html
main
header
h1 Misskey Version #{version}
- img(src='/assets/misskey-php-like-logo.png' alt='')
+ img(src='/static-assets/misskey-php-like-logo.png' alt='')
table
tr
th Instance
diff --git a/src/services/send-email.ts b/src/services/send-email.ts
index c716b3671..481480839 100644
--- a/src/services/send-email.ts
+++ b/src/services/send-email.ts
@@ -8,7 +8,7 @@ export const logger = new Logger('email');
export async function sendEmail(to: string, subject: string, html: string, text: string) {
const meta = await fetchMeta(true);
- const iconUrl = `${config.url}/assets/mi-white.png`;
+ const iconUrl = `${config.url}/static-assets/mi-white.png`;
const emailSettingUrl = `${config.url}/settings/email`;
const enableAuth = meta.smtpUser != null && meta.smtpUser !== '';
diff --git a/webpack.config.ts b/webpack.config.ts
index cc5264ceb..c530cf335 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -147,7 +147,7 @@ module.exports = {
}),
],
output: {
- path: __dirname + '/built/client/assets',
+ path: __dirname + '/built/assets',
filename: `[name].${meta.version}.js`,
publicPath: `/assets/`,
pathinfo: false,