diff --git a/.dockerignore b/.dockerignore index 2f03a01..2b9daea 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,4 @@ **/node_modules .git -*/dist \ No newline at end of file +**/dist +**/tsconfig.tsbuildinfo \ No newline at end of file diff --git a/.eslintrc.js b/.eslintrc.js index f1ee5a6..a2e5bd1 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -48,6 +48,18 @@ module.exports = { 'no-use-before-define': 'off', '@typescript-eslint/explicit-module-boundary-types': 'off', + '@typescript-eslint/no-unused-vars': [ + 'error', + { + args: 'after-used', + argsIgnorePattern: '^_', + caughtErrors: 'all', + caughtErrorsIgnorePattern: '^_', + destructuredArrayIgnorePattern: '^_', + varsIgnorePattern: '^_', + ignoreRestSiblings: true, + }, + ], // Allow missing file extensions 'import/extensions': [ diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index be850ff..09bdc15 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -35,23 +35,3 @@ jobs: - name: Test run: yarn test - - e2e: - runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build Test Environment, Stage 1 - run: docker-compose -f docker-compose.testing.yml build base backend app-test cypress - - - name: Build Test Quests - run: docker-compose -f docker-compose.testing.yml run --rm backend yarn build:quests - - - name: Run Cypress Tests - env: - GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} - GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} - GITHUB_CLIENT_ID: ${{ secrets.GH_CLIENT_ID }} - GITHUB_CLIENT_SECRET: ${{ secrets.GH_CLIENT_SECRET }} - run: docker-compose -f docker-compose.testing.yml run cypress diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml new file mode 100644 index 0000000..bf12175 --- /dev/null +++ b/.github/workflows/e2e.yml @@ -0,0 +1,24 @@ +name: E2E Tests + +on: [push, pull_request] + +jobs: + e2e: + runs-on: ubuntu-latest + steps: + - name: Checkout Code + uses: actions/checkout@v3 + + - name: Build Test Environment, Stage 1 + run: docker-compose -f docker-compose.testing.yml build base backend app-test cypress + + - name: Build Test Quests + run: docker-compose -f docker-compose.testing.yml run --rm backend yarn build:quests + + - name: Run Cypress Tests + env: + GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} + GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} + GITHUB_CLIENT_ID: ${{ secrets.GH_CLIENT_ID }} + GITHUB_CLIENT_SECRET: ${{ secrets.GH_CLIENT_SECRET }} + run: docker-compose -f docker-compose.testing.yml run cypress diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 0c2f197..7adbef8 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -12,23 +12,6 @@ jobs: uses: ./.github/workflows/ci-checks.yml secrets: inherit - code_review: - permissions: - pull-requests: write - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Code Review GPT - uses: mattzcarey/code-review-gpt@v0.1.4-alpha - with: - OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }} - MODEL: 'gpt-3.5-turbo' - GITHUB_TOKEN: ${{ github.token }} - build: - needs: ci-checks uses: ./.github/workflows/build.yml secrets: inherit diff --git a/README.md b/README.md index fd56c86..61bc910 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Run mongoDB first: - docker compose -f docker-compose.dev.yml up -d db + docker compose up -d The db will automatically restarts by Docker. diff --git a/app/Dockerfile b/app/Dockerfile index e5e4888..aa511c6 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -6,8 +6,9 @@ COPY package.json yarn.lock tsconfig.json ./ COPY packages/file-graph/package.json ./packages/file-graph/package.json COPY packages/utils/package.json ./packages/utils/package.json COPY packages/constants/package.json ./packages/constants/package.json +COPY packages/models/package.json ./packages/models/package.json COPY app/package.json ./app/package.json -RUN yarn install +RUN yarn install --frozen-lockfile # Dev stage FROM base as dev @@ -19,8 +20,8 @@ FROM base as build COPY packages/file-graph ./packages/file-graph COPY packages/utils ./packages/utils COPY packages/constants ./packages/constants +COPY packages/models ./packages/models COPY app ./app -RUN yarn workspace app build:refs RUN yarn workspace app build # Production stage diff --git a/app/index.html b/app/index.html index 5cc968a..040d38c 100644 --- a/app/index.html +++ b/app/index.html @@ -8,6 +8,6 @@
- +