Skip to content
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/screenshots

# dependencies
/node_modules
node_modules
/bower_components

# Dart
Expand Down
190 changes: 0 additions & 190 deletions functions/index.js

This file was deleted.

3 changes: 2 additions & 1 deletion functions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"@google-cloud/storage": "^0.8.0",
"firebase-admin": "^4.1.3",
"firebase-functions": "^0.5.2",
"jsonwebtoken": "^7.3.0"
"jsonwebtoken": "^7.3.0",
"request": "^2.81.0"
}
}
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"@angular/platform-browser-dynamic": "^4.0.0",
"@angular/platform-server": "^4.0.0",
"@angular/router": "^4.0.0",
"@google-cloud/storage": "^0.8.0",
"@types/chalk": "^0.4.31",
"@types/fs-extra": "0.0.37",
"@types/glob": "^5.0.30",
Expand All @@ -62,6 +63,7 @@
"dgeni-packages": "^0.16.5",
"firebase": "^3.7.2",
"firebase-admin": "^4.1.2",
"firebase-functions": "^0.5.2",
"firebase-tools": "^2.2.1",
"fs-extra": "^2.0.0",
"glob": "^7.1.1",
Expand All @@ -87,6 +89,7 @@
"http-rewrite-middleware": "^0.1.6",
"image-diff": "^1.6.3",
"jasmine-core": "^2.5.2",
"jsonwebtoken": "^7.3.0",
"karma": "^1.5.0",
"karma-browserstack-launcher": "^1.2.0",
"karma-chrome-launcher": "^2.0.0",
Expand All @@ -100,6 +103,7 @@
"minimist": "^1.2.0",
"node-sass": "^4.5.0",
"protractor": "^5.1.1",
"request": "^2.81.0",
"resolve-bin": "^0.4.0",
"rollup": "^0.41.6",
"run-sequence": "^1.2.2",
Expand All @@ -111,7 +115,7 @@
"ts-node": "^3.0.0",
"tslint": "^5.0.0",
"tslint-no-unused-var": "0.0.6",
"typescript": "~2.1.1",
"typescript": "~2.2.1",
"uglify-js": "^2.8.14",
"web-animations-js": "^2.2.2"
}
Expand Down
4 changes: 2 additions & 2 deletions tools/gulp/tasks/coverage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import {task} from 'gulp';
import {existsSync} from 'fs-extra';
import {COVERAGE_RESULT_FILE} from '../constants';
import {spawnSync} from 'child_process';
import {isTravisPushBuild} from '../util/travis-ci';
import {isTravisMasterBuild} from '../util/travis-ci';
import {openFirebaseDashboardDatabase} from '../util/firebase';

task('coverage:upload', () => {
if (!existsSync(COVERAGE_RESULT_FILE)) {
throw new Error('No coverage file has been found!');
}

if (!isTravisPushBuild()) {
if (!isTravisMasterBuild()) {
throw new Error('Coverage results will be only uploaded inside of Travis Push builds.');
}

Expand Down
4 changes: 2 additions & 2 deletions tools/gulp/tasks/payload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {join} from 'path';
import {statSync} from 'fs';
import {DIST_ROOT} from '../constants';
import {spawnSync} from 'child_process';
import {isTravisPushBuild} from '../util/travis-ci';
import {isTravisMasterBuild} from '../util/travis-ci';
import {openFirebaseDashboardDatabase} from '../util/firebase';

const bundlesDir = join(DIST_ROOT, 'bundles');
Expand All @@ -23,7 +23,7 @@ task('payload', ['library:clean-build'], () => {
console.log('Payload Results:', JSON.stringify(results, null, 2));

// Publish the results to firebase when it runs on Travis and not as a PR.
if (isTravisPushBuild()) {
if (isTravisMasterBuild()) {
return publishResults(results);
}

Expand Down
Loading