From 844350ee3d37edf98500b05389d69840a51e5dbf Mon Sep 17 00:00:00 2001 From: yjl9903 Date: Thu, 3 Oct 2024 00:50:17 +0800 Subject: [PATCH] fix(web): not use env in cloudflare --- .github/workflows/deploy.yml | 2 ++ apps/frontend/web/app/entry.server.tsx | 1 - apps/frontend/web/package.json | 2 +- apps/frontend/web/vite.config.ts | 3 ++- packages/app/package.json | 2 +- pnpm-lock.yaml | 16 ++++++++-------- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5f235eaa..878fe905 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -63,6 +63,8 @@ jobs: - name: Build run: pnpm build:web + env: + cloudflare: 'true' - name: Deploy run: pnpm -C apps/frontend/web run deploy:worker diff --git a/apps/frontend/web/app/entry.server.tsx b/apps/frontend/web/app/entry.server.tsx index 615740ed..b4d8f6b0 100644 --- a/apps/frontend/web/app/entry.server.tsx +++ b/apps/frontend/web/app/entry.server.tsx @@ -47,7 +47,6 @@ export default async function handleRequest( // eslint-disable-next-line @typescript-eslint/no-unused-vars loadContext: AppLoadContext ) { - console.log(request.url, isSitemapUrl(request)); if (isSitemapUrl(request)) { // @ts-ignore return await sitemap(request, remixContext); diff --git a/apps/frontend/web/package.json b/apps/frontend/web/package.json index 54f8ffbd..138d0438 100644 --- a/apps/frontend/web/package.json +++ b/apps/frontend/web/package.json @@ -54,7 +54,7 @@ "unocss-preset-flowind": "^0.0.3", "unocss-preset-shadcn": "^0.3.1", "unplugin-analytics": "^0.0.11", - "unplugin-info": "^1.2.0", + "unplugin-info": "^1.2.1", "vite-tsconfig-paths": "^4.2.1" } } diff --git a/apps/frontend/web/vite.config.ts b/apps/frontend/web/vite.config.ts index fa267716..b248346b 100644 --- a/apps/frontend/web/vite.config.ts +++ b/apps/frontend/web/vite.config.ts @@ -69,7 +69,8 @@ export default defineConfig({ * The base url of server */ SERVER_BASE - } + }, + cloudflare: process.env.cloudflare === 'true' }), Analytics({ analytics: { diff --git a/packages/app/package.json b/packages/app/package.json index 130556db..4ea0681d 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -70,6 +70,6 @@ "unocss-preset-animations": "^1.1.0", "unocss-preset-shadcn": "^0.3.1", "unplugin-analytics": "^0.0.11", - "unplugin-info": "^1.2.0" + "unplugin-info": "^1.2.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f98e8b93..672e3e06 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -187,8 +187,8 @@ importers: specifier: ^0.0.11 version: 0.0.11(esbuild@0.17.19)(rollup@4.21.2)(vite@5.4.2(@types/node@20.16.5)(terser@5.31.6)) unplugin-info: - specifier: ^1.2.0 - version: 1.2.0(esbuild@0.17.19)(rollup@4.21.2)(vite@5.4.2(@types/node@20.16.5)(terser@5.31.6))(webpack-sources@3.2.3) + specifier: ^1.2.1 + version: 1.2.1(esbuild@0.17.19)(rollup@4.21.2)(vite@5.4.2(@types/node@20.16.5)(terser@5.31.6))(webpack-sources@3.2.3) vite-tsconfig-paths: specifier: ^4.2.1 version: 4.3.2(typescript@5.6.2)(vite@5.4.2(@types/node@20.16.5)(terser@5.31.6)) @@ -374,8 +374,8 @@ importers: specifier: ^0.0.11 version: 0.0.11(esbuild@0.17.19)(rollup@2.79.1)(vite@5.4.2(@types/node@20.16.5)(terser@5.31.6)) unplugin-info: - specifier: ^1.2.0 - version: 1.2.0(esbuild@0.17.19)(rollup@2.79.1)(vite@5.4.2(@types/node@20.16.5)(terser@5.31.6))(webpack-sources@3.2.3) + specifier: ^1.2.1 + version: 1.2.1(esbuild@0.17.19)(rollup@2.79.1)(vite@5.4.2(@types/node@20.16.5)(terser@5.31.6))(webpack-sources@3.2.3) packages/cli: dependencies: @@ -8814,8 +8814,8 @@ packages: webpack: optional: true - unplugin-info@1.2.0: - resolution: {integrity: sha512-ePDKvnNi9b5nm8NHpeZZeaaORgfnvEGSnfYS6ed6HKyX84prRT20oYiuTQp2neUwI6blsN4Y3SoZX7XIt+BNZQ==} + unplugin-info@1.2.1: + resolution: {integrity: sha512-NwssEGmXCBYnGE3i9UhhK1nva1GF8EU21mBGmGZQVOYZwmNHOs+wcwgGnHsmc1nX4PkVQTLiawaLQBeP6HJKkA==} peerDependencies: '@nuxt/kit': ^3 '@nuxt/schema': ^3 @@ -19138,7 +19138,7 @@ snapshots: rollup: 4.21.2 vite: 5.4.2(@types/node@20.16.5)(terser@5.31.6) - unplugin-info@1.2.0(esbuild@0.17.19)(rollup@2.79.1)(vite@5.4.2(@types/node@20.16.5)(terser@5.31.6))(webpack-sources@3.2.3): + unplugin-info@1.2.1(esbuild@0.17.19)(rollup@2.79.1)(vite@5.4.2(@types/node@20.16.5)(terser@5.31.6))(webpack-sources@3.2.3): dependencies: ci-info: 4.0.0 git-url-parse: 15.0.0 @@ -19152,7 +19152,7 @@ snapshots: - supports-color - webpack-sources - unplugin-info@1.2.0(esbuild@0.17.19)(rollup@4.21.2)(vite@5.4.2(@types/node@20.16.5)(terser@5.31.6))(webpack-sources@3.2.3): + unplugin-info@1.2.1(esbuild@0.17.19)(rollup@4.21.2)(vite@5.4.2(@types/node@20.16.5)(terser@5.31.6))(webpack-sources@3.2.3): dependencies: ci-info: 4.0.0 git-url-parse: 15.0.0