From 90f13b210e29fd4644b25fb0e1773d7b7e2e2784 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Fri, 18 Oct 2024 23:23:08 +0200 Subject: [PATCH] build before start --- .github/workflows/test.yml | 13 +++++------- apps/login/package.json | 41 +++++++++++++++++++------------------- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6e1a7a10d4a..456f4917ceb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,14 +56,8 @@ jobs: - name: Install Dependencies run: CYPRESS_INSTALL_BINARY=0 pnpm install - # We build already here so we can fail fast if the build fails - - name: Build Production - run: pnpm build - if: ${{ matrix.command == 'test:acceptance' }} - - - run: | - echo "CYPRESS_VERSION=$(pnpm list -r | grep cypress | cut -d ' ' -f 2)" >> $GITHUB_ENV - echo "PLAYWRIGHT_VERSION=$(npx playwright --version | cut -d ' ' -f 2)" >> $GITHUB_ENV + - run: echo "CYPRESS_VERSION=$(pnpm list -r | grep cypress | cut -d ' ' -f 2)" >> $GITHUB_ENV + if: ${{ matrix.command == 'test:integration' }} - uses: actions/cache@v4.0.2 name: Setup Cypress binary cache @@ -78,6 +72,9 @@ jobs: run: pnpm install if: ${{ matrix.command == 'test:integration' }} + - run: echo "PLAYWRIGHT_VERSION=$(npx playwright --version | cut -d ' ' -f 2)" >> $GITHUB_ENV + if: ${{ matrix.command == 'test:acceptance' }} + - uses: actions/cache@v4.0.2 name: Setup Playwright binary cache with: diff --git a/apps/login/package.json b/apps/login/package.json index 8863d361e71..83991432166 100644 --- a/apps/login/package.json +++ b/apps/login/package.json @@ -1,7 +1,6 @@ { "name": "@zitadel/login", "private": true, - "type": "module", "scripts": { "dev": "next dev", "test": "concurrently --timings --kill-others-on-fail 'npm:test:unit' 'npm:test:integration'", @@ -22,6 +21,7 @@ "lint:fix": "prettier --write .", "lint-staged": "lint-staged", "build": "next build", + "prestart": "pnpm build", "start": "next start", "clean": "pnpm mock:destroy && rm -rf .turbo && rm -rf node_modules && rm -rf .next" }, @@ -32,19 +32,19 @@ "*": "prettier --write --ignore-unknown" }, "dependencies": { - "@headlessui/react": "^2.1.9", + "@headlessui/react": "^1.7.18", "@heroicons/react": "2.1.3", "@tailwindcss/forms": "0.5.7", "@vercel/analytics": "^1.2.2", "@zitadel/client": "workspace:*", + "@zitadel/next": "workspace:*", "@zitadel/node": "workspace:*", "@zitadel/proto": "workspace:*", + "@zitadel/react": "workspace:*", "clsx": "1.2.1", "copy-to-clipboard": "^3.3.3", - "deepmerge": "^4.3.1", "moment": "^2.29.4", - "next": "14.2.14", - "next-intl": "^3.20.0", + "next": "14.2.5", "next-themes": "^0.2.1", "nice-grpc": "2.0.1", "qrcode.react": "^3.1.0", @@ -55,12 +55,12 @@ "tinycolor2": "1.4.2" }, "devDependencies": { - "@bufbuild/buf": "^1.41.0", + "@bufbuild/buf": "^1.36.0", "@testing-library/jest-dom": "^6.4.5", - "@testing-library/react": "^16.0.1", + "@testing-library/react": "^16.0.0", "@types/ms": "0.7.34", - "@types/node": "22.5.5", - "@types/react": "18.3.7", + "@types/node": "22.1.0", + "@types/react": "18.3.3", "@types/react-dom": "18.3.0", "@types/tinycolor2": "1.4.3", "@types/uuid": "^10.0.0", @@ -68,23 +68,22 @@ "@zitadel/prettier-config": "workspace:*", "@zitadel/tsconfig": "workspace:*", "autoprefixer": "10.4.20", - "concurrently": "^9.0.1", - "cypress": "^13.14.2", + "concurrently": "^8.1.0", + "cypress": "^13.13.2", "del-cli": "5.1.0", "env-cmd": "^10.1.0", "eslint-config-zitadel": "workspace:*", "grpc-tools": "1.12.4", - "jsdom": "^25.0.0", - "lint-staged": "15.2.10", + "lint-staged": "15.2.8", "make-dir-cli": "4.0.0", - "nodemon": "^3.1.5", - "postcss": "8.4.47", - "prettier-plugin-tailwindcss": "0.6.6", - "sass": "^1.79.1", - "start-server-and-test": "^2.0.8", - "tailwindcss": "3.4.13", - "ts-proto": "^2.2.0", - "typescript": "^5.6.2", + "nodemon": "^3.1.4", + "postcss": "8.4.41", + "prettier-plugin-tailwindcss": "0.6.5", + "sass": "^1.77.1", + "start-server-and-test": "^2.0.0", + "tailwindcss": "3.4.9", + "ts-proto": "^1.139.0", + "typescript": "^5.4.5", "zitadel-tailwind-config": "workspace:*" } }