Skip to content

Commit

Permalink
Merge pull request #268 from scttcper/next
Browse files Browse the repository at this point in the history
7.0.0
  • Loading branch information
scttcper authored Nov 29, 2017
2 parents 544dfa5 + 7a1da7e commit d4c4ee4
Show file tree
Hide file tree
Showing 38 changed files with 950 additions and 633 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ deploy:
github_token: $GH_TOKEN
on:
branch: master
notifications:
email:
on_success: never
on_failure: change
262 changes: 183 additions & 79 deletions README.md

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const GLOBALS = {
'@angular/common': 'ng.common',
'@angular/animations': 'ng.animations',
'@angular/platform-browser': 'ng.platformBrowser',
'rxjs': 'Rx',
'rxjs/Observable': 'Rx',
'rxjs/Subject': 'Rx',
'rxjs/Observer': 'Rx',
Expand Down Expand Up @@ -52,8 +51,16 @@ function generateBundle(input, file, globals, name, format) {
external: Object.keys(globals),
file,
plugins,
onwarn(warning) {
if (warning.code === 'THIS_IS_UNDEFINED') {
return;
}
if (warning.code === 'UNUSED_EXTERNAL_IMPORT') {
return;
}
console.log(warning.message);
},
}).then(bundle => {
console.log(file);
return bundle.write({
file,
name,
Expand Down
2 changes: 1 addition & 1 deletion e2e/app.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ describe('toastr App', () => {
page = new ToastrPage();
});

it('should display message saying app works', () => {
it('should display toast HELLO THERE', () => {
page.navigateTo();
page.enterMessage();
page.clickShowToast();
Expand Down
2 changes: 1 addition & 1 deletion e2e/app.po.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { browser, element, by, until } from 'protractor';
import { browser, by, element, until } from 'protractor';

export class ToastrPage {
navigateTo() {
Expand Down
Loading

0 comments on commit d4c4ee4

Please sign in to comment.