Merge pull request #15 from phadej/meteor

issue with module exports in certain frameworks (Meteor, Electrion). …

Author: phadej

.travis.yml

@@ -1,7 +1,11 @@
-language: node_js
 sudo: false
+language: node_js
+
 node_js:
-  - "0.12"
-  - "0.11"
-  - "0.10"
-  - "iojs"
+  - "6.1"
+  - "6.0"
+  - "4.4"
+
+branches:
+  only:
+    - master

Makefile

@@ -26,7 +26,7 @@ eslint :
 jscs :
 	$(JSCS) $(SRC)
 
-mocha : 
+mocha :
 	$(MOCHA) --reporter=spec test
 
 istanbul :

README.md

@@ -46,7 +46,7 @@ $ rjson relaxed-json.js
 Error on line 27: Unexpected character: (
 (function () {
 
-% rjson package.json   
+% rjson package.json
 {
   "name": "relaxed-json",
   "description": "Relaxed JSON is strict superset JSON, relaxing strictness of valilla JSON",
@@ -56,6 +56,10 @@ Error on line 27: Unexpected character: (
 
 ## Changelog
 
+- 1.0.1 — 2017-03-08 — Meteor compatibility
+  - [#9](https://github.com/phadej/relaxed-json/issues/9)
+    [#14](https://github.com/phadej/relaxed-json/pull/14)
+    [#15](https://github.com/phadej/relaxed-json/pull/15)
 - 1.0.0 — 2015-07-13 — Stable release
   - Forward slashes bug fixed
 - 0.2.9 Dependencies bump

package.json

@@ -1,7 +1,7 @@
 {
   "name": "relaxed-json",
   "description": "Relaxed JSON is strict superset JSON, relaxing strictness of valilla JSON",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "homepage": "https://github.com/phadej/relaxed-json",
   "author": {
     "name": "Oleg Grenrus",

relaxed-json.js

@@ -582,7 +582,9 @@
   /* global window, module */
   if (typeof window !== "undefined") {
     window.RJSON = RJSON;
-  } else if (typeof module !== "undefined") {
+  }
+
+  if (typeof module !== "undefined") {
     module.exports = RJSON;
   }
 }());