summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarie <marie@kaifa.ch>2024-02-03 20:19:44 +0100
committerMarie <marie@kaifa.ch>2024-02-03 20:19:44 +0100
commit11628e4b6a439a8a5f0ed1e1e8997f4edc894ace (patch)
tree865f01b5a5fbaf98bc838451cb7bd39e44bceb66 /scripts
parentmerge: Fix sfm-js linkage (!399) (diff)
parent2024.2.0-beta.9 (diff)
downloadsharkey-11628e4b6a439a8a5f0ed1e1e8997f4edc894ace.tar.gz
sharkey-11628e4b6a439a8a5f0ed1e1e8997f4edc894ace.tar.bz2
sharkey-11628e4b6a439a8a5f0ed1e1e8997f4edc894ace.zip
merge: upstream
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build-assets.mjs8
-rw-r--r--scripts/dev.mjs12
2 files changed, 9 insertions, 11 deletions
diff --git a/scripts/build-assets.mjs b/scripts/build-assets.mjs
index 22f0871caa..6267e5c963 100644
--- a/scripts/build-assets.mjs
+++ b/scripts/build-assets.mjs
@@ -35,13 +35,6 @@ 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 });
}
@@ -81,7 +74,6 @@ async function build() {
copyFrontendFonts(),
copyFrontendTablerIcons(),
copyFrontendLocales(),
- copyFrontendShikiAssets(),
copyBackendViews(),
buildBackendScript(),
buildBackendStyle(),
diff --git a/scripts/dev.mjs b/scripts/dev.mjs
index f4ba51b7db..c5c56ce739 100644
--- a/scripts/dev.mjs
+++ b/scripts/dev.mjs
@@ -28,7 +28,7 @@ await execa('pnpm', ['build-assets'], {
stderr: process.stderr,
});
-await execa('pnpm', ['--filter', 'misskey-js', 'build'], {
+await execa('pnpm', ['--filter', 'misskey-js', 'ts'], {
cwd: _dirname + '/../',
stdout: process.stdout,
stderr: process.stderr,
@@ -40,13 +40,13 @@ await execa("pnpm", ['--filter', 'megalodon', 'build'], {
stderr: process.stderr,
});
-await execa('pnpm', ['--filter', 'misskey-reversi', 'build'], {
+await execa('pnpm', ['--filter', 'misskey-reversi', 'build:tsc'], {
cwd: _dirname + '/../',
stdout: process.stdout,
stderr: process.stderr,
});
-await execa('pnpm', ['--filter', 'misskey-bubble-game', 'build'], {
+await execa('pnpm', ['--filter', 'misskey-bubble-game', 'build:tsc'], {
cwd: _dirname + '/../',
stdout: process.stdout,
stderr: process.stderr,
@@ -82,6 +82,12 @@ execa('pnpm', ['--filter', 'sw', 'watch'], {
stderr: process.stderr,
});
+execa('pnpm', ['--filter', 'misskey-js', 'watch'], {
+ cwd: _dirname + '/../',
+ stdout: process.stdout,
+ stderr: process.stderr,
+});
+
execa('pnpm', ['--filter', 'misskey-reversi', 'watch'], {
cwd: _dirname + '/../',
stdout: process.stdout,