Skip to content

Feature/52/prebuilt install #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 19, 2019
Merged

Feature/52/prebuilt install #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
260d51b
(#62) Switched to prebuilt deps for OpenCV
s1hofmann May 18, 2019
f22c966
(#62) Enabled debug output in build script
s1hofmann May 18, 2019
7d0fead
(#62) Adjusted permissions for install in container
s1hofmann May 18, 2019
f6b7610
(#62) Updated OpenCV version
s1hofmann May 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .build/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cd $targetDir
echo "Installing node version $nodeVersion"
nvm install $nodeVersion
echo "npm ci"
npm ci > /dev/null 2>&1
npm ci
echo "git fetch --unshallow"
git fetch --unshallow
echo "npm run compile"
Expand Down
2 changes: 1 addition & 1 deletion lib/provider/native/robotjs-keyboard-action.class.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import robot = require("robotjs");
import robot = require("robotjs-node10");
import { Key } from "../../key.enum";
import { KeyboardActionProvider } from "./keyboard-action-provider.interface";

Expand Down
4 changes: 2 additions & 2 deletions lib/provider/native/robotjs-keyboard.action.class.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import robot = require("robotjs");
import robot = require("robotjs-node10");
import { Key } from "../../key.enum";
import { KeyboardAction } from "./robotjs-keyboard-action.class";

jest.mock("robotjs");
jest.mock("robotjs-node10");

beforeEach(() => {
jest.resetAllMocks();
Expand Down
4 changes: 2 additions & 2 deletions lib/provider/native/robotjs-mouse-action.class.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import robot = require("robotjs");
import robot = require("robotjs-node10");
import { Button } from "../../button.enum";
import { Point } from "../../point.class";
import { MouseAction } from "./robotjs-mouse-action.class";

jest.mock("robotjs");
jest.mock("robotjs-node10");

beforeEach(() => {
jest.resetAllMocks();
Expand Down
2 changes: 1 addition & 1 deletion lib/provider/native/robotjs-mouse-action.class.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import robot = require("robotjs");
import robot = require("robotjs-node10");
import { Button } from "../../button.enum";
import { Point } from "../../point.class";
import { MouseActionInterface } from "./mouse-action-provider.interface";
Expand Down
4 changes: 2 additions & 2 deletions lib/provider/native/robotjs-screen-action.class.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import robot = require("robotjs");
import robot = require("robotjs-node10");
import { Region } from "../../region.class";
import { ScreenAction } from "./robotjs-screen-action.class";

jest.mock("robotjs");
jest.mock("robotjs-node10");

beforeEach(() => {
jest.resetAllMocks();
Expand Down
2 changes: 1 addition & 1 deletion lib/provider/native/robotjs-screen-action.class.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import robot = require("robotjs");
import robot = require("robotjs-node10");
import { Image } from "../../image.class";
import { Region } from "../../region.class";
import { ScreenActionProvider } from "./screen-action-provider.interface";
Expand Down
85 changes: 27 additions & 58 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nut-tree/nut-js",
"version": "1.0.1",
"version": "2.0.0",
"license": "Apache-2.0",
"main": "dist/index",
"typings": "dist/index",
Expand Down Expand Up @@ -55,8 +55,8 @@
},
"dependencies": {
"clipboardy": "^2.0.0",
"opencv4nodejs-prebuilt": "^4.14.1",
"robotjs": "^0.5.1"
"opencv4nodejs-prebuilt": "4.15.0",
"robotjs-node10": "0.5.2"
},
"devDependencies": {
"@types/clipboardy": "^1.1.0",
Expand Down