Skip to content

Commit

Permalink
Merge branch 'master' into pr/357
Browse files Browse the repository at this point in the history
  • Loading branch information
Th3S4mur41 committed Dec 2, 2019
2 parents c46fa45 + 7e067cf commit ef3cc06
Show file tree
Hide file tree
Showing 23 changed files with 4,296 additions and 443 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
build/
node_modules/
prebuilds/
/.idea
34 changes: 18 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
sudo: false
language: cpp

env:
matrix:
- TRAVIS_NODE_VERSION="8"
- TRAVIS_NODE_VERSION="10"
- TRAVIS_NODE_VERSION="12"
- TRAVIS_NODE_VERSION="stable"

os:
- linux
- osx

env:
matrix:
- TRAVIS_NODE_VERSION="0.10"
- TRAVIS_NODE_VERSION="0.12"
- TRAVIS_NODE_VERSION="4"
- TRAVIS_NODE_VERSION="5"
- TRAVIS_NODE_VERSION="6"
- TRAVIS_NODE_VERSION="stable"
cache:
directories:
- node_modules

git:
depth: 5

addons:
apt:
Expand All @@ -27,11 +32,9 @@ addons:
- gcc-4.8

before_install:
# reinstall latest nvm
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh
- nvm install $TRAVIS_NODE_VERSION
- PATH=$PATH:`pwd`/node_modules/.bin

# print versions
- node --version
- npm --version
Expand All @@ -40,16 +43,15 @@ before_install:
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then export CXX=g++-4.8; fi
- $CXX --version

before_script:
# Start xvfb
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then export DISPLAY=:99.0; fi
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi

install:
- npm install

script:
- npm test
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then npm test; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then xvfb-run npm test; fi

after_success:
- if [[ $TRAVIS_TAG != "" ]]; then npm run prebuild -- -u $GITHUB_TOKEN; fi

notifications:
webhooks:
Expand Down
609 changes: 609 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ The RobotJS API is hosted at <https://robotjs.io/docs/syntax>.
Please ensure you have the required dependencies before installing:

* Windows
* Visual Studio 2013 (Express works fine).
* Python (v2.7.3 recommended, v3.x.x is not supported).
* windows-build-tools npm package (`npm install --global --production windows-build-tools` from an elevated PowerShell or CMD.exe)
* Mac
* Xcode Command Line Tools.
* Linux
Expand Down
27 changes: 17 additions & 10 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,26 @@
environment:
matrix:
# node.js
- nodejs_version: "0.10"
- nodejs_version: "0.12"
- nodejs_version: "4"
- nodejs_version: "5"
- nodejs_version: "6"
- nodejs_version: "8"
- nodejs_version: "10"
- nodejs_version: "12"
- nodejs_version: "Stable"

cache:
- node_modules

clone_depth: 5

platform:
- x86
- x64

# Install scripts. (runs after repo cloning)
install:
# Get the latest stable version of Node 0.STABLE.latest
- ps: Install-Product node $env:nodejs_version
- IF %nodejs_version% EQU 0.8 npm -g install npm@2
- IF %nodejs_version% EQU 0.8 set PATH=%APPDATA%\npm;%PATH%
- npm -g install npm
- IF %nodejs_version% NEQ 0.8 set PATH=%APPDATA%\npm;%PATH%
- set PATH=%APPDATA%\npm;%PATH%
# Typical npm stuff.
- npm install

Expand All @@ -29,6 +34,8 @@ test_script:
# run tests
- npm test

build: off
on_success:
- IF defined APPVEYOR_REPO_TAG_NAME npm run prebuild -- -u %GITHUB_TOKEN%

version: "{build}"
build: off
version: "{build}"
3 changes: 2 additions & 1 deletion index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ export function unicodeTap(value: number) : void
export function typeString(string: string) : void
export function typeStringDelayed(string: string, cpm: number) : void
export function setMouseDelay(delay: number) : void
export function updateScreenMetrics() : void
export function moveMouse(x: number, y: number) : void
export function moveMouseSmooth(x: number, y: number) : void
export function moveMouseSmooth(x: number, y: number,speed?:number) : void
export function mouseClick(button?: string, double?: boolean) : void
export function mouseToggle(down?: string, button?: string) : void
export function dragMouse(x: number, y: number) : void
Expand Down
Loading

0 comments on commit ef3cc06

Please sign in to comment.