usbharu
/
misskey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into better-tutorial

This commit is contained in:
かっこかり 2023-11-03 13:51:10 +09:00 committed by GitHub
parent bae684e484 3e00b32fae
commit 0a22dae08c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/server/api/endpoints/notes/create.test.ts
View File

@ -64,7 +64,7 @@ describe('api:notes/create', () => {
test('0 characters cw', () => { test('0 characters cw', () => {
expect(v({ text: 'Body', cw: '' })) expect(v({ text: 'Body', cw: '' }))
.toBe(VALID); .toBe(INVALID);
}); });
test('reject only cw', () => { test('reject only cw', () => {

3
packages/backend/src/server/web/ClientServerService.ts
View File

@ -253,8 +253,9 @@ export class ClientServerService {
decorateReply: false, decorateReply: false,
}); });
} else { } else {
const port = (process.env.VITE_PORT ?? '5173');
fastify.register(fastifyProxy, { fastify.register(fastifyProxy, {
upstream: 'http://localhost:5173', // TODO: port configuration upstream: 'http://localhost:' + port,
prefix: '/vite', prefix: '/vite',
rewritePrefix: '/vite', rewritePrefix: '/vite',
}); });

4
scripts/dev.mjs
View File

@ -11,6 +11,8 @@ import { execa } from 'execa';
const _filename = fileURLToPath(import.meta.url); const _filename = fileURLToPath(import.meta.url);
const _dirname = dirname(_filename); const _dirname = dirname(_filename);
const vitePort = process.env.VITE_PORT ? ["--strictPort", "--port", process.env.VITE_PORT] : ["--strictPort"];
await execa('pnpm', ['clean'], { await execa('pnpm', ['clean'], {
cwd: _dirname + '/../', cwd: _dirname + '/../',
stdout: process.stdout, stdout: process.stdout,
@ -41,7 +43,7 @@ execa('pnpm', ['--filter', 'backend', 'watch'], {
stderr: process.stderr, stderr: process.stderr,
}); });
execa('pnpm', ['--filter', 'frontend', 'watch'], { execa('pnpm', ['--filter', 'frontend', 'watch', ...vitePort], {
cwd: _dirname + '/../', cwd: _dirname + '/../',
stdout: process.stdout, stdout: process.stdout,
stderr: process.stderr, stderr: process.stderr,