diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f742824d..be206736 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,7 @@ jobs: - run: yarn prettier --check '{desktop,jobrunner,server}/**/*.{ts,tsx}' - lint-desktop: + lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -34,39 +34,8 @@ jobs: - run: yarn install --immutable --inline-builds - run: yarn lint - working-directory: ./desktop - - lint-server: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Use Node.js 18.x - uses: actions/setup-node@v3 - with: - node-version: 18.x - cache: "yarn" - cache-dependency-path: "yarn.lock" - - run: yarn install --immutable --inline-builds - - - run: yarn lint - working-directory: ./server - - lint-jobrunner: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Use Node.js 18.x - uses: actions/setup-node@v3 - with: - node-version: 18.x - cache: "yarn" - cache-dependency-path: "yarn.lock" - - run: yarn install --immutable --inline-builds - - - run: yarn lint - working-directory: ./jobrunner - typecheck-desktop: + typecheck: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -79,37 +48,6 @@ jobs: - run: yarn install --immutable --inline-builds - run: yarn typecheck - working-directory: ./desktop - - typecheck-server: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Use Node.js 18.x - uses: actions/setup-node@v3 - with: - node-version: 18.x - cache: "yarn" - cache-dependency-path: "yarn.lock" - - run: yarn install --immutable --inline-builds - - - run: yarn typecheck - working-directory: ./server - - typecheck-jobrunner: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Use Node.js 18.x - uses: actions/setup-node@v3 - with: - node-version: 18.x - cache: "yarn" - cache-dependency-path: "yarn.lock" - - run: yarn install --immutable --inline-builds - - - run: yarn typecheck - working-directory: ./jobrunner test-unit: runs-on: ubuntu-latest diff --git a/package.json b/package.json index d446a51f..4bb44e38 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,5 @@ { + "name": "bowser-root-workspace", "private": true, "workspaces": [ "./server", @@ -14,9 +15,10 @@ "prettier": "^3.0.3" }, "scripts": { - "lint": "yarn workspaces foreach run lint", - "prettify": "yarn workspaces foreach run prettify", - "test": "yarn workspaces foreach run test", + "lint": "yarn workspaces foreach -p --exclude bowser-root-workspace run lint", + "prettify": "yarn workspaces foreach -p --exclude bowser-root-workspace run prettify", + "test": "yarn workspaces foreach --exclude bowser-root-workspace run test", + "typecheck": "yarn workspaces foreach -p --exclude bowser-root-workspace run tsc --noEmit", "prepare": "husky install" }, "lint-staged": { diff --git a/server/package.json b/server/package.json index 4e9f3173..aad6d8d0 100644 --- a/server/package.json +++ b/server/package.json @@ -6,7 +6,7 @@ "dev": "next dev", "build": "next build", "start": "next start", - "lint": "next lint", + "lint": "next lint -f stylish", "test": "dotenv -e .env.test ../node_modules/.bin/vitest run --config ./vitest.config.ts", "test:e2e": "NODE_ENV=test E2E_TEST=true yarn playwright test", "test:e2e:ui": "NODE_ENV=test E2E_TEST=true yarn playwright test --ui --project=chromium", diff --git a/yarn.lock b/yarn.lock index 9dca441d..2c5c3170 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5844,6 +5844,17 @@ __metadata: languageName: unknown linkType: soft +"bowser-root-workspace@workspace:.": + version: 0.0.0-use.local + resolution: "bowser-root-workspace@workspace:." + dependencies: + danger: ^11.2.8 + husky: ^8.0.3 + lint-staged: ^14.0.1 + prettier: ^3.0.3 + languageName: unknown + linkType: soft + "bowser-server@workspace:*, bowser-server@workspace:server": version: 0.0.0-use.local resolution: "bowser-server@workspace:server" @@ -13404,17 +13415,6 @@ __metadata: languageName: node linkType: hard -"root-workspace-0b6124@workspace:.": - version: 0.0.0-use.local - resolution: "root-workspace-0b6124@workspace:." - dependencies: - danger: ^11.2.8 - husky: ^8.0.3 - lint-staged: ^14.0.1 - prettier: ^3.0.3 - languageName: unknown - linkType: soft - "rrweb-cssom@npm:^0.6.0": version: 0.6.0 resolution: "rrweb-cssom@npm:0.6.0"