From 10277150fa2346d762533a026a33174fc15ec49d Mon Sep 17 00:00:00 2001 From: Josh Crowther Date: Mon, 9 Oct 2017 13:23:23 -0700 Subject: [PATCH 1/6] Add gulpfile to properly build firebase.js binary --- packages/firebase/gulpfile.js | 54 +++++++++++++++++++ packages/firebase/package.json | 11 ++-- packages/firebase/webpack.config.js | 12 +---- yarn.lock | 81 ++++++++++++++++++++++++++--- 4 files changed, 138 insertions(+), 20 deletions(-) create mode 100644 packages/firebase/gulpfile.js diff --git a/packages/firebase/gulpfile.js b/packages/firebase/gulpfile.js new file mode 100644 index 00000000000..a0cddbaf411 --- /dev/null +++ b/packages/firebase/gulpfile.js @@ -0,0 +1,54 @@ +const concat = require('gulp-concat'); +const gulp = require('gulp'); +const sourcemaps = require('gulp-sourcemaps'); +const { resolve } = require('path'); +const webpack = require('webpack'); +const webpackStream = require('webpack-stream'); +const merge = require('merge2'); + +function compileWebpack(watch = false) { + return () => gulp.src([ + './app/index.js', + './auth/index.js', + './database/index.js', + './firestore/index.js', + './messaging/index.js', + './storage/index.js' + ]) + .pipe(webpackStream({ + watch, + config: require('./webpack.config') + }, webpack)) + .pipe(gulp.dest('.')); +} + +function concatFiles() { + return gulp.src([ + './firebase-app.js', + './firebase-auth.js', + './firebase-database.js', + './firebase-messaging.js', + './firebase-storage.js', + ]) + .pipe(sourcemaps.init({ loadMaps: true })) + .pipe(concat('firebase.js')) + .pipe(sourcemaps.write()) + .pipe(gulp.dest('.')); +} + +gulp.task('compile-webpack', compileWebpack()); +gulp.task('concat-files', concatFiles); + +const buildSdk = gulp.series(compileWebpack(), concatFiles); + +gulp.task('build', buildSdk); +gulp.task('watch', () => { + compileWebpack(true)(), + gulp.watch([ + './firebase-app.js', + './firebase-auth.js', + './firebase-database.js', + './firebase-messaging.js', + './firebase-storage.js', + ], concatFiles); +}); diff --git a/packages/firebase/package.json b/packages/firebase/package.json index e1be9b933b1..a04c6b4d6d9 100644 --- a/packages/firebase/package.json +++ b/packages/firebase/package.json @@ -19,9 +19,9 @@ }, "scripts": { "dev": "run-p watch:compiler watch:server", - "watch:compiler": "webpack -w --colors", + "watch:compiler": "gulp watch", "watch:server": "webpack-dev-server --config webpack.dev.js --colors", - "prepare": "webpack --config webpack.config.js" + "prepare": "gulp build" }, "main": "index.node.js", "browser": "index.js", @@ -30,8 +30,8 @@ "@firebase/auth": "0.1.0", "@firebase/database": "0.1.0", "@firebase/firestore": "0.1.0", - "@firebase/polyfill": "0.1.0", "@firebase/messaging": "0.1.0", + "@firebase/polyfill": "0.1.0", "@firebase/storage": "0.1.0", "dom-storage": "^2.0.2", "xmlhttprequest": "^1.8.0" @@ -39,9 +39,14 @@ "devDependencies": { "compression-webpack-plugin": "^1.0.0", "git-rev-sync": "^1.9.1", + "gulp": "gulpjs/gulp#4.0", + "gulp-concat": "^2.6.1", + "gulp-sourcemaps": "^2.6.1", + "merge2": "^1.2.0", "npm-run-all": "^4.1.1", "webpack": "^3.5.6", "webpack-dev-server": "^2.8.1", + "webpack-stream": "^4.0.0", "wrapper-webpack-plugin": "^1.0.0" }, "typings": "index.d.ts" diff --git a/packages/firebase/webpack.config.js b/packages/firebase/webpack.config.js index dcb381879bb..a7589f9ec64 100644 --- a/packages/firebase/webpack.config.js +++ b/packages/firebase/webpack.config.js @@ -59,16 +59,6 @@ const baseConfig = { } }; -const singleExport = Object.assign({}, baseConfig, { - entry: { - firebase: resolve(__dirname, 'index.js') - }, - output: Object.assign({}, baseConfig.output, { - library: 'firebase', - libraryTarget: 'window' - }) -}); - function isFirebaseApp(fileName) { const pathObj = parse(fileName); return pathObj.name === 'firebase-app'; @@ -114,4 +104,4 @@ const multiExport = Object.assign({}, baseConfig, { ] }); -module.exports = [singleExport, multiExport]; +module.exports = [multiExport]; diff --git a/yarn.lock b/yarn.lock index bbc1462e5d0..09976e01db1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1219,14 +1219,34 @@ cliui@^3.0.3, cliui@^3.2.0: strip-ansi "^3.0.1" wrap-ansi "^2.0.0" +clone-buffer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" + clone-stats@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" +clone-stats@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" + clone@^1.0.0, clone@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149" +clone@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" + +cloneable-readable@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117" + dependencies: + inherits "^2.0.1" + process-nextick-args "^1.0.6" + through2 "^2.0.1" + closure-builder@^2.2.23: version "2.2.27" resolved "https://registry.yarnpkg.com/closure-builder/-/closure-builder-2.2.27.tgz#2514342bfc8aabad91e3953aa5e3817c1910f773" @@ -1442,6 +1462,12 @@ concat-stream@~1.5.0, concat-stream@~1.5.1: readable-stream "~2.0.0" typedarray "~0.0.5" +concat-with-sourcemaps@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz#f55b3be2aeb47601b10a2d5259ccfb70fd2f1dd6" + dependencies: + source-map "^0.5.1" + configstore@3.1.1, configstore@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90" @@ -3476,6 +3502,14 @@ gulp-cli@^1.0.0: wreck "^6.3.0" yargs "^3.28.0" +gulp-concat@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.1.tgz#633d16c95d88504628ad02665663cee5a4793353" + dependencies: + concat-with-sourcemaps "^1.0.0" + through2 "^2.0.0" + vinyl "^2.0.0" + gulp-sourcemaps@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c" @@ -3535,7 +3569,7 @@ gulp-util@3.0.7: through2 "^2.0.0" vinyl "^0.5.0" -gulp-util@~3.0.7: +gulp-util@^3.0.7, gulp-util@~3.0.7: version "3.0.8" resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" dependencies: @@ -4875,6 +4909,10 @@ lodash._shimkeys@~2.4.1: dependencies: lodash._objecttypes "~2.4.1" +lodash.clone@^4.3.2: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" + lodash.create@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7" @@ -4971,6 +5009,10 @@ lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" +lodash.some@^4.2.2: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" + lodash.sortby@^4.5.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -5187,7 +5229,7 @@ memoizee@0.4.X: next-tick "1" timers-ext "^0.1.2" -memory-fs@^0.4.0, memory-fs@~0.4.1: +memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" dependencies: @@ -6155,7 +6197,7 @@ pretty-hrtime@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" -process-nextick-args@^1.0.7, process-nextick-args@~1.0.6: +process-nextick-args@^1.0.6, process-nextick-args@^1.0.7, process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" @@ -6534,6 +6576,10 @@ replace-ext@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" +replace-ext@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" + request@2.79.0: version "2.79.0" resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" @@ -7626,7 +7672,7 @@ through2@2.0.1: readable-stream "~2.0.0" xtend "~4.0.0" -through2@2.X, through2@^2.0.0, through2@^2.0.2, through2@^2.0.3, through2@~2.0.0, through2@~2.0.1: +through2@2.X, through2@^2.0.0, through2@^2.0.1, through2@^2.0.2, through2@^2.0.3, through2@~2.0.0, through2@~2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" dependencies: @@ -7640,7 +7686,7 @@ through2@^0.6.0: readable-stream ">=1.0.33-1 <1.1.0-0" xtend ">=4.0.0 <4.1.0-0" -through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@~2.3, through@~2.3.1: +through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -8177,6 +8223,17 @@ vinyl@^0.5.0: clone-stats "^0.0.1" replace-ext "0.0.1" +vinyl@^2.0.0, vinyl@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.1.0.tgz#021f9c2cf951d6b939943c89eb5ee5add4fd924c" + dependencies: + clone "^2.1.1" + clone-buffer "^1.0.0" + clone-stats "^1.0.0" + cloneable-readable "^1.0.0" + remove-trailing-separator "^1.0.1" + replace-ext "^1.0.0" + vlq@^0.2.1: version "0.2.3" resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" @@ -8287,7 +8344,19 @@ webpack-sources@^1.0.1: source-list-map "^2.0.0" source-map "~0.5.3" -webpack@^3.0.0, webpack@^3.5.5, webpack@^3.5.6: +webpack-stream@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/webpack-stream/-/webpack-stream-4.0.0.tgz#f3673dd907d6d9b1ea7bf51fcd1db85b5fd9e0f2" + dependencies: + gulp-util "^3.0.7" + lodash.clone "^4.3.2" + lodash.some "^4.2.2" + memory-fs "^0.4.1" + through "^2.3.8" + vinyl "^2.1.0" + webpack "^3.4.1" + +webpack@^3.0.0, webpack@^3.4.1, webpack@^3.5.5, webpack@^3.5.6: version "3.6.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.6.0.tgz#a89a929fbee205d35a4fa2cc487be9cbec8898bc" dependencies: From 5a4874a2cde8a3aa621996160d60b596a78acaa3 Mon Sep 17 00:00:00 2001 From: Josh Crowther Date: Mon, 9 Oct 2017 13:23:47 -0700 Subject: [PATCH 2/6] [AUTOMATED]: Prettier Code Styling --- packages/firebase/gulpfile.js | 75 ++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 32 deletions(-) diff --git a/packages/firebase/gulpfile.js b/packages/firebase/gulpfile.js index a0cddbaf411..5db5f15158f 100644 --- a/packages/firebase/gulpfile.js +++ b/packages/firebase/gulpfile.js @@ -7,33 +7,41 @@ const webpackStream = require('webpack-stream'); const merge = require('merge2'); function compileWebpack(watch = false) { - return () => gulp.src([ - './app/index.js', - './auth/index.js', - './database/index.js', - './firestore/index.js', - './messaging/index.js', - './storage/index.js' - ]) - .pipe(webpackStream({ - watch, - config: require('./webpack.config') - }, webpack)) - .pipe(gulp.dest('.')); + return () => + gulp + .src([ + './app/index.js', + './auth/index.js', + './database/index.js', + './firestore/index.js', + './messaging/index.js', + './storage/index.js' + ]) + .pipe( + webpackStream( + { + watch, + config: require('./webpack.config') + }, + webpack + ) + ) + .pipe(gulp.dest('.')); } function concatFiles() { - return gulp.src([ - './firebase-app.js', - './firebase-auth.js', - './firebase-database.js', - './firebase-messaging.js', - './firebase-storage.js', - ]) - .pipe(sourcemaps.init({ loadMaps: true })) - .pipe(concat('firebase.js')) - .pipe(sourcemaps.write()) - .pipe(gulp.dest('.')); + return gulp + .src([ + './firebase-app.js', + './firebase-auth.js', + './firebase-database.js', + './firebase-messaging.js', + './firebase-storage.js' + ]) + .pipe(sourcemaps.init({ loadMaps: true })) + .pipe(concat('firebase.js')) + .pipe(sourcemaps.write()) + .pipe(gulp.dest('.')); } gulp.task('compile-webpack', compileWebpack()); @@ -43,12 +51,15 @@ const buildSdk = gulp.series(compileWebpack(), concatFiles); gulp.task('build', buildSdk); gulp.task('watch', () => { - compileWebpack(true)(), - gulp.watch([ - './firebase-app.js', - './firebase-auth.js', - './firebase-database.js', - './firebase-messaging.js', - './firebase-storage.js', - ], concatFiles); + compileWebpack(true)(), + gulp.watch( + [ + './firebase-app.js', + './firebase-auth.js', + './firebase-database.js', + './firebase-messaging.js', + './firebase-storage.js' + ], + concatFiles + ); }); From a7197616be007f74ddae0feaf484d038003b636e Mon Sep 17 00:00:00 2001 From: Josh Crowther Date: Mon, 9 Oct 2017 13:23:47 -0700 Subject: [PATCH 3/6] [AUTOMATED]: License Headers --- packages/firebase/gulpfile.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/firebase/gulpfile.js b/packages/firebase/gulpfile.js index 5db5f15158f..940d4222a36 100644 --- a/packages/firebase/gulpfile.js +++ b/packages/firebase/gulpfile.js @@ -1,3 +1,19 @@ +/** + * Copyright 2017 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + const concat = require('gulp-concat'); const gulp = require('gulp'); const sourcemaps = require('gulp-sourcemaps'); From d7491c7e2f117ce61816869923284306b2d9d0f9 Mon Sep 17 00:00:00 2001 From: Josh Crowther Date: Mon, 9 Oct 2017 13:31:32 -0700 Subject: [PATCH 4/6] Update yarn.lock --- packages/firebase/gulpfile.js | 22 ++++----- packages/firebase/package.json | 1 - yarn.lock | 89 +++++++++++++++++----------------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/packages/firebase/gulpfile.js b/packages/firebase/gulpfile.js index 940d4222a36..a1b9ebbec01 100644 --- a/packages/firebase/gulpfile.js +++ b/packages/firebase/gulpfile.js @@ -67,15 +67,15 @@ const buildSdk = gulp.series(compileWebpack(), concatFiles); gulp.task('build', buildSdk); gulp.task('watch', () => { - compileWebpack(true)(), - gulp.watch( - [ - './firebase-app.js', - './firebase-auth.js', - './firebase-database.js', - './firebase-messaging.js', - './firebase-storage.js' - ], - concatFiles - ); + compileWebpack(true)(); + gulp.watch( + [ + './firebase-app.js', + './firebase-auth.js', + './firebase-database.js', + './firebase-messaging.js', + './firebase-storage.js' + ], + concatFiles + ); }); diff --git a/packages/firebase/package.json b/packages/firebase/package.json index a04c6b4d6d9..f6c39d41c68 100644 --- a/packages/firebase/package.json +++ b/packages/firebase/package.json @@ -42,7 +42,6 @@ "gulp": "gulpjs/gulp#4.0", "gulp-concat": "^2.6.1", "gulp-sourcemaps": "^2.6.1", - "merge2": "^1.2.0", "npm-run-all": "^4.1.1", "webpack": "^3.5.6", "webpack-dev-server": "^2.8.1", diff --git a/yarn.lock b/yarn.lock index 09976e01db1..4350fc8ef26 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3,8 +3,8 @@ "@google-cloud/common@^0.13.0": - version "0.13.5" - resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-0.13.5.tgz#b90599f29ce957b366adea8d7c0c3f3593d981ca" + version "0.13.6" + resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-0.13.6.tgz#a9d8e137bc429a44aba9689fe6a0e4331784f853" dependencies: array-uniq "^1.0.3" arrify "^1.0.1" @@ -19,7 +19,7 @@ methmeth "^1.1.0" modelo "^4.2.0" request "^2.79.0" - retry-request "^2.0.0" + retry-request "^3.0.0" split-array-stream "^1.0.0" stream-events "^1.0.1" string-format-obj "^1.1.0" @@ -107,8 +107,8 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c" "@types/node@^8.0.28", "@types/node@^8.0.31": - version "8.0.32" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.32.tgz#869a716538b6eec65ab3893f183d557be3cda206" + version "8.0.33" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd" "@types/sinon@^2.3.3": version "2.3.5" @@ -686,8 +686,8 @@ bluebird@^2.9.34: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" bluebird@^3.3.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" + version "3.5.1" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" @@ -1128,8 +1128,8 @@ chownr@^1.0.1: resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" chromedriver@^2.31.0: - version "2.32.3" - resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-2.32.3.tgz#ce84f055bee7cbfe56f31182b276f33256b12bf1" + version "2.33.0" + resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-2.33.0.tgz#561c84ae53cf05b0d0f6b515047ff10a4fd2d599" dependencies: extract-zip "^1.6.5" kew "^0.7.0" @@ -1181,8 +1181,8 @@ cli-spinners@^0.1.2: resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c" cli-spinners@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.0.1.tgz#2675321c100f195b02877ac499e9911fa34b9783" + version "1.1.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06" cli-table2@0.2.0: version "0.2.0" @@ -1283,6 +1283,10 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" +coffee-script@^1.12.7: + version "1.12.7" + resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53" + collection-map@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c" @@ -1400,8 +1404,8 @@ component-inherit@0.0.3: resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" compress-commons@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.0.tgz#58587092ef20d37cb58baf000112c9278ff73b9f" + version "1.2.1" + resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.1.tgz#03bed4571850bf874b4283a73726928768f6472f" dependencies: buffer-crc32 "^0.2.1" crc32-stream "^2.0.0" @@ -2134,8 +2138,8 @@ diff@3.2.0: resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" diff@^3.1.0, diff@^3.2.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75" + version "3.4.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c" diffie-hellman@^5.0.0: version "5.0.2" @@ -2363,13 +2367,13 @@ es-to-primitive@^1.1.1: is-symbol "^1.0.1" es5-ext@^0.10.14, es5-ext@^0.10.30, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2: - version "0.10.30" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.30.tgz#7141a16836697dbabfaaaeee41495ce29f52c939" + version "0.10.31" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.31.tgz#7bb938c95a7f1b9f728092dc09c41edcc398eefe" dependencies: - es6-iterator "2" - es6-symbol "~3.1" + es6-iterator "~2.0.1" + es6-symbol "~3.1.1" -es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1: +es6-iterator@^2.0.1, es6-iterator@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512" dependencies: @@ -2406,7 +2410,7 @@ es6-set@^0.1.4, es6-set@~0.1.5: es6-symbol "3.1.1" event-emitter "~0.3.5" -es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1: +es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" dependencies: @@ -2866,8 +2870,8 @@ fined@^1.0.1: parse-filepath "^1.0.1" firebase-tools@^3.10.1: - version "3.13.0" - resolved "https://registry.yarnpkg.com/firebase-tools/-/firebase-tools-3.13.0.tgz#74c40fbbd6070bb2890eb2983a53627b70ef0dc5" + version "3.13.1" + resolved "https://registry.yarnpkg.com/firebase-tools/-/firebase-tools-3.13.1.tgz#2ca82a5cdd5e887c5fe961cd8019e4a987625f5a" dependencies: JSONStream "^1.2.1" archiver "^0.16.0" @@ -3776,7 +3780,7 @@ homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1: dependencies: parse-passwd "^1.0.0" -hosted-git-info@^2.1.4: +hosted-git-info@^2.1.4, hosted-git-info@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" @@ -3811,8 +3815,8 @@ http-errors@1.6.2, http-errors@~1.6.1, http-errors@~1.6.2: statuses ">= 1.3.1 < 2" http-parser-js@>=0.4.0: - version "0.4.8" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.8.tgz#763f75c4b771a0bb44653b07070bff6ca7bc5561" + version "0.4.9" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.9.tgz#ea1a04fb64adff0242e9974f297dd4c3cad271e1" http-proxy-middleware@~0.17.4: version "0.17.4" @@ -4602,8 +4606,8 @@ karma-typescript@^3.0.5, karma-typescript@^3.0.6: vm-browserify "0.0.4" karma-webpack@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.4.tgz#3e2d4f48ba94a878e1c66bb8e1ae6128987a175b" + version "2.0.5" + resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.5.tgz#4f56887e32cf4f9583391c2388415de06af06efd" dependencies: async "~0.9.0" loader-utils "^0.2.5" @@ -4719,8 +4723,8 @@ lcid@^1.0.0: invert-kv "^1.0.0" lerna@^2.1.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.3.1.tgz#16397bc8ad8703381c8435e42ae0cd02086e8ee3" + version "2.4.0" + resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.4.0.tgz#7b76446b154bafb9cba8996f3dc233f1cb6ca7c3" dependencies: async "^1.5.0" chalk "^2.1.0" @@ -4738,6 +4742,7 @@ lerna@^2.1.0: glob-parent "^3.1.0" globby "^6.1.0" graceful-fs "^4.1.11" + hosted-git-info "^2.5.0" inquirer "^3.2.2" is-ci "^1.0.10" load-json-file "^3.0.0" @@ -5099,8 +5104,8 @@ log4js@^1.1.1: streamroller "^0.4.0" loglevel@^1.4.1, loglevel@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.5.0.tgz#3863984a2c326b986fbb965f378758a6dc8a4324" + version "1.5.1" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.5.1.tgz#189078c94ab9053ee215a0acdbf24244ea0f6502" lolex@^1.6.0: version "1.6.0" @@ -5946,8 +5951,11 @@ package-json@^2.0.0: semver "^5.1.0" pad@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pad/-/pad-1.1.0.tgz#7a7d185200ebac32f9f12ee756c3a1d087b3190b" + version "1.2.1" + resolved "https://registry.yarnpkg.com/pad/-/pad-1.2.1.tgz#c656342f14ab8605e9ed159b9b2f516577dfc872" + dependencies: + coffee-script "^1.12.7" + wcwidth "^1.0.1" pako@~0.2.0: version "0.2.9" @@ -6706,13 +6714,6 @@ restore-cursor@^2.0.0: onetime "^2.0.0" signal-exit "^3.0.2" -retry-request@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-2.0.5.tgz#d089a14a15db9ed60685b8602b40f4dcc0d3fb3c" - dependencies: - request "^2.81.0" - through2 "^2.0.0" - retry-request@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-3.0.0.tgz#8bad2b1dcf04938bb211e2ced862e591b82f1917" @@ -7027,8 +7028,8 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" simple-git@^1.77.0: - version "1.77.0" - resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.77.0.tgz#526537470b946e5f6f93d103ef54b46949600939" + version "1.79.0" + resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.79.0.tgz#5d4402dbae48d1f91b3c1862f080abada33ef130" dependencies: debug "^2.6.7" @@ -8279,7 +8280,7 @@ wbuf@^1.1.0, wbuf@^1.7.2: dependencies: minimalistic-assert "^1.0.0" -wcwidth@^1.0.0: +wcwidth@^1.0.0, wcwidth@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" dependencies: From 413a6d946518052088fd02ed7a6e9dc7e7239e54 Mon Sep 17 00:00:00 2001 From: Josh Crowther Date: Mon, 9 Oct 2017 13:55:53 -0700 Subject: [PATCH 5/6] Refactor to use external maps (THANKS @mikelehen) --- packages/firebase/gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firebase/gulpfile.js b/packages/firebase/gulpfile.js index a1b9ebbec01..d5302c7c1ff 100644 --- a/packages/firebase/gulpfile.js +++ b/packages/firebase/gulpfile.js @@ -56,7 +56,7 @@ function concatFiles() { ]) .pipe(sourcemaps.init({ loadMaps: true })) .pipe(concat('firebase.js')) - .pipe(sourcemaps.write()) + .pipe(sourcemaps.write('.')) .pipe(gulp.dest('.')); } From e81ac7cf90d5ad42a2a80e3859bec282f1be5e04 Mon Sep 17 00:00:00 2001 From: Josh Crowther Date: Mon, 9 Oct 2017 13:57:10 -0700 Subject: [PATCH 6/6] Add firebase files to .prettierignore --- .prettierignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.prettierignore b/.prettierignore index 9ee30628d73..4617a743e28 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,4 @@ # This file is pre-built and need not be formatted packages/auth/src/auth.js +packages/firebase/firebase* dist