.eslintignore

@@ -1,2 +1,3 @@
 /dist
-/vite-dist
+/out
+/ts-dist

.eslintrc.cjs

@@ -0,0 +1,37 @@
+module.exports = {
+  extends: ['mifi'],
+  rules: {
+    'no-console': 0,
+    'jsx-a11y/click-events-have-key-events': 0,
+    'jsx-a11y/interactive-supports-focus': 0,
+    'jsx-a11y/control-has-associated-label': 0,
+  },
+
+  overrides: [
+    {
+      files: ['./src/renderer/**/*.{js,cjs,mjs,jsx,ts,tsx,mts}'],
+      env: {
+        node: false,
+        browser: true,
+      },
+      rules: {
+        'import/no-extraneous-dependencies': 0,
+      },
+    },
+    {
+      files: ['./src/preload/**/*.{js,cjs,jsx,ts,tsx}'],
+      env: {
+        browser: true,
+      },
+    },
+    {
+      files: ['./script/**/*.{js,cjs,mjs,jsx,ts,tsx,mts}', 'electron.vite.config.js'],
+      rules: {
+        'import/no-extraneous-dependencies': ['error', {
+          devDependencies: true,
+          optionalDependencies: false,
+        }],
+      },
+    },
+  ],
+};

.github/ISSUE_TEMPLATE/file-issue.yml → .github/ISSUE_TEMPLATE/1-file-issue.yml

@@ -8,7 +8,7 @@ body:
   - type: checkboxes
     id: initial-checklist
     attributes:
-      label: I have a lot of issues to go through, so in order to make it easier for me to help you, I ask that you please try these things first
+      label: The fewer issues I have to read, the more new features I will have time to implement, so I ask that you please try these things first
       options:
         - label: Try with a different kind of file to confirm that the problem is related to just this file.
           required: true
@@ -22,7 +22,7 @@ body:
     id: steps-to-reproduce
     attributes:
       label: Steps to reproduce
-      description: How would I reproduce the problem? Please describe step-by-step what you're doing from starting up LosslessCut until the problem occurs. You can attach screenshots if needed.
+      description: How would I reproduce the problem? Please describe step-by-step what you're doing from starting up LosslessCut until the problem occurs. You can attach screenshots or screencasts if needed.
     validations:
       required: true
   - type: textarea
@@ -56,7 +56,7 @@ body:
   - type: textarea
     id: share-log
     attributes:
-      label: Share log
-      description: 'Please open developer tools after starting LosslessCut and before doing the failing operation. Then share any relevant output from the javascript Console. (Menu: Tools > Toggle Developer Tools)'
+      label: Share log from developer tools
+      description: 'Please open developer tools after starting LosslessCut and before performing the relevant operation. Then share any relevant output from the javascript Console. (Menu: Tools > Toggle Developer Tools)'
     validations:
       required: false

.github/ISSUE_TEMPLATE/bug.yml → .github/ISSUE_TEMPLATE/2-bug.yml

@@ -1,25 +1,28 @@
 name: 🐛 Bug report
-description: Describe a problem or bug with LosslessCut
+description: Describe a bug in LosslessCut (not related to a specific file or file type).
 body:
   - type: checkboxes
     id: initial-checklist
     attributes:
-      label: I have a lot of issues to go through, so in order to make it easier for me to help you, I ask that you please try these things first
+      label: The fewer issues I have to read, the more new features I will have time to implement, so I ask that you please try these things first
       options:
