Merge pull request #1132 from navikt/cleanup

Cleanup
navikt · Aug 4, 2023 · b74742f · b74742f
2 parents d5fbce7 + 374d7cf
commit b74742f
Show file tree

Hide file tree

Showing 197 changed files with 1,516 additions and 6,711 deletions.
diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
@@ -1,4 +1,4 @@
 paths:
   - apps/backend
-  - apps/frontend-2
+  - apps/frontend
   - apps/frackend
diff --git a/.github/workflows/team-frackend.yml b/.github/workflows/team-frackend.yml
@@ -8,7 +8,7 @@ on:
     paths:
       - '.github/workflows/team-frackend.yml'
       - 'apps/frackend/**'
-      - 'apps/frontend-2/**'
+      - 'apps/frontend/**'
   workflow_dispatch:
 
 env:
@@ -27,21 +27,21 @@ jobs:
           cache-dependency-path: apps/frackend/package-lock.json
 
       - name: Install frontend
-        working-directory: apps/frontend-2
+        working-directory: apps/frontend
         run: npm install
 
       - name: add version to frontend
         env:
           GITHUB_SHA: ${{ github.sha }}
-        working-directory: apps/frontend-2
+        working-directory: apps/frontend
         run: echo "VITE_APP_GIT_VERSION=${GITHUB_SHA}" >> .env
 
       - name: Build frontend
-        working-directory: apps/frontend-2
+        working-directory: apps/frontend
         run: npm run build
 
       - name: Copy frontend dist into public directory of frackend
-        working-directory: apps/frontend-2
+        working-directory: apps/frontend
         run: cp -r dist/ ../frackend/public
 
       - name: Docker login

diff --git a/.github/workflows/verify-frackend.yaml b/.github/workflows/verify-frackend.yaml
@@ -0,0 +1,32 @@
+name: "verify: frackend"
+
+on:
+  pull_request:
+    branches:
+      - 'main'
+    paths:
+      - 'apps/frackend/**'
+      - '.github/*/verify-frackend.yaml'
+
+jobs:
+  verify:
+    name: Verify there are no lint or typescript errors
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+          cache: 'npm'
+          cache-dependency-path: apps/frackend
+      - name: Install dependencies
+        working-directory: apps/frackend
+        run: npm ci
+
+      - name: Run ESLint
+        working-directory: apps/frackend
+        run: npm run lint
+
+      - name: Check for typescript errors
+        working-directory: apps/frackend
+        run: npm run check-types
diff --git a/.github/workflows/verify-frontend-2.yaml b/.github/workflows/verify-frontend-2.yaml
@@ -1,12 +1,12 @@
-name: "verify: frontend-2"
+name: "verify: frontend"
 
 on:
   pull_request:
     branches:
       - 'main'
     paths:
-      - 'apps/frontend-2/**'
-      - '.github/*/verify-frontend-2.yaml'
+      - 'apps/frontend/**'
+      - '.github/*/verify-frontend.yaml'
 
 jobs:
   verify:
@@ -18,19 +18,19 @@ jobs:
         with:
           node-version: '18'
           cache: 'npm'
-          cache-dependency-path: apps/frontend-2
+          cache-dependency-path: apps/frontend
       - name: Install dependencies
-        working-directory: apps/frontend-2
+        working-directory: apps/frontend
         run: npm ci
 
       - name: Run ESLint
-        working-directory: apps/frontend-2
+        working-directory: apps/frontend
         run: npm run lint
 
       - name: Run Stylelint
-        working-directory: apps/frontend-2
+        working-directory: apps/frontend
         run: npm run stylelint
 
       - name: Check for typescript errors
-        working-directory: apps/frontend-2
+        working-directory: apps/frontend
         run: npm run check-types