Merge branch 'master' into stable

Author: bryphe

.github/ISSUE_TEMPLATE.md

@@ -1,2 +1,2 @@
-<!-- Love oni? Please consider supporting our collective:
-👉  https://opencollective.com/oni/donate -->
+<!-- Want this issue prioritized? Please consider supporting the project and becoming an insider!
+👉  https://www.onivim.io/Insiders -->

.github/config.yml

@@ -2,6 +2,9 @@
 newIssueWelcomeComment: >
   Hello and welcome to the Oni repository! Thanks for opening your first issue here. To help us out, please make sure to include as much detail as possible - including screenshots and logs, if possible.
 backers:
+- 78856
+- 1359421
+- 4650931
 - 13532591
 - 5097613
 - 22454918
@@ -17,3 +20,9 @@ backers:
 - 817509
 - 163128
 - 4762
+- 933251
+- 3974037
+- 141159
+- 10263
+- 3117205
+- 5697723

.gitignore

@@ -147,3 +147,6 @@ yarn.lock
 
 # Webpack stats file
 stats.json
+
+# User Notes
+.notes

.gitmodules

@@ -7,6 +7,9 @@
 [submodule "vim/default/bundle/vim-unimpaired"]
 	path = vim/default/bundle/vim-unimpaired
 	url = https://github.com/tpope/vim-unimpaired
+[submodule "vim/default/bundle/vim-surround"]
+	path = vim/default/bundle/vim-surround
+	url = https://github.com/tpope/vim-surround.git
 [submodule "vim/core/typescript-vim"]
 	path = vim/core/typescript-vim
 	url = https://github.com/leafgarland/typescript-vim

.prettierignore

@@ -1,2 +1,3 @@
 package.json
 vim/core/oni-plugin-typescript/package.json
