From 1a8243f1cace06c2eb872177d39536f76c9a8f5d Mon Sep 17 00:00:00 2001 From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Sun, 29 Oct 2023 14:12:40 +0900 Subject: MkCodeのパースエンジンをShikiに変更 (#12102) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * (swap) prism -> shiki * fix styles * (bump) aiscript-vscode to v0.0.5 * refactor * replace prism-editor (beta) * Update scratchpad.vue * (enhance) MkCodeEditor自動インデント改行 * (fix) lint * (add) scratchpad: MkStickyContainer * Update CHANGELOG.md * clean up --------- Co-authored-by: syuilo --- scripts/build-assets.mjs | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'scripts') diff --git a/scripts/build-assets.mjs b/scripts/build-assets.mjs index a8a2cafa5f..1ffcec8aa3 100644 --- a/scripts/build-assets.mjs +++ b/scripts/build-assets.mjs @@ -33,6 +33,13 @@ async function copyFrontendLocales() { } } +async function copyFrontendShikiAssets() { + await fs.cp('./packages/frontend/node_modules/shiki/dist', './built/_frontend_dist_/shiki/dist', { dereference: true, recursive: true }); + await fs.cp('./packages/frontend/node_modules/shiki/languages', './built/_frontend_dist_/shiki/languages', { dereference: true, recursive: true }); + await fs.cp('./packages/frontend/node_modules/aiscript-vscode/aiscript/syntaxes', './built/_frontend_dist_/shiki/languages', { dereference: true, recursive: true }); + await fs.cp('./packages/frontend/node_modules/shiki/themes', './built/_frontend_dist_/shiki/themes', { dereference: true, recursive: true }); +} + async function copyBackendViews() { await fs.cp('./packages/backend/src/server/web/views', './packages/backend/built/server/web/views', { recursive: true }); } @@ -72,6 +79,7 @@ async function build() { copyFrontendFonts(), copyFrontendTablerIcons(), copyFrontendLocales(), + copyFrontendShikiAssets(), copyBackendViews(), buildBackendScript(), buildBackendStyle(), -- cgit v1.2.3-freya From 3e00b32faeb416c15ee75346ccd4c135bdfe576a Mon Sep 17 00:00:00 2001 From: anatawa12 Date: Fri, 3 Nov 2023 13:34:57 +0900 Subject: build: port vite port configuration (#12223) --- packages/backend/src/server/web/ClientServerService.ts | 3 ++- scripts/dev.mjs | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index cf621f4579..7a2a52a982 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -253,8 +253,9 @@ export class ClientServerService { decorateReply: false, }); } else { + const port = (process.env.VITE_PORT ?? '5173'); fastify.register(fastifyProxy, { - upstream: 'http://localhost:5173', // TODO: port configuration + upstream: 'http://localhost:' + port, prefix: '/vite', rewritePrefix: '/vite', }); diff --git a/scripts/dev.mjs b/scripts/dev.mjs index 26f29fc491..1d06aa541f 100644 --- a/scripts/dev.mjs +++ b/scripts/dev.mjs @@ -11,6 +11,8 @@ import { execa } from 'execa'; const _filename = fileURLToPath(import.meta.url); const _dirname = dirname(_filename); +const vitePort = process.env.VITE_PORT ? ["--strictPort", "--port", process.env.VITE_PORT] : ["--strictPort"]; + await execa('pnpm', ['clean'], { cwd: _dirname + '/../', stdout: process.stdout, @@ -41,7 +43,7 @@ execa('pnpm', ['--filter', 'backend', 'watch'], { stderr: process.stderr, }); -execa('pnpm', ['--filter', 'frontend', 'watch'], { +execa('pnpm', ['--filter', 'frontend', 'watch', ...vitePort], { cwd: _dirname + '/../', stdout: process.stdout, stderr: process.stderr, -- cgit v1.2.3-freya