Skip to content
This repository has been archived by the owner on Apr 1, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
@bryphe
bryphe committed Jun 21, 2018
2 parents 4aaffa7 + 82faff6 commit 5a68ac0
Show file tree
Hide file tree
Showing 192 changed files with 4,631 additions and 1,400 deletions.
12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
<!-- Want this issue prioritized? Please consider supporting the project and becoming an insider!
👉 https://www.onivim.io/Insiders -->

**Oni Version:**
**Neovim Version (Linux only):**
**Operating System:**

**Issue:**

**Expected behavior:**

**Actual behavior:**

**Steps to reproduce:**
3 changes: 3 additions & 0 deletions .github/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ backers:
- 1718128
- 2042893
- 14060883
- 244396
- 8832878
- 5127194
20 changes: 20 additions & 0 deletions @types/classnames/index.d.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Custom type definitions for classnames master branch
// Project: https://github.com/JedWatson/classnames

declare module "classnames" {
type ClassValue = string | number | ClassDictionary | ClassArray | undefined | null | false

interface ClassDictionary {
[id: string]: boolean | undefined | null
}

// This is the only way I found to break circular references between ClassArray and ClassValue
// https://github.com/Microsoft/TypeScript/issues/3496#issuecomment-128553540
interface ClassArray extends Array<ClassValue> {} // tslint:disable-line no-empty-interface

type ClassNamesFn = (...classes: ClassValue[]) => string

const classNames: ClassNamesFn

export default classNames
}
116 changes: 65 additions & 51 deletions BACKERS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ Oni is an MIT-licensed open-source project. It's an independent project without

If you use Oni, please consider joining them via the following options:

