Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restricted Express version to < 4 and updated marked version. #86

Merged
merged 1 commit into from May 19, 2014
Merged

Restricted Express version to < 4 and updated marked version. #86

merged 1 commit into from May 19, 2014

Conversation

tstrimple
Copy link

Res.locals is no longer a function in express which breaks all tests. Excluded it from package.json pending a fix to support Express 4+. Also updated Marked to 3.2 which adds the ability to customize the renderer.

@tstrimple
Copy link
Author

Not sure what you mean. That function is fine as long as npm install doesn't install express 4+, which is the change I made to package.json. What would need to change in that file?

Sent from my Windows Phone


From: Zachary Ilesmailto:notifications@github.com
Sent: ý4/ý18/ý2014 3:49 PM
To: jsantell/poetmailto:poet@noreply.github.com
Cc: Timothy Strimplemailto:tstrimple@gmail.com
Subject: Re: [poet] Restricted Express version to < 4 and updated marked version. (#86)

tstrimple, further, you must change line 74 in lib/poet/utils.js on master.

"function createLocals (app, helpers) {
app.locals(helpers);
}"

currently poet is not running in express 4.


Reply to this email directly or view it on GitHubhttps://github.com//pull/86#issuecomment-40843202.

@zackiles
Copy link

sorry i mistook your commit.

@jsantell
Copy link
Owner

Looks good -- can we get this squashed down to one commit and rebased with current master?

@tstrimple
Copy link
Author

No need to squash since you've update the express version. Rebased with just the marked change.

jsantell added a commit that referenced this pull request May 19, 2014
Restricted Express version to < 4 and updated marked version.
@jsantell jsantell merged commit 841e726 into jsantell:master May 19, 2014
@jsantell
Copy link
Owner

Published as 1.0.2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants