Skip to content

Commit 3e84f73

Browse files
committed
chore: extract ssr as single app
Signed-off-by: Innei <[email protected]>
1 parent cead6df commit 3e84f73

File tree

110 files changed

+394
-548
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+394
-548
lines changed

.github/workflows/build-web.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ jobs:
4242
run: pnpm install
4343
- name: Build web and SSR server
4444
run: |
45-
npm exec turbo run @follow/desktop#build:web @follow/server#build
45+
npm exec turbo run @follow/desktop#build:web @follow/ssr#build

.github/workflows/tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
const execSync = require("child_process").execSync;
2525
const fs = require("fs");
2626
const commitMessage = execSync("git log -1 --pretty=%B").toString("utf-8");
27-
const semverRegex = /chore: Release (v[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z-.]+)?)/;
27+
const semverRegex = /release\(desktop\): Release (v[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z-.]+)?)/;
2828
const match = commitMessage.match(semverRegex);
2929
if (match) {
3030
fs.appendFileSync(process.env.GITHUB_ENV, `tag_version=${match[1]}\n`);

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ stats.html
1515
electron.vite.config.*.mjs
1616
vite.config.*.mjs
1717

18-
# apps/server/**/fonts-data.ts
19-
# apps/server/**/index.template.ts
20-
2118
.generated
2219
.turbo
2320

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
],
1919
"tailwindCSS.experimental.configFile": {
2020
"apps/mobile/tailwind.config.ts": "apps/mobile/**",
21-
"apps/desktop/src/server/tailwind.config.ts": "apps/desktop/src/server/**",
22-
"apps/desktop/tailwind.config.ts": ["!apps/mobile/**", "!apps/desktop/src/server/**", "**"]
21+
"apps/ssr/tailwind.config.ts": "apps/ssr/**",
22+
"apps/desktop/tailwind.config.ts": ["!apps/mobile/**", "!apps/ssr/**", "**"]
2323
},
2424
"typescript.tsserver.maxTsServerMemory": 8096,
2525
"typescript.tsserver.nodePath": "node",

apps/desktop/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
"build:macos": "electron-vite build && electron-forge make --arch=x64 --platform=darwin && electron-forge make --arch=arm64 --platform=darwin && tsx scripts/merge-yml.ts",
1818
"build:mas": "electron-vite build && electron-forge make --arch=universal --platform=mas",
1919
"build:render": "vite build -c vite.config.electron-render.ts",
20-
"build:rn-web": "rm -rf out/rn-web && cross-env RN_BUILD=1 vite build",
2120
"build:web": "rm -rf out/web && cross-env WEB_BUILD=1 vite build",
2221
"dedupe:locales": "eslint --fix locales/**/*.json",
2322
"depcheck": "npx depcheck --quiet",
24-
"dev": "turbo run @follow/web#dev @follow/server#dev",
23+
"dev": "turbo run @follow/web#dev @follow/ssr#dev",
2524
"dev:debug": "export DEBUG=true && vite --debug",
2625
"dev:electron": "electron-vite dev",
27-
"dev:server": "pnpm run --filter=server dev",
26+
"dev:server": "pnpm run --filter=ssr dev",
2827
"dev:web": "cross-env WEB_BUILD=1 vite",
2928
"generator:i18n-template": "tsx scripts/generate-i18n-locale.ts",
3029
"publish": "electron-vite build && electron-forge publish",

apps/desktop/src/server/client/@types/default-resource.ts

Lines changed: 0 additions & 88 deletions
This file was deleted.

apps/desktop/src/server/src/meta-handler.map.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

apps/desktop/vite.config.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,9 @@ const devPrint = (): PluginOption => ({
4444
},
4545
})
4646

47-
const isRNBuild = process.env.RN_BUILD === "1"
4847
const isWebBuild = process.env.WEB_BUILD === "1"
4948
// eslint-disable-next-line no-console
50-
console.log(green("Build type:"), isRNBuild ? "RN" : isWebBuild ? "Web" : "Unknown")
49+
console.log(green("Build type:"), isWebBuild ? "Web" : "Unknown")
5150

5251
export default ({ mode }) => {
5352
const env = loadEnv(mode, process.cwd())
@@ -56,10 +55,10 @@ export default ({ mode }) => {
5655
return defineConfig({
5756
...viteRenderBaseConfig,
5857
root: ROOT,
59-
base: isRNBuild ? "./" : "/",
58+
base: "/",
6059
envDir: resolve(__dirname, "."),
6160
build: {
62-
outDir: resolve(__dirname, isRNBuild ? "out/rn-web" : "out/web"),
61+
outDir: resolve(__dirname, "out/web"),
6362
target: "ES2022",
6463
sourcemap: isCI,
6564
rollupOptions: {

apps/mobile/src/components/common/FollowWebView.tsx

Lines changed: 0 additions & 150 deletions
This file was deleted.
File renamed without changes.

0 commit comments

Comments
 (0)