Skip to content

Commit

Permalink
Merge branch 'release/0.5.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
kmcgrath committed Nov 17, 2016
2 parents 91780e5 + ce937c3 commit 3b54b5d
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 39 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: node_js
sudo: false
node_js:
- 7
- 6
- 5
- 4
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ All notable changes to this project will be documented here in
accordance with [Keep a CHANGELOG][keep-changelog-url].
This project adheres to [Semantic Versioning][semver-url].

## [0.5.7] - 2016-11-16
### Fixed
- stop partials being read with an extra newline

### Changed
- graceful-fs hack removed with dependency upgrade

## [0.5.6] - 2016-08-25
### Fixed
- warnings about graceful-fs on node 6
Expand Down
1 change: 1 addition & 0 deletions lib/condensation/template-helpers/partial.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ var helper = function(cModule,pPath,hArgs,hOpts,cOpts) {
var particle = cOpts.particleLoader.loadParticle('partial',cModule,pPath,{parentFile: hOpts.data._file});
var file = new File({path: particle.path});
var m = matter(fs.readFileSync(particle.fsPath,{encoding:'utf8'}));
m.content = m.content.replace(/\n$/,'');

if (!engine.partials[particle.path]) {
engine.registerPartial(particle.path,m.content);
Expand Down
35 changes: 17 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,43 +1,42 @@
{
"name": "condensation",
"version": "0.5.6",
"version": "0.5.7",
"publishConfig": {
"tag": "latest"
},
"description": "Package, reuse and share particles for CloudFormation projects",
"main": "index.js",
"scripts": {
"test": "mocha \"./test/**/*.test.js\" --timeout 45000",
"postinstall": "node scripts/postinstall.js"
"test": "mocha \"./test/**/*.test.js\" --timeout 45000"
},
"repository": {
"type": "git",
"url": "git+https://github.com/sungardas/condensation.git"
},
"author": "Kevin McGrath <kevin.mcgrath@sungardas.com>",
"dependencies": {
"aws-sdk": "^2.5.2",
"aws-sdk": "^2.7.3",
"backlog": "0.0.3",
"backoff": "^2.5.0",
"del": "^2.2.2",
"event-stream": "^3.3.4",
"fs-extra": "^0.30.0",
"glob": "^7.0.5",
"graceful-fs": "^4.1.6",
"gray-matter": "^2.0.2",
"fs-extra": "^1.0.0",
"glob": "^7.1.1",
"graceful-fs": "^4.1.10",
"gray-matter": "^2.1.0",
"gulp": "^3.9.1",
"gulp-cached": "^1.1.0",
"gulp-if": "^2.0.1",
"gulp-cached": "^1.1.1",
"gulp-if": "^2.0.2",
"gulp-rename": "^1.2.2",
"gulp-util": "^3.0.7",
"handlebars": "^4.0.5",
"lodash": "^4.15.0",
"handlebars": "^4.0.6",
"lodash": "^4.17.2",
"merge-stream": "^1.0.0",
"rimraf": "^2.5.4",
"s3": "^4.4.0",
"slash": "^1.0.0",
"through2": "^2.0.1",
"vinyl": "^1.2.0"
"vinyl": "^2.0.0"
},
"license": "Apache-2.0",
"keywords": [
Expand All @@ -50,12 +49,12 @@
},
"homepage": "https://github.com/sungardas/condensation",
"devDependencies": {
"async": "^2.0.1",
"clone": "^1.0.2",
"async": "^2.1.2",
"clone": "^2.0.0",
"condensation-particle-tests": "^0.5.2",
"coveralls": "^2.11.12",
"istanbul": "^0.4.4",
"mocha": "^3.0.2",
"coveralls": "^2.11.15",
"istanbul": "^0.4.5",
"mocha": "^3.1.2",
"semver": "^5.3.0"
},
"engines": {
Expand Down
21 changes: 0 additions & 21 deletions scripts/postinstall.js

This file was deleted.

0 comments on commit 3b54b5d

Please sign in to comment.