* Become a backer on [Patreon](https://patreon.com/onivim)
* Become a backer on [OpenCollective](https://opencollective.com/oni#backer)
* Become a backer on [Bountysource](https://salt.bountysource.com/teams/oni)
* Make a donation via [PayPal](https://www.paypal.me/bryphe/25)
* Make a donation via Bitcoin / Ethereum (coming soon)
* Become a backer on [Patreon](https://patreon.com/onivim)
* Become a backer on [OpenCollective](https://opencollective.com/oni#backer)
* Become a backer on [Bountysource](https://salt.bountysource.com/teams/oni)
* Make a donation via [PayPal](https://www.paypal.me/bryphe/25)
* Make a donation via Bitcoin / Ethereum (coming soon)

Thanks you to all our backers for making Oni possible!

Expand Down Expand Up @@ -55,67 +55,81 @@ Thanks you to all our backers for making Oni possible!

## VIP Backers via BountySource

* @jordwalke
* @mhartington
* @MikaAK
* @emolitor
* @jordwalke
* @mhartington
* @MikaAK
* @emolitor

## VIP Backers via Patreon

* @mikl
* Tom Boland
* @mikl
* Tom Boland

## Backers via BountySource

* @adambard
* @akin_so
* @ayohan
* @badosu
* @josemarluedke
* @napcode
* @robtrac
* @rrichardson
* @sbuljac
* @parkerault
* @city41
* @nithesh
* @erandac
* @appelgriebsch
* @adambard
* @akin_so
* @ayohan
* @badosu
* @josemarluedke
* @napcode
* @robtrac
* @rrichardson
* @sbuljac
* @parkerault
* @city41
* @nithesh
* @erandac
* @appelgriebsch

## Backers via PayPal

* @mchalkley
* @am2605
* Nathan Ensmenger
* @mchalkley
* @am2605
* Nathan Ensmenger

## Backers via OpenCollective

* Tal Amuyal
* Akinola Sowemimo
* Martijn Arts
* Amadeus Folego
* Kiyoshi Murata
* @Himura2la
* Tal Amuyal
* 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
* Channing Conger
* Clinton Bloodworth
* Lex Song
* Paul Baumgart
* Kaiden Sin
* Troy Vitullo
* Leo Critchley
* Patrick Massot
* Jerome Pellois
* Wesley Moore
* @bennettrogers
* @muream
* Johnnie Hård
* @robin-pham
* Ryan Campbell
* Balint Fulop
* Quasar Jarosz
* Channing Conger
* Clinton Bloodworth
* Lex Song
* Paul Baumgart
* Kaiden Sin
* Troy Vitullo
* Leo Critchley
* Patrick Massot
* Jerome Pellois
* Wesley Moore
* Kim Fiedler
* Nicolaus Hepler
* Nick Price
* Domenico Maisano
* Daniel Polanco
* Eric Hall
* Dimas Cyriaco
* Carlos Coves Prieto
* Bryan Germann
* James Herdman
* Wayan Jimmy
* Alex
* Phil Plückthun
* Norikazu Hayashi

<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>
Expand Down
103 changes: 53 additions & 50 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

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)
* [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)

<h3 align="center">Sponsors via OpenCollective</h3>

Expand Down Expand Up @@ -65,13 +65,13 @@ Check out [Releases](https://github.com/onivim/oni/releases) for the latest bina

Oni brings several IDE-like integrations to neovim:

* [Embedded Browser](https://github.com/onivim/oni/wiki/Features#embedded-browser)
* [Quick Info](https://github.com/onivim/oni/wiki/Features#quick-info)
* [Code Completion](https://github.com/onivim/oni/wiki/Features#code-completion)
* [Syntax / Compilation Errors](https://github.com/onivim/oni/wiki/Features#syntax--compilation-errors)
* [Fuzzy Finding](https://github.com/onivim/oni/wiki/Features#fuzzy-finder)
* [Status Bar](https://github.com/onivim/oni/wiki/Features#status-bar)
* [Interactive Tutorial](https://github.com/onivim/oni/wiki/Features#interactive-tutorial)
* [Embedded Browser](https://github.com/onivim/oni/wiki/Features#embedded-browser)
* [Quick Info](https://github.com/onivim/oni/wiki/Features#quick-info)
* [Code Completion](https://github.com/onivim/oni/wiki/Features#code-completion)
* [Syntax / Compilation Errors](https://github.com/onivim/oni/wiki/Features#syntax--compilation-errors)
* [Fuzzy Finding](https://github.com/onivim/oni/wiki/Features#fuzzy-finder)
* [Status Bar](https://github.com/onivim/oni/wiki/Features#status-bar)
* [Interactive Tutorial](https://github.com/onivim/oni/wiki/Features#interactive-tutorial)

And more coming - check out our [Roadmap](https://github.com/onivim/oni/wiki/Roadmap)

Expand All @@ -83,22 +83,22 @@ Oni is cross-platform and supports Windows, Mac, and Linux.

We have installation guides for each platform:

* [Windows](https://github.com/onivim/oni/wiki/Installation-Guide#windows)
* [Mac](https://github.com/onivim/oni/wiki/Installation-Guide#mac)
* [Linux](https://github.com/onivim/oni/wiki/Installation-Guide#linux)
* [Windows](https://github.com/onivim/oni/wiki/Installation-Guide#windows)
* [Mac](https://github.com/onivim/oni/wiki/Installation-Guide#mac)
* [Linux](https://github.com/onivim/oni/wiki/Installation-Guide#linux)

The latest binaries are available on our [Releases](https://github.com/onivim/oni/releases) page, and if you'd prefer to build from source, check out our [Development](https://github.com/onivim/oni/wiki/Development) guide.

## Goals

The goal of this project is to provide both the full-fledged Vim experience, with no compromises, while pushing forward to enable new productivity scenarios.

* **Modern UX** - The Vim experience should not be compromised by terminal limitations.
* **Rich plugin development** - using JavaScript, instead of VimL.
* **Cross-platform support** - across Windows, OS X, and Linux.
* **Batteries included** - rich features are available out of the box - minimal setup needed to be productive.
* **Performance** - no compromises, Vim is fast, and Oni should be fast too.
* **Ease Learning Curve** - without sacrificing the Vim experience.
* **Modern UX** - The Vim experience should not be compromised by terminal limitations.
* **Rich plugin development** - using JavaScript, instead of VimL.
* **Cross-platform support** - across Windows, OS X, and Linux.
* **Batteries included** - rich features are available out of the box - minimal setup needed to be productive.
* **Performance** - no compromises, Vim is fast, and Oni should be fast too.
* **Ease Learning Curve** - without sacrificing the Vim experience.

Vim is an incredible tool for manipulating _text_ at the speed of thought. With a composable, modal command language, it is no wonder that Vim usage is still prevalent today.

Expand All @@ -108,41 +108,44 @@ The goal of this project is to give an editor that gives the best of both worlds

## Documentation

* Check out the [Wiki](https://github.com/onivim/oni/wiki) for documentation on how to use and modify Oni.
* [FAQ](https://github.com/onivim/oni/wiki/FAQ)
* [Roadmap](https://github.com/onivim/oni/wiki/Roadmap)
* Check out the [Wiki](https://github.com/onivim/oni/wiki) for documentation on how to use and modify Oni.
* [FAQ](https://github.com/onivim/oni/wiki/FAQ)
* [Roadmap](https://github.com/onivim/oni/wiki/Roadmap)

## Contributing

There many ways to get involved & contribute to Oni:

* Support Oni financially by making a donation via:
* [Patreon](https://patreon.com/onivim)
* [OpenCollective](https://opencollective.com/oni)
* [Bountysource](https://salt.bountysource.com/teams/oni)
* Thumbs up existing [issues](https://github.com/onivim/oni/issues) if they impact you.
* [Create an issue](https://github.com/onivim/oni/issues) for bugs or new features.
* Review and update our [documentation](https://github.com/onivim/oni/wiki).
* Try out the latest [released build](https://github.com/onivim/oni/releases).
* Help us [develop](https://github.com/onivim/oni/wiki/Development):
* Review [PRs](https://github.com/onivim/oni/pulls)
* Submit a bug fix or feature
* Add test cases
* Create a blog post or YouTube video
* Follow us on [Twitter](https://twitter.com/oni_vim)
* Support Oni financially by making a donation via:
* [Patreon](https://patreon.com/onivim)
* [OpenCollective](https://opencollective.com/oni)
* [Bountysource](https://salt.bountysource.com/teams/oni)
* Thumbs up existing [issues](https://github.com/onivim/oni/issues) if they impact you.
* [Create an issue](https://github.com/onivim/oni/issues) for bugs or new features.
* Review and update our [documentation](https://github.com/onivim/oni/wiki).
* Try out the latest [released build](https://github.com/onivim/oni/releases).
* Help us [develop](https://github.com/onivim/oni/wiki/Development):
* Review [PRs](https://github.com/onivim/oni/pulls)
* Submit a bug fix or feature
* Add test cases
* Create a blog post or YouTube video
* Follow us on [Twitter](https://twitter.com/oni_vim)

## Acknowledgements

Oni is an independent project and is made possible by the support of some exceptional people. Big thanks to the following people for helping to realize this project:

* the [neovim team](https://neovim.io/), especially [justinmk](https://github.com/justinmk) and [tarruda](https://github.com/tarruda) - Oni would not be possible without their vision
* [jordwalke](https://github.com/jordwalke) for his generous support, inspiration, and ideas. And React ;)
* [keforbes](https://github.com/keforbes) for helping to get this project off the ground
* [tillarnold](https://github.com/tillarnold) for giving us the `oni` npm package name
* [mhartington](https://github.com/mhartington) for his generous support
* [badosu](https://github.com/badosu) for his support, contributions, and managing the AUR releases
* All our current monthly [sponsors](https://salt.bountysource.com/teams/oni/supporters) and [backers](BACKERS.md)
* All of our [contributors](https://github.com/onivim/oni/graphs/contributors) - thanks for helping to improve this project!
* the [neovim team](https://neovim.io/), especially [justinmk](https://github.com/justinmk) and [tarruda](https://github.com/tarruda) - Oni would not be possible without their vision
* [jordwalke](https://github.com/jordwalke) for his generous support, inspiration, and ideas. And React ;)
* [keforbes](https://github.com/keforbes) for helping to get this project off the ground
* [Akin909](https://github.com/Akin909) for his extensive contributions
* [CrossR](https://github.com/CrossR) for polishing features and configurations
* [Cryza](https://github.com/Cryza) for the webgl renderer
* [tillarnold](https://github.com/tillarnold) for giving us the `oni` npm package name
* [mhartington](https://github.com/mhartington) for his generous support
* [badosu](https://github.com/badosu) for his support, contributions, and managing the AUR releases
* All our current monthly [sponsors](https://salt.bountysource.com/teams/oni/supporters) and [backers](BACKERS.md)
* All of our [contributors](https://github.com/onivim/oni/graphs/contributors) - thanks for helping to improve this project!

Several other great neovim front-end UIs [here](https://github.com/neovim/neovim/wiki/Related-projects) served as a reference, especially [NyaoVim](https://github.com/rhysd/NyaoVim) and [VimR](https://github.com/qvacua/vimr). I encourage you to check those out!

Expand All @@ -163,9 +166,9 @@ Windows and OSX have a bundled version of Neovim, which is covered under [Neovim

Bundled plugins have their own license terms. These include:

* [typescript-vim](https://github.com/leafgarland/typescript-vim) (`oni/vim/core/typescript.vim`)
* [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`)
* [typescript-vim](https://github.com/leafgarland/typescript-vim) (`oni/vim/core/typescript.vim`)
* [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`)
6 changes: 6 additions & 0 deletions appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ branches:
- master
- /^release.*/

# Skip CI build if the changes match these rules exactly.
# Ie, if the BACKERS.md file is changed, we don't need to build.
skip_commits:
files:
- '**/*.md'

cache:
- .oni_build_cache -> package.json

Expand Down
Loading

0 comments on commit 5a68ac0

Please sign in to comment.