diff --git a/package.json b/package.json index 768435919..54323c657 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@angular/platform-browser": "^2.0.0", "@angular/platform-browser-dynamic": "^2.0.0", "@types/jasmine": "^2.5.36", - "firebase": "3.3.0", + "firebase": "^3.0.0", "rxjs": "5.0.0-beta.12" }, "devDependencies": { diff --git a/tools/rewrite-published-package.js b/tools/rewrite-published-package.js index 2f7e3ba31..988111c29 100644 --- a/tools/rewrite-published-package.js +++ b/tools/rewrite-published-package.js @@ -9,20 +9,7 @@ var srcPackage = require('../package.json'); delete srcPackage.scripts; var peerDependencies = Object.assign({}, srcPackage.dependencies); -// See note about including firebase as dependency -delete peerDependencies.firebase; -var outPackage = Object.assign({}, srcPackage, { - peerDependencies, - dependencies: { - /** - * Firebase SDK should be a dependency since it's not required that - * projects will install/use the SDK directly. And since Firebase uses - * semver, the version restriction is more permissive. This means if the user - * has installed Firebase already, npm is more likely to find a matching version. - **/ - firebase: srcPackage.dependencies.firebase - } -}); +var outPackage = Object.assign({}, srcPackage, { peerDependencies }); fs.writeFileSync('./dist/package.json', JSON.stringify(outPackage, null, 2)); diff --git a/yarn.lock b/yarn.lock index 875484782..0ae5a8224 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1,6 +1,6 @@ # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. # yarn lockfile v1 -"@angular/common@^2.0.0", "@angular/common@2.1.2": +"@angular/common@^2.0.0": version "2.1.2" resolved "https://registry.npmjs.org/@angular/common/-/common-2.1.2.tgz#5c5b37c21d6e573def1670f43962c262bc9be82e" @@ -12,11 +12,11 @@ minimist "^1.2.0" reflect-metadata "^0.1.2" -"@angular/compiler@^2.0.0", "@angular/compiler@2.1.2": +"@angular/compiler@^2.0.0": version "2.1.2" resolved "https://registry.npmjs.org/@angular/compiler/-/compiler-2.1.2.tgz#bd2a6c558de5350bdd43aa8e8de757943ac01d2a" -"@angular/core@^2.0.0", "@angular/core@2.1.2": +"@angular/core@^2.0.0": version "2.1.2" resolved "https://registry.npmjs.org/@angular/core/-/core-2.1.2.tgz#ce39521643f3d97bc5923d5a7aa76604e973dac8" @@ -24,7 +24,7 @@ version "2.1.2" resolved "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-2.1.2.tgz#3d51b494cfe0a29354c8c1f28369883679982af4" -"@angular/platform-browser@^2.0.0", "@angular/platform-browser@2.1.2": +"@angular/platform-browser@^2.0.0": version "2.1.2" resolved "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-2.1.2.tgz#1f07c3a5668ac2381a7324f9001521deede159bc" @@ -63,13 +63,6 @@ abbrev@1: version "1.0.9" resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" -accepts@1.1.4: - version "1.1.4" - resolved "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz#d71c96f7d41d0feda2c38cd14e8a27c04158df4a" - dependencies: - mime-types "~2.0.4" - negotiator "0.4.9" - accepts@1.3.3: version "1.3.3" resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca" @@ -429,10 +422,6 @@ balanced-match@^0.4.1: version "0.4.2" resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" -base64-arraybuffer@0.1.2: - version "0.1.2" - resolved "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz#474df4a9f2da24e05df3158c3b1db3c3cd46a154" - base64-arraybuffer@0.1.5: version "0.1.5" resolved "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8" @@ -504,7 +493,7 @@ bluebird@^2.9.27, bluebird@^2.9.30: version "2.11.0" resolved "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" -bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.3.4: +bluebird@^3.1.1, bluebird@^3.3.4: version "3.4.6" resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz#01da8d821d87813d158967e743d5fe6c62cf8c0f" @@ -746,12 +735,6 @@ columnify@^1.5.2: strip-ansi "^3.0.0" wcwidth "^1.0.0" -combine-lists@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6" - dependencies: - lodash "^4.5.0" - combined-stream@^1.0.5, combined-stream@~1.0.1, combined-stream@~1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009" @@ -1011,7 +994,7 @@ convert-source-map@^1.1.0, convert-source-map@^1.1.1: version "1.3.0" resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.3.0.tgz#e9f3e9c6e2728efc2676696a70eb382f73106a67" -core-js@^2.1.0, core-js@^2.2.0, core-js@^2.4.0: +core-js@^2.1.0, core-js@^2.4.0: version "2.4.1" resolved "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e" @@ -1259,23 +1242,6 @@ end-of-stream@1.0.0: dependencies: once "~1.3.0" -engine.io-client@1.6.9: - version "1.6.9" - resolved "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.9.tgz#1d6ad48048a5083c95096943b29d36efdb212401" - dependencies: - component-emitter "1.1.2" - component-inherit "0.0.3" - debug "2.2.0" - engine.io-parser "1.2.4" - has-cors "1.1.0" - indexof "0.0.1" - parsejson "0.0.1" - parseqs "0.0.2" - parseuri "0.0.4" - ws "1.0.1" - xmlhttprequest-ssl "1.5.1" - yeast "0.1.2" - engine.io-client@1.7.2: version "1.7.2" resolved "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.7.2.tgz#12f01d3d9d676908a86339cee067ff799a585c3d" @@ -1293,17 +1259,6 @@ engine.io-client@1.7.2: xmlhttprequest-ssl "1.5.1" yeast "0.1.2" -engine.io-parser@1.2.4: - version "1.2.4" - resolved "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz#e0897b0bf14e792d4cd2a5950553919c56948c42" - dependencies: - after "0.8.1" - arraybuffer.slice "0.0.6" - base64-arraybuffer "0.1.2" - blob "0.0.4" - has-binary "0.1.6" - utf8 "2.1.0" - engine.io-parser@1.3.1: version "1.3.1" resolved "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz#9554f1ae33107d6fbd170ca5466d2f833f6a07cf" @@ -1315,16 +1270,6 @@ engine.io-parser@1.3.1: has-binary "0.1.6" wtf-8 "1.0.0" -engine.io@1.6.10: - version "1.6.10" - resolved "https://registry.npmjs.org/engine.io/-/engine.io-1.6.10.tgz#f87d84e1bd21d1a2ec7f8deef0c62054acdfb27a" - dependencies: - accepts "1.1.4" - base64id "0.1.0" - debug "2.2.0" - engine.io-parser "1.2.4" - ws "1.0.1" - engine.io@1.7.2: version "1.7.2" resolved "https://registry.npmjs.org/engine.io/-/engine.io-1.7.2.tgz#877c14fa0486f8b664d46a8101bf74feef2e4e46" @@ -1588,19 +1533,9 @@ firebase-server@^0.5.2: targaryen "2.0.0" ws "0.8.1" -firebase@*: - version "3.5.2" - resolved "https://registry.npmjs.org/firebase/-/firebase-3.5.2.tgz#c7ab9ab0ad30bc4d4b8499c1778180a451b54653" - dependencies: - dom-storage "2.0.2" - faye-websocket "0.9.3" - jsonwebtoken "5.7.0" - rsvp "3.2.1" - xmlhttprequest "1.8.0" - -firebase@3.3.0: - version "3.3.0" - resolved "https://registry.npmjs.org/firebase/-/firebase-3.3.0.tgz#c060d6dd106d30abf460ce510621479e79144e2f" +firebase@^3.0.0: + version "3.6.1" + resolved "https://registry.yarnpkg.com/firebase/-/firebase-3.6.1.tgz#bcd7fe28f9eb75c8ecbefba9b4763b0800995229" dependencies: dom-storage "2.0.2" faye-websocket "0.9.3" @@ -2505,7 +2440,7 @@ isstream@~0.1.1, isstream@~0.1.2: version "0.1.2" resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" -jasmine-core@*, jasmine-core@^2.4.1, jasmine-core@~2.5.2: +jasmine-core@^2.4.1, jasmine-core@~2.5.2: version "2.5.2" resolved "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.5.2.tgz#6f61bd79061e27f43e6f9355e44b3c6cab6ff297" @@ -2736,37 +2671,6 @@ karma@^0.13.19: source-map "^0.5.3" useragent "^2.1.6" -karma@>=0.13: - version "1.3.0" - resolved "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz#b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f" - dependencies: - bluebird "^3.3.0" - body-parser "^1.12.4" - chokidar "^1.4.1" - colors "^1.1.0" - combine-lists "^1.0.0" - connect "^3.3.5" - core-js "^2.2.0" - di "^0.0.1" - dom-serialize "^2.2.0" - expand-braces "^0.1.1" - glob "^7.0.3" - graceful-fs "^4.1.2" - http-proxy "^1.13.0" - isbinaryfile "^3.0.0" - lodash "^3.8.0" - log4js "^0.6.31" - mime "^1.3.4" - minimatch "^3.0.0" - optimist "^0.6.1" - qjobs "^1.1.4" - range-parser "^1.2.0" - rimraf "^2.3.3" - socket.io "1.4.7" - source-map "^0.5.3" - tmp "0.0.28" - useragent "^2.1.9" - kind-of@^3.0.2: version "3.0.4" resolved "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz#7b8ecf18a4e17f8269d73b501c9f232c96887a74" @@ -2969,7 +2873,7 @@ lodash@^3.10.1, lodash@^3.8.0, lodash@3.10.1: version "3.10.1" resolved "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.1.0, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.5.0, lodash@^4.5.1: +lodash@^4.0.0, lodash@^4.1.0, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.5.1: version "4.16.4" resolved "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz#01ce306b9bad1319f2a5528674f88297aeb70127" @@ -3120,7 +3024,7 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.7: dependencies: mime-db "~1.24.0" -mime-types@~2.0.1, mime-types@~2.0.3, mime-types@~2.0.4: +mime-types@~2.0.1, mime-types@~2.0.3: version "2.0.14" resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz#310e159db23e077f8bb22b748dabfa4957140aa6" dependencies: @@ -3252,10 +3156,6 @@ ncp@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" -negotiator@0.4.9: - version "0.4.9" - resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz#92e46b6db53c7e421ed64a2bc94f08be7630df3f" - negotiator@0.6.1: version "0.6.1" resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" @@ -3431,7 +3331,7 @@ os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1: +os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -3681,10 +3581,6 @@ q@1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/q/-/q-1.0.0.tgz#dc1f92c4587be54f7853b29dc28e6d243a88498d" -qjobs@^1.1.4: - version "1.1.5" - resolved "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73" - qs@~2.3.3: version "2.3.3" resolved "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz#e9e85adbe75da0bbe4c8e0476a086290f863b404" @@ -3708,10 +3604,6 @@ randomatic@^1.1.3: is-number "^2.0.2" kind-of "^3.0.2" -range-parser@^1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" - raw-body@~2.1.7: version "2.1.7" resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz#adfeace2e4fb3098058014d08c072dcc59758774" @@ -4094,22 +3986,6 @@ socket.io-adapter@0.4.0: debug "2.2.0" socket.io-parser "2.2.2" -socket.io-client@1.4.6: - version "1.4.6" - resolved "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.6.tgz#49b0ba537efd15b8297c84016e642e1c7c752c3d" - dependencies: - backo2 "1.0.2" - component-bind "1.0.0" - component-emitter "1.2.0" - debug "2.2.0" - engine.io-client "1.6.9" - has-binary "0.1.7" - indexof "0.0.1" - object-component "0.0.3" - parseuri "0.0.4" - socket.io-parser "2.2.6" - to-array "0.1.4" - socket.io-client@1.5.1: version "1.5.1" resolved "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.5.1.tgz#0f366eae7de34bc880ebd71106e1ce8143775827" @@ -4136,16 +4012,6 @@ socket.io-parser@2.2.2: isarray "0.0.1" json3 "3.2.6" -socket.io-parser@2.2.6: - version "2.2.6" - resolved "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz#38dfd61df50dcf8ab1d9e2091322bf902ba28b99" - dependencies: - benchmark "1.0.0" - component-emitter "1.1.2" - debug "2.2.0" - isarray "0.0.1" - json3 "3.3.2" - socket.io-parser@2.3.1: version "2.3.1" resolved "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz#dd532025103ce429697326befd64005fcfe5b4a0" @@ -4166,17 +4032,6 @@ socket.io@^1.4.5: socket.io-client "1.5.1" socket.io-parser "2.3.1" -socket.io@1.4.7: - version "1.4.7" - resolved "https://registry.npmjs.org/socket.io/-/socket.io-1.4.7.tgz#92b7f7cb88c5797d4daee279fe8075dbe6d3fa1c" - dependencies: - debug "2.2.0" - engine.io "1.6.10" - has-binary "0.1.7" - socket.io-adapter "0.4.0" - socket.io-client "1.4.6" - socket.io-parser "2.2.6" - sort-keys@^1.0.0: version "1.1.2" resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" @@ -4498,12 +4353,6 @@ tmp@0.0.24: version "0.0.24" resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz#d6a5e198d14a9835cc6f2d7c3d9e302428c8cf12" -tmp@0.0.28: - version "0.0.28" - resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120" - dependencies: - os-tmpdir "~1.0.1" - to-absolute-glob@^0.1.1: version "0.1.1" resolved "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f" @@ -4654,10 +4503,6 @@ typedoc-default-themes@0.3.4: typedoc-default-themes "0.3.4" typescript "1.7.5" -"typescript@^2.0.0 || ^2.1.0-dev": - version "2.1.0-dev.20161028" - resolved "https://registry.npmjs.org/typescript/-/typescript-2.1.0-dev.20161028.tgz#4b7b67c734254db040566f7289f7eda5e9565825" - typescript@^2.0.2, typescript@^2.0.3: version "2.0.6" resolved "https://registry.npmjs.org/typescript/-/typescript-2.0.6.tgz#5385499ac9811508c2c43e0ea07a1ddca435e111" @@ -4833,7 +4678,7 @@ user-home@^1.0.0, user-home@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" -useragent@^2.1.6, useragent@^2.1.9: +useragent@^2.1.6: version "2.1.9" resolved "https://registry.npmjs.org/useragent/-/useragent-2.1.9.tgz#4dba2bc4dad1875777ab15de3ff8098b475000b7" dependencies: @@ -4846,10 +4691,6 @@ utf-8-validate@1.2.x: bindings "1.2.x" nan "^2.0.5" -utf8@2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz#0cfec5c8052d44a23e3aaa908104e8075f95dfd5" - util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -5029,13 +4870,6 @@ ws@^0.8.0, ws@0.8.1: bufferutil "1.2.x" utf-8-validate "1.2.x" -ws@1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz#7d0b2a2e58cddd819039c29c9de65045e1b310e9" - dependencies: - options ">=0.0.5" - ultron "1.0.x" - ws@1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz#082ddb6c641e85d4bb451f03d52f06eabdb1f018"