Merge branch 'develop' into feat-1714
This commit is contained in:
commit
22fdc8c837
|
@ -1,6 +1,8 @@
|
||||||
import dns from 'dns';
|
import dns from 'dns';
|
||||||
import { readFile } from 'node:fs/promises';
|
import { readFile } from 'node:fs/promises';
|
||||||
|
import type { IncomingMessage } from 'node:http';
|
||||||
import { defineConfig } from 'vite';
|
import { defineConfig } from 'vite';
|
||||||
|
import type { UserConfig } from 'vite';
|
||||||
import * as yaml from 'js-yaml';
|
import * as yaml from 'js-yaml';
|
||||||
import locales from '../../locales/index.js';
|
import locales from '../../locales/index.js';
|
||||||
import { getConfig } from './vite.config.js';
|
import { getConfig } from './vite.config.js';
|
||||||
|
@ -14,7 +16,15 @@ const { port } = yaml.load(await readFile('../../.config/default.yml', 'utf-8'))
|
||||||
const httpUrl = `http://localhost:${port}/`;
|
const httpUrl = `http://localhost:${port}/`;
|
||||||
const websocketUrl = `ws://localhost:${port}/`;
|
const websocketUrl = `ws://localhost:${port}/`;
|
||||||
|
|
||||||
const devConfig = {
|
// activitypubリクエストはProxyを通し、それ以外はViteの開発サーバーを返す
|
||||||
|
function varyHandler(req: IncomingMessage) {
|
||||||
|
if (req.headers.accept?.includes('application/activity+json')) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return '/index.html';
|
||||||
|
}
|
||||||
|
|
||||||
|
const devConfig: UserConfig = {
|
||||||
// 基本の設定は vite.config.js から引き継ぐ
|
// 基本の設定は vite.config.js から引き継ぐ
|
||||||
...defaultConfig,
|
...defaultConfig,
|
||||||
root: 'src',
|
root: 'src',
|
||||||
|
@ -56,15 +66,11 @@ const devConfig = {
|
||||||
'/inbox': httpUrl,
|
'/inbox': httpUrl,
|
||||||
'/notes': {
|
'/notes': {
|
||||||
target: httpUrl,
|
target: httpUrl,
|
||||||
headers: {
|
bypass: varyHandler,
|
||||||
'Accept': 'application/activity+json',
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
'/users': {
|
'/users': {
|
||||||
target: httpUrl,
|
target: httpUrl,
|
||||||
headers: {
|
bypass: varyHandler,
|
||||||
'Accept': 'application/activity+json',
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
'/.well-known': {
|
'/.well-known': {
|
||||||
target: httpUrl,
|
target: httpUrl,
|
||||||
|
|
Loading…
Reference in New Issue