fixing linting (#297)

* simplified github lint action. fixing cypres? * lint * simplifying vitest action
ourjapanlife · Dec 5, 2023 · 3d66bd1 · 3d66bd1
1 parent b3b6847
commit 3d66bd1
Show file tree

Hide file tree

Showing 10 changed files with 296 additions and 112 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -8,55 +8,36 @@ on:
     branches: [ "main" ]
   schedule:
     - cron: '45 15 * * 4'
-env:
-  CACHE_PATH: ./*
-  CACHE_KEY: lint-cache-${{ github.sha }}
 permissions:
   contents: read
   security-events: write
-  actions: write  # This is needed for pull requests to delete 
+  actions: write  # This is needed for pull requests to delete
 
 jobs:
-  setup:
-
-    name: Setup 🛫
+  # ESLint is a tool for identifying and reporting on patterns
+  # found in ECMAScript/JavaScript code.
+  # More details at https://github.com/eslint/eslint
+  # and https://eslint.org
+  eslint:
+    name: ESLint ✨
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18]  
-    runs-on: ubuntu-latest
+        node-version: [21.3.0]
     steps:
-      - name: Setup Cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.CACHE_PATH }}
-          key: ${{ env.CACHE_KEY }}-${{ matrix.node-version }}
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install Yarn/ Node ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: "yarn"
       - name: Install Dependencies
         run: yarn install --immutable
-        # this is needed to generate things like tsconfig declerations
-      - name: Prepare Nuxt
-        run: yarn prepare:ci
-  teardown:
-    name: Teardown 🛬
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [18]  
-    needs:
-      # list of lint jobs
-      - eslint 
-    if: always()
-    env:
-      LINT_RESULTS: ${{ toJson(needs) }}
-    steps:
+      - name: Run ESLint
+        run: yarn lint:ci
       - name: Check Lint Status
         if: always()
         run: |
@@ -66,51 +47,5 @@ jobs:
             exit 1
           fi
           exit 0
-
-
-
-  # ESLint is a tool for identifying and reporting on patterns
-  # found in ECMAScript/JavaScript code.
-  # More details at https://github.com/eslint/eslint
-  # and https://eslint.org
-  eslint:
-    name: ESLint ✨
-    runs-on: ubuntu-latest
-    needs: setup
-    strategy:
-      matrix:
-        node-version: [18]  
-    steps:
-      - name: Load Cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.CACHE_PATH }}
-          key: ${{ env.CACHE_KEY }}-${{ matrix.node-version }}
-      - name: Run ESLint
-        run: yarn lint:ci
-
-      - name: Upload Results
-        uses: github/codeql-action/upload-sarif@v2
-        if: always() # upload even if the lint fails
-        with:
-          sarif_file: eslint-results.sarif
-          wait-for-processing: true
-
-  # Stylelint is a tool for identifying and reporting on patterns
-  # found in CSS code.
-  # More details at https://stylelint.io/
-  stylelint:
-    name: Stylelint ✨
-    runs-on: ubuntu-latest
-    needs: setup
-    strategy:
-      matrix:
-        node-version: [18]  
-    steps:
-      - name: Load Cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.CACHE_PATH }}
-          key: ${{ env.CACHE_KEY }}-${{ matrix.node-version }}
-      - name: Run Styelint
-        run: yarn lint:css 
+    env:
+      LINT_RESULTS: ${{ toJson(needs) }}
diff --git a/.github/workflows/vitest.yml b/.github/workflows/vitest.yml
@@ -2,29 +2,21 @@ name: "Tests: vitest"
 
 on:
     push:
-        branches: ["main", "ragezbla/89-vitest-gh-actions"] # TODO remove after checking it works
+        branches: ["main"]
     pull_request:
         # The branches below must be a subset of the branches above
         branches: ["main"]
     schedule:
         - cron: "45 15 * * 4"
-env:
-    CACHE_PATH: ./*
-    CACHE_KEY: vitest-cache-${{ github.sha }}
 
 jobs:
     setup:
-        name: Setup 🛫
+        name: Running Pinia Tests 🚀
         strategy:
             matrix:
-                node-version: [16, 18]
+                node-version: [21.3.0]
         runs-on: ubuntu-latest
         steps:
-            - name: Setup Cache
-              uses: actions/cache@v3
-              with:
-                  path: ${{ env.CACHE_PATH }}
-                  key: ${{ env.CACHE_KEY }}-${{ matrix.node-version }}
             - name: Checkout Code
               uses: actions/checkout@v3
               with:
@@ -36,22 +28,6 @@ jobs:
                   cache: "yarn"
             - name: Install Dependencies
               run: yarn install --immutable
-              # this is needed to generate things like tsconfig declerations
-            - name: Prepare Nuxt
-              run: yarn prepare:ci
-
-    run-pinia-tests:
-        runs-on: ubuntu-latest
-        name: Running Pinia Tests 🚀
-        needs: setup
-        strategy:
-            matrix:
-                node-version: [16, 18]
-        steps:
-            - name: Load Cache
-              uses: actions/cache@v3
-              with:
-                  path: ${{ env.CACHE_PATH }}
-                  key: ${{ env.CACHE_KEY }}-${{ matrix.node-version }}
-            - name: Run Vitest
+            # Run the tests!
+            - name: Run Vitest 🚀
               run: yarn run test:pinia
diff --git a/...ts/home.cy.ts/Visits the home page -- allows setting search fields (failed).png b/...ts/home.cy.ts/Visits the home page -- allows setting search fields (failed).png
diff --git a/...s/Visits the home page -- can select English from the language bar (failed).png b/...s/Visits the home page -- can select English from the language bar (failed).png
diff --git a/.../Visits the home page -- can select Japanese from the language bar (failed).png b/.../Visits the home page -- can select Japanese from the language bar (failed).png
diff --git a/...ts/home.cy.ts/Visits the home page -- can select select a language (failed).png b/...ts/home.cy.ts/Visits the home page -- can select select a language (failed).png
diff --git a/...creenshots/home.cy.ts/Visits the home page -- shows doctors nearby (failed).png b/...creenshots/home.cy.ts/Visits the home page -- shows doctors nearby (failed).png
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-      "target": "ES2018",
+      "target": "ESNext",
       "module": "ESNext",
       "lib": [
         "ESNext",
@@ -10,7 +10,8 @@
       "types": [
         "cypress",
         "node"
-      ]
+      ],
+      "sourceMap": false
     },
     "include": ["**/*.ts"]
   }
diff --git a/package.json b/package.json
@@ -41,10 +41,12 @@
         "@microsoft/eslint-formatter-sarif": "^3.0.0",
         "@nuxt/types": "^2.17.2",
         "@nuxtjs/i18n": "next",
+        "@swc/core": "^1.3.100",
         "@testing-library/vue": "^6.6.1",
         "@typescript-eslint/eslint-plugin": "^6.13.2",
         "@typescript-eslint/parser": "^6.13.2",
         "@vitejs/plugin-vue": "^4.5.1",
+        "@vitest/coverage-v8": "^1.0.1",
         "@vue/test-utils": "^2.2.6",
         "all-contributors-cli": "^6.24.0",
         "autoprefixer": "^10.4.16",