Merge pull request #71 from Leo-Nicolle/develop

Release Books

.github/workflows/deploy.yml

@@ -32,16 +32,6 @@ jobs:
         with:
           node-version: "18"
 
-      # - name: Determine Deployment Type
-      #   if: ${{ success() }}
-      #   run: |
-      #     echo "DEPLOY_ASSETS=${{ contains(toJson(github.event.pull_request.labels.*.name), 'deploy:assets') }}" >> $GITHUB_ENV
-      #     echo "DEPLOY_SERVER=${{ contains(toJson(github.event.pull_request.labels.*.name), 'deploy:server') }}" >> $GITHUB_ENV
-      #     echo "DEPLOY_CLIENT=${{ contains(toJson(github.event.pull_request.labels.*.name), 'deploy:client') }}" >> $GITHUB_ENV
-      #     if [[ $DEPLOY_ASSETS == 'false' && $DEPLOY_SERVER == 'false' && $DEPLOY_CLIENT == 'false' ]]; then
-      #       exit 1;
-      #     fi
-
       - name: Install Dependencies
         if: ${{ success() }}
         run: npm ci
@@ -53,21 +43,11 @@ jobs:
       - name: Deploy
         if: ${{ success() }}
         run: |
-          # if [ "$DEPLOY_ASSETS" = 'true' ]; then
-          #   echo "Deploying JS assets"
-          #   ssh -i $KEY $TARGET "rm -rf $ASSETS && mkdir -p $ASSETS"
-          #   scp -i $KEY -r dist/public/assets/* "$TARGET:$ASSETS"
-          #   scp -i $KEY -r dist/public/index.html "$TARGET:$INDEX_HTML"
-          # fi
-          # if [ "$DEPLOY_CLIENT" = 'true' ]; then
           echo "Deploying full client"
           ssh -i $KEY $TARGET "rm -rf $PUBLIC && mkdir -p $PUBLIC"
           scp -i $KEY -r dist/public/* "$TARGET:$PUBLIC"
-          ssh -i $KEY $TARGET "cp $DICOS/*.zip $PUBLIC/assets"
-          # fi
-          # if [ "$DEPLOY_SERVER" = 'true' ]; then
+          ssh -i $KEY $TARGET "cp $DICOS/*.zip $PUBLIC"
           echo "Deploying server code"
           scp -i $KEY -r dist/server.js "$TARGET:$SERVER"
-          # fi
       - name: Cleanup
         run: "rm -f $KEY && rm -rf ~/.ssh"

client/package.json

@@ -7,7 +7,7 @@
     "pretest": "rm -rf reports/ && vite build --mode testing",
     "update:snapshot": "UPDATE_SNAPSHOTS=true vitest run --mode testing Grid-view",
     "test": "vitest run --mode testing",
-    "test2": "vitest",
+    "test2": "vitest run -c vitest.config.ts",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
@@ -104,4 +104,4 @@
     "not dead",
     "not ie 11"
   ]
-}
+}