chore: fix tasks

Author: Coly010

.github/workflows/ci.yml

@@ -26,12 +26,17 @@ jobs:
       # - run: npx nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="e2e-ci"
 
       # Cache node_modules
-      - uses: actions/setup-node@v4
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
         with:
-          node-version: 20
-          cache: 'npm'
+          run_install: false
 
-      - run: npm ci --legacy-peer-deps
+      - name: Install Node.js
+        uses: actions/setup-node@v5
+        with:
+          cache: 'pnpm'
+
+      - run: pnpm install
       - run: npx playwright install --with-deps
 
       # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
@@ -40,4 +45,4 @@ jobs:
       - run: npx nx run-many -t lint test build typecheck e2e
       # Nx Cloud recommends fixes for failures to help you get CI green faster. Learn more: https://nx.dev/ci/features/self-healing-ci
       - run: npx nx fix-ci
-        if: always()
+        if: always()

.github/workflows/nx-migrate.yml

@@ -51,8 +51,6 @@ jobs:
         if: ${{ steps.nx-workspace-package-check.outputs.was-changed == 'true' }}
         uses: actions/setup-node@v5
         with:
-          # Use the volta.node property as the source of truth
-          node-version-file: 'package.json'
           cache: 'pnpm'
 
       - name: Run nx migrate if @nx/workspace changed and commit the results
@@ -80,7 +78,6 @@ jobs:
           # Sometimes Nx can require config formatting changes after a migrate command
           # We need to expect lock file changes to be applicable
           pnpm install --ignore-scripts --frozen-lockfile=false
-          pnpm nx format
 
           # migrations.json may or may not exist after running nx migrate
           if [ -f migrations.json ]; then
@@ -90,9 +87,6 @@ jobs:
             rm migrations.json
           fi
 
-          # Ensure all the changed files are formatted appropriately
-          pnpm format
-
           # Commit all the changes to the PR (see note on not being able to use secrets.GITHUB_TOKEN for this)
           git config --global user.email "[email protected]"
           git config --global user.name "Coly010"

.github/workflows/pr.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           run_install: false
 
-      - name: Install Node.js per package.json
+      - name: Install Node.js
         uses: actions/setup-node@v5
         with:
           cache: 'pnpm'

apps/shop-e2e/eslint.config.mjs

@@ -5,7 +5,7 @@ export default [
   playwright.configs['flat/recommended'],
   ...baseConfig,
   {
-    files: ['**/*.ts', '**/*.js'],
+    files: ['src/**/*.ts', 'src/**/*.js'],
     // Override or add rules here
     rules: {},
   },

apps/shop/tsconfig.spec.json

@@ -11,13 +11,15 @@
       "@nx/react/typings/cssmodule.d.ts",
       "@nx/react/typings/image.d.ts"
     ],
+    "lib": ["es2022", "dom"],
     "jsx": "react-jsx"
   },
   "include": [
     "vite.config.ts",
     "vite.config.mts",
     "vitest.config.ts",
     "vitest.config.mts",
+    "src/test-setup.ts",
     "src/**/*.test.ts",
     "src/**/*.spec.ts",
     "src/**/*.test.tsx",

eslint.config.mjs

@@ -10,6 +10,7 @@ export default [
       '**/vite.config.*.timestamp*',
       '**/vitest.config.*.timestamp*',
       '**/test-output',
+      '**/out-tsc'
     ],
   },
   {

libs/api/products/src/lib/products.service.spec.ts

@@ -1,4 +1,3 @@
-import { describe, it, expect, beforeEach } from '@jest/globals';
 import { ProductsService } from './products.service';
 // eslint-disable-next-line
 import { ProductFilter } from '@org/models';

libs/shared/test-utils/package.json

@@ -12,6 +12,9 @@
     },
     "./package.json": "./package.json"
   },
+  "devDependencies": {
+    "@org/models": "workspace:*"
+  },
   "nx": {
     "sourceRoot": "libs/shared/test-utils/src",
     "projectType": "library",

libs/shared/test-utils/src/lib/test-render.tsx

@@ -1,5 +1,5 @@
 import { ReactElement } from 'react';
-import { render, RenderOptions } from '@testing-library/react';
+import {render, RenderOptions, RenderResult} from '@testing-library/react';
 import { BrowserRouter } from 'react-router-dom';
 
 interface AllTheProvidersProps {
@@ -13,9 +13,9 @@ function AllTheProviders({ children }: AllTheProvidersProps) {
 export function renderWithRouter(
   ui: ReactElement,
   options?: Omit<RenderOptions, 'wrapper'>
-) {
+): RenderResult {
   return render(ui, { wrapper: AllTheProviders, ...options });
 }
 
 export * from '@testing-library/react';
-export { renderWithRouter as render };
+export { renderWithRouter as render };

libs/shop/data/src/lib/hooks/use-product.ts

@@ -20,7 +20,7 @@ export function useProduct(id: string | undefined) {
 
       try {
         const response = await fetch(`${API_URL}/products/${id}`);
-        const data: ApiResponse<Product> = await response.json();
+        const data: ApiResponse<Product> = await response.json() as ApiResponse<Product>;
 
         if (!data.success) {
           throw new Error(data.error || 'Failed to load product');
@@ -45,4 +45,4 @@ export function useProduct(id: string | undefined) {
     loading,
     error,
   };
-}
+}