Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nut-tree/nut.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.7.0
Choose a base ref
...
head repository: nut-tree/nut.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref

Commits on Aug 3, 2021

  1. Bump tar from 4.4.13 to 4.4.15

    Bumps [tar](https://github.com/npm/node-tar) from 4.4.13 to 4.4.15.
    - [Release notes](https://github.com/npm/node-tar/releases)
    - [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
    - [Commits](isaacs/node-tar@v4.4.13...v4.4.15)
    
    ---
    updated-dependencies:
    - dependency-name: tar
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Aug 3, 2021
    Copy the full SHA
    7425090 View commit details

Commits on Aug 4, 2021

  1. Bump tar from 4.4.13 to 4.4.15 in /e2e/electron-test

    Bumps [tar](https://github.com/npm/node-tar) from 4.4.13 to 4.4.15.
    - [Release notes](https://github.com/npm/node-tar/releases)
    - [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
    - [Commits](isaacs/node-tar@v4.4.13...v4.4.15)
    
    ---
    updated-dependencies:
    - dependency-name: tar
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Aug 4, 2021
    Copy the full SHA
    43db328 View commit details

Commits on Aug 10, 2021

  1. Bump path-parse from 1.0.6 to 1.0.7

    Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
    - [Release notes](https://github.com/jbgutierrez/path-parse/releases)
    - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)
    
    ---
    updated-dependencies:
    - dependency-name: path-parse
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Aug 10, 2021
    Copy the full SHA
    c9c35ef View commit details

Commits on Aug 13, 2021

  1. Copy the full SHA
    f53d03e View commit details
  2. Copy the full SHA
    0ce6c8b View commit details
  3. Merge pull request #256 from nut-tree/feature/255/conditional_sonar

    (#255) Only run sonar step if SONAR_TOKEN is set
    s1hofmann authored Aug 13, 2021
    Copy the full SHA
    58c5aa1 View commit details
  4. Merge pull request #257 from nut-tree/feature/190/consistent_naming

    (#190) Rename private field native to nativeAdapter to stay consistent
    s1hofmann authored Aug 13, 2021
    Copy the full SHA
    d41d0be View commit details

Commits on Aug 18, 2021

  1. Merge pull request #251 from nut-tree/dependabot/npm_and_yarn/tar-4.4.15

    Bump tar from 4.4.13 to 4.4.15
    s1hofmann authored Aug 18, 2021
    Copy the full SHA
    7d9b5a5 View commit details
  2. Merge pull request #253 from nut-tree/dependabot/npm_and_yarn/path-pa…

    …rse-1.0.7
    
    Bump path-parse from 1.0.6 to 1.0.7
    s1hofmann authored Aug 18, 2021
    Copy the full SHA
    225275a View commit details
  3. Merge pull request #252 from nut-tree/dependabot/npm_and_yarn/e2e/ele…

    …ctron-test/tar-4.4.15
    
    Bump tar from 4.4.13 to 4.4.15 in /e2e/electron-test
    s1hofmann authored Aug 18, 2021
    Copy the full SHA
    20658c7 View commit details

Commits on Aug 28, 2021

  1. Copy the full SHA
    97ac21d View commit details

Commits on Aug 30, 2021

  1. Copy the full SHA
    6fe296e View commit details
  2. Copy the full SHA
    0be2917 View commit details
  3. Merge pull request #261 from nut-tree/bugfix/260/delete-key-mapping

    (#260) Added missing lookup for 'delete' key
    s1hofmann authored Aug 30, 2021
    Copy the full SHA
    5033525 View commit details

Commits on Aug 31, 2021

  1. Copy the full SHA
    6f0c298 View commit details

Commits on Sep 1, 2021

  1. Bump tar from 4.4.15 to 4.4.19 in /e2e/electron-test

    Bumps [tar](https://github.com/npm/node-tar) from 4.4.15 to 4.4.19.
    - [Release notes](https://github.com/npm/node-tar/releases)
    - [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
    - [Commits](isaacs/node-tar@v4.4.15...v4.4.19)
    
    ---
    updated-dependencies:
    - dependency-name: tar
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Sep 1, 2021
    Copy the full SHA
    955d40a View commit details

Commits on Sep 5, 2021

  1. Merge pull request #263 from nut-tree/feature/262/typescript-update

    (#262) Upgraded to Typescript 4.4.2 with minor adjustments
    s1hofmann authored Sep 5, 2021
    Copy the full SHA
    1893d2c View commit details
  2. Merge pull request #266 from nut-tree/maintenance/265/update-sonarclo…

    …ud-action
    
    (#265) Upgraded to SonarSource/sonarcloud-github-action v1.6
    s1hofmann authored Sep 5, 2021
    Copy the full SHA
    11df5b0 View commit details
  3. Copy the full SHA
    d50833c View commit details
  4. Copy the full SHA
    9312b2e View commit details
  5. Merge pull request #270 from nut-tree/feature/269/internal_objects

    (#269) Export some internal objects
    s1hofmann authored Sep 5, 2021
    Copy the full SHA
    224e7e5 View commit details
  6. Copy the full SHA
    2b79529 View commit details
  7. Copy the full SHA
    f5d532e View commit details
  8. Copy the full SHA
    074d440 View commit details
  9. Copy the full SHA
    7bb773a View commit details
  10. Copy the full SHA
    27fc8ed View commit details
  11. (#271) Revert node-abort-controller version bump due to inconsistenci…

    …es. (Typescript complains on compile time, but after the change it fails on runtime)
    s1hofmann committed Sep 5, 2021
    Copy the full SHA
    fb8bca7 View commit details
  12. Merge pull request #268 from nut-tree/dependabot/npm_and_yarn/e2e/ele…

    …ctron-test/tar-4.4.19
    
    Bump tar from 4.4.15 to 4.4.19 in /e2e/electron-test
    s1hofmann authored Sep 5, 2021
    Copy the full SHA
    e82a49e View commit details
  13. Copy the full SHA
    7c8c3f5 View commit details
  14. Merge pull request #272 from nut-tree/maintenance/271/dependency_updates

    Maintenance/271/dependency updates
    s1hofmann authored Sep 5, 2021
    Copy the full SHA
    fc82faf View commit details

Commits on Sep 9, 2021

  1. Copy the full SHA
    bd5468e View commit details

Commits on Sep 18, 2021

  1. Copy the full SHA
    379da07 View commit details
  2. Merge pull request #277 from nut-tree/feature/269/internal_objects

    (#269) Changed export level and renamed classes to be less ambiguous
    s1hofmann authored Sep 18, 2021
    Copy the full SHA
    079eca2 View commit details
  3. Copy the full SHA
    9515ce4 View commit details
  4. Merge pull request #280 from nut-tree/feature/278/grab_screen

    (#278) Added grab and grabRegion methods to Screen
    s1hofmann authored Sep 18, 2021
    Copy the full SHA
    c17b770 View commit details

Commits on Sep 26, 2021

  1. Copy the full SHA
    6de99cb View commit details
  2. Merge pull request #284 from nut-tree/feature/278/grab_screen

    (#278) Adjusted captureRegion and grabRegion parameters to accept Pro…
    s1hofmann authored Sep 26, 2021
    Copy the full SHA
    d8b183d View commit details

Commits on Sep 27, 2021

  1. Copy the full SHA
    86df469 View commit details
  2. Merge pull request #286 from nut-tree/feature/285/github_package_regi…

    …stry
    
    (#285) Added additional publish step for GitHub package registry
    s1hofmann authored Sep 27, 2021
    Copy the full SHA
    a414f6c View commit details
  3. Copy the full SHA
    4d0ab28 View commit details
  4. Merge pull request #287 from nut-tree/feature/285/github_package_regi…

    …stry
    
    (#258) Refined wording in snapshot release workflow
    s1hofmann authored Sep 27, 2021
    Copy the full SHA
    d4ca59a View commit details

Commits on Oct 25, 2021

  1. Feature/292/provider registry (#293)

    * (#292) Draft provider registry
    
    * (#292) Register ImageWriter and ImageReader instances
    s1hofmann authored Oct 25, 2021
    Copy the full SHA
    a1fcc65 View commit details
  2. Feature/294/export provider interfaces (#295)

    * (#294) Export interfaces for providers
    
    * (#294) Align naming of interfaces
    s1hofmann authored Oct 25, 2021
    Copy the full SHA
    7064a15 View commit details

Commits on Oct 26, 2021

  1. Copy the full SHA
    ef98e44 View commit details

Commits on Oct 27, 2021

  1. Copy the full SHA
    a818d79 View commit details

Commits on Oct 28, 2021

  1. Feature/279/separate image matching (#298)

    * (#279) Remove image matching provider code
    
    * (#279) Remove image matching providers from registry
    
    * (#279) Update vision adapter test
    
    * (#279) Remove opencv4nodejs-prebuilt dependency
    
    * (#279) Plugin e2e test
    
    * (#279) Init plugin e2e test
    
    * (#279) Align e2e package versions
    
    * (#279) Fix resource path
    
    * (#279) Add error info to output, formatting
    
    * (#279) Run plugin test in Docker environment
    
    * (#279) Export FileType enum
    
    * (#279) Move screen e2e test to plugin e2e test subpackage since it requires the template-matcher package as well
    
    * (#279) Move keyboard e2e test to plugin subpackage as well
    s1hofmann authored Oct 28, 2021
    Copy the full SHA
    6002651 View commit details

Commits on Nov 3, 2021

  1. Copy the full SHA
    faa9ef5 View commit details

Commits on Nov 4, 2021

  1. (#130) Introduce EasingFunction interface (#304)

    * (#130) Updated implementation
    
    * (#130) Easing function refinement
    s1hofmann authored Nov 4, 2021
    Copy the full SHA
    ab84e1d View commit details

Commits on Nov 5, 2021

  1. Feature/307/default imagereader imagewriter (#308)

    * (#307) Add jimp dependencz
    
    * (#307) Implement image reader
    
    * (#307) Implement image writer
    
    * (#307) Test data
    
    * (#307) Register both providers
    
    * (#307) Stick to BGR color format when loading images
    
    * (#307) Expose imagereader and imagewriter through utility functions
    
    * (#307) Updated tests to verify calls to Jimp
    
    * (#307) Mock jimp in testcases using the pluginRegistry to avoid ReferenceErrors
    
    * (#307) Mock jimp in e2e testcases to avoid ReferenceErrors
    s1hofmann authored Nov 5, 2021
    Copy the full SHA
    1ec9d62 View commit details

Commits on Nov 6, 2021

  1. Maintenance/310/remove adapters (#311)

    * (#310) Delete both adapters
    
    * (#310) Migrate window.function to not use adapters
    
    * (#310) Migrated window.class to not use adapters
    
    * (#310) Migrated screen.class to not use adapters
    
    * (#310) Migrated movement.function to not use adapters
    
    * (#310) Migrated mouse.class to not use adapters
    
    * (#310) Remove leftover notions of adapters in test description
    
    * (#310) Fixed expected format when saving a screenshot to disk
    
    * (#310) Migrated keyboard.class to not use adapters
    
    * (#310) Migrated clipboard.class to not use adapters
    
    * (#310) Migrated assert.class test to not use adapters
    
    * (#310) Migrated all exported instances to not use adapters
    
    * (#310) Removed mention of adapter from test description
    s1hofmann authored Nov 6, 2021
    Copy the full SHA
    9786e04 View commit details
Showing 338 changed files with 18,099 additions and 35,398 deletions.
26 changes: 0 additions & 26 deletions .build/build.sh

This file was deleted.

46 changes: 46 additions & 0 deletions .build/bump_version.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
const { exec } = require("child_process");
const { readFile, writeFile } = require("fs");
const { join } = require("path");

const args = process.argv.slice(2);
const version = args[0];
const allPackages = args.includes("--all");

if (version == null || version === "") {
throw new Error("Version is required");
}

exec("pnpm m ls --json --depth=-1", (_, stdout) => {
const modules = JSON.parse(stdout).filter(
(module) => {
return allPackages ? true : module.private !== true;
}
);

for (const module of modules) {
const filePath = join(module.path, "package.json");

readFile(filePath, "utf8", (err, data) => {
if (err) {
throw new Error(err);
}
// Parse JSON
const obj = JSON.parse(data);

// Change a property
obj.version = version;

// Convert object back to JSON
const json = JSON.stringify(obj, null, 2);

// Write JSON file
writeFile(filePath, json, "utf8", (err) => {
if (err) {
throw new Error(err);
} else {
console.log("File successfully updated.");
}
});
});
}
});
7 changes: 1 addition & 6 deletions .build/pre-release.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
#!/usr/bin/env bash
set -ex

echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
npm whoami

npm ci
patchVersion=$(npm --no-git-tag version patch)
nextVersion=${patchVersion}-next."$(date +%Y%m%d%H%M%S)"
echo "${nextVersion:1}"

npm version --no-git-tag -f "${nextVersion:1}"
npm run publish-next
node ./.build/bump_version.js "${nextVersion:1}"
16 changes: 0 additions & 16 deletions .build/run_linux.sh

This file was deleted.

9 changes: 0 additions & 9 deletions .build/run_osx.sh

This file was deleted.

9 changes: 0 additions & 9 deletions .build/setup_linux.sh

This file was deleted.

2 changes: 0 additions & 2 deletions .build/setup_osx.sh

This file was deleted.

Binary file added .gfx/permissions.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .gfx/permissions_popup.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions .gfx/sponsors/mighty.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file removed .github/CONTRIBUTING.md
Empty file.
10 changes: 8 additions & 2 deletions .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
@@ -8,13 +8,19 @@ about: Create a bug report to help us enhance our images
**Short overview**

**Issue occurs on**

- [ ] Virtual machine
- [ ] Docker container
- [ ] Dev/Host system

**node version**:

**OS type and version**:

**Detailed error description**

**Steps to reproduce error**
**Full code sample to reproduce**

**Additional content**
> Please provide any (mandatory) additional data to reproduce the error (Dockerfiles etc.)

> Please provide any (mandatory) additional data to reproduce the error (Dockerfiles etc.)
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
blank_issues_enabled: false
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/enhancement.md
Original file line number Diff line number Diff line change
@@ -10,4 +10,5 @@ about: Suggest a possible enhancement to the project
**Detailed description**

**Additional content**

> Please provide any (mandatory) additional data for your enhancement
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/feature.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Feature request
about: Open a feature request
about: Open a feature request
---

**Short overview**
@@ -10,4 +10,5 @@ about: Open a feature request
**Detailed feature description**

**Additional content**
> Please provide any (mandatory) additional data for your desired feature

> Please provide any (mandatory) additional data for your desired feature
8 changes: 7 additions & 1 deletion .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -6,9 +6,15 @@ about: File a request to resolve open questions
**Short summary**

**Desired execution environment / tested on**

- [ ] Virtual machine
- [ ] Docker container
- [ ] Dev/Host system

**node version**:

**OS type and version**:

**Full code sample related to question**

**Detailed question**
**Detailed question**
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE/bugfix.md
Original file line number Diff line number Diff line change
@@ -12,4 +12,4 @@ about: Request to merge a bugfix
**Checklist**

- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have updated the documentation accordingly.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE/enhancement.md
Original file line number Diff line number Diff line change
@@ -12,4 +12,4 @@ about: Request to merge an enhancement
**Checklist**

- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have updated the documentation accordingly.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE/feature.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Feature
about: Request to merge a new feature
about: Request to merge a new feature
---

**Short summary**
@@ -12,4 +12,4 @@ about: Request to merge a new feature
**Checklist**

- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have updated the documentation accordingly.
98 changes: 44 additions & 54 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,90 +1,80 @@
name: Run CI
on:
push:
branches-ignore:
- develop
- release/**
# push:
# branches-ignore:
# - develop
# - release/**
# paths-ignore:
# - '**/*.md'
pull_request:
workflow_dispatch:

jobs:
sonar:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'skip ci')"
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
steps:
- name: Set up Git repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: 14
- name: Setup Docker
run: |
docker pull s1hofmann/nut-ci:latest
docker run -it -d --name nut-ci --shm-size 8gb --user $(id -u):$(id -g) -v ${PWD}:${PWD}:rw s1hofmann/nut-ci:latest bash
node-version: 18
registry-url: https://registry.npmjs.org/
token: ${{ secrets.NPM_TOKEN }}
- name: Setup pnpm
uses: pnpm/action-setup@v3.0.0
- name: Install
run: npm ci
run: |
pnpm whoami
pnpm i
- name: Compile
run: npm run compile
- name: Init window e2e test subpackage
run: npm --prefix e2e/window-test ci
run: pnpm -r run compile
- name: Clean coverage report
run: npm run coverage:clean
run: pnpm run coverage:clean
- name: Generate coverage report
uses: GabrielBB/xvfb-action@v1
with:
run: npm run coverage -- --coverageDirectory=coverage/unit
- name: Run Docker E2E tests
run: docker exec nut-ci bash -c "bash $PWD/.build/build.sh ${PWD} 14"
- name: Run Electron e2e test subpackage
uses: GabrielBB/xvfb-action@v1
uses: coactions/setup-xvfb@v1
env:
NODE_OPTIONS: "--max-old-space-size=8192"
with:
run: npm --prefix e2e/electron-test cit
- name: Merge coverage reports
run: |
npm run coverage:merge
npm run coverage:merge-report
run: pnpm run coverage
- name: Send results to SonarCloud
uses: SonarSource/sonarcloud-github-action@v1.4
uses: SonarSource/sonarcloud-github-action@v2.1.1
with:
projectBaseDir: core/nut.js
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

test:
needs:
- sonar
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
strategy:
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
node: [ 12, 14, 16 ]
exclude:
- os: ubuntu-latest
node: 14
os: [ windows-latest, macos-latest ]
node: [ 18 ]
runs-on: ${{matrix.os}}
steps:
- name: Set up Git repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{matrix.node}}
- name: Setup Docker
if: ${{matrix.os == 'ubuntu-latest'}}
run: |
docker pull s1hofmann/nut-ci:latest
docker run -it -d --name nut-ci --shm-size 8gb --user $(id -u):$(id -g) -v ${PWD}:${PWD}:rw s1hofmann/nut-ci:latest bash
registry-url: https://registry.npmjs.org/
token: ${{ secrets.NPM_TOKEN }}
- name: Setup pnpm
uses: pnpm/action-setup@v3.0.0
- name: Install
run: npm ci
run: pnpm i
- name: Compile
run: npm run compile
- name: Init window e2e test subpackage
run: npm --prefix e2e/window-test ci
run: pnpm run compile
- name: Generate coverage report
uses: GabrielBB/xvfb-action@v1
with:
run: npm run coverage -- --coverageDirectory=coverage/unit
- name: Run Docker E2E tests
if: ${{matrix.os == 'ubuntu-latest'}}
run: docker exec nut-ci bash -c "bash $PWD/.build/build.sh ${PWD} ${{matrix.node}}"
- name: Run Electron e2e test subpackage
uses: GabrielBB/xvfb-action@v1
uses: coactions/setup-xvfb@v1
with:
run: npm --prefix e2e/electron-test cit
run: |
pnpm run coverage
Loading