Skip to content

Merged with master #727

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

Merged
merged 1 commit into from
Dec 13, 2019
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
649 changes: 0 additions & 649 deletions CHANGELOG.md

This file was deleted.

7 changes: 0 additions & 7 deletions createReleaseTarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,6 @@ echo "[INFO] Updating version number in package.json to ${VERSION_WITHOUT_RC}...
sed -i '' -e s/"\"version\": \".*\""/"\"version\": \"${VERSION_WITHOUT_RC}\""/ package.json
echo

#########################
# UPDATE CHANGELOG.md #
#########################
echo "[INFO] Updating version number in CHANGELOG.md to ${VERSION_WITHOUT_RC}..."
sed -i '' -e "/^# Unreleased$/d" CHANGELOG.md
echo -e "# Unreleased\n\n-\n\n# v${VERSION_WITHOUT_RC}" | cat - CHANGELOG.md > TEMP_CHANGELOG.md
mv TEMP_CHANGELOG.md CHANGELOG.md

############################
# REINSTALL DEPENDENCIES #
Expand Down
2 changes: 2 additions & 0 deletions docgen/content-sources/node/toc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ toc:
path: /docs/reference/admin/node/admin.messaging.AndroidNotification
- title: "FcmOptions"
path: /docs/reference/admin/node/admin.messaging.FcmOptions
- title: "LightSettings"
path: /docs/reference/admin/node/admin.messaging.LightSettings
- title: "Messaging"
path: /docs/reference/admin/node/admin.messaging.Messaging
- title: "MessagingConditionResponse"
Expand Down
2 changes: 1 addition & 1 deletion docgen/generate-docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const contentPath = path.resolve(`${__dirname}/content-sources/node`);
const tempHomePath = path.resolve(`${contentPath}/HOME_TEMP.md`);
const devsitePath = `/docs/reference/admin/node/`;

const firestoreExcludes = ['v1', 'v1beta1', 'setLogFunction'];
const firestoreExcludes = ['v1', 'v1beta1', 'setLogFunction','DocumentData'];
const firestoreHtmlPath = `${docPath}/admin.firestore.html`;
const firestoreHeader = `<section class="tsd-panel-group tsd-member-group ">
<h2>Type aliases</h2>
Expand Down
23 changes: 21 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ var replace = require('gulp-replace');
/****************/
var paths = {
src: [
'src/**/*.ts'
'src/**/*.ts',
],

test: [
'test/**/*.ts',
'!test/integration/typescript/src/example*.ts',
],

databaseSrc: [
Expand All @@ -52,6 +57,8 @@ var paths = {
// rather than including both src and test in the lib dir.
var buildProject = ts.createProject('tsconfig.json', {rootDir: 'src'});

var buildTest = ts.createProject('tsconfig.json');

var banner = `/*! firebase-admin v${pkg.version} */\n`;

/***********/
Expand Down Expand Up @@ -79,6 +86,16 @@ gulp.task('compile', function() {
.pipe(gulp.dest(paths.build))
});

/**
* Task only used to capture typescript compilation errors in the test suite.
* Output is discarded.
*/
gulp.task('compile_test', function() {
return gulp.src(paths.test)
// Compile Typescript into .js and .d.ts files
.pipe(buildTest())
});

gulp.task('copyDatabase', function() {
return gulp.src(paths.databaseSrc)
// Add headers
Expand All @@ -98,9 +115,11 @@ gulp.task('copyTypings', function() {
.pipe(gulp.dest(paths.build))
});

gulp.task('compile_all', gulp.series('compile', 'copyDatabase', 'copyTypings', 'compile_test'));

// Regenerates js every time a source file changes
gulp.task('watch', function() {
gulp.watch(paths.src, ['compile']);
gulp.watch(paths.src.concat(paths.test), {ignoreInitial: false}, gulp.series('compile_all'));
});

// Build task
Expand Down
Loading