+lib/yarn/*

.travis.yml

@@ -28,7 +28,10 @@ install:
 - yarn install
 script:
 - npm run check-cached-binaries
+- ./build/script/install-reason.sh
 - ./build/script/travis-build.sh
+- travis_wait ./build/script/travis-pack.sh
+- ./build/script/travis-test.sh
 deploy:
     - provider: s3
       access_key_id: AKIAIYMATI2CEFTHPBOQ
@@ -42,18 +45,6 @@ deploy:
       on:
         condition: $TRAVIS_OS_NAME = osx
         repo: onivim/oni
-    - provider: s3
-      access_key_id: AKIAIYMATI2CEFTHPBOQ
-      secret_access_key:
-        secure: S4f/aczEABGAMKk2tmVSkoGx+T2TLPmz5z6x6RKaM+eDmAaVSAELlIj1eAz6Tu2lv3jz+cpyAIISZNC/phORsJWwzbSZHVycLrMG0N3fDTqKFxu1fl6L3b3exRe9SiKXug73ZvHfktzd/XfRcgZKop4qgrwGiM57m0ZuZb/j1LkgjytTuvNAUxXbA84I8LZs/NhY17XuXq+KPlGElIHy3UFoGqQ8pBnTypkIU5rQTsoeAxXLBE8JAFfz+nBGZ7dx6OMbQcKX5jKh/gR3vk+4aTgV8gNE2Zp24ErjSqF2zly/gP9nE2DpfR7jqpZVHnb/v+OEjRDS80tLhPo8Dbibzwt2ZZNADpYBjSGtphwAmq4DCvJ7ORExOB5+O3wmXKQGdItyBTS7sW44n6BTyv87WxWuCaSDQ9QaO9PrbJdN5YGEYeRxSTM7Mn0t72IILkfFCUeSg6fl6tFs9iWIj5zltbxH1GQsRpA8j1Idg4O+894KnQABtw/YKh6rrdeYS9y/100qAjtV6qYyiP2IdPqMWGuasOiz87q3CQ8Ejd7uhiTjAaINVqos+0k04Yf5+rT4MqkeXnYFzjXuXcqDlpq6yJIZv3aD+PMSlZi2WmTYnPJXQFndHo/x9FhEh90UF9WdO5S27ySRSo8XQT4DyL3ToPkqz8y0slNmaNqiqMouQAU=
-      bucket: oni-builds
-      local-dir: s3_dist
-      upload-dir: $TRAVIS_BRANCH
-      acl: public_read
-      region: us-west-2
-      skip_cleanup: true
-      on:
-        repo: onivim/oni
     - provider: releases
       api_key:
         secure: AjQUeQNockqkBrVQCOQGyKq+sZ9C4SabSqp/bmXayKTB+7AmM8oohenxC09Sc4/dmIW1PQnDYL/4fjclJSRaywV5oiPqUnfhTveALkKFErmYnhA8oFi3VJYg4Tbszb2lYGITLOluuuAZGw67JZIuuiXzw/yOUfdWTmRCAVGzTmqkPsusYg56L4iRBWDwYQ3mhHsuNKFO7SIx1nJatj5hK9AkDJlcVilpA5IuWLWOHLY7nplFPUPUwMkRd99nifB7ITycbaAX4zLwp2U2wCb2uSTOzsFNfXykksf8AlreH0615Jb+T39/dDwQurDAQE3h+KUH5QhEvRJ1uphkGvx/x6Vn0LkJuSqS5DLeSATmVOVRK2f6AXcymvn/64qxizjlBR7bBoUxM55311qWJNKKk2FYFTAIW5fMzN0MRbaulpnpBwmhnBvd03rOMIghnvClHv2m8Eh5A6ppPnLcl2Vn7jsrqTmMm+PM1ppIWhCpvC7xn4digx1GGHXlYzfHkDxtnHwHcbj+WOkc+j4ha8Os+1ctdT3OJXz5rwW4viorSIhWryK+G36beguXe5YaoeMcK9Vzmb+S0lHdA7RuCWiJ31i/9ZMbzBhLkdcf/wfj9n3mkqmzvc4Uc1NM8FHQ23URsodSHpTdDi7q25Eqge/JP82AqJ2zAWA+QKVg54xCQQc=

BACKERS.md

@@ -56,6 +56,12 @@ Thanks you to all our backers for making Oni possible!
 
 * @jordwalke
 * @mhartington
+* @MikaAK
+* @emolitor
+
+## VIP Backers via Patreon
+
+* @mikl
 
 ## Backers via BountySource
 
@@ -68,6 +74,10 @@ Thanks you to all our backers for making Oni possible!
 * @robtrac
 * @rrichardson
 * @sbuljac
+* @parkerault
+* @city41
+* @nithesh
+* @erandac
 
 ## Backers via PayPal
 
@@ -79,6 +89,18 @@ Thanks you to all our backers for making Oni possible!
 * Akinola Sowemimo
 * Martijn Arts
 * Amadeus Folego
+* Kiyoshi Murata
+* @Himura2la
+
+## Backers via Patreon
+
+* @bennettrogers
+* @muream
+* Johnnie Hård
+* @robin-pham
+* Ryan Campbell
+* Balint Fulop
+* Quasar Jarosz
 
 <a href="https://opencollective.com/oni/tiers/backer/0/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/0/avatar.png"></a>
 <a href="https://opencollective.com/oni/tiers/backer/1/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/1/avatar.png"></a>

README.md

@@ -11,6 +11,7 @@
 
 Oni is an independent, MIT-licensed open source project. Please consider supporting Oni by:
 
+* [Become a backer or sponsor on Patreon](https://www.patreon.com/onivim)
 * [Become a backer or sponsor on Open Collective](https://opencollective.com/oni)
 * [Become a backer on BountySource](https://www.bountysource.com/teams/oni)
 
@@ -157,4 +158,5 @@ Bundled plugins have their own license terms. These include:
 * [targets.vim](https://github.com/wellle/targets.vim) (`oni/vim/default/bundle/targets.vim`)
 * [vim-commentary](https://github.com/tpope/vim-commentary) (`oni/vim/default/bundle/vim-commentary`)
 * [vim-unimpaired](https://github.com/tpope/vim-unimpaired) (`oni/vim/default/bundle/vim-unimpaired`)
+* [vim-surround](https://github.com/tpope/vim-surround) (`oni/vim/default/bundle/vim-surround`)
 * [vim-reasonml](https://github.com/reasonml-editor/vim-reason) (`.vim` files in `oni/vim/core/oni-plugin-reasonml`)

appveyor.yml

@@ -9,9 +9,6 @@ branches:
     - master
     - /^release.*/
 
-cache:
-    - "%LOCALAPPDATA%\\Yarn"
-
 platform:
     - x86
     - x64
@@ -27,7 +24,7 @@ install:
   - node --version
   - npm --version
   # install modules
-  - yarn install
+  - yarn install --verbose
 
 artifacts:
     - path: dist/*.exe
@@ -50,33 +47,9 @@ deploy:
       on:
           appveyor_repo_tag: true
 
-    - provider: S3
-      access_key_id: AKIAIYMATI2CEFTHPBOQ
-      secret_access_key:
-          secure: brqAO0yA6DSxwRbf7IbbmhvyEoQqSeetdrq4mutR2aaeLJBQu6by4u1Td+wq5Msc
-      bucket: oni-builds
-      region: us-west-2
-      unzip: false
-      set_public: true
-      folder: $(APPVEYOR_REPO_BRANCH)
-      artifact: SetupExe, ProductZip
-
 # Post-install test scripts.
 test_script:
-  # Output useful info for debugging.
-  - node --version
-  - npm --version
-  # build
-  - npm run build
-  - npm run lint
-  - npm run test:unit
-  # create setup package
-  - npm run copy-icons
-  - npm run dist:win
-  - npm run pack:win
-  # run integration tests
-  - npm run test:integration
-  - npm run demo:screenshot
+  - powershell build/script/appveyor-test.ps1
 
 # Don't actually build.
 build: off