From 2a1af9672f57ce425f9c5db941a8d372fb60666d Mon Sep 17 00:00:00 2001
From: Matthias <root@mattv.de>
Date: Mon, 22 Aug 2022 18:10:41 +0200
Subject: [PATCH] Fixed CI

---
 .gitlab-ci.yml      | 17 +++++++++--------
 tsconfig.build.json |  4 ----
 tsconfig.json       |  3 ++-
 webpack.config.ts   |  4 ++--
 4 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 tsconfig.build.json

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a533de..ef438b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,30 +8,30 @@ stages:
 cache:
     - key:
           files:
-              - package-lock.json
+              - yarn.lock
       paths:
           - node_modules
     - key:
           files:
-              - frontend/package-lock.json
+              - frontend/yarn.lock
       paths:
           - frontend/node_modules
 
 before_script:
-    - npm ci
+    - yarn install
     - cd frontend
-    - npm ci
+    - yarn install
 
 test_backend:
     stage: test
     script:
-        - npm run lint
+        - yarn lint
 
 test_frontend:
     stage: test
     script:
         - cd frontend
-        - npm run lint
+        - yarn lint
 
 build_backend:
     stage: build
@@ -39,7 +39,7 @@ build_backend:
         - job: test_backend
           artifacts: false
     script:
-        - npm webpack
+        - yarn webpack
     artifacts:
         paths:
             - dist/
@@ -52,7 +52,7 @@ build_frontend:
           artifacts: false
     script:
         - cd frontend
-        - npm run lint
+        - yarn build
     artifacts:
         paths:
             - frontend/dist/
@@ -72,6 +72,7 @@ package_server:
         - mkdir "$TMP/frontend"
         - mv frontend/dist/* "$TMP/frontend"
         - rm -r *
+        - rm -r .*
         - mv "$TMP/*" .
     artifacts:
         paths:
diff --git a/tsconfig.build.json b/tsconfig.build.json
deleted file mode 100644
index 3ac1105..0000000
--- a/tsconfig.build.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"extends": "./tsconfig.json",
-	"exclude": ["node_modules", "dist", "test", "**/*spec.ts", "frontend"]
-}
diff --git a/tsconfig.json b/tsconfig.json
index be3ec0e..2e7176f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,5 +12,6 @@
 		"baseUrl": "./",
 		"incremental": true,
 		"skipLibCheck": true
-	}
+	},
+	"exclude": ["node_modules", "dist", "test", "**/*spec.ts", "frontend"]
 }
diff --git a/webpack.config.ts b/webpack.config.ts
index 86de315..36cbefc 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -27,8 +27,8 @@ export default {
 					transform: transform_package
 				},
 				{
-					from: resolve(__dirname, 'package-lock.json'),
-					to: resolve(__dirname, 'dist', 'package-lock.json')
+					from: resolve(__dirname, 'yarn.lock'),
+					to: resolve(__dirname, 'dist', 'yarn.lock')
 				}
 			]
 		})