Merge branch 'develop'

Author: s1hofmann

.github/workflows/ci.yaml

@@ -1,11 +1,11 @@
 name: Run CI
 on:
-  push:
-    branches-ignore:
-      - develop
-      - release/**
-    paths-ignore:
-      - '**/*.md'
+#  push:
+#    branches-ignore:
+#      - develop
+#      - release/**
+#    paths-ignore:
+#      - '**/*.md'
   pull_request:
 
 jobs:
@@ -18,7 +18,7 @@ jobs:
       - name: Set up node
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
       - name: Setup Docker
         run: |
           docker pull s1hofmann/nut-ci:latest
@@ -57,7 +57,7 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest, macos-latest ]
-        node: [ 14 ]
+        node: [ 16 ]
     runs-on: ${{matrix.os}}
     steps:
       - name: Set up Git repository

.github/workflows/orga.yaml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
-        node: [ 14 ]
+        node: [ 16 ]
     runs-on: ${{matrix.os}}
     steps:
       - name: Set up Git repository
@@ -59,7 +59,7 @@ jobs:
       - name: Set up node
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
           registry-url: 'https://registry.npmjs.org'
       - name: Install
         run: npm ci

.github/workflows/snapshot_release.yaml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
-        node: [ 14 ]
+        node: [ 16 ]
     runs-on: ${{matrix.os}}
     steps:
       - name: Set up Git repository
@@ -51,7 +51,7 @@ jobs:
       - name: Set up node
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
           registry-url: 'https://registry.npmjs.org'
       - name: Install
         run: npm ci

.github/workflows/tagged_release.yaml

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2.2.0
+- Maintenance: Limit CI runs to PRs, not every push
+- Maintenance: Upgrade node version to 16 for all CI runs
+- Bugfix: Fix grave accent [(PR #414)](https://github.com/nut-tree/nut.js/pull/414)
+- Enhancement: Refine error messages on fetchFromUrl [(#415)](https://github.com/nut-tree/nut.js/issues/415)
+- Enhancement: Ship Windows runtime dependencies [(#365)](https://github.com/nut-tree/nut.js/issues/365)
+
 ## 2.1.1
 - Bugfix: Modifier keys are not properly released on macOS [(#264)](https://github.com/nut-tree/nut.js/issues/264)
 - Bugfix: Fix mouse clicks with modifiers on macOS [(#273)](https://github.com/nut-tree/nut.js/issues/273)

CHANGELOG.md

@@ -150,9 +150,7 @@ This section lists runtime requirements for `nut.js` on the respective target pl
 
 #### Windows
 
-In order to install `nut.js` on Windows, please make sure to have the [Microsoft Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) installed.
-
-In case you're running Windows 10 N, please make sure to have the [Media Feature Pack](https://support.microsoft.com/en-us/topic/media-feature-pack-for-windows-10-n-may-2020-ebbdf559-b84c-0fc2-bd51-e23c9f6a4439) installed as well.
+In case you're running Windows 10 N and want to use [ImageFinder plugins](https://nutjs.dev/plugins/imagefinder), please make sure to have the [Media Feature Pack](https://support.microsoft.com/en-us/topic/media-feature-pack-for-windows-10-n-may-2020-ebbdf559-b84c-0fc2-bd51-e23c9f6a4439) installed.
 
 #### macOS
 

README.md

@@ -37,7 +37,7 @@ describe('fetchFromUrl', () => {
         const SUT = () => fetchFromUrl(malformedUrl);
 
         // THEN
-        await expect(SUT).rejects.toThrowError("Invalid URL");
+        await expect(SUT).rejects.toThrowError("Failed to fetch image data. Reason: Invalid URL");
     });
 
     it('should throw on non-image URLs', async () => {
@@ -48,7 +48,7 @@ describe('fetchFromUrl', () => {
         const SUT = () => fetchFromUrl(nonImageUrl);
 
         // THEN
-        await expect(SUT).rejects.toThrowError('Could not find MIME for Buffer');
+        await expect(SUT).rejects.toThrowError("Failed to parse image data. Reason: Could not find MIME for Buffer");
     });
 
     it('should return an RGB image from a valid URL', async () => {

lib/imageResources.function.spec.ts

@@ -22,8 +22,8 @@ export async function fetchFromUrl(url: string | URL): Promise<Image> {
     } else {
         try {
             imageUrl = new URL(url);
-        } catch (e) {
-            throw e;
+        } catch (e: any) {
+            throw new Error(`Failed to fetch image data. Reason: ${e.message}`);
         }
     }
     return Jimp.read(imageUrl.href)
@@ -38,6 +38,6 @@ export async function fetchFromUrl(url: string | URL): Promise<Image> {
             );
         })
         .catch(err => {
-            throw err;
+            throw new Error(`Failed to parse image data. Reason: ${err.message}`);
         });
 }

lib/imageResources.function.ts

@@ -92,7 +92,7 @@ export default class KeyboardAction implements KeyboardProviderInterface {
         [Key.RightShift, "space"],
         [Key.RightSuper, "command"],
 
-        [Key.Grave, "~"],
+        [Key.Grave, "`"],
         [Key.Minus, "-"],
         [Key.Equal, "="],
         [Key.Backspace, "backspace"],