Merge branch 'develop'

BoundfoxStudios · Jun 24, 2024 · c3feecb · c3feecb
2 parents c709343 + c46e861
commit c3feecb
Show file tree

Hide file tree

Showing 53 changed files with 7,141 additions and 5,112 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -17,11 +17,11 @@ jobs:
 
     runs-on: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
       - name: install dependencies (ubuntu only)
@@ -47,7 +47,7 @@ jobs:
         with:
           includeDebug: true
           includeRelease: false
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: apps-${{ matrix.platform }}
           path: |

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -9,9 +9,9 @@ jobs:
   run-tests:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
       - run: npm install
       - name: run tests
         run: npm test
@@ -25,11 +25,11 @@ jobs:
       release-id: ${{ steps.create-release.outputs.result }}
       version: ${{ steps.get-next-version.outputs.new-release-version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - run: npm install
       - run: npx semantic-release --dry-run
         id: get-next-version
@@ -48,7 +48,7 @@ jobs:
           echo "EOF" >> $GITHUB_ENV
       - name: create release
         id: create-release
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const { data } = await github.rest.repos.createRelease({
@@ -72,15 +72,15 @@ jobs:
         platform: [ macos-latest, ubuntu-20.04, windows-latest ]
     runs-on: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: update package.json with current version
         uses: jaywcjlove/github-action-package@main
         with:
           version: ${{ needs.create-release.outputs.version }}
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
       - name: install dependencies (ubuntu only)
@@ -112,11 +112,11 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [ create-release, build-tauri ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - name: install frontend dependencies
         run: npm install
       - run: npx semantic-release
@@ -125,7 +125,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: publish release
         id: publish-release
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         env:
           release_id: ${{ needs.create-release.outputs.release-id }}
         with:
@@ -139,7 +139,7 @@ jobs:
             })
       - name: download latest.json for the updater
         id: latest-json
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         env:
           release_id: ${{ needs.create-release.outputs.release-id }}
         with:
@@ -161,7 +161,7 @@ jobs:
             const textDecoder = new TextDecoder('utf-8');
             return textDecoder.decode(latestJsonContent.data);
       - name: Deploy update.json to Gist
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GIST_TOKEN }}
           script: |

diff --git a/angular.json b/angular.json
@@ -36,11 +36,12 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser-esbuild",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "dist/kuwaka-wakati",
+            "outputPath": {
+              "base": "dist/kuwaka-wakati"
+            },
             "index": "src/index.html",
-            "main": "src/main.ts",
             "polyfills": [
               "zone.js"
             ],
@@ -55,7 +56,8 @@
             "allowedCommonJsDependencies": [
               "rfdc",
               "file-saver"
-            ]
+            ],
+            "browser": "src/main.ts"
           },
           "configurations": {
             "production": {
@@ -74,7 +76,6 @@
               "outputHashing": "all"
             },
             "development": {
-              "buildOptimizer": false,
               "optimization": false,
               "extractLicenses": false,
               "sourceMap": {
@@ -90,10 +91,10 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "kuwaka-wakati:build:production"
+              "buildTarget": "kuwaka-wakati:build:production"
             },
             "development": {
-              "browserTarget": "kuwaka-wakati:build:development"
+              "buildTarget": "kuwaka-wakati:build:development"
             }
           },
           "defaultConfiguration": "development"