Fix #241 - Remove config.json [BREAKING CHANGE] (#243)

* BREAKING CHANGE: Remove config.json from code / docs, now only config.js is supported * Bump version number
onivim · Feb 24, 2017 · e7e1435 · e7e1435
1 parent d52ae33
commit e7e1435
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -159,11 +159,11 @@ Leave the cursor hovering over an identifier.
 
 ### Configuration
 
-> ONI is configurable via a 'config.json' located in $HOME/.oni
+> ONI is configurable via a 'config.js' located in $HOME/.oni
 
-Here's an example config.json:
+Here's an example config.js:
 ```
-{
+module.exports = {
     "oni.useDefaultConfig": true,
     "oni.loadInitVim": true,
     "editor.fontSize": "14px",

diff --git a/browser/src/Config.ts b/browser/src/Config.ts
@@ -80,15 +80,11 @@ const DefaultPlatformConfig = Platform.isWindows() ? WindowsConfig : Platform.is
 
 Performance.mark("Config.load.start")
 
-export const userConfigFile = path.join(getUserFolder(), "config.json")
 export const userJsConfig = path.join(getUserFolder(), "config.js")
 
 let userConfig = {}
-if (fs.existsSync(userConfigFile)) {
-    userConfig = JSON.parse(fs.readFileSync(userConfigFile, "utf8"))
-}
-
 let userRuntimeConfig = {}
+
 if (fs.existsSync(userJsConfig)) {
     userRuntimeConfig = global["require"](userJsConfig) // tslint:disable-line no-string-literal
 }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oni-vim",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "NeoVim front-end with IDE-style extensibility",
   "keywords": [
     "vim",