Commit 6a86bdf4 authored by Grant's avatar Grant
Browse files

Merge branch 'main' into test-more-eslint

parents f8b7b9e7 dc2764d8

.gitlab-ci.yml

+29 −0
Original line number Diff line number Diff line
@@ -33,6 +33,35 @@ eslint server: 
    reports:

      codequality: packages/server/gl-codequality.json



jest server:

  stage: test

  rules:

    - if: $CI_PIPELINE_SOURCE == "merge_request_event"

      changes:

        - packages/server/src/**/*

  image: node:23-alpine

  services:

    - name: postgres:14-alpine

      alias: postgres

      variables:

        POSTGRES_DB: canvas

        POSTGRES_USER: canvas

        POSTGRES_PASSWORD: canvas

        POSTGRES_HOST_AUTH_METHOD: trust

  variables:

    DATABASE_URL: postgres://canvas@postgres/canvas

  script:

    - apk update && apk add git

    - npm i --include=dev

    - npx -w packages/server prisma migrate reset --force

    - npm -w packages/server run test:ci

  coverage: /All\sfiles.*?\s+([\d\.]+)/

  artifacts:

    reports:

      coverage_report:

        coverage_format: cobertura

        path: packages/server/coverage/cobertura-coverage.xml



build wiki:

  stage: build

  trigger:

.vscode/settings.json

+7 −1
Original line number Diff line number Diff line
@@ -4,5 +4,11 @@ 
    "packages/client",

    "packages/admin",

    "packages/lib"

  ]

  ],

  "jest.rootPath": "packages/server/src",

  "jest.runMode": {

    "type": "on-demand",

    "coverage": true,

    "runAllTestsOnStartup": false

  }

}

Dockerfile

+0 −3
Original line number Diff line number Diff line
@@ -123,9 +123,6 @@ ENV PORT 3000 
ENV NODE_ENV production

ENV SERVE_CLIENT /home/node/app/packages/client

ENV SERVE_ADMIN /home/node/app/packages/admin

ENV PIXEL_LOG_PATH /home/node/app/pixel.log



VOLUME /home/node/app/pixel.log



EXPOSE 3000

# profiler port, only used if profiler is explicity running

package-lock.json

+5615 −2465

File changed.

Preview size limit exceeded, changes collapsed.

package.json

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
    "eslint-formatter-gitlab": "^5.1.0",

    "eslint-plugin-react-hooks": "^5.1.0",

    "eslint-plugin-simple-import-sort": "^12.1.1",

    "jest-fetch-mock": "^3.0.3",

    "nodemon": "^3.1.9",

    "prettier": "^3.4.2",

    "tailwindcss": "^3.4.17",