-        - label: Try with the [newest version from GitHub](https://github.com/mifi/lossless-cut/releases/latest)
+        - label: Try with the [newest version from GitHub](https://github.com/mifi/lossless-cut/releases/latest) (also it might have already been fixed in latest [nightly build](https://github.com/mifi/lossless-cut#nightly-builds-))
           required: true
         - label: Read the [documentation](https://github.com/mifi/lossless-cut) and [FAQ, Known issues, Troubleshooting](https://github.com/mifi/lossless-cut/blob/master/issues.md)
           required: true
         - label: Search for your problem under [Issues](https://github.com/mifi/lossless-cut/issues) or [Discussions](https://github.com/mifi/lossless-cut/discussions)
           required: true
-        - label: If you have an issue only with one particular file, [use this form instead](https://github.com/mifi/lossless-cut/issues/new?assignees=&labels=&template=file-issue.yml)
+        - label: If you have a problem only with a particular file (or file type), [use this form instead](https://github.com/mifi/lossless-cut/issues/new?assignees=&labels=&template=file-issue.yml)
+          required: true
+        - label: Windows 7, 8 and 8.1 are [no longer supported](https://github.com/mifi/lossless-cut/discussions/1476). **This is not a question about Windows 8.1 or older.**
           required: true
   - type: dropdown
     id: operating-system
     attributes:
       label: Operating System
       description: Which operating system are you running?
       options:
+        - I don't want to say
         - MacOS 13
         - MacOS 12
         - MacOS 11
@@ -38,7 +41,7 @@ body:
     id: steps-to-reproduce
     attributes:
       label: Steps to reproduce
-      description: How would I reproduce the problem? Please describe step-by-step what you're doing from starting up LosslessCut until the problem occurs. You can attach screenshots if needed.
+      description: How would I reproduce the problem? Please describe step-by-step what you're doing from starting up LosslessCut until the problem occurs. You can attach screenshots or screencasts if needed.
     validations:
       required: true
   - type: textarea
@@ -58,7 +61,7 @@ body:
   - type: textarea
     id: share-log
     attributes:
-      label: Share log
+      label: Share log from developer tools
       description: 'If you have a problem or an unexpected bug or crash, please open developer tools after starting LosslessCut and before doing the failing operation. Then share the output from the javascript Console. (Menu: Tools > Toggle Developer Tools)'
     validations:
       required: false

.github/ISSUE_TEMPLATE/feature.yml → .github/ISSUE_TEMPLATE/3-feature.yml

@@ -4,7 +4,7 @@ body:
   - type: checkboxes
     id: initial-checklist
     attributes:
-      label: I have a lot of issues to go through, so in order to make it easier for me to help you, I ask that you please try these things first
+      label: The fewer issues I have to read, the more new features I will have time to implement, so I ask that you please try these things first
       options:
         - label: Check out all the menus and keyboard shortcuts. Maybe the feature already exists?
           required: true
@@ -18,6 +18,6 @@ body:
     id: feature-description
     attributes:
       label: Description
-      description: A clear and concise description of what you want you would like to be added or improved in LosslessCut. You can attach screenshots if needed.
+      description: A clear and concise description of what you want you would like to be added or improved in LosslessCut. You can attach screenshots or screencasts if needed.
     validations:
       required: true

.github/workflows/build.yml

@@ -12,9 +12,11 @@ on:
 jobs:
   release:
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
 
     env:
       is_tag: ${{ startsWith(github.ref, 'refs/tags/v') }}
+      SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
 
     strategy:
       matrix:
@@ -31,18 +33,15 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
 
        # Because of timeout issue https://github.com/yarnpkg/yarn/issues/4890
-      - run: yarn install --network-timeout 1000000
+      - run: yarn install --immutable --network-timeout 1000000
 
-      - name: Install and login to Snapcraft
-        uses: samuelmeuli/action-snapcraft@v1
+      - name: (Linux) Install and login to Snapcraft
+        uses: samuelmeuli/action-snapcraft@v2
         if: startsWith(matrix.os, 'ubuntu')
-        with:
-          # Log in to Snap Store
-          snapcraft_token: ${{ secrets.snapcraft_token }}
 
       - name: Save provisioning profile
         if: startsWith(matrix.os, 'macos')
@@ -51,26 +50,24 @@ jobs:
         run: |
           echo -n "$PROVISIONING_PROFILE_BASE64" | base64 --decode > LosslessCut_Mac_App_Store_provisioning_profile.provisionprofile
 
-      - name: Prepare Apple API key
-        # Import Apple API key for app notarization on macOS and for uploading to Mac App Store
-        # 'altool --help': '--apiKey' will search the following directories in sequence for a private key file with the name of:
-        # 'AuthKey_<api_key>.p8': './private_keys', '~/private_keys', '~/.private_keys', and '~/.appstoreconnect/private_keys'.
+      - name: (MacOS) Prepare Apple API key
+        # Import Apple API key for uploading to Mac App Store and for notarization
         if: startsWith(matrix.os, 'macos')
         run: |
           mkdir -p ~/.appstoreconnect/private_keys/
           echo '${{ secrets.api_key }}' > ~/.appstoreconnect/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
 
-      - name: Download ffmpeg for Mac
+      - name: (MacOS) Download ffmpeg
         if: startsWith(matrix.os, 'macos')
         run: |
           yarn download-ffmpeg-darwin-x64
           yarn download-ffmpeg-darwin-arm64
 
-      - name: Download ffmpeg for Windows
+      - name: (Windows) Download ffmpeg
         if: startsWith(matrix.os, 'windows')
         run: yarn download-ffmpeg-win32-x64
 
-      - name: Download ffmpeg for Linux
+      - name: (Linux) Download ffmpeg
         if: startsWith(matrix.os, 'ubuntu')
         run: yarn download-ffmpeg-linux-x64
 
@@ -85,7 +82,7 @@ jobs:
           # release the app after building
           release: ${{ env.is_tag == 'true' }}
 
-          max_attempts: 2
+          max_attempts: 1
 
           mac_certs: ${{ secrets.mac_certs }}
           mac_certs_password: ${{ secrets.mac_certs_password }}
@@ -94,31 +91,34 @@ jobs:
 #          windows_certs: ${{ secrets.windows_certs }}
 #          windows_certs_password: ${{ secrets.windows_certs_password }}
         env:
-          # macOS notarization API key
-          API_KEY_ID: ${{ secrets.api_key_id }}
-          API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
+          APPLE_API_KEY: ~/.appstoreconnect/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
+          APPLE_API_KEY_ID: ${{ secrets.api_key_id }}
+          APPLE_API_ISSUER: ${{ secrets.api_key_issuer_id }}
 
-      - name: Upload to Mac App Store
+      - name: (MacOS) Upload to Mac App Store
         if: startsWith(matrix.os, 'macos') && env.is_tag == 'true'
         run: |
-          node script/xcrun-wrapper.mjs dist/mas-universal/LosslessCut-mac-universal.pkg ${{ secrets.api_key_id }} ${{ secrets.api_key_issuer_id }} 1505323402 no.mifi.losslesscut-mac
+          npx tsx script/xcrun-wrapper.mts dist/mas-universal/LosslessCut-mac-universal.pkg ${{ secrets.api_key_id }} ${{ secrets.api_key_issuer_id }} 1505323402 no.mifi.losslesscut-mac
 
-      - uses: actions/upload-artifact@v3
+      - name: (MacOS) Upload artifacts
+        uses: actions/upload-artifact@v3
         if: startsWith(matrix.os, 'macos') && env.is_tag == 'false'
         with:
           name: MacOS
           path: |
             dist/LosslessCut-mac-arm64.dmg
             dist/LosslessCut-mac-x64.dmg
 
-      - uses: actions/upload-artifact@v3
+      - name: (Windows) Upload artifacts
+        uses: actions/upload-artifact@v3
         if: startsWith(matrix.os, 'windows') && env.is_tag == 'false'
         with:
           name: Windows
           path: |
             dist/LosslessCut-win-x64.7z
 
-      - uses: actions/upload-artifact@v3
+      - name: (Linux) Upload artifacts
+        uses: actions/upload-artifact@v3
         if: startsWith(matrix.os, 'ubuntu') && env.is_tag == 'false'
         with:
           name: Linux

.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+
+    steps:
+      # Windows fix. See https://github.com/actions/checkout/issues/226
+      - run: git config --global core.autocrlf false
+
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18
+          cache: 'yarn'
+
+      - run: yarn install --immutable
+      - run: yarn dedupe --check
+      - run: yarn test
+      - run: yarn tsc
+      - run: yarn lint

.gitignore

@@ -11,9 +11,10 @@ node_modules
 !.yarn/versions
 
 /dist
-/vite-dist
+/out
 /icon-build
 /build-resources
 /doc
 /ffmpeg
 /app.log
+/ts-dist

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
   "search.exclude": {
-    "/public/locales/**": true,
+    "/src/main/locales/**": true,
   }
 }