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

Commit 9f5cfd2

Browse files
committed
Working around meteor packaging issue, and adding underscore as NPM dependancy, not atmosphere one
1 parent 699d908 commit 9f5cfd2

File tree

8 files changed

+14
-10
lines changed

8 files changed

+14
-10
lines changed

.versions

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ [email protected]
2727
2828
2929
30-
local-test:lookback:[email protected].6
30+
local-test:lookback:[email protected].7
3131
32-
32+
3333
3434
meteorhacks:[email protected]
3535
meteorhacks:[email protected]

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,9 @@ Why not try [`meteor-logger`](https://github.com/lookback/meteor-logger)? :)
507507
508508
## Version history
509509
510+
511+
- `0.7.7`
512+
- 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 !).
510513
- `0.7.6`
511514
- 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 !).
512515
- Update example app to Meteor 1.4.2.

example/.meteor/versions

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ [email protected]
7070
7171
7272
73-
7473
7574
7675

lib/mailer.js

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import RoutingMiddleware from './routing';
99
import TemplateHelpers from './template-helpers';
1010
import Utils from './utils';
11+
import _ from 'underscore';
1112

1213
const TAG = 'mailer';
1314

lib/routing.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// provided `route` prop from the template.
99

1010
import Utils from './utils';
11+
import _ from 'underscore';
1112

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

37-
return (req, res, params, _) => {
38+
return (req, res, params) => {
3839
let data = null;
3940

4041
try {
@@ -83,7 +84,7 @@ export default function Routing(template, settings, render, compile) {
8384
};
8485
};
8586

86-
const sendAction = (req, res, params, _) => {
87+
const sendAction = (req, res, params) => {
8788
const {to = settings.testEmail, cc, bcc} = params.query;
8889

8990
Utils.Logger.info(`Sending ${template.name}…`);

lib/utils.js

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
const fs = Npm.require('fs');
44
const Path = Npm.require('path');
55
const htmlToText = Npm.require('html-to-text');
6+
const _ = Npm.require('underscore');
67

78
const isDevEnv = process.env.NODE_ENV === 'development';
89
const minorVersion = parseInt(Meteor.release.split('.')[1], 10);

package.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ var where = 'server';
44
Package.describe({
55
name: 'lookback:emails',
66
summary: 'Send HTML emails with server side Blaze templates. Preview and debug in the browser.',
7-
version: '0.7.6',
7+
version: '0.7.7',
88
git: 'https://github.com/lookback/meteor-emails.git'
99
});
1010

1111
Npm.depends({
12-
'html-to-text': '2.1.3'
12+
'html-to-text': '2.1.3',
13+
'underscore': '1.8.3'
1314
});
1415

1516
Package.onUse(function(api) {
@@ -25,7 +26,6 @@ Package.onUse(function(api) {
2526
api.use([
2627
2728
'check',
28-
'underscore',
2929
'email',
3030
3131
'meteorhacks:[email protected]',
@@ -42,7 +42,6 @@ Package.onUse(function(api) {
4242
Package.onTest(function(api) {
4343
api.use([
4444
'ecmascript',
45-
'underscore',
4645
'dispatch:mocha',
4746
'practicalmeteor:chai',
4847
'lookback:emails',

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lookback-emails",
3-
"version": "0.7.6",
3+
"version": "0.7.7",
44
"description": "`lookback:emails` is a Meteor package that makes it easier to build, test and debug rich HTML emails.",
55
"repository": {
66
"type": "git",

0 commit comments

Comments
 (0)