Fix js-yaml bug with references

use package's versio nof js-yaml instead of grunt's version.
Swaven · Mar 17, 2016 · a9af88f · a9af88f
1 parent 676e873
commit a9af88f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -86,5 +86,6 @@ In lieu of a formal styleguide, take care to maintain the existing coding style.
 
 ## Release History
 
+* 2016-03-17: [v1.0.2](https://github.com/Swaven/grunt-merge-yaml/releases/tag/v1.0.2): fix js-yaml reference bug
 * 2016-03-10: [v1.0.1](https://github.com/Swaven/grunt-merge-yaml/releases/tag/v1.0.1): object keys defined in 2nd file only are added
 * 2016-03-08: [v0.1.0](https://github.com/Swaven/grunt-merge-yaml/releases/tag/v0.1.0): first release
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "grunt-merge-yaml",
   "description": "Merge together 2 yaml files",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "homepage": "https://github.com/Swaven/grunt-merge-yaml",
   "author": {
     "name": "Swaven"

diff --git a/tasks/merge_yaml.js b/tasks/merge_yaml.js
@@ -64,9 +64,8 @@ module.exports = function(grunt) {
         baseFile = this.data.base,
         target = this.data.target,
         dest = this.data.dest,
-        // file = 'config/config.' + target + '.yml',
-        baseConfig = grunt.file.readYAML(baseFile),
-        config = grunt.file.readYAML(target),
+        baseConfig = yaml.safeLoad(fs.readFileSync(baseFile, 'utf8')),
+        config = yaml.safeLoad(fs.readFileSync(target, 'utf8')),
         mergedConfig = explore(baseConfig, config),
         mergedContent = yaml.safeDump(mergedConfig); // Serialize object as YAML