Skip to content
This repository was archived by the owner on Jan 22, 2021. It is now read-only.

Working around meteor packaging issue, and adding underscore as NPM d… #85

Merged
merged 1 commit into from
Nov 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .versions
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ [email protected]
[email protected]
[email protected]
[email protected]
local-test:lookback:[email protected].6
local-test:lookback:[email protected].7
[email protected]_1
lookback:[email protected].6
lookback:[email protected].7
[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,9 @@ Why not try [`meteor-logger`](https://github.com/lookback/meteor-logger)? :)

## Version history


- `0.7.7`
- Fix [#80](https://github.com/lookback/meteor-emails/issues/80) by adding underscore to NPM dependancies (fixed in [#78](https://github.com/lookback/meteor-emails/pull/78), thanks @grabcode !).
- `0.7.6`
- Fix [#76](https://github.com/lookback/meteor-emails/issues/76) by finding the correct paths to email templates in unit and app test mode (fixed in [#78](https://github.com/lookback/meteor-emails/pull/78), thanks @thebarty !).
- Update example app to Meteor 1.4.2.
Expand Down
1 change: 0 additions & 1 deletion example/.meteor/versions
1 change: 1 addition & 0 deletions lib/mailer.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import RoutingMiddleware from './routing';
import TemplateHelpers from './template-helpers';
import Utils from './utils';
import _ from 'underscore';

const TAG = 'mailer';

Expand Down
5 changes: 3 additions & 2 deletions lib/routing.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
// provided `route` prop from the template.

import Utils from './utils';
import _ from 'underscore';

const CONTENT_TYPES = {
html: 'text/html',
Expand All @@ -34,7 +35,7 @@ export default function Routing(template, settings, render, compile) {
const previewAction = (type) => {
check(type, Match.OneOf('html', 'text'));

return (req, res, params, _) => {
return (req, res, params) => {
let data = null;

try {
Expand Down Expand Up @@ -83,7 +84,7 @@ export default function Routing(template, settings, render, compile) {
};
};

const sendAction = (req, res, params, _) => {
const sendAction = (req, res, params) => {
const {to = settings.testEmail, cc, bcc} = params.query;

Utils.Logger.info(`Sending ${template.name}…`);
Expand Down
1 change: 1 addition & 0 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
const fs = Npm.require('fs');
const Path = Npm.require('path');
const htmlToText = Npm.require('html-to-text');
const _ = Npm.require('underscore');

const isDevEnv = process.env.NODE_ENV === 'development';
const minorVersion = parseInt(Meteor.release.split('.')[1], 10);
Expand Down
7 changes: 3 additions & 4 deletions package.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ var where = 'server';
Package.describe({
name: 'lookback:emails',
summary: 'Send HTML emails with server side Blaze templates. Preview and debug in the browser.',
version: '0.7.6',
version: '0.7.7',
git: 'https://github.com/lookback/meteor-emails.git'
});

Npm.depends({
'html-to-text': '2.1.3'
'html-to-text': '2.1.3',
'underscore': '1.8.3'
});

Package.onUse(function(api) {
Expand All @@ -25,7 +26,6 @@ Package.onUse(function(api) {
api.use([
'[email protected]',
'check',
'underscore',
'email',
'sacha:[email protected]',
'meteorhacks:[email protected]',
Expand All @@ -42,7 +42,6 @@ Package.onUse(function(api) {
Package.onTest(function(api) {
api.use([
'ecmascript',
'underscore',
'dispatch:mocha',
'practicalmeteor:chai',
'lookback:emails',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lookback-emails",
"version": "0.7.6",
"version": "0.7.7",
"description": "`lookback:emails` is a Meteor package that makes it easier to build, test and debug rich HTML emails.",
"repository": {
"type": "git",
Expand Down