[pull] main from staniel359:main

.github/FUNDING.yml

@@ -0,0 +1 @@
+ko_fi: staniel359

.github/workflows/main.yml

@@ -2,51 +2,97 @@ name: main
 on: workflow_dispatch
 
 jobs:
-  CD:
-    runs-on: macos-latest
+  build:
+    strategy:
+      matrix:
+        os:
+          - macos-latest
+          - windows-latest
+          - ubuntu-latest
+
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Set up checkout
-        uses: actions/checkout@v2
-
-      - name: Set up Yarn cache
-        uses: actions/cache@v2
+        uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
         with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-node-modules-cache-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: ${{ runner.os }}-node-modules-cache-
+          version: latest
+
+      - name: Fix pnpm bug # https://github.com/electron-userland/electron-builder/issues/6933#issuecomment-1213438889
+        if: matrix.os == 'windows-latest'
+        run: |
+          # Get the version of pnpm
+          $pnpmVersion = pnpm -v
+
+          # Construct the file path with the pnpm version
+          $file = "C:\Users\runneradmin\setup-pnpm\node_modules\.pnpm\pnpm@$pnpmVersion\node_modules\pnpm\bin\pnpm.cjs"
+
+          # Read the content of the file
+          $content = Get-Content $file
+
+          # Replace the target string
+          $content = $content -replace "#!/usr/bin/env node", "#!node"
+
+          # Write the modified content back to the file
+          $content | Set-Content $file
+
+          Write-Host "Replacement complete."
 
       - name: Set up Electron cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/.cache/electron
-          key: ${{ runner.os }}-electron-cache-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-electron-cache-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: ${{ runner.os }}-electron-cache-
 
       - name: Set up Electron Builder cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/.cache/electron-builder
-          key: ${{ runner.os }}-electron-builder-cache-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-electron-builder-cache-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: ${{ runner.os }}-electron-builder-cache-
 
       - name: Set up Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
-          node-version: '17.x'
+          node-version: 20
+          cache: pnpm
 
       - name: Set up dependencies
-        run: yarn --ignore-scripts
+        run: pnpm install
 
       - name: Lint
-        run: yarn lint
+        run: pnpm lint
+
+      - name: Create .env file
+        run: |
+          touch .env
+          echo VITE_APP_ELECTRON_STORE_KEY=${{ secrets.ELECTRON_STORE_KEY }} >> .env
+          echo VITE_APP_SHARE_ENCRYPTION_KEY=${{ secrets.SHARE_ENCRYPTION_KEY }} >> .env
+          echo VITE_APP_ANONYMOUS_TOKEN=${{ secrets.ANONYMOUS_TOKEN }} >> .env
+          echo VITE_APP_DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }} >> .env
+          cat .env
+
+      - name: Install packages (Linux-only)
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y flatpak flatpak-builder libarchive-tools rpm
+          flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
 
       - name: Release
         env:
           ELECTRON_CACHE: ${{ github.workspace }}/.cache/electron
           ELECTRON_BUILDER_CACHE: ${{ github.workspace }}/.cache/electron-builder
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: yarn release
+        run: pnpm release
 
-      - name: Clear Wine cache
-        run: rm -rf ${{ github.workspace }}/.cache/electron-builder/wine
+      - name: Release macos x64 # We do it separately without defining in electron-builder.json to prevent the distribution.xml not found error
+        if: matrix.os == 'macos-latest'
+        env:
+          ELECTRON_CACHE: ${{ github.workspace }}/.cache/electron
+          ELECTRON_BUILDER_CACHE: ${{ github.workspace }}/.cache/electron-builder
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        run: pnpm release --x64
+

.gitignore

@@ -1,11 +1,59 @@
 /build
 /build_electron
+
 /electron_data
+
 /node_modules
-/semantic/src
+
+/semantic/src/definitions/behaviors
+
+/semantic/src/definitions/collections/**
+!/semantic/src/definitions/collections/table.less
+
+/semantic/src/definitions/elements
+
+/semantic/src/definitions/globals/**
+!/semantic/src/definitions/globals/site.less
+
+/semantic/src/definitions/modules/**
+!/semantic/src/definitions/modules/dimmer.less
+!/semantic/src/definitions/modules/dropdown.less
+
+/semantic/src/definitions/views
+
+/semantic/src/themes
+
+/semantic/src/site/collections
+
+/semantic/src/site/elements
+!/semantic/src/site/elements/button.variables
+
+/semantic/src/site/globals
+!/semantic/src/site/globals/site.overrides
+!/semantic/src/site/globals/site.variables
+
+/semantic/src/site/modules
+!/semantic/src/site/modules/checkbox.variables
+!/semantic/src/site/modules/dropdown.variables
+
+/semantic/src/site/views
+
+/semantic/src/overrides.less
+/semantic/src/semantic.less
+/semantic/src/theme.config
+/semantic/src/theme.less
+
 /semantic/tasks
-/semantic/dist/components
-/semantic/dist/semantic.css
-/semantic/dist/semantic.js
+
+/semantic/dist
+!/semantic/dist/semantic.min.css
+!/semantic/dist/semantic.min.js
+!/semantic/dist/semantic.rtl.min.css
+
 /semantic/gulpfile.js
-yarn-error.log
+
+.env
+
+# yalc is used for developing and testing electron-builder but we don't need the files
+.yalc
+yalc.lock

.npmrc

@@ -0,0 +1 @@
+node-linker=hoisted