From 532188f04aff035b218e1e4000c24623f98213e8 Mon Sep 17 00:00:00 2001 From: Dhravya Date: Mon, 24 Jun 2024 21:00:22 -0500 Subject: [PATCH] a lot of hotfixes to fix production build --- .github/workflows/build.yml | 74 ------------------------------ .gitignore | 2 + apps/web/package.json | 2 +- package.json | 1 + packages/shared-types/package.json | 4 +- 5 files changed, 7 insertions(+), 76 deletions(-) delete mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 9c1f459d..00000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,74 +0,0 @@ -name: Build and Deploy Changes - -on: - push: - branches: [main] - paths: - - "apps/web/**" - - "apps/extension/**" - - "apps/cf-ai-backend/**" - pull_request: - branches: [main] - paths: - - "apps/web/**" - - "apps/extension/**" - - "apps/cf-ai-backend/**" - -jobs: - build-extension: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: ./.github/actions/buildextension - - build-app: - runs-on: ubuntu-latest - steps: - - name: Checkout repo - uses: actions/checkout@v3 - - - name: Setup Bun - uses: oven-sh/setup-bun@v1 - with: - bun-version: latest - - - name: Install packages - run: bun i - shell: bash - - - name: Build app - run: bun run pages:build - working-directory: apps/web - shell: bash - env: - GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} - GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} - NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }} - DATABASE_URL: ${{ secrets.DATABASE_URL }} - NEXTAUTH_URL: ${{ secrets.NEXTAUTH_URL }} - BACKEND_SECURITY_KEY: ${{ secrets.BACKEND_SECURITY_KEY }} - - - name: Publish to Cloudflare Pages - uses: cloudflare/pages-action@v1 - if: github.event_name == 'push' && github.ref == 'refs/heads/main' - with: - apiToken: ${{ secrets.CF_API_TOKEN }} - accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }} - directory: apps/web/.vercel/output/static - branch: main - - # deploy-cf-worker: - # runs-on: ubuntu-latest - # steps: - # - name: Checkout repo - # uses: actions/checkout@v3 - - # - name: Deploy to Cloudflare Workers - # uses: cloudflare/wrangler-action@1.2.0 - # with: - # apiToken: ${{ secrets.CF_API_TOKEN }} - # workingDirectory: apps/cf-ai-backend - # env: - # OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }} - # SECURITY_KEY: ${{ secrets.BACKEND_SECURITY_KEY }} diff --git a/.gitignore b/.gitignore index d8480f00..c80a841f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ bun.lockb .*.vars .wrangler .million +yarn.lock +package-lock.json # Dependencies node_modules diff --git a/apps/web/package.json b/apps/web/package.json index 7723e142..935ce094 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -2,7 +2,7 @@ "name": "@repo/web", "version": "1.0.0", "private": true, - "packageManager": "pnpm@9.4.0", + "packageManager": "yarn@1.22.21", "scripts": { "dev": "next dev", "build": "next build", diff --git a/package.json b/package.json index 4e6ea945..074f1c06 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "@repo/eslint-config": "*", "@repo/tailwind-config": "*", "@repo/typescript-config": "*", + "@repo/shared-types": "*", "@repo/ui": "*", "@tailwindcss/typography": "^0.5.13", "autoprefixer": "^10.4.19", diff --git a/packages/shared-types/package.json b/packages/shared-types/package.json index 18e6049e..8b9e0110 100644 --- a/packages/shared-types/package.json +++ b/packages/shared-types/package.json @@ -1,3 +1,5 @@ { - "name": "@repo/shared-types" + "name": "@repo/shared-types", + "version": "0.0.0", + "private": true }