summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-11-05 18:18:35 +0900
committerGitHub <noreply@github.com>2023-11-05 18:18:35 +0900
commit0c2dd335930298be37e7c81e0f5a8ab4c3964299 (patch)
treeb80975182254ab4bd6669b9ad417beca4d85d1ef /scripts
parentMerge pull request #12060 from misskey-dev/develop (diff)
parent2023.11.0 (diff)
downloadmisskey-0c2dd335930298be37e7c81e0f5a8ab4c3964299.tar.gz
misskey-0c2dd335930298be37e7c81e0f5a8ab4c3964299.tar.bz2
misskey-0c2dd335930298be37e7c81e0f5a8ab4c3964299.zip
Merge pull request #12177 from misskey-dev/develop
Release: 2023.11.0
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build-assets.mjs8
-rw-r--r--scripts/dev.mjs4
2 files changed, 11 insertions, 1 deletions
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(),
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,