diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-10-18 21:14:49 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-10-18 21:14:49 +0000 |
| commit | ba17776b1961376b5369aa775e8910a227cc02ec (patch) | |
| tree | 0d0579dd911a6c9b74ebc84195cacf10eafe0918 /scripts | |
| parent | merge: Allow logged in users to refresh polls (!686) (diff) | |
| parent | Merge branch 'develop' into feature/2024.9.0 (diff) | |
| download | sharkey-ba17776b1961376b5369aa775e8910a227cc02ec.tar.gz sharkey-ba17776b1961376b5369aa775e8910a227cc02ec.tar.bz2 sharkey-ba17776b1961376b5369aa775e8910a227cc02ec.zip | |
merge: version 2024.9.0 (!675)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/675
Approved-by: Julia <julia@insertdomain.name>
Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build-assets.mjs | 2 | ||||
| -rw-r--r-- | scripts/clean-all.js | 6 | ||||
| -rw-r--r-- | scripts/clean.js | 2 | ||||
| -rw-r--r-- | scripts/dev.mjs | 12 |
4 files changed, 22 insertions, 0 deletions
diff --git a/scripts/build-assets.mjs b/scripts/build-assets.mjs index 4e587aa41d..66380a0e17 100644 --- a/scripts/build-assets.mjs +++ b/scripts/build-assets.mjs @@ -73,6 +73,7 @@ async function buildBackendScript() { for (const file of [ './packages/backend/src/server/web/boot.js', + './packages/backend/src/server/web/boot.embed.js', './packages/backend/src/server/web/bios.js', './packages/backend/src/server/web/cli.js' ]) { @@ -89,6 +90,7 @@ async function buildBackendStyle() { for (const file of [ './packages/backend/src/server/web/style.css', + './packages/backend/src/server/web/style.embed.css', './packages/backend/src/server/web/bios.css', './packages/backend/src/server/web/cli.css', './packages/backend/src/server/web/error.css' diff --git a/scripts/clean-all.js b/scripts/clean-all.js index 3df2f2ceff..a35868e9e7 100644 --- a/scripts/clean-all.js +++ b/scripts/clean-all.js @@ -10,9 +10,15 @@ const fs = require('fs'); fs.rmSync(__dirname + '/../packages/backend/built', { recursive: true, force: true }); fs.rmSync(__dirname + '/../packages/backend/node_modules', { recursive: true, force: true }); + fs.rmSync(__dirname + '/../packages/frontend-shared/built', { recursive: true, force: true }); + fs.rmSync(__dirname + '/../packages/frontend-shared/node_modules', { recursive: true, force: true }); + fs.rmSync(__dirname + '/../packages/frontend/built', { recursive: true, force: true }); fs.rmSync(__dirname + '/../packages/frontend/node_modules', { recursive: true, force: true }); + fs.rmSync(__dirname + '/../packages/frontend-embed/built', { recursive: true, force: true }); + fs.rmSync(__dirname + '/../packages/frontend-embed/node_modules', { recursive: true, force: true }); + fs.rmSync(__dirname + '/../packages/sw/built', { recursive: true, force: true }); fs.rmSync(__dirname + '/../packages/sw/node_modules', { recursive: true, force: true }); diff --git a/scripts/clean.js b/scripts/clean.js index 6d8182fec2..ebff55dacd 100644 --- a/scripts/clean.js +++ b/scripts/clean.js @@ -7,7 +7,9 @@ const fs = require('fs'); (async () => { fs.rmSync(__dirname + '/../packages/backend/built', { recursive: true, force: true }); + fs.rmSync(__dirname + '/../packages/frontend-shared/built', { recursive: true, force: true }); fs.rmSync(__dirname + '/../packages/frontend/built', { recursive: true, force: true }); + fs.rmSync(__dirname + '/../packages/frontend-embed/built', { recursive: true, force: true }); fs.rmSync(__dirname + '/../packages/sw/built', { recursive: true, force: true }); fs.rmSync(__dirname + '/../packages/misskey-js/built', { recursive: true, force: true }); fs.rmSync(__dirname + '/../packages/misskey-reversi/built', { recursive: true, force: true }); diff --git a/scripts/dev.mjs b/scripts/dev.mjs index a5c071fa7e..ea3b017ba5 100644 --- a/scripts/dev.mjs +++ b/scripts/dev.mjs @@ -70,12 +70,24 @@ execa('pnpm', ['--filter', 'backend', 'dev'], { stderr: process.stderr, }); +execa('pnpm', ['--filter', 'frontend-shared', 'watch'], { + cwd: _dirname + '/../', + stdout: process.stdout, + stderr: process.stderr, +}); + execa('pnpm', ['--filter', 'frontend', process.env.MK_DEV_PREFER === 'backend' ? 'watch' : 'dev'], { cwd: _dirname + '/../', stdout: process.stdout, stderr: process.stderr, }); +execa('pnpm', ['--filter', 'frontend-embed', process.env.MK_DEV_PREFER === 'backend' ? 'watch' : 'dev'], { + cwd: _dirname + '/../', + stdout: process.stdout, + stderr: process.stderr, +}); + execa('pnpm', ['--filter', 'sw', 'watch'], { cwd: _dirname + '/../', stdout: process.stdout, |