From 57cd54bf559dde79709b9542aa65ac2238f061be Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 20 Jan 2017 12:03:02 +0000 Subject: [PATCH 01/15] WIP: migrate from jade to pug --- services/web/Gruntfile.coffee | 6 +- .../StaticPages/HomeController.coffee | 6 +- .../app/coffee/infrastructure/Modules.coffee | 4 +- .../app/coffee/infrastructure/Server.coffee | 2 +- .../app/views/admin/{index.jade => index.pug} | 0 .../admin/{register.jade => register.pug} | 0 .../beta_program/{opt_in.jade => opt_in.pug} | 0 .../{blog_holder.jade => blog_holder.pug} | 0 ...act-us-modal.jade => contact-us-modal.pug} | 0 .../app/views/general/{404.jade => 404.pug} | 0 .../app/views/general/{500.jade => 500.pug} | 0 .../views/general/{closed.jade => closed.pug} | 0 .../web/app/views/{layout.jade => layout.pug} | 0 .../views/layout/{footer.jade => footer.pug} | 0 .../views/layout/{navbar.jade => navbar.pug} | 0 .../views/project/{editor.jade => editor.pug} | 0 .../{binary-file.jade => binary-file.pug} | 0 .../project/editor/{chat.jade => chat.pug} | 0 .../editor/{editor.jade => editor.pug} | 0 ...onboarding.jade => feature-onboarding.pug} | 0 .../editor/{file-tree.jade => file-tree.pug} | 0 .../editor/{header.jade => header.pug} | 0 .../editor/{history.jade => history.pug} | 0 .../editor/{hotkeys.jade => hotkeys.pug} | 0 .../editor/{left-menu.jade => left-menu.pug} | 0 .../project/editor/{pdf.jade => pdf.pug} | 0 ...ish-template.jade => publish-template.pug} | 0 .../{review-panel.jade => review-panel.pug} | 0 .../project/editor/{share.jade => share.pug} | 0 .../invite/{not-valid.jade => not-valid.pug} | 0 .../project/invite/{show.jade => show.pug} | 0 .../app/views/project/{list.jade => list.pug} | 0 ...oject-list.jade => empty-project-list.pug} | 0 .../project/list/{modals.jade => modals.pug} | 0 .../{notifications.jade => notifications.pug} | 0 .../{project-list.jade => project-list.pug} | 0 .../list/{side-bar.jade => side-bar.pug} | 0 .../views/referal/{bonus.jade => bonus.pug} | 0 .../app/views/{restore.jade => restore.pug} | 0 ...scribtex-modal.jade => scribtex-modal.pug} | 0 .../web/app/views/{sentry.jade => sentry.pug} | 0 ...custom_account.jade => custom_account.pug} | 0 .../{dashboard.jade => dashboard.pug} | 0 ...-details.jade => edit-billing-details.pug} | 0 .../group/{invite.jade => invite.pug} | 0 ...ccessful_join.jade => successful_join.pug} | 0 .../{group_admin.jade => group_admin.pug} | 0 .../views/subscriptions/{new.jade => new.pug} | 0 .../subscriptions/{plans.jade => plans.pug} | 0 ...ption.jade => successful_subscription.pug} | 0 ...gradeToAnnual.jade => upgradeToAnnual.pug} | 0 .../web/app/views/{tests.jade => tests.pug} | 0 ...n_message.jade => translation_message.pug} | 0 .../{case_study.jade => case_study.pug} | 0 ...sity_holder.jade => university_holder.pug} | 0 .../user/{activate.jade => activate.pug} | 0 .../app/views/user/{login.jade => login.pug} | 0 .../{passwordReset.jade => passwordReset.pug} | 0 .../user/{register.jade => register.pug} | 0 .../user/{restricted.jade => restricted.pug} | 0 .../user/{sessions.jade => sessions.pug} | 0 .../{setPassword.jade => setPassword.pug} | 0 .../user/{settings.jade => settings.pug} | 0 ...nus_templates.jade => bonus_templates.pug} | 0 services/web/npm-shrinkwrap.json | 3195 ++++++++--------- services/web/package.json | 3 +- .../ide/editor/directives/aceEditor.coffee | 2 +- 67 files changed, 1469 insertions(+), 1749 deletions(-) rename services/web/app/views/admin/{index.jade => index.pug} (100%) rename services/web/app/views/admin/{register.jade => register.pug} (100%) rename services/web/app/views/beta_program/{opt_in.jade => opt_in.pug} (100%) rename services/web/app/views/blog/{blog_holder.jade => blog_holder.pug} (100%) rename services/web/app/views/{contact-us-modal.jade => contact-us-modal.pug} (100%) rename services/web/app/views/general/{404.jade => 404.pug} (100%) rename services/web/app/views/general/{500.jade => 500.pug} (100%) rename services/web/app/views/general/{closed.jade => closed.pug} (100%) rename services/web/app/views/{layout.jade => layout.pug} (100%) rename services/web/app/views/layout/{footer.jade => footer.pug} (100%) rename services/web/app/views/layout/{navbar.jade => navbar.pug} (100%) rename services/web/app/views/project/{editor.jade => editor.pug} (100%) rename services/web/app/views/project/editor/{binary-file.jade => binary-file.pug} (100%) rename services/web/app/views/project/editor/{chat.jade => chat.pug} (100%) rename services/web/app/views/project/editor/{editor.jade => editor.pug} (100%) rename services/web/app/views/project/editor/{feature-onboarding.jade => feature-onboarding.pug} (100%) rename services/web/app/views/project/editor/{file-tree.jade => file-tree.pug} (100%) rename services/web/app/views/project/editor/{header.jade => header.pug} (100%) rename services/web/app/views/project/editor/{history.jade => history.pug} (100%) rename services/web/app/views/project/editor/{hotkeys.jade => hotkeys.pug} (100%) rename services/web/app/views/project/editor/{left-menu.jade => left-menu.pug} (100%) rename services/web/app/views/project/editor/{pdf.jade => pdf.pug} (100%) rename services/web/app/views/project/editor/{publish-template.jade => publish-template.pug} (100%) rename services/web/app/views/project/editor/{review-panel.jade => review-panel.pug} (100%) rename services/web/app/views/project/editor/{share.jade => share.pug} (100%) rename services/web/app/views/project/invite/{not-valid.jade => not-valid.pug} (100%) rename services/web/app/views/project/invite/{show.jade => show.pug} (100%) rename services/web/app/views/project/{list.jade => list.pug} (100%) rename services/web/app/views/project/list/{empty-project-list.jade => empty-project-list.pug} (100%) rename services/web/app/views/project/list/{modals.jade => modals.pug} (100%) rename services/web/app/views/project/list/{notifications.jade => notifications.pug} (100%) rename services/web/app/views/project/list/{project-list.jade => project-list.pug} (100%) rename services/web/app/views/project/list/{side-bar.jade => side-bar.pug} (100%) rename services/web/app/views/referal/{bonus.jade => bonus.pug} (100%) rename services/web/app/views/{restore.jade => restore.pug} (100%) rename services/web/app/views/{scribtex-modal.jade => scribtex-modal.pug} (100%) rename services/web/app/views/{sentry.jade => sentry.pug} (100%) rename services/web/app/views/subscriptions/{custom_account.jade => custom_account.pug} (100%) rename services/web/app/views/subscriptions/{dashboard.jade => dashboard.pug} (100%) rename services/web/app/views/subscriptions/{edit-billing-details.jade => edit-billing-details.pug} (100%) rename services/web/app/views/subscriptions/group/{invite.jade => invite.pug} (100%) rename services/web/app/views/subscriptions/group/{successful_join.jade => successful_join.pug} (100%) rename services/web/app/views/subscriptions/{group_admin.jade => group_admin.pug} (100%) rename services/web/app/views/subscriptions/{new.jade => new.pug} (100%) rename services/web/app/views/subscriptions/{plans.jade => plans.pug} (100%) rename services/web/app/views/subscriptions/{successful_subscription.jade => successful_subscription.pug} (100%) rename services/web/app/views/subscriptions/{upgradeToAnnual.jade => upgradeToAnnual.pug} (100%) rename services/web/app/views/{tests.jade => tests.pug} (100%) rename services/web/app/views/translations/{translation_message.jade => translation_message.pug} (100%) rename services/web/app/views/university/{case_study.jade => case_study.pug} (100%) rename services/web/app/views/university/{university_holder.jade => university_holder.pug} (100%) rename services/web/app/views/user/{activate.jade => activate.pug} (100%) rename services/web/app/views/user/{login.jade => login.pug} (100%) rename services/web/app/views/user/{passwordReset.jade => passwordReset.pug} (100%) rename services/web/app/views/user/{register.jade => register.pug} (100%) rename services/web/app/views/user/{restricted.jade => restricted.pug} (100%) rename services/web/app/views/user/{sessions.jade => sessions.pug} (100%) rename services/web/app/views/user/{setPassword.jade => setPassword.pug} (100%) rename services/web/app/views/user/{settings.jade => settings.pug} (100%) rename services/web/app/views/view_templates/{bonus_templates.jade => bonus_templates.pug} (100%) diff --git a/services/web/Gruntfile.coffee b/services/web/Gruntfile.coffee index 2444c8cb0d..6c9bb0ede0 100644 --- a/services/web/Gruntfile.coffee +++ b/services/web/Gruntfile.coffee @@ -222,11 +222,11 @@ module.exports = (grunt) -> sed: version: - path: "app/views/sentry.jade" + path: "app/views/sentry.pug" pattern: '@@COMMIT@@', replacement: '<%= commit %>', release: - path: "app/views/sentry.jade" + path: "app/views/sentry.pug" pattern: "@@RELEASE@@" replacement: process.env.BUILD_NUMBER || "(unknown build)" @@ -389,5 +389,5 @@ module.exports = (grunt) -> grunt.registerTask 'default', 'run' - grunt.registerTask 'version', "Write the version number into sentry.jade", ['git-rev-parse', 'sed'] + grunt.registerTask 'version', "Write the version number into sentry.pug", ['git-rev-parse', 'sed'] diff --git a/services/web/app/coffee/Features/StaticPages/HomeController.coffee b/services/web/app/coffee/Features/StaticPages/HomeController.coffee index 6675d55333..c1a8c46323 100755 --- a/services/web/app/coffee/Features/StaticPages/HomeController.coffee +++ b/services/web/app/coffee/Features/StaticPages/HomeController.coffee @@ -7,7 +7,7 @@ fs = require "fs" ErrorController = require "../Errors/ErrorController" AuthenticationController = require('../Authentication/AuthenticationController') -homepageExists = fs.existsSync Path.resolve(__dirname + "/../../../views/external/home.jade") +homepageExists = fs.existsSync Path.resolve(__dirname + "/../../../views/external/home.pug") module.exports = HomeController = index : (req,res)-> @@ -28,10 +28,10 @@ module.exports = HomeController = externalPage: (page, title) -> return (req, res, next = (error) ->) -> - path = Path.resolve(__dirname + "/../../../views/external/#{page}.jade") + path = Path.resolve(__dirname + "/../../../views/external/#{page}.pug") fs.exists path, (exists) -> # No error in this callback - old method in Node.js! if exists - res.render "external/#{page}.jade", + res.render "external/#{page}.pug", title: title else ErrorController.notFound(req, res, next) diff --git a/services/web/app/coffee/infrastructure/Modules.coffee b/services/web/app/coffee/infrastructure/Modules.coffee index 1b3c2ea9a5..e7d521fa56 100644 --- a/services/web/app/coffee/infrastructure/Modules.coffee +++ b/services/web/app/coffee/infrastructure/Modules.coffee @@ -1,6 +1,6 @@ fs = require "fs" Path = require "path" -jade = require "jade" +pug = require "pug" async = require "async" MODULE_BASE_PATH = Path.resolve(__dirname + "/../../../modules") @@ -29,7 +29,7 @@ module.exports = Modules = for module in @modules for view, partial of module.viewIncludes or {} @viewIncludes[view] ||= [] - @viewIncludes[view].push jade.compile(fs.readFileSync(Path.join(MODULE_BASE_PATH, module.name, "app/views", partial + ".jade")), doctype: "html") + @viewIncludes[view].push pug.compile(fs.readFileSync(Path.join(MODULE_BASE_PATH, module.name, "app/views", partial + ".pug")), doctype: "html") moduleIncludes: (view, locals) -> compiledPartials = Modules.viewIncludes[view] or [] diff --git a/services/web/app/coffee/infrastructure/Server.coffee b/services/web/app/coffee/infrastructure/Server.coffee index 43683bdd4e..3a152b045d 100644 --- a/services/web/app/coffee/infrastructure/Server.coffee +++ b/services/web/app/coffee/infrastructure/Server.coffee @@ -62,7 +62,7 @@ if Settings.behindProxy webRouter.use express.static(__dirname + '/../../../public', {maxAge: staticCacheAge }) app.set 'views', __dirname + '/../../views' -app.set 'view engine', 'jade' +app.set 'view engine', 'pug' Modules.loadViewIncludes app diff --git a/services/web/app/views/admin/index.jade b/services/web/app/views/admin/index.pug similarity index 100% rename from services/web/app/views/admin/index.jade rename to services/web/app/views/admin/index.pug diff --git a/services/web/app/views/admin/register.jade b/services/web/app/views/admin/register.pug similarity index 100% rename from services/web/app/views/admin/register.jade rename to services/web/app/views/admin/register.pug diff --git a/services/web/app/views/beta_program/opt_in.jade b/services/web/app/views/beta_program/opt_in.pug similarity index 100% rename from services/web/app/views/beta_program/opt_in.jade rename to services/web/app/views/beta_program/opt_in.pug diff --git a/services/web/app/views/blog/blog_holder.jade b/services/web/app/views/blog/blog_holder.pug similarity index 100% rename from services/web/app/views/blog/blog_holder.jade rename to services/web/app/views/blog/blog_holder.pug diff --git a/services/web/app/views/contact-us-modal.jade b/services/web/app/views/contact-us-modal.pug similarity index 100% rename from services/web/app/views/contact-us-modal.jade rename to services/web/app/views/contact-us-modal.pug diff --git a/services/web/app/views/general/404.jade b/services/web/app/views/general/404.pug similarity index 100% rename from services/web/app/views/general/404.jade rename to services/web/app/views/general/404.pug diff --git a/services/web/app/views/general/500.jade b/services/web/app/views/general/500.pug similarity index 100% rename from services/web/app/views/general/500.jade rename to services/web/app/views/general/500.pug diff --git a/services/web/app/views/general/closed.jade b/services/web/app/views/general/closed.pug similarity index 100% rename from services/web/app/views/general/closed.jade rename to services/web/app/views/general/closed.pug diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.pug similarity index 100% rename from services/web/app/views/layout.jade rename to services/web/app/views/layout.pug diff --git a/services/web/app/views/layout/footer.jade b/services/web/app/views/layout/footer.pug similarity index 100% rename from services/web/app/views/layout/footer.jade rename to services/web/app/views/layout/footer.pug diff --git a/services/web/app/views/layout/navbar.jade b/services/web/app/views/layout/navbar.pug similarity index 100% rename from services/web/app/views/layout/navbar.jade rename to services/web/app/views/layout/navbar.pug diff --git a/services/web/app/views/project/editor.jade b/services/web/app/views/project/editor.pug similarity index 100% rename from services/web/app/views/project/editor.jade rename to services/web/app/views/project/editor.pug diff --git a/services/web/app/views/project/editor/binary-file.jade b/services/web/app/views/project/editor/binary-file.pug similarity index 100% rename from services/web/app/views/project/editor/binary-file.jade rename to services/web/app/views/project/editor/binary-file.pug diff --git a/services/web/app/views/project/editor/chat.jade b/services/web/app/views/project/editor/chat.pug similarity index 100% rename from services/web/app/views/project/editor/chat.jade rename to services/web/app/views/project/editor/chat.pug diff --git a/services/web/app/views/project/editor/editor.jade b/services/web/app/views/project/editor/editor.pug similarity index 100% rename from services/web/app/views/project/editor/editor.jade rename to services/web/app/views/project/editor/editor.pug diff --git a/services/web/app/views/project/editor/feature-onboarding.jade b/services/web/app/views/project/editor/feature-onboarding.pug similarity index 100% rename from services/web/app/views/project/editor/feature-onboarding.jade rename to services/web/app/views/project/editor/feature-onboarding.pug diff --git a/services/web/app/views/project/editor/file-tree.jade b/services/web/app/views/project/editor/file-tree.pug similarity index 100% rename from services/web/app/views/project/editor/file-tree.jade rename to services/web/app/views/project/editor/file-tree.pug diff --git a/services/web/app/views/project/editor/header.jade b/services/web/app/views/project/editor/header.pug similarity index 100% rename from services/web/app/views/project/editor/header.jade rename to services/web/app/views/project/editor/header.pug diff --git a/services/web/app/views/project/editor/history.jade b/services/web/app/views/project/editor/history.pug similarity index 100% rename from services/web/app/views/project/editor/history.jade rename to services/web/app/views/project/editor/history.pug diff --git a/services/web/app/views/project/editor/hotkeys.jade b/services/web/app/views/project/editor/hotkeys.pug similarity index 100% rename from services/web/app/views/project/editor/hotkeys.jade rename to services/web/app/views/project/editor/hotkeys.pug diff --git a/services/web/app/views/project/editor/left-menu.jade b/services/web/app/views/project/editor/left-menu.pug similarity index 100% rename from services/web/app/views/project/editor/left-menu.jade rename to services/web/app/views/project/editor/left-menu.pug diff --git a/services/web/app/views/project/editor/pdf.jade b/services/web/app/views/project/editor/pdf.pug similarity index 100% rename from services/web/app/views/project/editor/pdf.jade rename to services/web/app/views/project/editor/pdf.pug diff --git a/services/web/app/views/project/editor/publish-template.jade b/services/web/app/views/project/editor/publish-template.pug similarity index 100% rename from services/web/app/views/project/editor/publish-template.jade rename to services/web/app/views/project/editor/publish-template.pug diff --git a/services/web/app/views/project/editor/review-panel.jade b/services/web/app/views/project/editor/review-panel.pug similarity index 100% rename from services/web/app/views/project/editor/review-panel.jade rename to services/web/app/views/project/editor/review-panel.pug diff --git a/services/web/app/views/project/editor/share.jade b/services/web/app/views/project/editor/share.pug similarity index 100% rename from services/web/app/views/project/editor/share.jade rename to services/web/app/views/project/editor/share.pug diff --git a/services/web/app/views/project/invite/not-valid.jade b/services/web/app/views/project/invite/not-valid.pug similarity index 100% rename from services/web/app/views/project/invite/not-valid.jade rename to services/web/app/views/project/invite/not-valid.pug diff --git a/services/web/app/views/project/invite/show.jade b/services/web/app/views/project/invite/show.pug similarity index 100% rename from services/web/app/views/project/invite/show.jade rename to services/web/app/views/project/invite/show.pug diff --git a/services/web/app/views/project/list.jade b/services/web/app/views/project/list.pug similarity index 100% rename from services/web/app/views/project/list.jade rename to services/web/app/views/project/list.pug diff --git a/services/web/app/views/project/list/empty-project-list.jade b/services/web/app/views/project/list/empty-project-list.pug similarity index 100% rename from services/web/app/views/project/list/empty-project-list.jade rename to services/web/app/views/project/list/empty-project-list.pug diff --git a/services/web/app/views/project/list/modals.jade b/services/web/app/views/project/list/modals.pug similarity index 100% rename from services/web/app/views/project/list/modals.jade rename to services/web/app/views/project/list/modals.pug diff --git a/services/web/app/views/project/list/notifications.jade b/services/web/app/views/project/list/notifications.pug similarity index 100% rename from services/web/app/views/project/list/notifications.jade rename to services/web/app/views/project/list/notifications.pug diff --git a/services/web/app/views/project/list/project-list.jade b/services/web/app/views/project/list/project-list.pug similarity index 100% rename from services/web/app/views/project/list/project-list.jade rename to services/web/app/views/project/list/project-list.pug diff --git a/services/web/app/views/project/list/side-bar.jade b/services/web/app/views/project/list/side-bar.pug similarity index 100% rename from services/web/app/views/project/list/side-bar.jade rename to services/web/app/views/project/list/side-bar.pug diff --git a/services/web/app/views/referal/bonus.jade b/services/web/app/views/referal/bonus.pug similarity index 100% rename from services/web/app/views/referal/bonus.jade rename to services/web/app/views/referal/bonus.pug diff --git a/services/web/app/views/restore.jade b/services/web/app/views/restore.pug similarity index 100% rename from services/web/app/views/restore.jade rename to services/web/app/views/restore.pug diff --git a/services/web/app/views/scribtex-modal.jade b/services/web/app/views/scribtex-modal.pug similarity index 100% rename from services/web/app/views/scribtex-modal.jade rename to services/web/app/views/scribtex-modal.pug diff --git a/services/web/app/views/sentry.jade b/services/web/app/views/sentry.pug similarity index 100% rename from services/web/app/views/sentry.jade rename to services/web/app/views/sentry.pug diff --git a/services/web/app/views/subscriptions/custom_account.jade b/services/web/app/views/subscriptions/custom_account.pug similarity index 100% rename from services/web/app/views/subscriptions/custom_account.jade rename to services/web/app/views/subscriptions/custom_account.pug diff --git a/services/web/app/views/subscriptions/dashboard.jade b/services/web/app/views/subscriptions/dashboard.pug similarity index 100% rename from services/web/app/views/subscriptions/dashboard.jade rename to services/web/app/views/subscriptions/dashboard.pug diff --git a/services/web/app/views/subscriptions/edit-billing-details.jade b/services/web/app/views/subscriptions/edit-billing-details.pug similarity index 100% rename from services/web/app/views/subscriptions/edit-billing-details.jade rename to services/web/app/views/subscriptions/edit-billing-details.pug diff --git a/services/web/app/views/subscriptions/group/invite.jade b/services/web/app/views/subscriptions/group/invite.pug similarity index 100% rename from services/web/app/views/subscriptions/group/invite.jade rename to services/web/app/views/subscriptions/group/invite.pug diff --git a/services/web/app/views/subscriptions/group/successful_join.jade b/services/web/app/views/subscriptions/group/successful_join.pug similarity index 100% rename from services/web/app/views/subscriptions/group/successful_join.jade rename to services/web/app/views/subscriptions/group/successful_join.pug diff --git a/services/web/app/views/subscriptions/group_admin.jade b/services/web/app/views/subscriptions/group_admin.pug similarity index 100% rename from services/web/app/views/subscriptions/group_admin.jade rename to services/web/app/views/subscriptions/group_admin.pug diff --git a/services/web/app/views/subscriptions/new.jade b/services/web/app/views/subscriptions/new.pug similarity index 100% rename from services/web/app/views/subscriptions/new.jade rename to services/web/app/views/subscriptions/new.pug diff --git a/services/web/app/views/subscriptions/plans.jade b/services/web/app/views/subscriptions/plans.pug similarity index 100% rename from services/web/app/views/subscriptions/plans.jade rename to services/web/app/views/subscriptions/plans.pug diff --git a/services/web/app/views/subscriptions/successful_subscription.jade b/services/web/app/views/subscriptions/successful_subscription.pug similarity index 100% rename from services/web/app/views/subscriptions/successful_subscription.jade rename to services/web/app/views/subscriptions/successful_subscription.pug diff --git a/services/web/app/views/subscriptions/upgradeToAnnual.jade b/services/web/app/views/subscriptions/upgradeToAnnual.pug similarity index 100% rename from services/web/app/views/subscriptions/upgradeToAnnual.jade rename to services/web/app/views/subscriptions/upgradeToAnnual.pug diff --git a/services/web/app/views/tests.jade b/services/web/app/views/tests.pug similarity index 100% rename from services/web/app/views/tests.jade rename to services/web/app/views/tests.pug diff --git a/services/web/app/views/translations/translation_message.jade b/services/web/app/views/translations/translation_message.pug similarity index 100% rename from services/web/app/views/translations/translation_message.jade rename to services/web/app/views/translations/translation_message.pug diff --git a/services/web/app/views/university/case_study.jade b/services/web/app/views/university/case_study.pug similarity index 100% rename from services/web/app/views/university/case_study.jade rename to services/web/app/views/university/case_study.pug diff --git a/services/web/app/views/university/university_holder.jade b/services/web/app/views/university/university_holder.pug similarity index 100% rename from services/web/app/views/university/university_holder.jade rename to services/web/app/views/university/university_holder.pug diff --git a/services/web/app/views/user/activate.jade b/services/web/app/views/user/activate.pug similarity index 100% rename from services/web/app/views/user/activate.jade rename to services/web/app/views/user/activate.pug diff --git a/services/web/app/views/user/login.jade b/services/web/app/views/user/login.pug similarity index 100% rename from services/web/app/views/user/login.jade rename to services/web/app/views/user/login.pug diff --git a/services/web/app/views/user/passwordReset.jade b/services/web/app/views/user/passwordReset.pug similarity index 100% rename from services/web/app/views/user/passwordReset.jade rename to services/web/app/views/user/passwordReset.pug diff --git a/services/web/app/views/user/register.jade b/services/web/app/views/user/register.pug similarity index 100% rename from services/web/app/views/user/register.jade rename to services/web/app/views/user/register.pug diff --git a/services/web/app/views/user/restricted.jade b/services/web/app/views/user/restricted.pug similarity index 100% rename from services/web/app/views/user/restricted.jade rename to services/web/app/views/user/restricted.pug diff --git a/services/web/app/views/user/sessions.jade b/services/web/app/views/user/sessions.pug similarity index 100% rename from services/web/app/views/user/sessions.jade rename to services/web/app/views/user/sessions.pug diff --git a/services/web/app/views/user/setPassword.jade b/services/web/app/views/user/setPassword.pug similarity index 100% rename from services/web/app/views/user/setPassword.jade rename to services/web/app/views/user/setPassword.pug diff --git a/services/web/app/views/user/settings.jade b/services/web/app/views/user/settings.pug similarity index 100% rename from services/web/app/views/user/settings.jade rename to services/web/app/views/user/settings.pug diff --git a/services/web/app/views/view_templates/bonus_templates.jade b/services/web/app/views/view_templates/bonus_templates.pug similarity index 100% rename from services/web/app/views/view_templates/bonus_templates.jade rename to services/web/app/views/view_templates/bonus_templates.pug diff --git a/services/web/npm-shrinkwrap.json b/services/web/npm-shrinkwrap.json index 04fdfc0142..c9616495f9 100644 --- a/services/web/npm-shrinkwrap.json +++ b/services/web/npm-shrinkwrap.json @@ -4,65 +4,54 @@ "dependencies": { "archiver": { "version": "0.9.0", - "from": "https://registry.npmjs.org/archiver/-/archiver-0.9.0.tgz", - "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.9.0.tgz", + "from": "archiver@0.9.0", "dependencies": { "buffer-crc32": { - "version": "0.2.5", - "from": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz" + "version": "0.2.13", + "from": "buffer-crc32@~0.2.1", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz" }, "readable-stream": { "version": "1.0.34", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "from": "readable-stream@~1.0.24", "dependencies": { "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + "from": "isarray@0.0.1" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" } } }, "tar-stream": { "version": "0.3.3", - "from": "https://registry.npmjs.org/tar-stream/-/tar-stream-0.3.3.tgz", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-0.3.3.tgz", + "from": "tar-stream@~0.3.0", "dependencies": { "bl": { "version": "0.6.0", - "from": "https://registry.npmjs.org/bl/-/bl-0.6.0.tgz", - "resolved": "https://registry.npmjs.org/bl/-/bl-0.6.0.tgz" + "from": "bl@~0.6.0" }, "end-of-stream": { "version": "0.1.5", - "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", + "from": "end-of-stream@~0.1.3", "dependencies": { "once": { "version": "1.3.3", - "from": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "from": "once@~1.3.0", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } } @@ -72,77 +61,63 @@ }, "zip-stream": { "version": "0.3.7", - "from": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.3.7.tgz", - "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.3.7.tgz", + "from": "zip-stream@~0.3.0", "dependencies": { "crc32-stream": { "version": "0.2.0", - "from": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.2.0.tgz" + "from": "crc32-stream@~0.2.0" }, "debug": { "version": "1.0.4", - "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz", + "from": "debug@~1.0.2", "dependencies": { "ms": { "version": "0.6.2", - "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz" + "from": "ms@0.6.2" } } }, "deflate-crc32-stream": { "version": "0.1.2", - "from": "https://registry.npmjs.org/deflate-crc32-stream/-/deflate-crc32-stream-0.1.2.tgz", - "resolved": "https://registry.npmjs.org/deflate-crc32-stream/-/deflate-crc32-stream-0.1.2.tgz" + "from": "deflate-crc32-stream@~0.1.0" } } }, "lazystream": { "version": "0.1.0", - "from": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz" + "from": "lazystream@~0.1.0" }, "file-utils": { "version": "0.1.5", - "from": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz", - "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz", + "from": "file-utils@~0.1.5", "dependencies": { "lodash": { "version": "2.1.0", - "from": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz" + "from": "lodash@~2.1.0" }, "iconv-lite": { "version": "0.2.11", - "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz" + "from": "iconv-lite@~0.2.11" }, "glob": { "version": "3.2.11", - "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz", + "from": "glob@~3.2.6", "dependencies": { "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" }, "minimatch": { "version": "0.3.0", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz", + "from": "minimatch@0.3", "dependencies": { "lru-cache": { "version": "2.7.3", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" + "from": "lru-cache@2" }, "sigmund": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + "from": "sigmund@~1.0.0" } } } @@ -150,96 +125,80 @@ }, "minimatch": { "version": "0.2.14", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "from": "minimatch@~0.2.12", "dependencies": { "lru-cache": { "version": "2.7.3", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" + "from": "lru-cache@2" }, "sigmund": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + "from": "sigmund@~1.0.0" } } }, "findup-sync": { "version": "0.1.3", - "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz", + "from": "findup-sync@~0.1.2", "dependencies": { "lodash": { "version": "2.4.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz" + "from": "lodash@~2.4.1" } } }, "isbinaryfile": { "version": "0.1.9", - "from": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz" + "from": "isbinaryfile@~0.1.9" } } }, "lodash": { "version": "2.4.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz" + "from": "lodash@~2.4.0" } } }, "async": { "version": "0.6.2", - "from": "https://registry.npmjs.org/async/-/async-0.6.2.tgz", - "resolved": "https://registry.npmjs.org/async/-/async-0.6.2.tgz" + "from": "async@0.6.2" }, "base64-stream": { "version": "0.1.3", - "from": "https://registry.npmjs.org/base64-stream/-/base64-stream-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/base64-stream/-/base64-stream-0.1.3.tgz", + "from": "base64-stream@^0.1.2", "dependencies": { "readable-stream": { - "version": "2.1.4", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", + "version": "2.2.2", + "from": "readable-stream@^2.0.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz", "dependencies": { "buffer-shims": { "version": "1.0.0", - "from": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" + "from": "buffer-shims@^1.0.0" }, "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "1.0.0", - "from": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + "from": "isarray@~1.0.0" + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@~2.0.1" }, "process-nextick-args": { "version": "1.0.7", - "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" + "from": "process-nextick-args@~1.0.6" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "util-deprecate": { "version": "1.0.2", - "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + "from": "util-deprecate@~1.0.1" } } } @@ -247,133 +206,112 @@ }, "basic-auth-connect": { "version": "1.0.0", - "from": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz" + "from": "basic-auth-connect@^1.0.0" }, "bcrypt": { "version": "0.8.3", - "from": "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.3.tgz", - "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.3.tgz", + "from": "bcrypt@0.8.3", "dependencies": { "bindings": { "version": "1.2.1", - "from": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" + "from": "bindings@1.2.1" }, "nan": { "version": "1.8.4", - "from": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz" + "from": "nan@1.8.4" } } }, "body-parser": { - "version": "1.15.2", - "from": "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz", + "version": "1.16.0", + "from": "body-parser@^1.13.1", "dependencies": { "bytes": { "version": "2.4.0", - "from": "bytes@2.4.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz" + "from": "bytes@2.4.0" }, "content-type": { "version": "1.0.2", - "from": "content-type@~1.0.1", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz" + "from": "content-type@~1.0.2" }, "debug": { - "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.6.0", + "from": "debug@^2.2.0", "dependencies": { "ms": { - "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.2", + "from": "ms@0.7.2" } } }, "depd": { "version": "1.1.0", - "from": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz" + "from": "depd@~1.1.0" }, "http-errors": { - "version": "1.5.0", - "from": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz", + "version": "1.5.1", + "from": "http-errors@~1.5.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz", "dependencies": { "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2.0.3" }, "setprototypeof": { - "version": "1.0.1", - "from": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz" + "version": "1.0.2", + "from": "setprototypeof@1.0.2" }, "statuses": { - "version": "1.3.0", - "from": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz" + "version": "1.3.1", + "from": "statuses@>= 1.3.1 < 2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz" } } }, "iconv-lite": { - "version": "0.4.13", - "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz" + "version": "0.4.15", + "from": "iconv-lite@0.4.15" }, "on-finished": { "version": "2.3.0", "from": "on-finished@~2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "dependencies": { "ee-first": { "version": "1.1.1", - "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" + "from": "ee-first@1.1.1" } } }, "qs": { - "version": "6.2.0", - "from": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz" + "version": "6.2.1", + "from": "qs@6.2.1" }, "raw-body": { - "version": "2.1.7", - "from": "raw-body@~2.1.5", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz", + "version": "2.2.0", + "from": "raw-body@~2.2.0", "dependencies": { "unpipe": { "version": "1.0.0", - "from": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" + "from": "unpipe@1.0.0" } } }, "type-is": { - "version": "1.6.13", - "from": "type-is@~1.6.10", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz", + "version": "1.6.14", + "from": "type-is@~1.6.14", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz", "dependencies": { "media-typer": { "version": "0.3.0", - "from": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" + "from": "media-typer@0.3.0" }, "mime-types": { - "version": "2.1.11", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "version": "2.1.14", + "from": "mime-types@~2.1.13", "dependencies": { "mime-db": { - "version": "1.23.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" + "version": "1.26.0", + "from": "mime-db@~1.26.0" } } } @@ -383,18 +321,15 @@ }, "bufferedstream": { "version": "1.6.0", - "from": "https://registry.npmjs.org/bufferedstream/-/bufferedstream-1.6.0.tgz", - "resolved": "https://registry.npmjs.org/bufferedstream/-/bufferedstream-1.6.0.tgz" + "from": "bufferedstream@1.6.0" }, "connect-redis": { - "version": "3.1.0", - "from": "connect-redis@3.1.0", - "resolved": "https://registry.npmjs.org/connect-redis/-/connect-redis-3.1.0.tgz", + "version": "3.2.0", + "from": "connect-redis@^3.1.0", "dependencies": { "debug": { - "version": "2.3.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.3.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.0.tgz", + "version": "2.6.0", + "from": "debug@^2.2.0", "dependencies": { "ms": { "version": "0.7.2", @@ -403,184 +338,163 @@ } }, "redis": { - "version": "2.6.3", - "from": "https://registry.npmjs.org/redis/-/redis-2.6.3.tgz", - "resolved": "https://registry.npmjs.org/redis/-/redis-2.6.3.tgz", + "version": "2.6.5", + "from": "redis@^2.1.0", "dependencies": { "double-ended-queue": { "version": "2.1.0-0", - "from": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz", - "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz" + "from": "double-ended-queue@^2.1.0-0" }, "redis-commands": { "version": "1.3.0", - "from": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.0.tgz", - "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.0.tgz" + "from": "redis-commands@^1.2.0" }, "redis-parser": { - "version": "2.1.1", - "from": "https://registry.npmjs.org/redis-parser/-/redis-parser-2.1.1.tgz", - "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-2.1.1.tgz" + "version": "2.3.0", + "from": "redis-parser@^2.0.0", + "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-2.3.0.tgz" } } } } }, "contentful": { - "version": "3.5.0", - "from": "https://registry.npmjs.org/contentful/-/contentful-3.5.0.tgz", - "resolved": "https://registry.npmjs.org/contentful/-/contentful-3.5.0.tgz", + "version": "3.8.0", + "from": "contentful@^3.3.14", + "resolved": "https://registry.npmjs.org/contentful/-/contentful-3.8.0.tgz", "dependencies": { "babel-runtime": { - "version": "6.11.6", - "from": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz", + "version": "6.3.19", + "from": "babel-runtime@~6.3.19", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.3.19.tgz", "dependencies": { "core-js": { - "version": "2.4.1", - "from": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" - }, - "regenerator-runtime": { - "version": "0.9.5", - "from": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz" + "version": "1.2.7", + "from": "core-js@^1.2.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz" } } }, "contentful-sdk-core": { - "version": "2.3.4", - "from": "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-2.3.4.tgz", - "resolved": "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-2.3.4.tgz", + "version": "2.5.0", + "from": "contentful-sdk-core@~2.5.0", + "resolved": "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-2.5.0.tgz", "dependencies": { "follow-redirects": { "version": "0.0.7", - "from": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.7.tgz", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.7.tgz", + "from": "follow-redirects@0.0.7", "dependencies": { "debug": { - "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.6.0", + "from": "debug@^2.2.0", "dependencies": { "ms": { - "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.2", + "from": "ms@0.7.2" } } }, "stream-consume": { "version": "0.1.0", - "from": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz" + "from": "stream-consume@^0.1.0" } } }, "qs": { - "version": "6.2.1", - "from": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz" + "version": "6.3.0", + "from": "qs@^6.1.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz" } } }, "json-stringify-safe": { "version": "5.0.1", - "from": "json-stringify-safe@~5.0.0", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" + "from": "json-stringify-safe@~5.0.1" + }, + "lodash": { + "version": "4.2.1", + "from": "lodash@~4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz" } } }, "cookie": { "version": "0.2.4", - "from": "https://registry.npmjs.org/cookie/-/cookie-0.2.4.tgz", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.2.4.tgz" + "from": "cookie@^0.2.3" }, "cookie-parser": { "version": "1.3.5", - "from": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz", - "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz", + "from": "cookie-parser@1.3.5", "dependencies": { "cookie": { "version": "0.1.3", - "from": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz" + "from": "cookie@0.1.3" }, "cookie-signature": { "version": "1.0.6", - "from": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" + "from": "cookie-signature@1.0.6" } } }, "csurf": { "version": "1.9.0", - "from": "https://registry.npmjs.org/csurf/-/csurf-1.9.0.tgz", - "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.9.0.tgz", + "from": "csurf@^1.8.3", "dependencies": { "cookie": { "version": "0.3.1", - "from": "cookie@0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz" + "from": "cookie@0.3.1" }, "cookie-signature": { "version": "1.0.6", - "from": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" + "from": "cookie-signature@1.0.6" }, "csrf": { - "version": "3.0.3", - "from": "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz", - "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz", + "version": "3.0.4", + "from": "csrf@~3.0.3", + "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz", "dependencies": { "base64-url": { - "version": "1.2.2", - "from": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz", - "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz" + "version": "1.3.3", + "from": "base64-url@1.3.3", + "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz" }, "rndm": { "version": "1.2.0", - "from": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz" + "from": "rndm@1.2.0" }, "tsscmp": { "version": "1.0.5", - "from": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz" + "from": "tsscmp@1.0.5" }, "uid-safe": { - "version": "2.1.1", - "from": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz", - "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz", + "version": "2.1.3", + "from": "uid-safe@2.1.3", "dependencies": { "random-bytes": { "version": "1.0.0", - "from": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz" + "from": "random-bytes@~1.0.0" } } } } }, "http-errors": { - "version": "1.5.0", - "from": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz", + "version": "1.5.1", + "from": "http-errors@~1.5.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz", "dependencies": { "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2.0.3" }, "setprototypeof": { - "version": "1.0.1", - "from": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz" + "version": "1.0.2", + "from": "setprototypeof@1.0.2" }, "statuses": { - "version": "1.3.0", - "from": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz" + "version": "1.3.1", + "from": "statuses@>= 1.3.1 < 2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz" } } } @@ -588,280 +502,230 @@ }, "dateformat": { "version": "1.0.4-1.2.3", - "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.4-1.2.3.tgz", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.4-1.2.3.tgz" + "from": "dateformat@1.0.4-1.2.3" }, "express": { "version": "4.13.0", - "from": "https://registry.npmjs.org/express/-/express-4.13.0.tgz", - "resolved": "https://registry.npmjs.org/express/-/express-4.13.0.tgz", + "from": "express@4.13.0", "dependencies": { "accepts": { "version": "1.2.13", - "from": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", + "from": "accepts@~1.2.9", "dependencies": { "mime-types": { - "version": "2.1.11", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "version": "2.1.14", + "from": "mime-types@~2.1.13", "dependencies": { "mime-db": { - "version": "1.23.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" + "version": "1.26.0", + "from": "mime-db@~1.26.0" } } }, "negotiator": { "version": "0.5.3", - "from": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz" + "from": "negotiator@0.5.3" } } }, "array-flatten": { "version": "1.1.0", - "from": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.0.tgz" + "from": "array-flatten@1.1.0" }, "content-disposition": { "version": "0.5.0", - "from": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz" + "from": "content-disposition@0.5.0" }, "content-type": { "version": "1.0.2", - "from": "content-type@~1.0.1", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz" + "from": "content-type@~1.0.1" }, "cookie": { "version": "0.1.3", - "from": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz" + "from": "cookie@0.1.3" }, "cookie-signature": { "version": "1.0.6", - "from": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" + "from": "cookie-signature@1.0.6" }, "debug": { "version": "2.2.0", "from": "debug@~2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", "dependencies": { "ms": { "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "from": "ms@0.7.1" } } }, "depd": { "version": "1.0.1", - "from": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz" + "from": "depd@~1.0.1" }, "escape-html": { "version": "1.0.2", - "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz" + "from": "escape-html@1.0.2" }, "etag": { "version": "1.7.0", - "from": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz" + "from": "etag@~1.7.0" }, "finalhandler": { "version": "0.4.0", - "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz", + "from": "finalhandler@0.4.0", "dependencies": { "unpipe": { "version": "1.0.0", - "from": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" + "from": "unpipe@~1.0.0" } } }, "fresh": { "version": "0.3.0", - "from": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz" + "from": "fresh@0.3.0" }, "merge-descriptors": { "version": "1.0.0", - "from": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz" + "from": "merge-descriptors@1.0.0" }, "methods": { "version": "1.1.2", - "from": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" + "from": "methods@~1.1.1" }, "on-finished": { "version": "2.3.0", "from": "on-finished@~2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "dependencies": { "ee-first": { "version": "1.1.1", - "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" + "from": "ee-first@1.1.1" } } }, "parseurl": { "version": "1.3.1", - "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz" + "from": "parseurl@~1.3.0" }, "path-to-regexp": { "version": "0.1.6", - "from": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.6.tgz", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.6.tgz" + "from": "path-to-regexp@0.1.6" }, "proxy-addr": { "version": "1.0.10", - "from": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz", + "from": "proxy-addr@~1.0.8", "dependencies": { "forwarded": { "version": "0.1.0", - "from": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz" + "from": "forwarded@~0.1.0" }, "ipaddr.js": { "version": "1.0.5", - "from": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz" + "from": "ipaddr.js@1.0.5" } } }, "qs": { "version": "2.4.2", - "from": "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz", - "resolved": "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz" + "from": "qs@2.4.2" }, "range-parser": { "version": "1.0.3", - "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz" + "from": "range-parser@~1.0.2" }, "send": { "version": "0.13.0", - "from": "https://registry.npmjs.org/send/-/send-0.13.0.tgz", - "resolved": "https://registry.npmjs.org/send/-/send-0.13.0.tgz", + "from": "send@0.13.0", "dependencies": { "destroy": { "version": "1.0.3", - "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz" + "from": "destroy@1.0.3" }, "http-errors": { "version": "1.3.1", - "from": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", + "from": "http-errors@~1.3.1", "dependencies": { "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" } } }, "mime": { "version": "1.3.4", - "from": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz" + "from": "mime@1.3.4" }, "ms": { "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "from": "ms@0.7.1" }, "statuses": { "version": "1.2.1", - "from": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz" + "from": "statuses@~1.2.1" } } }, "serve-static": { "version": "1.10.3", - "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz", + "from": "serve-static@~1.10.0", "dependencies": { "escape-html": { "version": "1.0.3", - "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" + "from": "escape-html@~1.0.3" }, "send": { "version": "0.13.2", - "from": "https://registry.npmjs.org/send/-/send-0.13.2.tgz", - "resolved": "https://registry.npmjs.org/send/-/send-0.13.2.tgz", + "from": "send@0.13.2", "dependencies": { "depd": { "version": "1.1.0", - "from": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz" + "from": "depd@~1.1.0" }, "destroy": { "version": "1.0.4", - "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz" + "from": "destroy@~1.0.4" }, "http-errors": { "version": "1.3.1", - "from": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", + "from": "http-errors@~1.3.1", "dependencies": { "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" } } }, "mime": { "version": "1.3.4", - "from": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz" + "from": "mime@1.3.4" }, "ms": { "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "from": "ms@0.7.1" }, "statuses": { "version": "1.2.1", - "from": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz" + "from": "statuses@~1.2.1" } } } } }, "type-is": { - "version": "1.6.13", - "from": "type-is@~1.6.10", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz", + "version": "1.6.14", + "from": "type-is@~1.6.3", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz", "dependencies": { "media-typer": { "version": "0.3.0", - "from": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" + "from": "media-typer@0.3.0" }, "mime-types": { - "version": "2.1.11", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "version": "2.1.14", + "from": "mime-types@~2.1.13", "dependencies": { "mime-db": { - "version": "1.23.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" + "version": "1.26.0", + "from": "mime-db@~1.26.0" } } } @@ -869,25 +733,21 @@ }, "vary": { "version": "1.0.1", - "from": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz" + "from": "vary@~1.0.0" }, "utils-merge": { "version": "1.0.0", - "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz" + "from": "utils-merge@1.0.0" } } }, "express-session": { "version": "1.14.2", - "from": "express-session@1.14.2", - "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz", + "from": "express-session@^1.14.2", "dependencies": { "cookie": { "version": "0.3.1", - "from": "cookie@0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz" + "from": "cookie@0.3.1" }, "cookie-signature": { "version": "1.0.6", @@ -895,45 +755,43 @@ }, "crc": { "version": "3.4.1", - "from": "crc@3.4.1", - "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz" + "from": "crc@3.4.1" }, "debug": { "version": "2.2.0", - "from": "debug@2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "from": "debug@~2.2.0", "dependencies": { "ms": { "version": "0.7.1", - "from": "ms@0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "from": "ms@0.7.1" } } }, "depd": { "version": "1.1.0", - "from": "depd@1.1.0" + "from": "depd@~1.1.0" }, "on-headers": { "version": "1.0.1", - "from": "on-headers@1.0.1" + "from": "on-headers@~1.0.1", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz" }, "parseurl": { "version": "1.3.1", - "from": "parseurl@1.3.1" + "from": "parseurl@~1.3.1" }, "uid-safe": { "version": "2.1.3", - "from": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz", - "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz", + "from": "uid-safe@~2.1.3", "dependencies": { "base64-url": { "version": "1.3.3", - "from": "base64-url@1.3.3" + "from": "base64-url@1.3.3", + "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz" }, "random-bytes": { "version": "1.0.0", - "from": "random-bytes@1.0.0" + "from": "random-bytes@~1.0.0" } } }, @@ -945,63 +803,51 @@ }, "grunt": { "version": "0.4.5", - "from": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz", - "resolved": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz", + "from": "grunt@^0.4.5", "dependencies": { "async": { "version": "0.1.22", - "from": "https://registry.npmjs.org/async/-/async-0.1.22.tgz", - "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz" + "from": "async@~0.1.22" }, "coffee-script": { "version": "1.3.3", - "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz" + "from": "coffee-script@~1.3.3" }, "colors": { "version": "0.6.2", - "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", - "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz" + "from": "colors@~0.6.2" }, "dateformat": { "version": "1.0.2-1.2.3", - "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz" + "from": "dateformat@1.0.2-1.2.3" }, "eventemitter2": { "version": "0.4.14", - "from": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz" + "from": "eventemitter2@~0.4.13" }, "findup-sync": { "version": "0.1.3", - "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz", + "from": "findup-sync@~0.1.2", "dependencies": { "glob": { "version": "3.2.11", - "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz", + "from": "glob@~3.2.9", "dependencies": { "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" }, "minimatch": { "version": "0.3.0", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz", + "from": "minimatch@0.3", "dependencies": { "lru-cache": { "version": "2.7.3", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" + "from": "lru-cache@2" }, "sigmund": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + "from": "sigmund@~1.0.0" } } } @@ -1009,150 +855,123 @@ }, "lodash": { "version": "2.4.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz" + "from": "lodash@~2.4.1" } } }, "glob": { "version": "3.1.21", - "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", + "from": "glob@~3.1.21", "dependencies": { "graceful-fs": { "version": "1.2.3", - "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz" + "from": "graceful-fs@~1.2.0" }, "inherits": { "version": "1.0.2", - "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz" + "from": "inherits@1" } } }, "hooker": { "version": "0.2.3", - "from": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz", - "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" + "from": "hooker@~0.2.3" }, "iconv-lite": { "version": "0.2.11", - "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz" + "from": "iconv-lite@~0.2.11" }, "minimatch": { "version": "0.2.14", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "from": "minimatch@~0.2.12", "dependencies": { "lru-cache": { "version": "2.7.3", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" + "from": "lru-cache@2" }, "sigmund": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + "from": "sigmund@~1.0.0" } } }, "nopt": { "version": "1.0.10", - "from": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "from": "nopt@~1.0.10", "dependencies": { "abbrev": { "version": "1.0.9", - "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" + "from": "abbrev@1" } } }, "rimraf": { "version": "2.2.8", - "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz" + "from": "rimraf@~2.2.8" }, "lodash": { "version": "0.9.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz" + "from": "lodash@~0.9.2" }, "underscore.string": { "version": "2.2.1", - "from": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz", - "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz" + "from": "underscore.string@~2.2.1" }, "which": { "version": "1.0.9", - "from": "https://registry.npmjs.org/which/-/which-1.0.9.tgz", - "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz" + "from": "which@~1.0.5" }, "js-yaml": { "version": "2.0.5", - "from": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz", + "from": "js-yaml@~2.0.5", "dependencies": { "argparse": { "version": "0.1.16", - "from": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz", + "from": "argparse@~ 0.1.11", "dependencies": { "underscore": { "version": "1.7.0", - "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz" + "from": "underscore@~1.7.0" }, "underscore.string": { "version": "2.4.0", - "from": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz", - "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz" + "from": "underscore.string@~2.4.0" } } }, "esprima": { "version": "1.0.4", - "from": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz" + "from": "esprima@~ 1.0.2" } } }, "exit": { "version": "0.1.2", - "from": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz" + "from": "exit@~0.1.1" }, "getobject": { "version": "0.1.0", - "from": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz" + "from": "getobject@~0.1.0" }, "grunt-legacy-util": { "version": "0.2.0", - "from": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz" + "from": "grunt-legacy-util@~0.2.0" }, "grunt-legacy-log": { "version": "0.1.3", - "from": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz", + "from": "grunt-legacy-log@~0.1.0", "dependencies": { "grunt-legacy-log-utils": { "version": "0.1.1", - "from": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz" + "from": "grunt-legacy-log-utils@~0.1.1" }, "lodash": { "version": "2.4.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz" + "from": "lodash@~2.4.1" }, "underscore.string": { "version": "2.3.3", - "from": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz", - "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz" + "from": "underscore.string@~2.3.3" } } } @@ -1160,45 +979,39 @@ }, "heapdump": { "version": "0.3.7", - "from": "https://registry.npmjs.org/heapdump/-/heapdump-0.3.7.tgz", - "resolved": "https://registry.npmjs.org/heapdump/-/heapdump-0.3.7.tgz" + "from": "heapdump@^0.3.7" }, "http-proxy": { - "version": "1.14.0", - "from": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.14.0.tgz", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.14.0.tgz", + "version": "1.16.2", + "from": "http-proxy@^1.8.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz", "dependencies": { "eventemitter3": { "version": "1.2.0", - "from": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz" + "from": "eventemitter3@1.x.x" }, "requires-port": { "version": "1.0.0", - "from": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz" + "from": "requires-port@1.x.x" } } }, "ioredis": { - "version": "2.4.0", - "from": "https://registry.npmjs.org/ioredis/-/ioredis-2.4.0.tgz", - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-2.4.0.tgz", + "version": "2.5.0", + "from": "ioredis@^2.4.0", "dependencies": { "bluebird": { - "version": "3.4.6", - "from": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz" + "version": "3.4.7", + "from": "bluebird@^3.3.4", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz" }, "cluster-key-slot": { "version": "1.0.8", - "from": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.0.8.tgz", - "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.0.8.tgz" + "from": "cluster-key-slot@^1.0.6" }, "debug": { - "version": "2.3.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.3.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.0.tgz", + "version": "2.6.0", + "from": "debug@^2.2.0", "dependencies": { "ms": { "version": "0.7.2", @@ -1208,100 +1021,85 @@ }, "double-ended-queue": { "version": "2.1.0-0", - "from": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz", - "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz" + "from": "double-ended-queue@^2.1.0-0" }, "flexbuffer": { "version": "0.0.6", - "from": "flexbuffer@0.0.6" + "from": "flexbuffer@0.0.6", + "resolved": "https://registry.npmjs.org/flexbuffer/-/flexbuffer-0.0.6.tgz" }, "redis-commands": { "version": "1.3.0", - "from": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.0.tgz", - "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.0.tgz" + "from": "redis-commands@^1.2.0" }, "redis-parser": { "version": "1.3.0", - "from": "https://registry.npmjs.org/redis-parser/-/redis-parser-1.3.0.tgz", - "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-1.3.0.tgz" + "from": "redis-parser@^1.3.0" } } }, "jade": { "version": "1.3.1", - "from": "https://registry.npmjs.org/jade/-/jade-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/jade/-/jade-1.3.1.tgz", + "from": "jade@~1.3.1", "dependencies": { "commander": { "version": "2.1.0", - "from": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz" + "from": "commander@2.1.0" }, "mkdirp": { "version": "0.3.5", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" + "from": "mkdirp@~0.3.5" }, "transformers": { "version": "2.1.0", - "from": "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz", - "resolved": "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz", + "from": "transformers@2.1.0", "dependencies": { "promise": { "version": "2.0.0", - "from": "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz", + "from": "promise@~2.0", "dependencies": { "is-promise": { "version": "1.0.1", - "from": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz" + "from": "is-promise@~1" } } }, "css": { "version": "1.0.8", - "from": "https://registry.npmjs.org/css/-/css-1.0.8.tgz", - "resolved": "https://registry.npmjs.org/css/-/css-1.0.8.tgz", + "from": "css@~1.0.8", "dependencies": { "css-parse": { "version": "1.0.4", - "from": "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz", - "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz" + "from": "css-parse@1.0.4" }, "css-stringify": { "version": "1.0.5", - "from": "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz" + "from": "css-stringify@1.0.5" } } }, "uglify-js": { "version": "2.2.5", - "from": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz", + "from": "uglify-js@~2.2.5", "dependencies": { "source-map": { "version": "0.1.43", - "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "from": "source-map@~0.1.7", "dependencies": { "amdefine": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz" + "version": "1.0.1", + "from": "amdefine@>=0.0.4", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz" } } }, "optimist": { "version": "0.3.7", - "from": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", + "from": "optimist@~0.3.5", "dependencies": { "wordwrap": { "version": "0.0.3", - "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz" + "from": "wordwrap@~0.0.2" } } } @@ -1311,38 +1109,31 @@ }, "character-parser": { "version": "1.2.0", - "from": "https://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz" + "from": "character-parser@1.2.0" }, "monocle": { "version": "1.1.51", - "from": "https://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz", - "resolved": "https://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz", + "from": "monocle@1.1.51", "dependencies": { "readdirp": { "version": "0.2.5", - "from": "https://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz", + "from": "readdirp@~0.2.3", "dependencies": { "minimatch": { "version": "3.0.3", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "from": "minimatch@>=0.2.4", "dependencies": { "brace-expansion": { "version": "1.1.6", - "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "from": "brace-expansion@^1.0.0", "dependencies": { "balanced-match": { "version": "0.4.2", - "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + "from": "balanced-match@^0.4.1" }, "concat-map": { "version": "0.0.1", - "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "from": "concat-map@0.0.1" } } } @@ -1354,60 +1145,50 @@ }, "with": { "version": "3.0.1", - "from": "https://registry.npmjs.org/with/-/with-3.0.1.tgz", - "resolved": "https://registry.npmjs.org/with/-/with-3.0.1.tgz", + "from": "with@~3.0.0", "dependencies": { "uglify-js": { "version": "2.4.24", - "from": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz", + "from": "uglify-js@~2.4.12", "dependencies": { "async": { "version": "0.2.10", - "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", - "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz" + "from": "async@~0.2.6" }, "source-map": { "version": "0.1.34", - "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz", + "from": "source-map@0.1.34", "dependencies": { "amdefine": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz" + "version": "1.0.1", + "from": "amdefine@>=0.0.4", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz" } } }, "uglify-to-browserify": { "version": "1.0.2", - "from": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz" + "from": "uglify-to-browserify@~1.0.0" }, "yargs": { "version": "3.5.4", - "from": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz", + "from": "yargs@~3.5.4", "dependencies": { "camelcase": { "version": "1.2.1", - "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz" + "from": "camelcase@^1.0.2" }, "decamelize": { "version": "1.2.0", - "from": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" + "from": "decamelize@^1.0.0" }, "window-size": { "version": "0.1.0", - "from": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz" + "from": "window-size@0.1.0" }, "wordwrap": { "version": "0.0.2", - "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz" + "from": "wordwrap@0.0.2" } } } @@ -1417,60 +1198,50 @@ }, "constantinople": { "version": "2.0.1", - "from": "https://registry.npmjs.org/constantinople/-/constantinople-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-2.0.1.tgz", + "from": "constantinople@~2.0.0", "dependencies": { "uglify-js": { "version": "2.4.24", - "from": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz", + "from": "uglify-js@~2.4.0", "dependencies": { "async": { "version": "0.2.10", - "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", - "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz" + "from": "async@~0.2.6" }, "source-map": { "version": "0.1.34", - "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz", + "from": "source-map@0.1.34", "dependencies": { "amdefine": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz" + "version": "1.0.1", + "from": "amdefine@>=0.0.4", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz" } } }, "uglify-to-browserify": { "version": "1.0.2", - "from": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz" + "from": "uglify-to-browserify@~1.0.0" }, "yargs": { "version": "3.5.4", - "from": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz", + "from": "yargs@~3.5.4", "dependencies": { "camelcase": { "version": "1.2.1", - "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz" + "from": "camelcase@^1.0.2" }, "decamelize": { "version": "1.2.0", - "from": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" + "from": "decamelize@^1.0.0" }, "window-size": { "version": "0.1.0", - "from": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz" + "from": "window-size@0.1.0" }, "wordwrap": { "version": "0.0.2", - "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz" + "from": "wordwrap@0.0.2" } } } @@ -1481,102 +1252,100 @@ } }, "ldapjs": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/ldapjs/-/ldapjs-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-1.0.0.tgz", + "version": "1.0.1", + "from": "ldapjs@^1.0.0", + "resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-1.0.1.tgz", "dependencies": { "asn1": { "version": "0.2.3", - "from": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz" + "from": "asn1@0.2.3" }, "assert-plus": { - "version": "0.1.5", - "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz" + "version": "1.0.0", + "from": "assert-plus@^1.0.0" }, "bunyan": { - "version": "1.5.1", - "from": "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz", - "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz", + "version": "1.8.5", + "from": "bunyan@^1.8.3", + "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz", "dependencies": { + "dtrace-provider": { + "version": "0.8.0", + "from": "dtrace-provider@~0.8", + "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz", + "dependencies": { + "nan": { + "version": "2.5.0", + "from": "nan@^2.3.3", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz" + } + } + }, "mv": { "version": "2.1.1", - "from": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", - "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", + "from": "mv@~2", "dependencies": { "mkdirp": { "version": "0.5.1", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "from": "mkdirp@~0.5.1", "dependencies": { "minimist": { "version": "0.0.8", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" + "from": "minimist@0.0.8" } } }, "ncp": { "version": "2.0.0", - "from": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz" + "from": "ncp@~2.0.0" }, "rimraf": { "version": "2.4.5", - "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", + "from": "rimraf@~2.4.0", "dependencies": { "glob": { "version": "6.0.4", - "from": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "from": "glob@^6.0.1", "dependencies": { "inflight": { - "version": "1.0.5", - "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", + "version": "1.0.6", + "from": "inflight@^1.0.4", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" }, "minimatch": { "version": "3.0.3", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "from": "minimatch@2 || 3", "dependencies": { "brace-expansion": { "version": "1.1.6", - "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "from": "brace-expansion@^1.0.0", "dependencies": { "balanced-match": { "version": "0.4.2", - "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + "from": "balanced-match@^0.4.1" }, "concat-map": { "version": "0.0.1", - "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "from": "concat-map@0.0.1" } } } } }, "path-is-absolute": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" + "version": "1.0.1", + "from": "path-is-absolute@^1.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" } } } @@ -1586,192 +1355,199 @@ }, "safe-json-stringify": { "version": "1.0.3", - "from": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz" + "from": "safe-json-stringify@~1" + }, + "moment": { + "version": "2.17.1", + "from": "moment@^2.10.6", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz" } } }, "dashdash": { - "version": "1.10.1", - "from": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz" + "version": "1.14.1", + "from": "dashdash@^1.14.0", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz" }, "backoff": { - "version": "2.4.1", - "from": "https://registry.npmjs.org/backoff/-/backoff-2.4.1.tgz", - "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.4.1.tgz", + "version": "2.5.0", + "from": "backoff@^2.5.0", + "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz", "dependencies": { "precond": { "version": "0.2.3", - "from": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz", - "resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz" + "from": "precond@0.2" } } }, "ldap-filter": { "version": "0.2.2", - "from": "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.2.2.tgz", - "resolved": "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.2.2.tgz" + "from": "ldap-filter@0.2.2", + "dependencies": { + "assert-plus": { + "version": "0.1.5", + "from": "assert-plus@0.1.5" + } + } }, "once": { - "version": "1.3.2", - "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz", + "version": "1.4.0", + "from": "once@^1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "vasync": { - "version": "1.6.3", - "from": "https://registry.npmjs.org/vasync/-/vasync-1.6.3.tgz", - "resolved": "https://registry.npmjs.org/vasync/-/vasync-1.6.3.tgz" + "version": "1.6.4", + "from": "vasync@^1.6.4", + "resolved": "https://registry.npmjs.org/vasync/-/vasync-1.6.4.tgz", + "dependencies": { + "verror": { + "version": "1.6.0", + "from": "verror@1.6.0", + "dependencies": { + "extsprintf": { + "version": "1.2.0", + "from": "extsprintf@1.2.0" + } + } + } + } }, "verror": { - "version": "1.6.0", - "from": "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz", + "version": "1.9.0", + "from": "verror@^1.8.1", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz", "dependencies": { + "core-util-is": { + "version": "1.0.2", + "from": "core-util-is@1.0.2" + }, "extsprintf": { - "version": "1.2.0", - "from": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz" + "version": "1.3.0", + "from": "extsprintf@^1.2.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz" } } }, "dtrace-provider": { - "version": "0.6.0", - "from": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz", - "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz", + "version": "0.7.1", + "from": "dtrace-provider@^0.7.0", + "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz", "dependencies": { "nan": { - "version": "2.4.0", - "from": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz" + "version": "2.5.0", + "from": "nan@^2.3.3", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz" } } } } }, "lodash": { - "version": "4.14.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + "version": "4.17.4", + "from": "lodash@^4.13.1" }, "logger-sharelatex": { "version": "1.3.1", - "from": "logger-sharelatex@git+https://github.com/sharelatex/logger-sharelatex.git#bf413ec621a000cf0e08c939de38d5e24541a08c", + "from": "logger-sharelatex@git+https://github.com/sharelatex/logger-sharelatex.git#v1.3.1", "resolved": "git+https://github.com/sharelatex/logger-sharelatex.git#bf413ec621a000cf0e08c939de38d5e24541a08c", "dependencies": { "bunyan": { "version": "1.5.1", - "from": "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz", - "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz", + "from": "bunyan@1.5.1", "dependencies": { "dtrace-provider": { "version": "0.6.0", - "from": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz", - "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz", + "from": "dtrace-provider@~0.6", "dependencies": { "nan": { - "version": "2.4.0", - "from": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz" + "version": "2.5.0", + "from": "nan@^2.0.8", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz" } } }, "mv": { "version": "2.1.1", - "from": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", - "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", + "from": "mv@~2", "dependencies": { "mkdirp": { "version": "0.5.1", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "from": "mkdirp@~0.5.1", "dependencies": { "minimist": { "version": "0.0.8", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" + "from": "minimist@0.0.8" } } }, "ncp": { "version": "2.0.0", - "from": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz" + "from": "ncp@~2.0.0" }, "rimraf": { "version": "2.4.5", - "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", + "from": "rimraf@~2.4.0", "dependencies": { "glob": { "version": "6.0.4", - "from": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "from": "glob@^6.0.1", "dependencies": { "inflight": { - "version": "1.0.5", - "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", + "version": "1.0.6", + "from": "inflight@^1.0.4", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" }, "minimatch": { "version": "3.0.3", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "from": "minimatch@2 || 3", "dependencies": { "brace-expansion": { "version": "1.1.6", - "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "from": "brace-expansion@^1.0.0", "dependencies": { "balanced-match": { "version": "0.4.2", - "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + "from": "balanced-match@^0.4.1" }, "concat-map": { "version": "0.0.1", - "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "from": "concat-map@0.0.1" } } } } }, "once": { - "version": "1.3.3", - "from": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "version": "1.4.0", + "from": "once@^1.3.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "path-is-absolute": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" + "version": "1.0.1", + "from": "path-is-absolute@^1.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" } } } @@ -1781,35 +1557,29 @@ }, "safe-json-stringify": { "version": "1.0.3", - "from": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz" + "from": "safe-json-stringify@~1" } } }, "coffee-script": { "version": "1.4.0", - "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.4.0.tgz", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.4.0.tgz" + "from": "coffee-script@1.4.0" }, "raven": { "version": "0.8.1", - "from": "https://registry.npmjs.org/raven/-/raven-0.8.1.tgz", - "resolved": "https://registry.npmjs.org/raven/-/raven-0.8.1.tgz", + "from": "raven@^0.8.0", "dependencies": { "cookie": { "version": "0.1.0", - "from": "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz" + "from": "cookie@0.1.0" }, "lsmod": { "version": "0.0.3", - "from": "https://registry.npmjs.org/lsmod/-/lsmod-0.0.3.tgz", - "resolved": "https://registry.npmjs.org/lsmod/-/lsmod-0.0.3.tgz" + "from": "lsmod@~0.0.3" }, "stack-trace": { "version": "0.0.7", - "from": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz" + "from": "stack-trace@0.0.7" } } } @@ -1817,181 +1587,153 @@ }, "lynx": { "version": "0.1.1", - "from": "https://registry.npmjs.org/lynx/-/lynx-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/lynx/-/lynx-0.1.1.tgz", + "from": "lynx@0.1.1", "dependencies": { "mersenne": { "version": "0.0.3", - "from": "https://registry.npmjs.org/mersenne/-/mersenne-0.0.3.tgz", - "resolved": "https://registry.npmjs.org/mersenne/-/mersenne-0.0.3.tgz" + "from": "mersenne@~0.0.3" }, "statsd-parser": { "version": "0.0.4", - "from": "https://registry.npmjs.org/statsd-parser/-/statsd-parser-0.0.4.tgz", - "resolved": "https://registry.npmjs.org/statsd-parser/-/statsd-parser-0.0.4.tgz" + "from": "statsd-parser@~0.0.4" } } }, "marked": { "version": "0.3.6", - "from": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz" + "from": "marked@^0.3.5" }, "method-override": { - "version": "2.3.6", - "from": "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz", - "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz", + "version": "2.3.7", + "from": "method-override@^2.3.3", + "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz", "dependencies": { "debug": { - "version": "2.2.0", - "from": "debug@2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.3.3", + "from": "debug@2.3.3", "dependencies": { "ms": { - "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.2", + "from": "ms@0.7.2" } } }, "methods": { "version": "1.1.2", - "from": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" + "from": "methods@~1.1.2" }, "parseurl": { "version": "1.3.1", - "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz" + "from": "parseurl@~1.3.1" }, "vary": { "version": "1.1.0", - "from": "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz" + "from": "vary@~1.1.0" } } }, "metrics-sharelatex": { - "version": "1.3.0", - "from": "metrics-sharelatex@git+https://github.com/sharelatex/metrics-sharelatex.git#080c4aeb696edcd5d6d86f202f2c528f0661d7a6", - "resolved": "git+https://github.com/sharelatex/metrics-sharelatex.git#080c4aeb696edcd5d6d86f202f2c528f0661d7a6", + "version": "1.6.0", + "from": "metrics-sharelatex@git+https://github.com/sharelatex/metrics-sharelatex.git#v1.6.0", + "resolved": "git+https://github.com/sharelatex/metrics-sharelatex.git#718f1144407ab2c867b869ebb38e07de2be1933b", "dependencies": { "coffee-script": { "version": "1.6.0", - "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz" + "from": "coffee-script@1.6.0" } } }, "mimelib": { "version": "0.2.14", - "from": "https://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz", - "resolved": "https://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz", + "from": "mimelib@0.2.14", "dependencies": { "encoding": { "version": "0.1.12", - "from": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "from": "encoding@~0.1", "dependencies": { "iconv-lite": { - "version": "0.4.13", - "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz" + "version": "0.4.15", + "from": "iconv-lite@~0.4.13" } } }, "addressparser": { "version": "0.2.1", - "from": "https://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz", - "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz" + "from": "addressparser@~0.2.0" } } }, "mocha": { "version": "1.17.1", - "from": "https://registry.npmjs.org/mocha/-/mocha-1.17.1.tgz", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-1.17.1.tgz", + "from": "mocha@1.17.1", "dependencies": { "commander": { "version": "2.0.0", - "from": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz" + "from": "commander@2.0.0" }, "growl": { "version": "1.7.0", - "from": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz" + "from": "growl@1.7.x" }, "jade": { "version": "0.26.3", - "from": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz", - "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz", + "from": "jade@0.26.3", "dependencies": { "commander": { "version": "0.6.1", - "from": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz", + "from": "commander@0.6.1", "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz" }, "mkdirp": { "version": "0.3.0", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", + "from": "mkdirp@0.3.0", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz" } } }, "diff": { "version": "1.0.7", - "from": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz" + "from": "diff@1.0.7" }, "debug": { - "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.6.0", + "from": "debug@*", "dependencies": { "ms": { - "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.2", + "from": "ms@0.7.2" } } }, "mkdirp": { "version": "0.3.5", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" + "from": "mkdirp@0.3.5" }, "glob": { "version": "3.2.3", - "from": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz", + "from": "glob@3.2.3", "dependencies": { "minimatch": { "version": "0.2.14", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "from": "minimatch@~0.2.11", "dependencies": { "lru-cache": { "version": "2.7.3", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" + "from": "lru-cache@2" }, "sigmund": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + "from": "sigmund@~1.0.0" } } }, "graceful-fs": { "version": "2.0.3", - "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz" + "from": "graceful-fs@~2.0.0" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" } } } @@ -1999,109 +1741,90 @@ }, "mongojs": { "version": "0.18.2", - "from": "https://registry.npmjs.org/mongojs/-/mongojs-0.18.2.tgz", - "resolved": "https://registry.npmjs.org/mongojs/-/mongojs-0.18.2.tgz", + "from": "mongojs@0.18.2", "dependencies": { "thunky": { "version": "0.1.0", - "from": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz" + "from": "thunky@~0.1.0" }, "readable-stream": { "version": "1.1.14", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "from": "readable-stream@~1.1.9", "dependencies": { "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + "from": "isarray@0.0.1" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" } } }, "mongodb": { "version": "1.4.32", - "from": "https://registry.npmjs.org/mongodb/-/mongodb-1.4.32.tgz", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-1.4.32.tgz", + "from": "mongodb@1.4.32", "dependencies": { "bson": { "version": "0.2.22", - "from": "https://registry.npmjs.org/bson/-/bson-0.2.22.tgz", - "resolved": "https://registry.npmjs.org/bson/-/bson-0.2.22.tgz", + "from": "bson@~0.2", "dependencies": { "nan": { "version": "1.8.4", - "from": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz" + "from": "nan@~1.8" } } }, "kerberos": { "version": "0.0.9", - "from": "https://registry.npmjs.org/kerberos/-/kerberos-0.0.9.tgz", - "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-0.0.9.tgz", + "from": "kerberos@0.0.9", "dependencies": { "nan": { "version": "1.6.2", - "from": "https://registry.npmjs.org/nan/-/nan-1.6.2.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.6.2.tgz" + "from": "nan@1.6.2" } } }, "readable-stream": { - "version": "2.1.4", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", + "version": "2.2.2", + "from": "readable-stream@latest", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz", "dependencies": { "buffer-shims": { "version": "1.0.0", - "from": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" + "from": "buffer-shims@^1.0.0" }, "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "1.0.0", - "from": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + "from": "isarray@~1.0.0" + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@~2.0.1" }, "process-nextick-args": { "version": "1.0.7", - "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" + "from": "process-nextick-args@~1.0.6" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "util-deprecate": { "version": "1.0.2", - "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + "from": "util-deprecate@~1.0.1" } } } @@ -2111,33 +1834,27 @@ }, "mongoose": { "version": "4.1.0", - "from": "https://registry.npmjs.org/mongoose/-/mongoose-4.1.0.tgz", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.1.0.tgz", + "from": "mongoose@4.1.0", "dependencies": { "async": { "version": "0.9.0", - "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz" + "from": "async@0.9.0" }, "bson": { "version": "0.3.2", - "from": "https://registry.npmjs.org/bson/-/bson-0.3.2.tgz", - "resolved": "https://registry.npmjs.org/bson/-/bson-0.3.2.tgz", + "from": "bson@~0.3", "dependencies": { "bson-ext": { "version": "0.1.13", - "from": "https://registry.npmjs.org/bson-ext/-/bson-ext-0.1.13.tgz", - "resolved": "https://registry.npmjs.org/bson-ext/-/bson-ext-0.1.13.tgz", + "from": "bson-ext@~0.1", "dependencies": { "bindings": { "version": "1.2.1", - "from": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" + "from": "bindings@^1.2.1" }, "nan": { "version": "2.0.9", - "from": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz" + "from": "nan@~2.0.9" } } } @@ -2145,38 +1862,32 @@ }, "hooks-fixed": { "version": "1.1.0", - "from": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-1.1.0.tgz" + "from": "hooks-fixed@1.1.0" }, "kareem": { "version": "1.0.1", - "from": "https://registry.npmjs.org/kareem/-/kareem-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.0.1.tgz" + "from": "kareem@1.0.1" }, "mongodb": { "version": "2.0.34", - "from": "https://registry.npmjs.org/mongodb/-/mongodb-2.0.34.tgz", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.0.34.tgz", + "from": "mongodb@2.0.34", "dependencies": { "mongodb-core": { "version": "1.2.0", - "from": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.2.0.tgz", + "from": "mongodb-core@1.2.0", "dependencies": { "bson": { "version": "0.4.23", - "from": "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz", - "resolved": "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz" + "from": "bson@~0.4" }, "kerberos": { - "version": "0.0.21", - "from": "https://registry.npmjs.org/kerberos/-/kerberos-0.0.21.tgz", - "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-0.0.21.tgz", + "version": "0.0.22", + "from": "kerberos@~0.0", + "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-0.0.22.tgz", "dependencies": { "nan": { - "version": "2.3.5", - "from": "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz" + "version": "2.4.0", + "from": "nan@~2.4" } } } @@ -2184,28 +1895,24 @@ }, "readable-stream": { "version": "1.0.31", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz", + "from": "readable-stream@1.0.31", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz", "dependencies": { "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + "from": "isarray@0.0.1" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" } } } @@ -2213,33 +1920,28 @@ }, "mpath": { "version": "0.1.1", - "from": "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz" + "from": "mpath@0.1.1" }, "mpromise": { "version": "0.5.4", - "from": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.4.tgz", - "resolved": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.4.tgz" + "from": "mpromise@0.5.4" }, "mquery": { "version": "1.6.1", - "from": "https://registry.npmjs.org/mquery/-/mquery-1.6.1.tgz", - "resolved": "https://registry.npmjs.org/mquery/-/mquery-1.6.1.tgz", + "from": "mquery@1.6.1", "dependencies": { "bluebird": { "version": "2.9.26", - "from": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.26.tgz", + "from": "bluebird@2.9.26", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.26.tgz" }, "debug": { "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "from": "debug@2.2.0", "dependencies": { "ms": { "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "from": "ms@0.7.1" } } } @@ -2247,72 +1949,59 @@ }, "ms": { "version": "0.1.0", - "from": "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz" + "from": "ms@0.1.0" }, "muri": { "version": "1.0.0", - "from": "https://registry.npmjs.org/muri/-/muri-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/muri/-/muri-1.0.0.tgz" + "from": "muri@1.0.0" }, "regexp-clone": { "version": "0.0.1", - "from": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz" + "from": "regexp-clone@0.0.1" }, "sliced": { "version": "0.0.5", - "from": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz", - "resolved": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz" + "from": "sliced@0.0.5" } } }, "multer": { "version": "0.1.8", - "from": "https://registry.npmjs.org/multer/-/multer-0.1.8.tgz", - "resolved": "https://registry.npmjs.org/multer/-/multer-0.1.8.tgz", + "from": "multer@^0.1.8", "dependencies": { "busboy": { - "version": "0.2.13", - "from": "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz", - "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz", + "version": "0.2.14", + "from": "busboy@~0.2.9", "dependencies": { "dicer": { "version": "0.2.5", - "from": "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz", - "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz", + "from": "dicer@0.2.5", "dependencies": { "streamsearch": { "version": "0.1.2", - "from": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", - "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz" + "from": "streamsearch@0.1.2" } } }, "readable-stream": { "version": "1.1.14", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "from": "readable-stream@1.1.x", "dependencies": { "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + "from": "isarray@0.0.1" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" } } } @@ -2320,33 +2009,27 @@ }, "mkdirp": { "version": "0.3.5", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" + "from": "mkdirp@~0.3.5" }, "qs": { "version": "1.2.2", - "from": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz", - "resolved": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz" + "from": "qs@~1.2.2" }, "type-is": { "version": "1.5.7", - "from": "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz", + "from": "type-is@~1.5.2", "dependencies": { "media-typer": { "version": "0.3.0", - "from": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" + "from": "media-typer@0.3.0" }, "mime-types": { "version": "2.0.14", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz", + "from": "mime-types@~2.0.9", "dependencies": { "mime-db": { "version": "1.12.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz" + "from": "mime-db@~1.12.0" } } } @@ -2356,65 +2039,53 @@ }, "node-uuid": { "version": "1.4.1", - "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz" + "from": "node-uuid@1.4.1" }, "nodemailer": { "version": "2.1.0", - "from": "https://registry.npmjs.org/nodemailer/-/nodemailer-2.1.0.tgz", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-2.1.0.tgz", + "from": "nodemailer@2.1.0", "dependencies": { "libmime": { "version": "2.0.0", - "from": "https://registry.npmjs.org/libmime/-/libmime-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/libmime/-/libmime-2.0.0.tgz", + "from": "libmime@2.0.0", "dependencies": { "iconv-lite": { "version": "0.4.13", - "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz" + "from": "iconv-lite@0.4.13" }, "libbase64": { "version": "0.1.0", - "from": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz" + "from": "libbase64@0.1.0" }, "libqp": { "version": "1.1.0", - "from": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz" + "from": "libqp@1.1.0" } } }, "mailcomposer": { "version": "3.3.2", - "from": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.3.2.tgz", - "resolved": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.3.2.tgz", + "from": "mailcomposer@3.3.2", "dependencies": { "buildmail": { "version": "3.3.2", - "from": "https://registry.npmjs.org/buildmail/-/buildmail-3.3.2.tgz", - "resolved": "https://registry.npmjs.org/buildmail/-/buildmail-3.3.2.tgz", + "from": "buildmail@3.3.2", "dependencies": { "addressparser": { "version": "1.0.0", - "from": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.0.tgz" + "from": "addressparser@1.0.0" }, "libbase64": { "version": "0.1.0", - "from": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz" + "from": "libbase64@0.1.0" }, "libqp": { "version": "1.1.0", - "from": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz" + "from": "libqp@1.1.0" }, "nodemailer-fetch": { "version": "1.2.1", - "from": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.2.1.tgz" + "from": "nodemailer-fetch@1.2.1" } } } @@ -2422,69 +2093,57 @@ }, "nodemailer-direct-transport": { "version": "2.0.1", - "from": "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-2.0.1.tgz", + "from": "nodemailer-direct-transport@2.0.1", "dependencies": { "smtp-connection": { "version": "2.0.1", - "from": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.0.1.tgz" + "from": "smtp-connection@2.0.1" } } }, "nodemailer-shared": { "version": "1.0.3", - "from": "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.0.3.tgz", + "from": "nodemailer-shared@1.0.3", "dependencies": { "nodemailer-fetch": { "version": "1.2.1", - "from": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.2.1.tgz" + "from": "nodemailer-fetch@1.2.1" } } }, "nodemailer-smtp-pool": { "version": "2.1.0", - "from": "https://registry.npmjs.org/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.1.0.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.1.0.tgz", + "from": "nodemailer-smtp-pool@2.1.0", "dependencies": { "clone": { "version": "1.0.2", - "from": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz" + "from": "clone@1.0.2" }, "nodemailer-wellknown": { "version": "0.1.7", - "from": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.7.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.7.tgz" + "from": "nodemailer-wellknown@0.1.7" }, "smtp-connection": { "version": "2.0.1", - "from": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.0.1.tgz" + "from": "smtp-connection@2.0.1" } } }, "nodemailer-smtp-transport": { "version": "2.0.1", - "from": "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.0.1.tgz", + "from": "nodemailer-smtp-transport@2.0.1", "dependencies": { "clone": { "version": "1.0.2", - "from": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz" + "from": "clone@1.0.2" }, "nodemailer-wellknown": { "version": "0.1.7", - "from": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.7.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.7.tgz" + "from": "nodemailer-wellknown@0.1.7" }, "smtp-connection": { "version": "2.0.1", - "from": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.0.1.tgz" + "from": "smtp-connection@2.0.1" } } } @@ -2492,69 +2151,104 @@ }, "nodemailer-sendgrid-transport": { "version": "0.2.0", - "from": "https://registry.npmjs.org/nodemailer-sendgrid-transport/-/nodemailer-sendgrid-transport-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-sendgrid-transport/-/nodemailer-sendgrid-transport-0.2.0.tgz", + "from": "nodemailer-sendgrid-transport@^0.2.0", "dependencies": { "sendgrid": { "version": "1.9.2", - "from": "https://registry.npmjs.org/sendgrid/-/sendgrid-1.9.2.tgz", - "resolved": "https://registry.npmjs.org/sendgrid/-/sendgrid-1.9.2.tgz", + "from": "sendgrid@^1.8.0", "dependencies": { "mime": { "version": "1.3.4", - "from": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz" + "from": "mime@^1.2.9" }, "lodash": { "version": "3.10.1", - "from": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" + "from": "lodash@^3.0.1 || ^2.0.0" }, "smtpapi": { "version": "1.2.0", - "from": "https://registry.npmjs.org/smtpapi/-/smtpapi-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/smtpapi/-/smtpapi-1.2.0.tgz" + "from": "smtpapi@^1.2.0" } } } } }, "nodemailer-ses-transport": { - "version": "1.4.0", - "from": "https://registry.npmjs.org/nodemailer-ses-transport/-/nodemailer-ses-transport-1.4.0.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-ses-transport/-/nodemailer-ses-transport-1.4.0.tgz", + "version": "1.5.0", + "from": "nodemailer-ses-transport@^1.3.0", + "resolved": "https://registry.npmjs.org/nodemailer-ses-transport/-/nodemailer-ses-transport-1.5.0.tgz", "dependencies": { "aws-sdk": { - "version": "2.4.14", - "from": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.4.14.tgz", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.4.14.tgz", + "version": "2.7.26", + "from": "aws-sdk@^2.6.12", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.7.26.tgz", "dependencies": { + "buffer": { + "version": "4.9.1", + "from": "buffer@4.9.1", + "dependencies": { + "base64-js": { + "version": "1.2.0", + "from": "base64-js@^1.0.2", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz" + }, + "ieee754": { + "version": "1.1.8", + "from": "ieee754@^1.1.4", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz" + }, + "isarray": { + "version": "1.0.0", + "from": "isarray@^1.0.0" + } + } + }, + "crypto-browserify": { + "version": "1.0.9", + "from": "crypto-browserify@1.0.9" + }, + "jmespath": { + "version": "0.15.0", + "from": "jmespath@0.15.0" + }, + "querystring": { + "version": "0.2.0", + "from": "querystring@0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz" + }, "sax": { "version": "1.1.5", - "from": "https://registry.npmjs.org/sax/-/sax-1.1.5.tgz", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.5.tgz" + "from": "sax@1.1.5" + }, + "url": { + "version": "0.10.3", + "from": "url@0.10.3", + "dependencies": { + "punycode": { + "version": "1.3.2", + "from": "punycode@1.3.2" + } + } + }, + "uuid": { + "version": "3.0.0", + "from": "uuid@3.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz" }, "xml2js": { "version": "0.4.15", - "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.15.tgz", + "from": "xml2js@0.4.15", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.15.tgz" }, "xmlbuilder": { "version": "2.6.2", - "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz", + "from": "xmlbuilder@2.6.2", "dependencies": { "lodash": { "version": "3.5.0", - "from": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz" + "from": "lodash@~3.5.0" } } - }, - "jmespath": { - "version": "0.15.0", - "from": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz", - "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz" } } } @@ -2562,67 +2256,55 @@ }, "optimist": { "version": "0.6.1", - "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "from": "optimist@0.6.1", "dependencies": { "wordwrap": { "version": "0.0.3", - "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz" + "from": "wordwrap@~0.0.2" }, "minimist": { "version": "0.0.10", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" + "from": "minimist@~0.0.1" } } }, "passport": { "version": "0.3.2", - "from": "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz", - "resolved": "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz", + "from": "passport@^0.3.2", "dependencies": { "passport-strategy": { "version": "1.0.0", - "from": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz" + "from": "passport-strategy@1.x.x" }, "pause": { "version": "0.0.1", - "from": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz" + "from": "pause@0.0.1" } } }, "passport-ldapauth": { "version": "0.6.0", - "from": "https://registry.npmjs.org/passport-ldapauth/-/passport-ldapauth-0.6.0.tgz", - "resolved": "https://registry.npmjs.org/passport-ldapauth/-/passport-ldapauth-0.6.0.tgz", + "from": "passport-ldapauth@^0.6.0", "dependencies": { "passport-strategy": { "version": "1.0.0", - "from": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz" + "from": "passport-strategy@1.x.x" }, "ldapauth-fork": { - "version": "2.5.3", - "from": "https://registry.npmjs.org/ldapauth-fork/-/ldapauth-fork-2.5.3.tgz", - "resolved": "https://registry.npmjs.org/ldapauth-fork/-/ldapauth-fork-2.5.3.tgz", + "version": "2.5.5", + "from": "ldapauth-fork@~2.5.0", "dependencies": { "bcryptjs": { "version": "2.3.0", - "from": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz", - "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz" + "from": "bcryptjs@2.3.0" }, "lru-cache": { "version": "3.2.0", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz", + "from": "lru-cache@3.2.0", "dependencies": { "pseudomap": { "version": "1.0.2", - "from": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz" + "from": "pseudomap@^1.0.1" } } } @@ -2632,20 +2314,17 @@ }, "passport-local": { "version": "1.0.0", - "from": "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz", + "from": "passport-local@^1.0.0", "dependencies": { "passport-strategy": { "version": "1.0.0", - "from": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz" + "from": "passport-strategy@1.x.x" } } }, "passport-saml": { "version": "0.15.0", - "from": "passport-saml@", - "resolved": "https://registry.npmjs.org/passport-saml/-/passport-saml-0.15.0.tgz", + "from": "passport-saml@^0.15.0", "dependencies": { "passport-strategy": { "version": "1.0.0", @@ -2658,7 +2337,6 @@ "xml2js": { "version": "0.4.17", "from": "xml2js@0.4.x", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz", "dependencies": { "sax": { "version": "1.2.1", @@ -2666,32 +2344,35 @@ }, "xmlbuilder": { "version": "4.2.1", - "from": "xmlbuilder@^4.1.0", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz" + "from": "xmlbuilder@^4.1.0" } } }, "xml-crypto": { - "version": "0.8.4", + "version": "0.8.5", "from": "xml-crypto@0.8.x", + "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-0.8.5.tgz", "dependencies": { "xmldom": { "version": "0.1.19", "from": "xmldom@=0.1.19" }, "xpath.js": { - "version": "1.0.6", - "from": "xpath.js@>=0.0.3" + "version": "1.0.7", + "from": "xpath.js@>=0.0.3", + "resolved": "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz" } } }, "xmldom": { - "version": "0.1.22", - "from": "xmldom@0.1.x" + "version": "0.1.27", + "from": "xmldom@0.1.x", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz" }, "xmlbuilder": { "version": "2.5.2", "from": "xmlbuilder@2.5.x", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.2.tgz", "dependencies": { "lodash": { "version": "3.2.0", @@ -2702,6 +2383,7 @@ "xml-encryption": { "version": "0.7.4", "from": "xml-encryption@~0.7", + "resolved": "https://registry.npmjs.org/xml-encryption/-/xml-encryption-0.7.4.tgz", "dependencies": { "ejs": { "version": "0.8.8", @@ -2713,166 +2395,393 @@ }, "xpath": { "version": "0.0.5", - "from": "xpath@0.0.5", - "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.5.tgz" + "from": "xpath@0.0.5" }, "node-forge": { "version": "0.2.24", - "from": "node-forge@0.2.24", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.2.24.tgz" + "from": "node-forge@0.2.24" } } } } }, - "pg": { - "version": "6.0.3", - "from": "https://registry.npmjs.org/pg/-/pg-6.0.3.tgz", - "resolved": "https://registry.npmjs.org/pg/-/pg-6.0.3.tgz", + "pug": { + "version": "2.0.0-beta6", + "from": "pug@^2.0.0-beta6", "dependencies": { - "buffer-writer": { - "version": "1.0.1", - "from": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.1.tgz" - }, - "packet-reader": { - "version": "0.2.0", - "from": "https://registry.npmjs.org/packet-reader/-/packet-reader-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-0.2.0.tgz" - }, - "pg-connection-string": { - "version": "0.1.3", - "from": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz" - }, - "pg-pool": { - "version": "1.4.0", - "from": "https://registry.npmjs.org/pg-pool/-/pg-pool-1.4.0.tgz", - "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-1.4.0.tgz", + "pug-code-gen": { + "version": "1.1.0", + "from": "pug-code-gen@^1.1.0", "dependencies": { - "generic-pool": { - "version": "2.4.2", - "from": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.2.tgz", - "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.2.tgz" + "constantinople": { + "version": "3.1.0", + "from": "constantinople@^3.0.1", + "dependencies": { + "acorn": { + "version": "3.3.0", + "from": "acorn@^3.1.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz" + }, + "is-expression": { + "version": "2.1.0", + "from": "is-expression@^2.0.1", + "dependencies": { + "object-assign": { + "version": "4.1.1", + "from": "object-assign@^4.0.1" + } + } + } + } }, - "object-assign": { - "version": "4.1.0", - "from": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" - } - } - }, - "pg-types": { - "version": "1.11.0", - "from": "https://registry.npmjs.org/pg-types/-/pg-types-1.11.0.tgz", - "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-1.11.0.tgz", - "dependencies": { - "ap": { - "version": "0.2.0", - "from": "https://registry.npmjs.org/ap/-/ap-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/ap/-/ap-0.2.0.tgz" + "doctypes": { + "version": "1.1.0", + "from": "doctypes@^1.1.0" }, - "postgres-array": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/postgres-array/-/postgres-array-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-1.0.0.tgz" - }, - "postgres-bytea": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz" - }, - "postgres-date": { - "version": "1.0.3", - "from": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.3.tgz" - }, - "postgres-interval": { + "js-stringify": { "version": "1.0.2", - "from": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.0.2.tgz", + "from": "js-stringify@^1.0.1" + }, + "pug-attrs": { + "version": "2.0.1", + "from": "pug-attrs@^2.0.1" + }, + "pug-error": { + "version": "1.3.1", + "from": "pug-error@^1.3.0" + }, + "void-elements": { + "version": "2.0.1", + "from": "void-elements@^2.0.1", + "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz" + }, + "with": { + "version": "5.1.1", + "from": "with@^5.0.0", "dependencies": { - "xtend": { - "version": "4.0.1", - "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" + "acorn": { + "version": "3.3.0", + "from": "acorn@^3.1.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz" + }, + "acorn-globals": { + "version": "3.0.0", + "from": "acorn-globals@^3.0.0" } } } } }, - "pgpass": { - "version": "0.0.6", - "from": "https://registry.npmjs.org/pgpass/-/pgpass-0.0.6.tgz", - "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-0.0.6.tgz", + "pug-filters": { + "version": "1.2.4", + "from": "pug-filters@^1.2.4", "dependencies": { - "split": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/split/-/split-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/split/-/split-1.0.0.tgz", + "constantinople": { + "version": "3.1.0", + "from": "constantinople@^3.0.1", "dependencies": { - "through": { - "version": "2.3.8", - "from": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz" + "acorn": { + "version": "3.3.0", + "from": "acorn@^3.1.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz" + }, + "is-expression": { + "version": "2.1.0", + "from": "is-expression@^2.0.1", + "dependencies": { + "object-assign": { + "version": "4.1.1", + "from": "object-assign@^4.0.1" + } + } + } + } + }, + "pug-error": { + "version": "1.3.1", + "from": "pug-error@^1.3.0" + }, + "pug-walk": { + "version": "1.0.0", + "from": "pug-walk@^1.0.0" + }, + "jstransformer": { + "version": "1.0.0", + "from": "jstransformer@1.0.0", + "dependencies": { + "is-promise": { + "version": "2.1.0", + "from": "is-promise@^2.0.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz" + }, + "promise": { + "version": "7.1.1", + "from": "promise@^7.0.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz", + "dependencies": { + "asap": { + "version": "2.0.5", + "from": "asap@~2.0.3", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz" + } + } + } + } + }, + "resolve": { + "version": "1.2.0", + "from": "resolve@^1.1.6", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz" + }, + "uglify-js": { + "version": "2.7.5", + "from": "uglify-js@^2.6.1", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz", + "dependencies": { + "async": { + "version": "0.2.10", + "from": "async@~0.2.6" + }, + "source-map": { + "version": "0.5.6", + "from": "source-map@~0.5.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" + }, + "uglify-to-browserify": { + "version": "1.0.2", + "from": "uglify-to-browserify@~1.0.0" + }, + "yargs": { + "version": "3.10.0", + "from": "yargs@~3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "dependencies": { + "camelcase": { + "version": "1.2.1", + "from": "camelcase@^1.0.2" + }, + "cliui": { + "version": "2.1.0", + "from": "cliui@^2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "dependencies": { + "center-align": { + "version": "0.1.3", + "from": "center-align@^0.1.1", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "dependencies": { + "align-text": { + "version": "0.1.4", + "from": "align-text@^0.1.1", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "dependencies": { + "kind-of": { + "version": "3.1.0", + "from": "kind-of@^3.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz", + "dependencies": { + "is-buffer": { + "version": "1.1.4", + "from": "is-buffer@^1.0.2", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz" + } + } + }, + "longest": { + "version": "1.0.1", + "from": "longest@^1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz" + }, + "repeat-string": { + "version": "1.6.1", + "from": "repeat-string@^1.5.2", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz" + } + } + }, + "lazy-cache": { + "version": "1.0.4", + "from": "lazy-cache@^1.0.3", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz" + } + } + }, + "right-align": { + "version": "0.1.3", + "from": "right-align@^0.1.1", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "dependencies": { + "align-text": { + "version": "0.1.4", + "from": "align-text@^0.1.1", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "dependencies": { + "kind-of": { + "version": "3.1.0", + "from": "kind-of@^3.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz", + "dependencies": { + "is-buffer": { + "version": "1.1.4", + "from": "is-buffer@^1.0.2", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz" + } + } + }, + "longest": { + "version": "1.0.1", + "from": "longest@^1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz" + }, + "repeat-string": { + "version": "1.6.1", + "from": "repeat-string@^1.5.2", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz" + } + } + } + } + }, + "wordwrap": { + "version": "0.0.2", + "from": "wordwrap@0.0.2" + } + } + }, + "decamelize": { + "version": "1.2.0", + "from": "decamelize@^1.0.0" + }, + "window-size": { + "version": "0.1.0", + "from": "window-size@0.1.0" + } + } } } } } }, - "semver": { - "version": "4.3.2", - "from": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz" - } - } - }, - "pg-hstore": { - "version": "2.3.2", - "from": "https://registry.npmjs.org/pg-hstore/-/pg-hstore-2.3.2.tgz", - "resolved": "https://registry.npmjs.org/pg-hstore/-/pg-hstore-2.3.2.tgz", - "dependencies": { - "underscore": { - "version": "1.8.3", - "from": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz" + "pug-lexer": { + "version": "2.3.0", + "from": "pug-lexer@^2.2.0", + "dependencies": { + "character-parser": { + "version": "2.2.0", + "from": "character-parser@^2.1.1", + "dependencies": { + "is-regex": { + "version": "1.0.3", + "from": "is-regex@^1.0.3" + } + } + }, + "is-expression": { + "version": "3.0.0", + "from": "is-expression@^3.0.0", + "dependencies": { + "acorn": { + "version": "4.0.4", + "from": "acorn@~4.0.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz" + }, + "object-assign": { + "version": "4.1.1", + "from": "object-assign@^4.0.1" + } + } + }, + "pug-error": { + "version": "1.3.1", + "from": "pug-error@^1.3.0" + } + } + }, + "pug-linker": { + "version": "1.0.1", + "from": "pug-linker@^1.0.1", + "dependencies": { + "pug-error": { + "version": "1.3.1", + "from": "pug-error@^1.3.0" + }, + "pug-walk": { + "version": "1.0.0", + "from": "pug-walk@^1.0.0" + } + } + }, + "pug-load": { + "version": "2.0.3", + "from": "pug-load@^2.0.3", + "dependencies": { + "object-assign": { + "version": "4.1.1", + "from": "object-assign@^4.1.0" + }, + "pug-walk": { + "version": "1.0.0", + "from": "pug-walk@^1.0.0" + } + } + }, + "pug-parser": { + "version": "2.0.1", + "from": "pug-parser@^2.0.1", + "dependencies": { + "pug-error": { + "version": "1.3.1", + "from": "pug-error@^1.3.0" + }, + "token-stream": { + "version": "0.0.1", + "from": "token-stream@0.0.1" + } + } + }, + "pug-runtime": { + "version": "2.0.2", + "from": "pug-runtime@^2.0.2" + }, + "pug-strip-comments": { + "version": "1.0.1", + "from": "pug-strip-comments@^1.0.1", + "dependencies": { + "pug-error": { + "version": "1.3.1", + "from": "pug-error@^1.0.0" + } + } } } }, "redback": { "version": "0.4.0", - "from": "https://registry.npmjs.org/redback/-/redback-0.4.0.tgz", - "resolved": "https://registry.npmjs.org/redback/-/redback-0.4.0.tgz" + "from": "redback@0.4.0" }, "redis": { "version": "0.10.1", - "from": "https://registry.npmjs.org/redis/-/redis-0.10.1.tgz", - "resolved": "https://registry.npmjs.org/redis/-/redis-0.10.1.tgz" + "from": "redis@0.10.1" }, "redis-sharelatex": { "version": "0.0.9", - "from": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-0.0.9.tgz", - "resolved": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-0.0.9.tgz", + "from": "redis-sharelatex@0.0.9", "dependencies": { "chai": { "version": "1.9.1", - "from": "https://registry.npmjs.org/chai/-/chai-1.9.1.tgz", - "resolved": "https://registry.npmjs.org/chai/-/chai-1.9.1.tgz", + "from": "chai@1.9.1", "dependencies": { "assertion-error": { "version": "1.0.0", - "from": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz" + "from": "assertion-error@1.0.0" }, "deep-eql": { "version": "0.1.3", - "from": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz", + "from": "deep-eql@^0.1.3", "dependencies": { "type-detect": { "version": "0.1.1", - "from": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz" + "from": "type-detect@0.1.1" } } } @@ -2880,195 +2789,173 @@ }, "coffee-script": { "version": "1.8.0", - "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz", + "from": "coffee-script@1.8.0", "dependencies": { "mkdirp": { "version": "0.3.5", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" + "from": "mkdirp@~0.3.5" } } }, "grunt-contrib-coffee": { "version": "0.11.1", - "from": "https://registry.npmjs.org/grunt-contrib-coffee/-/grunt-contrib-coffee-0.11.1.tgz", - "resolved": "https://registry.npmjs.org/grunt-contrib-coffee/-/grunt-contrib-coffee-0.11.1.tgz", + "from": "grunt-contrib-coffee@0.11.1", "dependencies": { "coffee-script": { "version": "1.7.1", - "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz", + "from": "coffee-script@~1.7.0", "dependencies": { "mkdirp": { "version": "0.3.5", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" + "from": "mkdirp@~0.3.5" } } }, "chalk": { "version": "0.5.1", - "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", + "from": "chalk@~0.5.0", "dependencies": { "ansi-styles": { "version": "1.1.0", - "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz" + "from": "ansi-styles@^1.1.0" }, "escape-string-regexp": { "version": "1.0.5", - "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + "from": "escape-string-regexp@^1.0.0" }, "has-ansi": { "version": "0.1.0", - "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", + "from": "has-ansi@^0.1.0", "dependencies": { "ansi-regex": { "version": "0.2.1", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" + "from": "ansi-regex@^0.2.0" } } }, "strip-ansi": { "version": "0.3.0", - "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", + "from": "strip-ansi@^0.3.0", "dependencies": { "ansi-regex": { "version": "0.2.1", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" + "from": "ansi-regex@^0.2.0" } } }, "supports-color": { "version": "0.2.0", - "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz" + "from": "supports-color@^0.2.0" } } }, "lodash": { "version": "2.4.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz" + "from": "lodash@~2.4.1" } } }, "grunt-mocha-test": { "version": "0.12.0", - "from": "https://registry.npmjs.org/grunt-mocha-test/-/grunt-mocha-test-0.12.0.tgz", - "resolved": "https://registry.npmjs.org/grunt-mocha-test/-/grunt-mocha-test-0.12.0.tgz", + "from": "grunt-mocha-test@0.12.0", "dependencies": { "hooker": { "version": "0.2.3", - "from": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz", - "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" + "from": "hooker@~0.2.3" }, "fs-extra": { "version": "0.11.1", - "from": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.11.1.tgz", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.11.1.tgz", + "from": "fs-extra@~0.11.1", "dependencies": { "ncp": { "version": "0.6.0", - "from": "https://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz" + "from": "ncp@^0.6.0" }, "mkdirp": { "version": "0.5.1", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "from": "mkdirp@^0.5.0", "dependencies": { "minimist": { "version": "0.0.8", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" + "from": "minimist@0.0.8" } } }, "jsonfile": { - "version": "2.3.1", - "from": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.3.1.tgz", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.3.1.tgz" + "version": "2.4.0", + "from": "jsonfile@^2.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "dependencies": { + "graceful-fs": { + "version": "4.1.11", + "from": "graceful-fs@^4.1.6", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz" + } + } }, "rimraf": { "version": "2.5.4", - "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", + "from": "rimraf@^2.2.8", "dependencies": { "glob": { - "version": "7.0.5", - "from": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", + "version": "7.1.1", + "from": "glob@^7.0.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", "dependencies": { "fs.realpath": { "version": "1.0.0", - "from": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + "from": "fs.realpath@^1.0.0" }, "inflight": { - "version": "1.0.5", - "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", + "version": "1.0.6", + "from": "inflight@^1.0.4", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" }, "minimatch": { "version": "3.0.3", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "from": "minimatch@^3.0.2", "dependencies": { "brace-expansion": { "version": "1.1.6", - "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "from": "brace-expansion@^1.0.0", "dependencies": { "balanced-match": { "version": "0.4.2", - "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + "from": "balanced-match@^0.4.1" }, "concat-map": { "version": "0.0.1", - "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "from": "concat-map@0.0.1" } } } } }, "once": { - "version": "1.3.3", - "from": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "version": "1.4.0", + "from": "once@^1.3.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "path-is-absolute": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" + "version": "1.0.1", + "from": "path-is-absolute@^1.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" } } } @@ -3080,89 +2967,75 @@ }, "mocha": { "version": "1.21.4", - "from": "https://registry.npmjs.org/mocha/-/mocha-1.21.4.tgz", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-1.21.4.tgz", + "from": "mocha@1.21.4", "dependencies": { "commander": { "version": "2.0.0", - "from": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz" + "from": "commander@2.0.0" }, "growl": { "version": "1.8.1", - "from": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz" + "from": "growl@1.8.x" }, "jade": { "version": "0.26.3", - "from": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz", - "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz", + "from": "jade@0.26.3", "dependencies": { "commander": { "version": "0.6.1", - "from": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz", + "from": "commander@0.6.1", "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz" }, "mkdirp": { "version": "0.3.0", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", + "from": "mkdirp@0.3.0", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz" } } }, "diff": { "version": "1.0.7", - "from": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz" + "from": "diff@1.0.7" }, "debug": { - "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.6.0", + "from": "debug@*", "dependencies": { "ms": { - "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.2", + "from": "ms@0.7.2" } } }, "mkdirp": { "version": "0.3.5", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" + "from": "mkdirp@0.3.5" }, "glob": { "version": "3.2.3", - "from": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz", + "from": "glob@3.2.3", "dependencies": { "minimatch": { "version": "0.2.14", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "from": "minimatch@~0.2.11", "dependencies": { "lru-cache": { "version": "2.7.3", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" + "from": "lru-cache@2" }, "sigmund": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + "from": "sigmund@~1.0.0" } } }, "graceful-fs": { "version": "2.0.3", - "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz" + "from": "graceful-fs@~2.0.0" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" } } } @@ -3170,69 +3043,57 @@ }, "redis": { "version": "0.12.1", - "from": "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz", - "resolved": "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz" + "from": "redis@0.12.1" }, "redis-sentinel": { "version": "0.1.1", - "from": "https://registry.npmjs.org/redis-sentinel/-/redis-sentinel-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/redis-sentinel/-/redis-sentinel-0.1.1.tgz", + "from": "redis-sentinel@0.1.1", "dependencies": { "redis": { "version": "0.11.0", - "from": "https://registry.npmjs.org/redis/-/redis-0.11.0.tgz", - "resolved": "https://registry.npmjs.org/redis/-/redis-0.11.0.tgz" + "from": "redis@0.11.x" }, "q": { "version": "0.9.2", - "from": "https://registry.npmjs.org/q/-/q-0.9.2.tgz", - "resolved": "https://registry.npmjs.org/q/-/q-0.9.2.tgz" + "from": "q@0.9.2" } } }, "sandboxed-module": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-1.0.1.tgz", + "from": "sandboxed-module@1.0.1", "dependencies": { "require-like": { "version": "0.1.2", - "from": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz", - "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz" + "from": "require-like@0.1.2" }, "stack-trace": { "version": "0.0.9", - "from": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz" + "from": "stack-trace@0.0.9" } } }, "sinon": { "version": "1.10.3", - "from": "https://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz", + "from": "sinon@1.10.3", "dependencies": { "formatio": { "version": "1.0.2", - "from": "https://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz", + "from": "formatio@~1.0", "dependencies": { "samsam": { "version": "1.1.3", - "from": "https://registry.npmjs.org/samsam/-/samsam-1.1.3.tgz", - "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.3.tgz" + "from": "samsam@~1.1" } } }, "util": { "version": "0.10.3", - "from": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "from": "util@>=0.10.3 <1", "dependencies": { "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "from": "inherits@2.0.1" } } } @@ -3240,215 +3101,147 @@ }, "underscore": { "version": "1.7.0", - "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz" + "from": "underscore@1.7.0" } } }, "request": { - "version": "2.74.0", - "from": "https://registry.npmjs.org/request/-/request-2.74.0.tgz", - "resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz", + "version": "2.79.0", + "from": "request@^2.69.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", "dependencies": { "aws-sign2": { "version": "0.6.0", - "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" + "from": "aws-sign2@~0.6.0" }, "aws4": { - "version": "1.4.1", - "from": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz" - }, - "bl": { - "version": "1.1.2", - "from": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", - "dependencies": { - "readable-stream": { - "version": "2.0.6", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "dependencies": { - "core-util-is": { - "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - }, - "isarray": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" - }, - "process-nextick-args": { - "version": "1.0.7", - "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" - }, - "string_decoder": { - "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - }, - "util-deprecate": { - "version": "1.0.2", - "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" - } - } - } - } + "version": "1.5.0", + "from": "aws4@^1.2.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz" }, "caseless": { "version": "0.11.0", - "from": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz" + "from": "caseless@~0.11.0" }, "combined-stream": { "version": "1.0.5", - "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", + "from": "combined-stream@~1.0.5", "dependencies": { "delayed-stream": { "version": "1.0.0", - "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" + "from": "delayed-stream@~1.0.0" } } }, "extend": { "version": "3.0.0", - "from": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz" + "from": "extend@~3.0.0" }, "forever-agent": { "version": "0.6.1", - "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" + "from": "forever-agent@~0.6.1" }, "form-data": { - "version": "1.0.0-rc4", - "from": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz", + "version": "2.1.2", + "from": "form-data@~2.1.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz", "dependencies": { - "async": { - "version": "1.5.2", - "from": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" + "asynckit": { + "version": "0.4.0", + "from": "asynckit@^0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz" } } }, "har-validator": { "version": "2.0.6", - "from": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", + "from": "har-validator@~2.0.6", "dependencies": { "chalk": { "version": "1.1.3", - "from": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "from": "chalk@^1.1.1", "dependencies": { "ansi-styles": { "version": "2.2.1", - "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" + "from": "ansi-styles@^2.2.1" }, "escape-string-regexp": { "version": "1.0.5", - "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + "from": "escape-string-regexp@^1.0.2" }, "has-ansi": { "version": "2.0.0", - "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "from": "has-ansi@^2.0.0", "dependencies": { "ansi-regex": { - "version": "2.0.0", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" + "version": "2.1.1", + "from": "ansi-regex@^2.0.0" } } }, "strip-ansi": { "version": "3.0.1", - "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "from": "strip-ansi@^3.0.0", "dependencies": { "ansi-regex": { - "version": "2.0.0", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" + "version": "2.1.1", + "from": "ansi-regex@^2.0.0" } } }, "supports-color": { "version": "2.0.0", - "from": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" + "from": "supports-color@^2.0.0" } } }, "commander": { "version": "2.9.0", - "from": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "from": "commander@^2.9.0", "dependencies": { "graceful-readlink": { "version": "1.0.1", - "from": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz" + "from": "graceful-readlink@>= 1.0.0" } } }, "is-my-json-valid": { - "version": "2.13.1", - "from": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz", + "version": "2.15.0", + "from": "is-my-json-valid@^2.12.4", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz", "dependencies": { "generate-function": { "version": "2.0.0", - "from": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz" + "from": "generate-function@^2.0.0" }, "generate-object-property": { "version": "1.2.0", - "from": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", + "from": "generate-object-property@^1.1.0", "dependencies": { "is-property": { "version": "1.0.2", - "from": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz" + "from": "is-property@^1.0.0" } } }, "jsonpointer": { - "version": "2.0.0", - "from": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz" + "version": "4.0.1", + "from": "jsonpointer@^4.0.0", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz" }, "xtend": { "version": "4.0.1", - "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" + "from": "xtend@^4.0.0" } } }, "pinkie-promise": { "version": "2.0.1", - "from": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "from": "pinkie-promise@^2.0.0", "dependencies": { "pinkie": { "version": "2.0.4", - "from": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" + "from": "pinkie@^2.0.0" } } } @@ -3456,107 +3249,95 @@ }, "hawk": { "version": "3.1.3", - "from": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "from": "hawk@~3.1.3", "dependencies": { "hoek": { "version": "2.16.3", - "from": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" + "from": "hoek@2.x.x" }, "boom": { "version": "2.10.1", - "from": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" + "from": "boom@2.x.x" }, "cryptiles": { "version": "2.0.5", - "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz" + "from": "cryptiles@2.x.x" }, "sntp": { "version": "1.0.9", - "from": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz" + "from": "sntp@1.x.x" } } }, "http-signature": { "version": "1.1.1", - "from": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "from": "http-signature@~1.1.0", "dependencies": { "assert-plus": { "version": "0.2.0", - "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz" + "from": "assert-plus@^0.2.0" }, "jsprim": { - "version": "1.3.0", - "from": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz", + "version": "1.3.1", + "from": "jsprim@^1.2.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz", "dependencies": { "extsprintf": { "version": "1.0.2", - "from": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz" + "from": "extsprintf@1.0.2" }, "json-schema": { - "version": "0.2.2", - "from": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz" + "version": "0.2.3", + "from": "json-schema@0.2.3" }, "verror": { "version": "1.3.6", - "from": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz" + "from": "verror@1.3.6" } } }, "sshpk": { - "version": "1.9.2", - "from": "https://registry.npmjs.org/sshpk/-/sshpk-1.9.2.tgz", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.9.2.tgz", + "version": "1.10.2", + "from": "sshpk@^1.7.0", "dependencies": { "asn1": { "version": "0.2.3", - "from": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz" + "from": "asn1@~0.2.3" }, "assert-plus": { "version": "1.0.0", - "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + "from": "assert-plus@^1.0.0" }, "dashdash": { - "version": "1.14.0", - "from": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz" + "version": "1.14.1", + "from": "dashdash@^1.12.0", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz" }, "getpass": { "version": "0.1.6", - "from": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz" + "from": "getpass@^0.1.1" }, "jsbn": { "version": "0.1.0", - "from": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz" + "from": "jsbn@~0.1.0" }, "tweetnacl": { - "version": "0.13.3", - "from": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz" + "version": "0.14.5", + "from": "tweetnacl@~0.14.0", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz" }, "jodid25519": { "version": "1.0.2", - "from": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz" + "from": "jodid25519@^1.0.0" }, "ecc-jsbn": { "version": "0.1.1", - "from": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz" + "from": "ecc-jsbn@~0.1.1" + }, + "bcrypt-pbkdf": { + "version": "1.0.0", + "from": "bcrypt-pbkdf@^1.0.0", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz" } } } @@ -3564,196 +3345,214 @@ }, "is-typedarray": { "version": "1.0.0", - "from": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" + "from": "is-typedarray@~1.0.0" }, "isstream": { "version": "0.1.2", - "from": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" + "from": "isstream@~0.1.2" }, "json-stringify-safe": { "version": "5.0.1", - "from": "json-stringify-safe@~5.0.0", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" + "from": "json-stringify-safe@~5.0.1" }, "mime-types": { - "version": "2.1.11", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "version": "2.1.14", + "from": "mime-types@~2.1.7", "dependencies": { "mime-db": { - "version": "1.23.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" + "version": "1.26.0", + "from": "mime-db@~1.26.0" } } }, - "node-uuid": { - "version": "1.4.7", - "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz" - }, "oauth-sign": { "version": "0.8.2", - "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz" + "from": "oauth-sign@~0.8.1" }, "qs": { - "version": "6.2.1", - "from": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz" + "version": "6.3.0", + "from": "qs@~6.3.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz" }, "stringstream": { "version": "0.0.5", - "from": "stringstream@~0.0.4", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz" + "from": "stringstream@~0.0.4" }, "tough-cookie": { - "version": "2.3.1", - "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz" + "version": "2.3.2", + "from": "tough-cookie@~2.3.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", + "dependencies": { + "punycode": { + "version": "1.4.1", + "from": "punycode@^1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz" + } + } }, "tunnel-agent": { "version": "0.4.3", - "from": "tunnel-agent@~0.4.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz" + "from": "tunnel-agent@~0.4.1" + }, + "uuid": { + "version": "3.0.1", + "from": "uuid@^3.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz" } } }, "requests": { "version": "0.1.7", - "from": "https://registry.npmjs.org/requests/-/requests-0.1.7.tgz", - "resolved": "https://registry.npmjs.org/requests/-/requests-0.1.7.tgz", + "from": "requests@^0.1.7", "dependencies": { "axo": { - "version": "0.0.1", - "from": "https://registry.npmjs.org/axo/-/axo-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/axo/-/axo-0.0.1.tgz" + "version": "0.0.2", + "from": "axo@0.0.x", + "resolved": "https://registry.npmjs.org/axo/-/axo-0.0.2.tgz" }, "eventemitter3": { "version": "1.1.1", - "from": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.1.1.tgz" + "from": "eventemitter3@1.1.x" }, "extendible": { "version": "0.1.1", - "from": "https://registry.npmjs.org/extendible/-/extendible-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/extendible/-/extendible-0.1.1.tgz" + "from": "extendible@0.1.x" }, "hang": { "version": "1.0.0", - "from": "https://registry.npmjs.org/hang/-/hang-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/hang/-/hang-1.0.0.tgz" + "from": "hang@1.0.x" }, "loads": { "version": "0.0.4", - "from": "https://registry.npmjs.org/loads/-/loads-0.0.4.tgz", - "resolved": "https://registry.npmjs.org/loads/-/loads-0.0.4.tgz", + "from": "loads@0.0.x", "dependencies": { "failure": { "version": "1.1.1", - "from": "https://registry.npmjs.org/failure/-/failure-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/failure/-/failure-1.1.1.tgz" + "from": "failure@1.1.x" }, "one-time": { "version": "0.0.4", - "from": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz" + "from": "one-time@0.0.x" }, "xhr-response": { "version": "1.0.1", - "from": "https://registry.npmjs.org/xhr-response/-/xhr-response-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/xhr-response/-/xhr-response-1.0.1.tgz" + "from": "xhr-response@1.0.x" }, "xhr-status": { "version": "1.0.0", - "from": "https://registry.npmjs.org/xhr-status/-/xhr-status-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/xhr-status/-/xhr-status-1.0.0.tgz" + "from": "xhr-status@1.0.x" } } }, "xhr-send": { "version": "1.0.0", - "from": "https://registry.npmjs.org/xhr-send/-/xhr-send-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/xhr-send/-/xhr-send-1.0.0.tgz" + "from": "xhr-send@1.0.x" } } }, "rimraf": { "version": "2.2.6", - "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz" + "from": "rimraf@2.2.6" }, "sanitizer": { "version": "0.1.1", - "from": "https://registry.npmjs.org/sanitizer/-/sanitizer-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/sanitizer/-/sanitizer-0.1.1.tgz" + "from": "sanitizer@0.1.1" }, "sequelize": { - "version": "3.23.6", - "from": "https://registry.npmjs.org/sequelize/-/sequelize-3.23.6.tgz", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-3.23.6.tgz", + "version": "3.29.0", + "from": "sequelize@^3.2.0", "dependencies": { "bluebird": { - "version": "3.4.1", - "from": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.1.tgz", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.1.tgz" + "version": "3.4.7", + "from": "bluebird@^3.3.4", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz" }, "depd": { "version": "1.1.0", - "from": "depd@~1.1.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz" + "from": "depd@^1.1.0" }, "dottie": { "version": "1.1.1", - "from": "https://registry.npmjs.org/dottie/-/dottie-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/dottie/-/dottie-1.1.1.tgz" + "from": "dottie@^1.0.0" }, "generic-pool": { "version": "2.4.2", - "from": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.2.tgz", - "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.2.tgz" + "from": "generic-pool@2.4.2" }, "inflection": { "version": "1.10.0", - "from": "https://registry.npmjs.org/inflection/-/inflection-1.10.0.tgz", - "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.10.0.tgz" + "from": "inflection@^1.6.0" }, "lodash": { "version": "4.12.0", - "from": "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz" + "from": "lodash@4.12.0" }, "moment": { - "version": "2.14.1", - "from": "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz" + "version": "2.17.1", + "from": "moment@^2.13.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz" }, "moment-timezone": { - "version": "0.5.5", - "from": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.5.tgz", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.5.tgz" + "version": "0.5.11", + "from": "moment-timezone@^0.5.4" }, "node-uuid": { "version": "1.4.7", - "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz" + "from": "node-uuid@~1.4.4" }, "retry-as-promised": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-2.0.1.tgz", + "version": "2.2.0", + "from": "retry-as-promised@^2.0.0", + "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-2.2.0.tgz", "dependencies": { + "cross-env": { + "version": "3.1.4", + "from": "cross-env@^3.1.2", + "dependencies": { + "cross-spawn": { + "version": "3.0.1", + "from": "cross-spawn@^3.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", + "dependencies": { + "lru-cache": { + "version": "4.0.2", + "from": "lru-cache@^4.0.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz", + "dependencies": { + "pseudomap": { + "version": "1.0.2", + "from": "pseudomap@^1.0.1" + }, + "yallist": { + "version": "2.0.0", + "from": "yallist@^2.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz" + } + } + }, + "which": { + "version": "1.2.12", + "from": "which@^1.2.9", + "resolved": "https://registry.npmjs.org/which/-/which-1.2.12.tgz", + "dependencies": { + "isexe": { + "version": "1.1.2", + "from": "isexe@^1.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz" + } + } + } + } + } + } + }, "debug": { - "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.6.0", + "from": "debug@^2.2.0", "dependencies": { "ms": { - "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.2", + "from": "ms@0.7.2" } } } @@ -3761,170 +3560,148 @@ }, "semver": { "version": "5.3.0", - "from": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz" + "from": "semver@^5.0.1" }, "shimmer": { "version": "1.1.0", - "from": "https://registry.npmjs.org/shimmer/-/shimmer-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.1.0.tgz" + "from": "shimmer@1.1.0" }, "terraformer-wkt-parser": { - "version": "1.1.0", - "from": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.1.0.tgz", + "version": "1.1.2", + "from": "terraformer-wkt-parser@^1.1.0", + "resolved": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.1.2.tgz", "dependencies": { "terraformer": { - "version": "1.0.5", - "from": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.5.tgz" + "version": "1.0.7", + "from": "terraformer@~1.0.5", + "resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.7.tgz" } } }, "toposort-class": { "version": "1.0.1", - "from": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz" + "from": "toposort-class@^1.0.1" }, "validator": { - "version": "5.5.0", - "from": "https://registry.npmjs.org/validator/-/validator-5.5.0.tgz", - "resolved": "https://registry.npmjs.org/validator/-/validator-5.5.0.tgz" + "version": "5.7.0", + "from": "validator@^5.2.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-5.7.0.tgz" }, "wkx": { "version": "0.2.0", - "from": "https://registry.npmjs.org/wkx/-/wkx-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.2.0.tgz" + "from": "wkx@0.2.0" } } }, "settings-sharelatex": { "version": "1.0.0", - "from": "settings-sharelatex@git+https://github.com/sharelatex/settings-sharelatex.git#cbc5e41c1dbe6789721a14b3fdae05bf22546559", + "from": "settings-sharelatex@git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0", "resolved": "git+https://github.com/sharelatex/settings-sharelatex.git#cbc5e41c1dbe6789721a14b3fdae05bf22546559", "dependencies": { "coffee-script": { "version": "1.6.0", - "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz" + "from": "coffee-script@1.6.0" } } }, "sixpack-client": { "version": "1.0.0", - "from": "https://registry.npmjs.org/sixpack-client/-/sixpack-client-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/sixpack-client/-/sixpack-client-1.0.0.tgz" + "from": "sixpack-client@^1.0.0" }, "temp": { "version": "0.8.3", - "from": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz", - "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz", + "from": "temp@^0.8.3", "dependencies": { "os-tmpdir": { - "version": "1.0.1", - "from": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz" + "version": "1.0.2", + "from": "os-tmpdir@^1.0.0", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz" } } }, "underscore": { "version": "1.6.0", - "from": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" + "from": "underscore@1.6.0" }, "v8-profiler": { "version": "5.6.5", - "from": "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.6.5.tgz", - "resolved": "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.6.5.tgz", + "from": "v8-profiler@^5.2.3", "dependencies": { "nan": { - "version": "2.4.0", - "from": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz" + "version": "2.5.0", + "from": "nan@^2.3.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz" }, "node-pre-gyp": { - "version": "0.6.29", - "from": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.29.tgz", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.29.tgz", + "version": "0.6.32", + "from": "node-pre-gyp@^0.6.5", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz", "dependencies": { "mkdirp": { "version": "0.5.1", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "from": "mkdirp@~0.5.1", "dependencies": { "minimist": { "version": "0.0.8", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" + "from": "minimist@0.0.8" } } }, "nopt": { "version": "3.0.6", - "from": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "from": "nopt@~3.0.6", "dependencies": { "abbrev": { "version": "1.0.9", - "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" + "from": "abbrev@1" } } }, "npmlog": { - "version": "3.1.2", - "from": "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz", + "version": "4.0.2", + "from": "npmlog@^4.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz", "dependencies": { "are-we-there-yet": { "version": "1.1.2", - "from": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz", + "from": "are-we-there-yet@~1.1.2", "dependencies": { "delegates": { "version": "1.0.0", - "from": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz" + "from": "delegates@^1.0.0" }, "readable-stream": { - "version": "2.1.4", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", + "version": "2.2.2", + "from": "readable-stream@^2.0.0 || ^1.1.13", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz", "dependencies": { "buffer-shims": { "version": "1.0.0", - "from": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" + "from": "buffer-shims@^1.0.0" }, "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "1.0.0", - "from": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + "from": "isarray@~1.0.0" + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@~2.0.1" }, "process-nextick-args": { "version": "1.0.7", - "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" + "from": "process-nextick-args@~1.0.6" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "util-deprecate": { "version": "1.0.2", - "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + "from": "util-deprecate@~1.0.1" } } } @@ -3932,65 +3709,52 @@ }, "console-control-strings": { "version": "1.1.0", - "from": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz" + "from": "console-control-strings@~1.1.0" }, "gauge": { - "version": "2.6.0", - "from": "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz", + "version": "2.7.2", + "from": "gauge@~2.7.1", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz", "dependencies": { "aproba": { "version": "1.0.4", - "from": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz" + "from": "aproba@^1.0.3" }, - "has-color": { - "version": "0.1.7", - "from": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz", - "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz" + "supports-color": { + "version": "0.2.0", + "from": "supports-color@^0.2.0" }, "has-unicode": { "version": "2.0.1", - "from": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz" + "from": "has-unicode@^2.0.0" }, "object-assign": { - "version": "4.1.0", - "from": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + "version": "4.1.1", + "from": "object-assign@^4.1.0" }, "signal-exit": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz" + "version": "3.0.2", + "from": "signal-exit@^3.0.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz" }, "string-width": { - "version": "1.0.1", - "from": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz", + "version": "1.0.2", + "from": "string-width@^1.0.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "dependencies": { "code-point-at": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz", - "dependencies": { - "number-is-nan": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz" - } - } + "version": "1.1.0", + "from": "code-point-at@^1.0.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" }, "is-fullwidth-code-point": { "version": "1.0.0", - "from": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "from": "is-fullwidth-code-point@^1.0.0", "dependencies": { "number-is-nan": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz" + "version": "1.0.1", + "from": "number-is-nan@^1.0.0", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" } } } @@ -3998,231 +3762,198 @@ }, "strip-ansi": { "version": "3.0.1", - "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "from": "strip-ansi@^3.0.1", "dependencies": { "ansi-regex": { - "version": "2.0.0", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" + "version": "2.1.1", + "from": "ansi-regex@^2.0.0" } } }, "wide-align": { "version": "1.1.0", - "from": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz" + "from": "wide-align@^1.1.0" } } }, "set-blocking": { "version": "2.0.0", - "from": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" + "from": "set-blocking@~2.0.0" } } }, "rc": { "version": "1.1.6", - "from": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz", + "from": "rc@~1.1.6", "dependencies": { "deep-extend": { "version": "0.4.1", - "from": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz" + "from": "deep-extend@~0.4.0" }, "ini": { "version": "1.3.4", - "from": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz" + "from": "ini@~1.3.0" }, "minimist": { "version": "1.2.0", - "from": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" + "from": "minimist@^1.2.0" }, "strip-json-comments": { "version": "1.0.4", - "from": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz" + "from": "strip-json-comments@~1.0.4" } } }, "rimraf": { "version": "2.5.4", - "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", + "from": "rimraf@~2.5.4", "dependencies": { "glob": { - "version": "7.0.5", - "from": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", + "version": "7.1.1", + "from": "glob@^7.0.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", "dependencies": { "fs.realpath": { "version": "1.0.0", - "from": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + "from": "fs.realpath@^1.0.0" }, "inflight": { - "version": "1.0.5", - "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", + "version": "1.0.6", + "from": "inflight@^1.0.4", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" }, "minimatch": { "version": "3.0.3", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "from": "minimatch@^3.0.2", "dependencies": { "brace-expansion": { "version": "1.1.6", - "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "from": "brace-expansion@^1.0.0", "dependencies": { "balanced-match": { "version": "0.4.2", - "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + "from": "balanced-match@^0.4.1" }, "concat-map": { "version": "0.0.1", - "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "from": "concat-map@0.0.1" } } } } }, "once": { - "version": "1.3.3", - "from": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "version": "1.4.0", + "from": "once@^1.3.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "path-is-absolute": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" + "version": "1.0.1", + "from": "path-is-absolute@^1.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" } } } } }, "semver": { - "version": "5.2.0", - "from": "https://registry.npmjs.org/semver/-/semver-5.2.0.tgz", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.2.0.tgz" + "version": "5.3.0", + "from": "semver@~5.3.0" }, "tar": { "version": "2.2.1", - "from": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "from": "tar@~2.2.1", "dependencies": { "block-stream": { "version": "0.0.9", - "from": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz" + "from": "block-stream@*" }, "fstream": { "version": "1.0.10", - "from": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz", + "from": "fstream@^1.0.2", "dependencies": { "graceful-fs": { - "version": "4.1.5", - "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.5.tgz", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.5.tgz" + "version": "4.1.11", + "from": "graceful-fs@^4.1.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz" } } }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.0" } } }, "tar-pack": { - "version": "3.1.4", - "from": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.4.tgz", - "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.4.tgz", + "version": "3.3.0", + "from": "tar-pack@~3.3.0", + "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz", "dependencies": { "debug": { "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "from": "debug@~2.2.0", "dependencies": { "ms": { "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "from": "ms@0.7.1" } } }, "fstream": { "version": "1.0.10", - "from": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz", + "from": "fstream@~1.0.10", "dependencies": { "graceful-fs": { - "version": "4.1.5", - "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.5.tgz", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.5.tgz" + "version": "4.1.11", + "from": "graceful-fs@^4.1.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.0" } } }, "fstream-ignore": { "version": "1.0.5", - "from": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz", + "from": "fstream-ignore@~1.0.5", "dependencies": { "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" }, "minimatch": { "version": "3.0.3", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "from": "minimatch@^3.0.0", "dependencies": { "brace-expansion": { "version": "1.1.6", - "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "from": "brace-expansion@^1.0.0", "dependencies": { "balanced-match": { "version": "0.4.2", - "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + "from": "balanced-match@^0.4.1" }, "concat-map": { "version": "0.0.1", - "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "from": "concat-map@0.0.1" } } } @@ -4232,62 +3963,52 @@ }, "once": { "version": "1.3.3", - "from": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "from": "once@~1.3.3", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "readable-stream": { - "version": "2.1.4", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", + "version": "2.1.5", + "from": "readable-stream@~2.1.4", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz", "dependencies": { "buffer-shims": { "version": "1.0.0", - "from": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" + "from": "buffer-shims@^1.0.0" }, "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + "from": "core-util-is@~1.0.0" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" }, "isarray": { "version": "1.0.0", - "from": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + "from": "isarray@~1.0.0" }, "process-nextick-args": { "version": "1.0.7", - "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" + "from": "process-nextick-args@~1.0.6" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "util-deprecate": { "version": "1.0.2", - "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + "from": "util-deprecate@~1.0.1" } } }, "uid-number": { "version": "0.0.6", - "from": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz", - "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz" + "from": "uid-number@~0.0.6" } } } @@ -4297,13 +4018,11 @@ }, "xml2js": { "version": "0.2.0", - "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.0.tgz", + "from": "xml2js@0.2.0", "dependencies": { "sax": { "version": "1.2.1", - "from": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz" + "from": "sax@>=0.1.1" } } } diff --git a/services/web/package.json b/services/web/package.json index cfd2379f73..55dd7b0a18 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -64,7 +64,8 @@ "underscore": "1.6.0", "v8-profiler": "^5.2.3", "xml2js": "0.2.0", - "passport-saml": "^0.15.0" + "passport-saml": "^0.15.0", + "pug": "^2.0.0-beta6" }, "devDependencies": { "bunyan": "0.22.1", diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee index 41c70b4dee..9ceae66dbc 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee @@ -13,7 +13,7 @@ define [ EditSession = ace.require('ace/edit_session').EditSession ModeList = ace.require('ace/ext/modelist') - # set the path for ace workers if using a CDN (from editor.jade) + # set the path for ace workers if using a CDN (from editor.pug) if window.aceWorkerPath != "" syntaxValidationEnabled = true ace.config.set('workerPath', "#{window.aceWorkerPath}") From abbffb8e4b3f1e059291ef254700fe4c1dc74759 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Mon, 23 Jan 2017 10:03:16 +0000 Subject: [PATCH 02/15] Remove deprecated `node-uuid` package, replace with `uuid`. --- .../ThirdPartyDataStore/UpdateMerger.coffee | 2 +- services/web/app/coffee/models/User.coffee | 2 +- services/web/npm-shrinkwrap.json | 2879 +++++++---------- services/web/package.json | 4 +- 4 files changed, 1150 insertions(+), 1737 deletions(-) diff --git a/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee b/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee index 5e20c2b515..bce0befe22 100644 --- a/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee +++ b/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee @@ -4,7 +4,7 @@ editorController = require('../Editor/EditorController') logger = require('logger-sharelatex') Settings = require('settings-sharelatex') FileTypeManager = require('../Uploads/FileTypeManager') -uuid = require('node-uuid') +uuid = require('uuid') fs = require('fs') module.exports = diff --git a/services/web/app/coffee/models/User.coffee b/services/web/app/coffee/models/User.coffee index c6e469a1f4..44cea29a70 100644 --- a/services/web/app/coffee/models/User.coffee +++ b/services/web/app/coffee/models/User.coffee @@ -2,7 +2,7 @@ Project = require('./Project').Project Settings = require 'settings-sharelatex' _ = require('underscore') mongoose = require('mongoose') -uuid = require('node-uuid') +uuid = require('uuid') Schema = mongoose.Schema ObjectId = Schema.ObjectId diff --git a/services/web/npm-shrinkwrap.json b/services/web/npm-shrinkwrap.json index 04fdfc0142..6fbb560b79 100644 --- a/services/web/npm-shrinkwrap.json +++ b/services/web/npm-shrinkwrap.json @@ -4,65 +4,54 @@ "dependencies": { "archiver": { "version": "0.9.0", - "from": "https://registry.npmjs.org/archiver/-/archiver-0.9.0.tgz", - "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.9.0.tgz", + "from": "archiver@0.9.0", "dependencies": { "buffer-crc32": { - "version": "0.2.5", - "from": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz" + "version": "0.2.13", + "from": "buffer-crc32@~0.2.1", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz" }, "readable-stream": { "version": "1.0.34", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "from": "readable-stream@~1.0.24", "dependencies": { "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + "from": "isarray@0.0.1" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" } } }, "tar-stream": { "version": "0.3.3", - "from": "https://registry.npmjs.org/tar-stream/-/tar-stream-0.3.3.tgz", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-0.3.3.tgz", + "from": "tar-stream@~0.3.0", "dependencies": { "bl": { "version": "0.6.0", - "from": "https://registry.npmjs.org/bl/-/bl-0.6.0.tgz", - "resolved": "https://registry.npmjs.org/bl/-/bl-0.6.0.tgz" + "from": "bl@~0.6.0" }, "end-of-stream": { "version": "0.1.5", - "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", + "from": "end-of-stream@~0.1.3", "dependencies": { "once": { "version": "1.3.3", - "from": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "from": "once@~1.3.0", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } } @@ -72,77 +61,63 @@ }, "zip-stream": { "version": "0.3.7", - "from": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.3.7.tgz", - "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.3.7.tgz", + "from": "zip-stream@~0.3.0", "dependencies": { "crc32-stream": { "version": "0.2.0", - "from": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.2.0.tgz" + "from": "crc32-stream@~0.2.0" }, "debug": { "version": "1.0.4", - "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz", + "from": "debug@~1.0.2", "dependencies": { "ms": { "version": "0.6.2", - "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz" + "from": "ms@0.6.2" } } }, "deflate-crc32-stream": { "version": "0.1.2", - "from": "https://registry.npmjs.org/deflate-crc32-stream/-/deflate-crc32-stream-0.1.2.tgz", - "resolved": "https://registry.npmjs.org/deflate-crc32-stream/-/deflate-crc32-stream-0.1.2.tgz" + "from": "deflate-crc32-stream@~0.1.0" } } }, "lazystream": { "version": "0.1.0", - "from": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz" + "from": "lazystream@~0.1.0" }, "file-utils": { "version": "0.1.5", - "from": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz", - "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz", + "from": "file-utils@~0.1.5", "dependencies": { "lodash": { "version": "2.1.0", - "from": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz" + "from": "lodash@~2.1.0" }, "iconv-lite": { "version": "0.2.11", - "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz" + "from": "iconv-lite@~0.2.11" }, "glob": { "version": "3.2.11", - "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz", + "from": "glob@~3.2.6", "dependencies": { "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" }, "minimatch": { "version": "0.3.0", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz", + "from": "minimatch@0.3", "dependencies": { "lru-cache": { "version": "2.7.3", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" + "from": "lru-cache@2" }, "sigmund": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + "from": "sigmund@~1.0.0" } } } @@ -150,96 +125,81 @@ }, "minimatch": { "version": "0.2.14", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "from": "minimatch@~0.2.12", "dependencies": { "lru-cache": { "version": "2.7.3", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" + "from": "lru-cache@2" }, "sigmund": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + "from": "sigmund@~1.0.0" } } }, "findup-sync": { "version": "0.1.3", - "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz", + "from": "findup-sync@~0.1.2", "dependencies": { "lodash": { "version": "2.4.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz" + "from": "lodash@~2.4.1" } } }, "isbinaryfile": { "version": "0.1.9", - "from": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz" + "from": "isbinaryfile@~0.1.9" } } }, "lodash": { "version": "2.4.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz" + "from": "lodash@~2.4.0" } } }, "async": { "version": "0.6.2", - "from": "https://registry.npmjs.org/async/-/async-0.6.2.tgz", + "from": "async@0.6.2", "resolved": "https://registry.npmjs.org/async/-/async-0.6.2.tgz" }, "base64-stream": { "version": "0.1.3", - "from": "https://registry.npmjs.org/base64-stream/-/base64-stream-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/base64-stream/-/base64-stream-0.1.3.tgz", + "from": "base64-stream@^0.1.2", "dependencies": { "readable-stream": { - "version": "2.1.4", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", + "version": "2.2.2", + "from": "readable-stream@^2.0.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz", "dependencies": { "buffer-shims": { "version": "1.0.0", - "from": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" + "from": "buffer-shims@^1.0.0" }, "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "1.0.0", - "from": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + "from": "isarray@~1.0.0" + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@~2.0.1" }, "process-nextick-args": { "version": "1.0.7", - "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" + "from": "process-nextick-args@~1.0.6" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "util-deprecate": { "version": "1.0.2", - "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + "from": "util-deprecate@~1.0.1" } } } @@ -247,133 +207,116 @@ }, "basic-auth-connect": { "version": "1.0.0", - "from": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz" + "from": "basic-auth-connect@^1.0.0" }, "bcrypt": { "version": "0.8.3", - "from": "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.3.tgz", - "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.3.tgz", + "from": "bcrypt@0.8.3", "dependencies": { "bindings": { "version": "1.2.1", - "from": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" + "from": "bindings@1.2.1" }, "nan": { "version": "1.8.4", - "from": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz", + "from": "nan@1.8.4", "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz" } } }, "body-parser": { - "version": "1.15.2", - "from": "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz", + "version": "1.16.0", + "from": "body-parser@^1.13.1", "dependencies": { "bytes": { "version": "2.4.0", - "from": "bytes@2.4.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz" + "from": "bytes@2.4.0" }, "content-type": { "version": "1.0.2", - "from": "content-type@~1.0.1", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz" + "from": "content-type@~1.0.1" }, "debug": { - "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.6.0", + "from": "debug@^2.2.0", "dependencies": { "ms": { - "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.2", + "from": "ms@0.7.2" } } }, "depd": { "version": "1.1.0", - "from": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz" + "from": "depd@^1.1.0" }, "http-errors": { - "version": "1.5.0", - "from": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz", + "version": "1.5.1", + "from": "http-errors@~1.5.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz", "dependencies": { "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2.0.3" }, "setprototypeof": { - "version": "1.0.1", - "from": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz" + "version": "1.0.2", + "from": "setprototypeof@1.0.2", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz" }, "statuses": { - "version": "1.3.0", - "from": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz" + "version": "1.3.1", + "from": "statuses@>= 1.3.1 < 2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz" } } }, "iconv-lite": { - "version": "0.4.13", - "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz" + "version": "0.4.15", + "from": "iconv-lite@~0.4.13", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz" }, "on-finished": { "version": "2.3.0", "from": "on-finished@~2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "dependencies": { "ee-first": { "version": "1.1.1", - "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" + "from": "ee-first@1.1.1" } } }, "qs": { - "version": "6.2.0", - "from": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz" + "version": "6.2.1", + "from": "qs@6.2.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz" }, "raw-body": { - "version": "2.1.7", - "from": "raw-body@~2.1.5", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz", + "version": "2.2.0", + "from": "raw-body@~2.2.0", "dependencies": { "unpipe": { "version": "1.0.0", - "from": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" + "from": "unpipe@1.0.0" } } }, "type-is": { - "version": "1.6.13", + "version": "1.6.14", "from": "type-is@~1.6.10", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz", "dependencies": { "media-typer": { "version": "0.3.0", - "from": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" + "from": "media-typer@0.3.0" }, "mime-types": { - "version": "2.1.11", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "version": "2.1.14", + "from": "mime-types@~2.1.13", "dependencies": { "mime-db": { - "version": "1.23.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" + "version": "1.26.0", + "from": "mime-db@~1.26.0" } } } @@ -383,18 +326,15 @@ }, "bufferedstream": { "version": "1.6.0", - "from": "https://registry.npmjs.org/bufferedstream/-/bufferedstream-1.6.0.tgz", - "resolved": "https://registry.npmjs.org/bufferedstream/-/bufferedstream-1.6.0.tgz" + "from": "bufferedstream@1.6.0" }, "connect-redis": { - "version": "3.1.0", - "from": "connect-redis@3.1.0", - "resolved": "https://registry.npmjs.org/connect-redis/-/connect-redis-3.1.0.tgz", + "version": "3.2.0", + "from": "connect-redis@^3.1.0", "dependencies": { "debug": { - "version": "2.3.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.3.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.0.tgz", + "version": "2.6.0", + "from": "debug@^2.2.0", "dependencies": { "ms": { "version": "0.7.2", @@ -403,184 +343,165 @@ } }, "redis": { - "version": "2.6.3", - "from": "https://registry.npmjs.org/redis/-/redis-2.6.3.tgz", - "resolved": "https://registry.npmjs.org/redis/-/redis-2.6.3.tgz", + "version": "2.6.5", + "from": "redis@^2.1.0", "dependencies": { "double-ended-queue": { "version": "2.1.0-0", - "from": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz", - "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz" + "from": "double-ended-queue@^2.1.0-0" }, "redis-commands": { "version": "1.3.0", - "from": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.0.tgz", - "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.0.tgz" + "from": "redis-commands@^1.2.0" }, "redis-parser": { - "version": "2.1.1", - "from": "https://registry.npmjs.org/redis-parser/-/redis-parser-2.1.1.tgz", - "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-2.1.1.tgz" + "version": "2.3.0", + "from": "redis-parser@^2.0.0", + "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-2.3.0.tgz" } } } } }, "contentful": { - "version": "3.5.0", - "from": "https://registry.npmjs.org/contentful/-/contentful-3.5.0.tgz", - "resolved": "https://registry.npmjs.org/contentful/-/contentful-3.5.0.tgz", + "version": "3.8.0", + "from": "contentful@^3.3.14", + "resolved": "https://registry.npmjs.org/contentful/-/contentful-3.8.0.tgz", "dependencies": { "babel-runtime": { - "version": "6.11.6", - "from": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz", + "version": "6.3.19", + "from": "babel-runtime@~6.3.19", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.3.19.tgz", "dependencies": { "core-js": { - "version": "2.4.1", - "from": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" - }, - "regenerator-runtime": { - "version": "0.9.5", - "from": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz" + "version": "1.2.7", + "from": "core-js@^1.2.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz" } } }, "contentful-sdk-core": { - "version": "2.3.4", - "from": "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-2.3.4.tgz", - "resolved": "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-2.3.4.tgz", + "version": "2.5.0", + "from": "contentful-sdk-core@~2.5.0", + "resolved": "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-2.5.0.tgz", "dependencies": { "follow-redirects": { "version": "0.0.7", - "from": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.7.tgz", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.7.tgz", + "from": "follow-redirects@0.0.7", "dependencies": { "debug": { - "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.6.0", + "from": "debug@^2.2.0", "dependencies": { "ms": { - "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.2", + "from": "ms@0.7.2" } } }, "stream-consume": { "version": "0.1.0", - "from": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz" + "from": "stream-consume@^0.1.0" } } }, "qs": { - "version": "6.2.1", - "from": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz" + "version": "6.3.0", + "from": "qs@^6.1.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz" } } }, "json-stringify-safe": { "version": "5.0.1", - "from": "json-stringify-safe@~5.0.0", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" + "from": "json-stringify-safe@~5.0.1" + }, + "lodash": { + "version": "4.2.1", + "from": "lodash@~4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz" } } }, "cookie": { "version": "0.2.4", - "from": "https://registry.npmjs.org/cookie/-/cookie-0.2.4.tgz", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.2.4.tgz" + "from": "cookie@^0.2.3" }, "cookie-parser": { "version": "1.3.5", - "from": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz", + "from": "cookie-parser@1.3.5", "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz", "dependencies": { "cookie": { "version": "0.1.3", - "from": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz" + "from": "cookie@0.1.3" }, "cookie-signature": { "version": "1.0.6", - "from": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" + "from": "cookie-signature@1.0.6" } } }, "csurf": { "version": "1.9.0", - "from": "https://registry.npmjs.org/csurf/-/csurf-1.9.0.tgz", - "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.9.0.tgz", + "from": "csurf@^1.8.3", "dependencies": { "cookie": { "version": "0.3.1", - "from": "cookie@0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz" + "from": "cookie@0.3.1" }, "cookie-signature": { "version": "1.0.6", - "from": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" + "from": "cookie-signature@1.0.6" }, "csrf": { - "version": "3.0.3", - "from": "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz", - "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz", + "version": "3.0.4", + "from": "csrf@~3.0.3", + "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz", "dependencies": { "base64-url": { - "version": "1.2.2", - "from": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz", - "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz" + "version": "1.3.3", + "from": "base64-url@1.3.3", + "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz" }, "rndm": { "version": "1.2.0", - "from": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz" + "from": "rndm@1.2.0" }, "tsscmp": { "version": "1.0.5", - "from": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz" + "from": "tsscmp@1.0.5" }, "uid-safe": { - "version": "2.1.1", - "from": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz", - "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz", + "version": "2.1.3", + "from": "uid-safe@~2.1.3", "dependencies": { "random-bytes": { "version": "1.0.0", - "from": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz" + "from": "random-bytes@~1.0.0" } } } } }, "http-errors": { - "version": "1.5.0", - "from": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz", + "version": "1.5.1", + "from": "http-errors@~1.5.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz", "dependencies": { "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" }, "setprototypeof": { - "version": "1.0.1", - "from": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz" + "version": "1.0.2", + "from": "setprototypeof@1.0.2", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz" }, "statuses": { - "version": "1.3.0", - "from": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz" + "version": "1.3.1", + "from": "statuses@>= 1.3.1 < 2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz" } } } @@ -588,280 +509,232 @@ }, "dateformat": { "version": "1.0.4-1.2.3", - "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.4-1.2.3.tgz", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.4-1.2.3.tgz" + "from": "dateformat@1.0.4-1.2.3" }, "express": { "version": "4.13.0", - "from": "https://registry.npmjs.org/express/-/express-4.13.0.tgz", + "from": "express@4.13.0", "resolved": "https://registry.npmjs.org/express/-/express-4.13.0.tgz", "dependencies": { "accepts": { "version": "1.2.13", - "from": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", + "from": "accepts@~1.2.9", "dependencies": { "mime-types": { - "version": "2.1.11", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "version": "2.1.14", + "from": "mime-types@~2.1.13", "dependencies": { "mime-db": { - "version": "1.23.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" + "version": "1.26.0", + "from": "mime-db@~1.26.0" } } }, "negotiator": { "version": "0.5.3", - "from": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz" + "from": "negotiator@0.5.3" } } }, "array-flatten": { "version": "1.1.0", - "from": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.0.tgz" + "from": "array-flatten@1.1.0" }, "content-disposition": { "version": "0.5.0", - "from": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz" + "from": "content-disposition@0.5.0" }, "content-type": { "version": "1.0.2", - "from": "content-type@~1.0.1", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz" + "from": "content-type@~1.0.1" }, "cookie": { "version": "0.1.3", - "from": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz" + "from": "cookie@0.1.3" }, "cookie-signature": { "version": "1.0.6", - "from": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" + "from": "cookie-signature@1.0.6" }, "debug": { "version": "2.2.0", "from": "debug@~2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", "dependencies": { "ms": { "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "from": "ms@0.7.1" } } }, "depd": { "version": "1.0.1", - "from": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz" + "from": "depd@~1.0.1" }, "escape-html": { "version": "1.0.2", - "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz" + "from": "escape-html@1.0.2" }, "etag": { "version": "1.7.0", - "from": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz" + "from": "etag@~1.7.0" }, "finalhandler": { "version": "0.4.0", - "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz", + "from": "finalhandler@0.4.0", "dependencies": { "unpipe": { "version": "1.0.0", - "from": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" + "from": "unpipe@~1.0.0" } } }, "fresh": { "version": "0.3.0", - "from": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz" + "from": "fresh@0.3.0" }, "merge-descriptors": { "version": "1.0.0", - "from": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz" + "from": "merge-descriptors@1.0.0" }, "methods": { "version": "1.1.2", - "from": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" + "from": "methods@~1.1.1" }, "on-finished": { "version": "2.3.0", "from": "on-finished@~2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "dependencies": { "ee-first": { "version": "1.1.1", - "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" + "from": "ee-first@1.1.1" } } }, "parseurl": { "version": "1.3.1", - "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz" + "from": "parseurl@~1.3.0" }, "path-to-regexp": { "version": "0.1.6", - "from": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.6.tgz", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.6.tgz" + "from": "path-to-regexp@0.1.6" }, "proxy-addr": { "version": "1.0.10", - "from": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz", + "from": "proxy-addr@~1.0.8", "dependencies": { "forwarded": { "version": "0.1.0", - "from": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz" + "from": "forwarded@~0.1.0" }, "ipaddr.js": { "version": "1.0.5", - "from": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz" + "from": "ipaddr.js@1.0.5" } } }, "qs": { "version": "2.4.2", - "from": "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz", + "from": "qs@2.4.2", "resolved": "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz" }, "range-parser": { "version": "1.0.3", - "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz" + "from": "range-parser@~1.0.2" }, "send": { "version": "0.13.0", - "from": "https://registry.npmjs.org/send/-/send-0.13.0.tgz", - "resolved": "https://registry.npmjs.org/send/-/send-0.13.0.tgz", + "from": "send@0.13.0", "dependencies": { "destroy": { "version": "1.0.3", - "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz" + "from": "destroy@1.0.3" }, "http-errors": { "version": "1.3.1", - "from": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", + "from": "http-errors@~1.3.1", "dependencies": { "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" } } }, "mime": { "version": "1.3.4", - "from": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz" + "from": "mime@1.3.4" }, "ms": { "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "from": "ms@0.7.1" }, "statuses": { "version": "1.2.1", - "from": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz" + "from": "statuses@~1.2.1" } } }, "serve-static": { "version": "1.10.3", - "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz", + "from": "serve-static@~1.10.0", "dependencies": { "escape-html": { "version": "1.0.3", - "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" + "from": "escape-html@~1.0.3" }, "send": { "version": "0.13.2", - "from": "https://registry.npmjs.org/send/-/send-0.13.2.tgz", - "resolved": "https://registry.npmjs.org/send/-/send-0.13.2.tgz", + "from": "send@0.13.2", "dependencies": { "depd": { "version": "1.1.0", - "from": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz" + "from": "depd@~1.1.0" }, "destroy": { "version": "1.0.4", - "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz" + "from": "destroy@~1.0.4" }, "http-errors": { "version": "1.3.1", - "from": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", + "from": "http-errors@~1.3.1", "dependencies": { "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" } } }, "mime": { "version": "1.3.4", - "from": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz" + "from": "mime@1.3.4" }, "ms": { "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "from": "ms@0.7.1" }, "statuses": { "version": "1.2.1", - "from": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz" + "from": "statuses@~1.2.1" } } } } }, "type-is": { - "version": "1.6.13", + "version": "1.6.14", "from": "type-is@~1.6.10", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz", "dependencies": { "media-typer": { "version": "0.3.0", - "from": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" + "from": "media-typer@0.3.0" }, "mime-types": { - "version": "2.1.11", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "version": "2.1.14", + "from": "mime-types@~2.1.13", "dependencies": { "mime-db": { - "version": "1.23.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" + "version": "1.26.0", + "from": "mime-db@~1.26.0" } } } @@ -869,71 +742,67 @@ }, "vary": { "version": "1.0.1", - "from": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz" + "from": "vary@~1.0.0" }, "utils-merge": { "version": "1.0.0", - "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz" + "from": "utils-merge@1.0.0" } } }, "express-session": { - "version": "1.14.2", - "from": "express-session@1.14.2", - "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz", + "version": "1.15.0", + "from": "express-session@^1.14.2", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.15.0.tgz", "dependencies": { "cookie": { "version": "0.3.1", - "from": "cookie@0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz" + "from": "cookie@0.3.1" }, "cookie-signature": { "version": "1.0.6", "from": "cookie-signature@1.0.6" }, "crc": { - "version": "3.4.1", - "from": "crc@3.4.1", - "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz" + "version": "3.4.4", + "from": "crc@3.4.4", + "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz" }, "debug": { - "version": "2.2.0", - "from": "debug@2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.6.0", + "from": "debug@^2.2.0", "dependencies": { "ms": { - "version": "0.7.1", - "from": "ms@0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.2", + "from": "ms@0.7.2" } } }, "depd": { "version": "1.1.0", - "from": "depd@1.1.0" + "from": "depd@~1.1.0" }, "on-headers": { "version": "1.0.1", - "from": "on-headers@1.0.1" + "from": "on-headers@~1.0.1", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz" }, "parseurl": { "version": "1.3.1", - "from": "parseurl@1.3.1" + "from": "parseurl@~1.3.0" }, "uid-safe": { "version": "2.1.3", - "from": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz", - "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz", + "from": "uid-safe@~2.1.3", "dependencies": { "base64-url": { "version": "1.3.3", - "from": "base64-url@1.3.3" + "from": "base64-url@1.3.3", + "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz" }, "random-bytes": { "version": "1.0.0", - "from": "random-bytes@1.0.0" + "from": "random-bytes@~1.0.0" } } }, @@ -945,63 +814,51 @@ }, "grunt": { "version": "0.4.5", - "from": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz", - "resolved": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz", + "from": "grunt@^0.4.5", "dependencies": { "async": { "version": "0.1.22", - "from": "https://registry.npmjs.org/async/-/async-0.1.22.tgz", - "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz" + "from": "async@~0.1.22" }, "coffee-script": { "version": "1.3.3", - "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz" + "from": "coffee-script@~1.3.3" }, "colors": { "version": "0.6.2", - "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", - "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz" + "from": "colors@~0.6.2" }, "dateformat": { "version": "1.0.2-1.2.3", - "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz" + "from": "dateformat@1.0.2-1.2.3" }, "eventemitter2": { "version": "0.4.14", - "from": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz" + "from": "eventemitter2@~0.4.13" }, "findup-sync": { "version": "0.1.3", - "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz", + "from": "findup-sync@~0.1.2", "dependencies": { "glob": { "version": "3.2.11", - "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz", + "from": "glob@~3.2.9", "dependencies": { "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" }, "minimatch": { "version": "0.3.0", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz", + "from": "minimatch@0.3", "dependencies": { "lru-cache": { "version": "2.7.3", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" + "from": "lru-cache@2" }, "sigmund": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + "from": "sigmund@~1.0.0" } } } @@ -1009,150 +866,124 @@ }, "lodash": { "version": "2.4.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz" + "from": "lodash@~2.4.1" } } }, "glob": { "version": "3.1.21", - "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", + "from": "glob@~3.1.21", "dependencies": { "graceful-fs": { "version": "1.2.3", - "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz" + "from": "graceful-fs@~1.2.0" }, "inherits": { "version": "1.0.2", - "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz" + "from": "inherits@1" } } }, "hooker": { "version": "0.2.3", - "from": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz", - "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" + "from": "hooker@~0.2.3" }, "iconv-lite": { "version": "0.2.11", - "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz" + "from": "iconv-lite@~0.2.11" }, "minimatch": { "version": "0.2.14", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "from": "minimatch@~0.2.12", "dependencies": { "lru-cache": { "version": "2.7.3", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" + "from": "lru-cache@2" }, "sigmund": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + "from": "sigmund@~1.0.0" } } }, "nopt": { "version": "1.0.10", - "from": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "from": "nopt@~1.0.10", "dependencies": { "abbrev": { "version": "1.0.9", - "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" + "from": "abbrev@1" } } }, "rimraf": { "version": "2.2.8", - "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz" + "from": "rimraf@~2.2.8" }, "lodash": { "version": "0.9.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz" + "from": "lodash@~0.9.2" }, "underscore.string": { "version": "2.2.1", - "from": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz", - "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz" + "from": "underscore.string@~2.2.1" }, "which": { "version": "1.0.9", - "from": "https://registry.npmjs.org/which/-/which-1.0.9.tgz", - "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz" + "from": "which@~1.0.5" }, "js-yaml": { "version": "2.0.5", - "from": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz", + "from": "js-yaml@~2.0.5", "dependencies": { "argparse": { "version": "0.1.16", - "from": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz", + "from": "argparse@~ 0.1.11", "dependencies": { "underscore": { "version": "1.7.0", - "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz", + "from": "underscore@~1.7.0", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz" }, "underscore.string": { "version": "2.4.0", - "from": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz", - "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz" + "from": "underscore.string@~2.4.0" } } }, "esprima": { "version": "1.0.4", - "from": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz" + "from": "esprima@~ 1.0.2" } } }, "exit": { "version": "0.1.2", - "from": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz" + "from": "exit@~0.1.1" }, "getobject": { "version": "0.1.0", - "from": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz" + "from": "getobject@~0.1.0" }, "grunt-legacy-util": { "version": "0.2.0", - "from": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz" + "from": "grunt-legacy-util@~0.2.0" }, "grunt-legacy-log": { "version": "0.1.3", - "from": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz", + "from": "grunt-legacy-log@~0.1.0", "dependencies": { "grunt-legacy-log-utils": { "version": "0.1.1", - "from": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz" + "from": "grunt-legacy-log-utils@~0.1.1" }, "lodash": { "version": "2.4.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz" + "from": "lodash@~2.4.1" }, "underscore.string": { "version": "2.3.3", - "from": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz", - "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz" + "from": "underscore.string@~2.3.3" } } } @@ -1160,45 +991,39 @@ }, "heapdump": { "version": "0.3.7", - "from": "https://registry.npmjs.org/heapdump/-/heapdump-0.3.7.tgz", - "resolved": "https://registry.npmjs.org/heapdump/-/heapdump-0.3.7.tgz" + "from": "heapdump@^0.3.7" }, "http-proxy": { - "version": "1.14.0", - "from": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.14.0.tgz", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.14.0.tgz", + "version": "1.16.2", + "from": "http-proxy@^1.8.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz", "dependencies": { "eventemitter3": { "version": "1.2.0", - "from": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz" + "from": "eventemitter3@1.x.x" }, "requires-port": { "version": "1.0.0", - "from": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz" + "from": "requires-port@1.x.x" } } }, "ioredis": { - "version": "2.4.0", - "from": "https://registry.npmjs.org/ioredis/-/ioredis-2.4.0.tgz", - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-2.4.0.tgz", + "version": "2.5.0", + "from": "ioredis@^2.4.0", "dependencies": { "bluebird": { - "version": "3.4.6", - "from": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz" + "version": "3.4.7", + "from": "bluebird@^3.3.4", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz" }, "cluster-key-slot": { "version": "1.0.8", - "from": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.0.8.tgz", - "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.0.8.tgz" + "from": "cluster-key-slot@^1.0.6" }, "debug": { - "version": "2.3.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.3.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.0.tgz", + "version": "2.6.0", + "from": "debug@^2.2.0", "dependencies": { "ms": { "version": "0.7.2", @@ -1208,100 +1033,87 @@ }, "double-ended-queue": { "version": "2.1.0-0", - "from": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz", - "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz" + "from": "double-ended-queue@^2.1.0-0" }, "flexbuffer": { "version": "0.0.6", - "from": "flexbuffer@0.0.6" + "from": "flexbuffer@0.0.6", + "resolved": "https://registry.npmjs.org/flexbuffer/-/flexbuffer-0.0.6.tgz" }, "redis-commands": { "version": "1.3.0", - "from": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.0.tgz", - "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.0.tgz" + "from": "redis-commands@^1.2.0" }, "redis-parser": { "version": "1.3.0", - "from": "https://registry.npmjs.org/redis-parser/-/redis-parser-1.3.0.tgz", - "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-1.3.0.tgz" + "from": "redis-parser@^1.3.0" } } }, "jade": { "version": "1.3.1", - "from": "https://registry.npmjs.org/jade/-/jade-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/jade/-/jade-1.3.1.tgz", + "from": "jade@~1.3.1", "dependencies": { "commander": { "version": "2.1.0", - "from": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", + "from": "commander@2.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz" }, "mkdirp": { "version": "0.3.5", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", + "from": "mkdirp@~0.3.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" }, "transformers": { "version": "2.1.0", - "from": "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz", - "resolved": "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz", + "from": "transformers@2.1.0", "dependencies": { "promise": { "version": "2.0.0", - "from": "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz", + "from": "promise@~2.0", "dependencies": { "is-promise": { "version": "1.0.1", - "from": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz" + "from": "is-promise@~1" } } }, "css": { "version": "1.0.8", - "from": "https://registry.npmjs.org/css/-/css-1.0.8.tgz", - "resolved": "https://registry.npmjs.org/css/-/css-1.0.8.tgz", + "from": "css@~1.0.8", "dependencies": { "css-parse": { "version": "1.0.4", - "from": "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz", - "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz" + "from": "css-parse@1.0.4" }, "css-stringify": { "version": "1.0.5", - "from": "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz" + "from": "css-stringify@1.0.5" } } }, "uglify-js": { "version": "2.2.5", - "from": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz", + "from": "uglify-js@~2.2.5", "dependencies": { "source-map": { "version": "0.1.43", - "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "from": "source-map@~0.1.7", "dependencies": { "amdefine": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz" + "version": "1.0.1", + "from": "amdefine@>=0.0.4", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz" } } }, "optimist": { "version": "0.3.7", - "from": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", + "from": "optimist@~0.3.5", "dependencies": { "wordwrap": { "version": "0.0.3", - "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz" + "from": "wordwrap@~0.0.2" } } } @@ -1311,38 +1123,31 @@ }, "character-parser": { "version": "1.2.0", - "from": "https://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz" + "from": "character-parser@1.2.0" }, "monocle": { "version": "1.1.51", - "from": "https://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz", - "resolved": "https://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz", + "from": "monocle@1.1.51", "dependencies": { "readdirp": { "version": "0.2.5", - "from": "https://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz", + "from": "readdirp@~0.2.3", "dependencies": { "minimatch": { "version": "3.0.3", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "from": "minimatch@>=0.2.4", "dependencies": { "brace-expansion": { "version": "1.1.6", - "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "from": "brace-expansion@^1.0.0", "dependencies": { "balanced-match": { "version": "0.4.2", - "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + "from": "balanced-match@^0.4.1" }, "concat-map": { "version": "0.0.1", - "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "from": "concat-map@0.0.1" } } } @@ -1354,60 +1159,50 @@ }, "with": { "version": "3.0.1", - "from": "https://registry.npmjs.org/with/-/with-3.0.1.tgz", - "resolved": "https://registry.npmjs.org/with/-/with-3.0.1.tgz", + "from": "with@~3.0.0", "dependencies": { "uglify-js": { "version": "2.4.24", - "from": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz", + "from": "uglify-js@~2.4.12", "dependencies": { "async": { "version": "0.2.10", - "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", - "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz" + "from": "async@~0.2.6" }, "source-map": { "version": "0.1.34", - "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz", + "from": "source-map@0.1.34", "dependencies": { "amdefine": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz" + "version": "1.0.1", + "from": "amdefine@>=0.0.4", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz" } } }, "uglify-to-browserify": { "version": "1.0.2", - "from": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz" + "from": "uglify-to-browserify@~1.0.0" }, "yargs": { "version": "3.5.4", - "from": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz", + "from": "yargs@~3.5.4", "dependencies": { "camelcase": { "version": "1.2.1", - "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz" + "from": "camelcase@^1.0.2" }, "decamelize": { "version": "1.2.0", - "from": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" + "from": "decamelize@^1.0.0" }, "window-size": { "version": "0.1.0", - "from": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz" + "from": "window-size@0.1.0" }, "wordwrap": { "version": "0.0.2", - "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz" + "from": "wordwrap@0.0.2" } } } @@ -1417,60 +1212,50 @@ }, "constantinople": { "version": "2.0.1", - "from": "https://registry.npmjs.org/constantinople/-/constantinople-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-2.0.1.tgz", + "from": "constantinople@~2.0.0", "dependencies": { "uglify-js": { "version": "2.4.24", - "from": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz", + "from": "uglify-js@~2.4.12", "dependencies": { "async": { "version": "0.2.10", - "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", - "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz" + "from": "async@~0.2.6" }, "source-map": { "version": "0.1.34", - "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz", + "from": "source-map@0.1.34", "dependencies": { "amdefine": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz" + "version": "1.0.1", + "from": "amdefine@>=0.0.4", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz" } } }, "uglify-to-browserify": { "version": "1.0.2", - "from": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz" + "from": "uglify-to-browserify@~1.0.0" }, "yargs": { "version": "3.5.4", - "from": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz", + "from": "yargs@~3.5.4", "dependencies": { "camelcase": { "version": "1.2.1", - "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz" + "from": "camelcase@^1.0.2" }, "decamelize": { "version": "1.2.0", - "from": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" + "from": "decamelize@^1.0.0" }, "window-size": { "version": "0.1.0", - "from": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz" + "from": "window-size@0.1.0" }, "wordwrap": { "version": "0.0.2", - "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz" + "from": "wordwrap@0.0.2" } } } @@ -1481,102 +1266,101 @@ } }, "ldapjs": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/ldapjs/-/ldapjs-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-1.0.0.tgz", + "version": "1.0.1", + "from": "ldapjs@^1.0.0", + "resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-1.0.1.tgz", "dependencies": { "asn1": { "version": "0.2.3", - "from": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz" + "from": "asn1@0.2.3" }, "assert-plus": { - "version": "0.1.5", - "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz" + "version": "1.0.0", + "from": "assert-plus@^1.0.0" }, "bunyan": { - "version": "1.5.1", - "from": "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz", - "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz", + "version": "1.8.5", + "from": "bunyan@^1.8.3", + "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz", "dependencies": { + "dtrace-provider": { + "version": "0.8.0", + "from": "dtrace-provider@~0.8", + "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz", + "dependencies": { + "nan": { + "version": "2.5.1", + "from": "nan@^2.0.8", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz" + } + } + }, "mv": { "version": "2.1.1", - "from": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", - "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", + "from": "mv@~2", "dependencies": { "mkdirp": { "version": "0.5.1", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "from": "mkdirp@~0.5.1", "dependencies": { "minimist": { "version": "0.0.8", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "from": "minimist@0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" } } }, "ncp": { "version": "2.0.0", - "from": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz" + "from": "ncp@~2.0.0" }, "rimraf": { "version": "2.4.5", - "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", + "from": "rimraf@~2.4.0", "dependencies": { "glob": { "version": "6.0.4", - "from": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "from": "glob@^6.0.1", "dependencies": { "inflight": { - "version": "1.0.5", - "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", + "version": "1.0.6", + "from": "inflight@^1.0.4", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" }, "minimatch": { "version": "3.0.3", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "from": "minimatch@2 || 3", "dependencies": { "brace-expansion": { "version": "1.1.6", - "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "from": "brace-expansion@^1.0.0", "dependencies": { "balanced-match": { "version": "0.4.2", - "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + "from": "balanced-match@^0.4.1" }, "concat-map": { "version": "0.0.1", - "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "from": "concat-map@0.0.1" } } } } }, "path-is-absolute": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" + "version": "1.0.1", + "from": "path-is-absolute@^1.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" } } } @@ -1586,192 +1370,200 @@ }, "safe-json-stringify": { "version": "1.0.3", - "from": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz" + "from": "safe-json-stringify@~1" + }, + "moment": { + "version": "2.17.1", + "from": "moment@^2.10.6", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz" } } }, "dashdash": { - "version": "1.10.1", - "from": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz" + "version": "1.14.1", + "from": "dashdash@^1.14.0", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz" }, "backoff": { - "version": "2.4.1", - "from": "https://registry.npmjs.org/backoff/-/backoff-2.4.1.tgz", - "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.4.1.tgz", + "version": "2.5.0", + "from": "backoff@^2.5.0", + "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz", "dependencies": { "precond": { "version": "0.2.3", - "from": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz", - "resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz" + "from": "precond@0.2" } } }, "ldap-filter": { "version": "0.2.2", - "from": "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.2.2.tgz", - "resolved": "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.2.2.tgz" + "from": "ldap-filter@0.2.2", + "dependencies": { + "assert-plus": { + "version": "0.1.5", + "from": "assert-plus@0.1.5" + } + } }, "once": { - "version": "1.3.2", - "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz", + "version": "1.4.0", + "from": "once@^1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "vasync": { - "version": "1.6.3", - "from": "https://registry.npmjs.org/vasync/-/vasync-1.6.3.tgz", - "resolved": "https://registry.npmjs.org/vasync/-/vasync-1.6.3.tgz" + "version": "1.6.4", + "from": "vasync@^1.6.4", + "resolved": "https://registry.npmjs.org/vasync/-/vasync-1.6.4.tgz", + "dependencies": { + "verror": { + "version": "1.6.0", + "from": "verror@1.6.0", + "dependencies": { + "extsprintf": { + "version": "1.2.0", + "from": "extsprintf@1.2.0" + } + } + } + } }, "verror": { - "version": "1.6.0", - "from": "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz", + "version": "1.9.0", + "from": "verror@^1.8.1", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz", "dependencies": { + "core-util-is": { + "version": "1.0.2", + "from": "core-util-is@1.0.2" + }, "extsprintf": { - "version": "1.2.0", - "from": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz" + "version": "1.3.0", + "from": "extsprintf@^1.2.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz" } } }, "dtrace-provider": { - "version": "0.6.0", - "from": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz", - "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz", + "version": "0.7.1", + "from": "dtrace-provider@^0.7.0", + "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz", "dependencies": { "nan": { - "version": "2.4.0", - "from": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz" + "version": "2.5.1", + "from": "nan@^2.0.8", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz" } } } } }, "lodash": { - "version": "4.14.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + "version": "4.17.4", + "from": "lodash@^4.13.1" }, "logger-sharelatex": { "version": "1.3.1", - "from": "logger-sharelatex@git+https://github.com/sharelatex/logger-sharelatex.git#bf413ec621a000cf0e08c939de38d5e24541a08c", + "from": "logger-sharelatex@git+https://github.com/sharelatex/logger-sharelatex.git#v1.3.1", "resolved": "git+https://github.com/sharelatex/logger-sharelatex.git#bf413ec621a000cf0e08c939de38d5e24541a08c", "dependencies": { "bunyan": { "version": "1.5.1", - "from": "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz", - "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz", + "from": "bunyan@1.5.1", "dependencies": { "dtrace-provider": { "version": "0.6.0", - "from": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz", - "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz", + "from": "dtrace-provider@~0.6", "dependencies": { "nan": { - "version": "2.4.0", - "from": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz" + "version": "2.5.1", + "from": "nan@^2.0.8", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz" } } }, "mv": { "version": "2.1.1", - "from": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", - "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", + "from": "mv@~2", "dependencies": { "mkdirp": { "version": "0.5.1", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "from": "mkdirp@~0.5.1", "dependencies": { "minimist": { "version": "0.0.8", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "from": "minimist@0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" } } }, "ncp": { "version": "2.0.0", - "from": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz" + "from": "ncp@~2.0.0" }, "rimraf": { "version": "2.4.5", - "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", + "from": "rimraf@~2.4.0", "dependencies": { "glob": { "version": "6.0.4", - "from": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "from": "glob@^6.0.1", "dependencies": { "inflight": { - "version": "1.0.5", - "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", + "version": "1.0.6", + "from": "inflight@^1.0.4", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" }, "minimatch": { "version": "3.0.3", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "from": "minimatch@2 || 3", "dependencies": { "brace-expansion": { "version": "1.1.6", - "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "from": "brace-expansion@^1.0.0", "dependencies": { "balanced-match": { "version": "0.4.2", - "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + "from": "balanced-match@^0.4.1" }, "concat-map": { "version": "0.0.1", - "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "from": "concat-map@0.0.1" } } } } }, "once": { - "version": "1.3.3", - "from": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "version": "1.4.0", + "from": "once@^1.3.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "path-is-absolute": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" + "version": "1.0.1", + "from": "path-is-absolute@^1.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" } } } @@ -1781,35 +1573,33 @@ }, "safe-json-stringify": { "version": "1.0.3", - "from": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz" + "from": "safe-json-stringify@~1" } } }, "coffee-script": { "version": "1.4.0", - "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.4.0.tgz", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.4.0.tgz" + "from": "coffee-script@1.4.0" }, "raven": { "version": "0.8.1", - "from": "https://registry.npmjs.org/raven/-/raven-0.8.1.tgz", - "resolved": "https://registry.npmjs.org/raven/-/raven-0.8.1.tgz", + "from": "raven@^0.8.0", "dependencies": { "cookie": { "version": "0.1.0", - "from": "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz" + "from": "cookie@0.1.0" }, "lsmod": { "version": "0.0.3", - "from": "https://registry.npmjs.org/lsmod/-/lsmod-0.0.3.tgz", - "resolved": "https://registry.npmjs.org/lsmod/-/lsmod-0.0.3.tgz" + "from": "lsmod@~0.0.3" + }, + "node-uuid": { + "version": "1.4.7", + "from": "node-uuid@~1.4.1" }, "stack-trace": { "version": "0.0.7", - "from": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz" + "from": "stack-trace@0.0.7" } } } @@ -1817,181 +1607,159 @@ }, "lynx": { "version": "0.1.1", - "from": "https://registry.npmjs.org/lynx/-/lynx-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/lynx/-/lynx-0.1.1.tgz", + "from": "lynx@0.1.1", "dependencies": { "mersenne": { "version": "0.0.3", - "from": "https://registry.npmjs.org/mersenne/-/mersenne-0.0.3.tgz", - "resolved": "https://registry.npmjs.org/mersenne/-/mersenne-0.0.3.tgz" + "from": "mersenne@~0.0.3" }, "statsd-parser": { "version": "0.0.4", - "from": "https://registry.npmjs.org/statsd-parser/-/statsd-parser-0.0.4.tgz", - "resolved": "https://registry.npmjs.org/statsd-parser/-/statsd-parser-0.0.4.tgz" + "from": "statsd-parser@~0.0.4" } } }, "marked": { "version": "0.3.6", - "from": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz" + "from": "marked@^0.3.5" }, "method-override": { - "version": "2.3.6", - "from": "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz", - "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz", + "version": "2.3.7", + "from": "method-override@^2.3.3", + "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz", "dependencies": { "debug": { - "version": "2.2.0", - "from": "debug@2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.3.3", + "from": "debug@2.3.3", "dependencies": { "ms": { - "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.2", + "from": "ms@0.7.2" } } }, "methods": { "version": "1.1.2", - "from": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" + "from": "methods@~1.1.2" }, "parseurl": { "version": "1.3.1", - "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz" + "from": "parseurl@~1.3.1" }, "vary": { "version": "1.1.0", - "from": "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz" + "from": "vary@~1.1.0" } } }, "metrics-sharelatex": { - "version": "1.3.0", - "from": "metrics-sharelatex@git+https://github.com/sharelatex/metrics-sharelatex.git#080c4aeb696edcd5d6d86f202f2c528f0661d7a6", - "resolved": "git+https://github.com/sharelatex/metrics-sharelatex.git#080c4aeb696edcd5d6d86f202f2c528f0661d7a6", + "version": "1.6.0", + "from": "metrics-sharelatex@git+https://github.com/sharelatex/metrics-sharelatex.git#v1.6.0", + "resolved": "git+https://github.com/sharelatex/metrics-sharelatex.git#718f1144407ab2c867b869ebb38e07de2be1933b", "dependencies": { "coffee-script": { "version": "1.6.0", - "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz" + "from": "coffee-script@1.6.0" } } }, "mimelib": { "version": "0.2.14", - "from": "https://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz", - "resolved": "https://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz", + "from": "mimelib@0.2.14", "dependencies": { "encoding": { "version": "0.1.12", - "from": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "from": "encoding@~0.1", "dependencies": { "iconv-lite": { - "version": "0.4.13", - "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz" + "version": "0.4.15", + "from": "iconv-lite@~0.4.13", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz" } } }, "addressparser": { "version": "0.2.1", - "from": "https://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz", - "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz" + "from": "addressparser@~0.2.0" } } }, "mocha": { "version": "1.17.1", - "from": "https://registry.npmjs.org/mocha/-/mocha-1.17.1.tgz", + "from": "mocha@1.17.1", "resolved": "https://registry.npmjs.org/mocha/-/mocha-1.17.1.tgz", "dependencies": { "commander": { "version": "2.0.0", - "from": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz", + "from": "commander@2.0.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz" }, "growl": { "version": "1.7.0", - "from": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz" + "from": "growl@1.7.x" }, "jade": { "version": "0.26.3", - "from": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz", + "from": "jade@0.26.3", "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz", "dependencies": { "commander": { "version": "0.6.1", - "from": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz", + "from": "commander@0.6.1", "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz" }, "mkdirp": { "version": "0.3.0", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", + "from": "mkdirp@0.3.0", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz" } } }, "diff": { "version": "1.0.7", - "from": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz" + "from": "diff@1.0.7" }, "debug": { - "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.6.0", + "from": "debug@^2.2.0", "dependencies": { "ms": { - "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.2", + "from": "ms@0.7.2" } } }, "mkdirp": { "version": "0.3.5", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", + "from": "mkdirp@~0.3.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" }, "glob": { "version": "3.2.3", - "from": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz", + "from": "glob@3.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz", "dependencies": { "minimatch": { "version": "0.2.14", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "from": "minimatch@~0.2.11", "dependencies": { "lru-cache": { "version": "2.7.3", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" + "from": "lru-cache@2" }, "sigmund": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + "from": "sigmund@~1.0.0" } } }, "graceful-fs": { "version": "2.0.3", - "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz" + "from": "graceful-fs@~2.0.0" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" } } } @@ -1999,109 +1767,93 @@ }, "mongojs": { "version": "0.18.2", - "from": "https://registry.npmjs.org/mongojs/-/mongojs-0.18.2.tgz", - "resolved": "https://registry.npmjs.org/mongojs/-/mongojs-0.18.2.tgz", + "from": "mongojs@0.18.2", "dependencies": { "thunky": { "version": "0.1.0", - "from": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz" + "from": "thunky@~0.1.0" }, "readable-stream": { "version": "1.1.14", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "from": "readable-stream@1.1.x", "dependencies": { "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + "from": "isarray@0.0.1" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" } } }, "mongodb": { "version": "1.4.32", - "from": "https://registry.npmjs.org/mongodb/-/mongodb-1.4.32.tgz", + "from": "mongodb@1.4.32", "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-1.4.32.tgz", "dependencies": { "bson": { "version": "0.2.22", - "from": "https://registry.npmjs.org/bson/-/bson-0.2.22.tgz", - "resolved": "https://registry.npmjs.org/bson/-/bson-0.2.22.tgz", + "from": "bson@~0.2", "dependencies": { "nan": { "version": "1.8.4", - "from": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz", + "from": "nan@~1.8", "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz" } } }, "kerberos": { "version": "0.0.9", - "from": "https://registry.npmjs.org/kerberos/-/kerberos-0.0.9.tgz", - "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-0.0.9.tgz", + "from": "kerberos@0.0.9", "dependencies": { "nan": { "version": "1.6.2", - "from": "https://registry.npmjs.org/nan/-/nan-1.6.2.tgz", + "from": "nan@1.6.2", "resolved": "https://registry.npmjs.org/nan/-/nan-1.6.2.tgz" } } }, "readable-stream": { - "version": "2.1.4", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", + "version": "2.2.2", + "from": "readable-stream@latest", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz", "dependencies": { "buffer-shims": { "version": "1.0.0", - "from": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" + "from": "buffer-shims@^1.0.0" }, "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "1.0.0", - "from": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + "from": "isarray@~1.0.0" + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@~2.0.1" }, "process-nextick-args": { "version": "1.0.7", - "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" + "from": "process-nextick-args@~1.0.6" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "util-deprecate": { "version": "1.0.2", - "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + "from": "util-deprecate@~1.0.1" } } } @@ -2111,33 +1863,29 @@ }, "mongoose": { "version": "4.1.0", - "from": "https://registry.npmjs.org/mongoose/-/mongoose-4.1.0.tgz", + "from": "mongoose@4.1.0", "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.1.0.tgz", "dependencies": { "async": { "version": "0.9.0", - "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz", + "from": "async@0.9.0", "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz" }, "bson": { "version": "0.3.2", - "from": "https://registry.npmjs.org/bson/-/bson-0.3.2.tgz", - "resolved": "https://registry.npmjs.org/bson/-/bson-0.3.2.tgz", + "from": "bson@~0.3", "dependencies": { "bson-ext": { "version": "0.1.13", - "from": "https://registry.npmjs.org/bson-ext/-/bson-ext-0.1.13.tgz", - "resolved": "https://registry.npmjs.org/bson-ext/-/bson-ext-0.1.13.tgz", + "from": "bson-ext@~0.1", "dependencies": { "bindings": { "version": "1.2.1", - "from": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" + "from": "bindings@^1.2.1" }, "nan": { "version": "2.0.9", - "from": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz" + "from": "nan@~2.0.9" } } } @@ -2145,38 +1893,33 @@ }, "hooks-fixed": { "version": "1.1.0", - "from": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-1.1.0.tgz" + "from": "hooks-fixed@1.1.0" }, "kareem": { "version": "1.0.1", - "from": "https://registry.npmjs.org/kareem/-/kareem-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.0.1.tgz" + "from": "kareem@1.0.1" }, "mongodb": { "version": "2.0.34", - "from": "https://registry.npmjs.org/mongodb/-/mongodb-2.0.34.tgz", + "from": "mongodb@2.0.34", "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.0.34.tgz", "dependencies": { "mongodb-core": { "version": "1.2.0", - "from": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.2.0.tgz", + "from": "mongodb-core@1.2.0", "dependencies": { "bson": { "version": "0.4.23", - "from": "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz", - "resolved": "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz" + "from": "bson@~0.4" }, "kerberos": { - "version": "0.0.21", - "from": "https://registry.npmjs.org/kerberos/-/kerberos-0.0.21.tgz", - "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-0.0.21.tgz", + "version": "0.0.22", + "from": "kerberos@~0.0", + "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-0.0.22.tgz", "dependencies": { "nan": { - "version": "2.3.5", - "from": "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz" + "version": "2.4.0", + "from": "nan@~2.4" } } } @@ -2184,28 +1927,24 @@ }, "readable-stream": { "version": "1.0.31", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz", + "from": "readable-stream@1.0.31", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz", "dependencies": { "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + "from": "isarray@0.0.1" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" } } } @@ -2213,33 +1952,27 @@ }, "mpath": { "version": "0.1.1", - "from": "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz" + "from": "mpath@0.1.1" }, "mpromise": { "version": "0.5.4", - "from": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.4.tgz", - "resolved": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.4.tgz" + "from": "mpromise@0.5.4" }, "mquery": { "version": "1.6.1", - "from": "https://registry.npmjs.org/mquery/-/mquery-1.6.1.tgz", - "resolved": "https://registry.npmjs.org/mquery/-/mquery-1.6.1.tgz", + "from": "mquery@1.6.1", "dependencies": { "bluebird": { "version": "2.9.26", - "from": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.26.tgz", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.26.tgz" + "from": "bluebird@2.9.26" }, "debug": { "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "from": "debug@2.2.0", "dependencies": { "ms": { "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "from": "ms@0.7.1" } } } @@ -2247,72 +1980,59 @@ }, "ms": { "version": "0.1.0", - "from": "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz" + "from": "ms@0.1.0" }, "muri": { "version": "1.0.0", - "from": "https://registry.npmjs.org/muri/-/muri-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/muri/-/muri-1.0.0.tgz" + "from": "muri@1.0.0" }, "regexp-clone": { "version": "0.0.1", - "from": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz" + "from": "regexp-clone@0.0.1" }, "sliced": { "version": "0.0.5", - "from": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz", - "resolved": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz" + "from": "sliced@0.0.5" } } }, "multer": { "version": "0.1.8", - "from": "https://registry.npmjs.org/multer/-/multer-0.1.8.tgz", - "resolved": "https://registry.npmjs.org/multer/-/multer-0.1.8.tgz", + "from": "multer@^0.1.8", "dependencies": { "busboy": { - "version": "0.2.13", - "from": "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz", - "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz", + "version": "0.2.14", + "from": "busboy@~0.2.9", "dependencies": { "dicer": { "version": "0.2.5", - "from": "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz", - "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz", + "from": "dicer@0.2.5", "dependencies": { "streamsearch": { "version": "0.1.2", - "from": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", - "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz" + "from": "streamsearch@0.1.2" } } }, "readable-stream": { "version": "1.1.14", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "from": "readable-stream@1.1.x", "dependencies": { "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + "from": "isarray@0.0.1" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" } } } @@ -2320,33 +2040,27 @@ }, "mkdirp": { "version": "0.3.5", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" + "from": "mkdirp@~0.3.5" }, "qs": { "version": "1.2.2", - "from": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz", - "resolved": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz" + "from": "qs@~1.2.2" }, "type-is": { "version": "1.5.7", - "from": "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz", + "from": "type-is@~1.5.2", "dependencies": { "media-typer": { "version": "0.3.0", - "from": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" + "from": "media-typer@0.3.0" }, "mime-types": { "version": "2.0.14", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz", + "from": "mime-types@~2.0.9", "dependencies": { "mime-db": { "version": "1.12.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz" + "from": "mime-db@~1.12.0" } } } @@ -2354,67 +2068,53 @@ } } }, - "node-uuid": { - "version": "1.4.1", - "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz" - }, "nodemailer": { "version": "2.1.0", - "from": "https://registry.npmjs.org/nodemailer/-/nodemailer-2.1.0.tgz", + "from": "nodemailer@2.1.0", "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-2.1.0.tgz", "dependencies": { "libmime": { "version": "2.0.0", - "from": "https://registry.npmjs.org/libmime/-/libmime-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/libmime/-/libmime-2.0.0.tgz", + "from": "libmime@2.0.0", "dependencies": { "iconv-lite": { "version": "0.4.13", - "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", + "from": "iconv-lite@0.4.13", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz" }, "libbase64": { "version": "0.1.0", - "from": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz" + "from": "libbase64@0.1.0" }, "libqp": { "version": "1.1.0", - "from": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz" + "from": "libqp@1.1.0" } } }, "mailcomposer": { "version": "3.3.2", - "from": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.3.2.tgz", - "resolved": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.3.2.tgz", + "from": "mailcomposer@3.3.2", "dependencies": { "buildmail": { "version": "3.3.2", - "from": "https://registry.npmjs.org/buildmail/-/buildmail-3.3.2.tgz", - "resolved": "https://registry.npmjs.org/buildmail/-/buildmail-3.3.2.tgz", + "from": "buildmail@3.3.2", "dependencies": { "addressparser": { "version": "1.0.0", - "from": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.0.tgz" + "from": "addressparser@1.0.0" }, "libbase64": { "version": "0.1.0", - "from": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz" + "from": "libbase64@0.1.0" }, "libqp": { "version": "1.1.0", - "from": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz" + "from": "libqp@1.1.0" }, "nodemailer-fetch": { "version": "1.2.1", - "from": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.2.1.tgz" + "from": "nodemailer-fetch@1.2.1" } } } @@ -2422,69 +2122,57 @@ }, "nodemailer-direct-transport": { "version": "2.0.1", - "from": "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-2.0.1.tgz", + "from": "nodemailer-direct-transport@2.0.1", "dependencies": { "smtp-connection": { "version": "2.0.1", - "from": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.0.1.tgz" + "from": "smtp-connection@2.0.1" } } }, "nodemailer-shared": { "version": "1.0.3", - "from": "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.0.3.tgz", + "from": "nodemailer-shared@1.0.3", "dependencies": { "nodemailer-fetch": { "version": "1.2.1", - "from": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.2.1.tgz" + "from": "nodemailer-fetch@1.2.1" } } }, "nodemailer-smtp-pool": { "version": "2.1.0", - "from": "https://registry.npmjs.org/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.1.0.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.1.0.tgz", + "from": "nodemailer-smtp-pool@2.1.0", "dependencies": { "clone": { "version": "1.0.2", - "from": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz" + "from": "clone@1.0.2" }, "nodemailer-wellknown": { "version": "0.1.7", - "from": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.7.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.7.tgz" + "from": "nodemailer-wellknown@0.1.7" }, "smtp-connection": { "version": "2.0.1", - "from": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.0.1.tgz" + "from": "smtp-connection@2.0.1" } } }, "nodemailer-smtp-transport": { "version": "2.0.1", - "from": "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.0.1.tgz", + "from": "nodemailer-smtp-transport@2.0.1", "dependencies": { "clone": { "version": "1.0.2", - "from": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz" + "from": "clone@1.0.2" }, "nodemailer-wellknown": { "version": "0.1.7", - "from": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.7.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.7.tgz" + "from": "nodemailer-wellknown@0.1.7" }, "smtp-connection": { "version": "2.0.1", - "from": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.0.1.tgz" + "from": "smtp-connection@2.0.1" } } } @@ -2492,69 +2180,102 @@ }, "nodemailer-sendgrid-transport": { "version": "0.2.0", - "from": "https://registry.npmjs.org/nodemailer-sendgrid-transport/-/nodemailer-sendgrid-transport-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-sendgrid-transport/-/nodemailer-sendgrid-transport-0.2.0.tgz", + "from": "nodemailer-sendgrid-transport@^0.2.0", "dependencies": { "sendgrid": { "version": "1.9.2", - "from": "https://registry.npmjs.org/sendgrid/-/sendgrid-1.9.2.tgz", - "resolved": "https://registry.npmjs.org/sendgrid/-/sendgrid-1.9.2.tgz", + "from": "sendgrid@^1.8.0", "dependencies": { "mime": { "version": "1.3.4", - "from": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz" + "from": "mime@^1.2.9" }, "lodash": { "version": "3.10.1", - "from": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" + "from": "lodash@^3.0.1 || ^2.0.0" }, "smtpapi": { "version": "1.2.0", - "from": "https://registry.npmjs.org/smtpapi/-/smtpapi-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/smtpapi/-/smtpapi-1.2.0.tgz" + "from": "smtpapi@^1.2.0" } } } } }, "nodemailer-ses-transport": { - "version": "1.4.0", - "from": "https://registry.npmjs.org/nodemailer-ses-transport/-/nodemailer-ses-transport-1.4.0.tgz", - "resolved": "https://registry.npmjs.org/nodemailer-ses-transport/-/nodemailer-ses-transport-1.4.0.tgz", + "version": "1.5.0", + "from": "nodemailer-ses-transport@^1.3.0", + "resolved": "https://registry.npmjs.org/nodemailer-ses-transport/-/nodemailer-ses-transport-1.5.0.tgz", "dependencies": { "aws-sdk": { - "version": "2.4.14", - "from": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.4.14.tgz", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.4.14.tgz", + "version": "2.7.27", + "from": "aws-sdk@^2.6.12", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.7.27.tgz", "dependencies": { - "sax": { - "version": "1.1.5", - "from": "https://registry.npmjs.org/sax/-/sax-1.1.5.tgz", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.5.tgz" - }, - "xml2js": { - "version": "0.4.15", - "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.15.tgz", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.15.tgz" - }, - "xmlbuilder": { - "version": "2.6.2", - "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz", + "buffer": { + "version": "4.9.1", + "from": "buffer@4.9.1", "dependencies": { - "lodash": { - "version": "3.5.0", - "from": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz" + "base64-js": { + "version": "1.2.0", + "from": "base64-js@^1.0.2", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz" + }, + "ieee754": { + "version": "1.1.8", + "from": "ieee754@^1.1.4", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz" + }, + "isarray": { + "version": "1.0.0", + "from": "isarray@^1.0.0" } } }, + "crypto-browserify": { + "version": "1.0.9", + "from": "crypto-browserify@1.0.9" + }, "jmespath": { "version": "0.15.0", - "from": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz", - "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz" + "from": "jmespath@0.15.0" + }, + "querystring": { + "version": "0.2.0", + "from": "querystring@0.2.0" + }, + "sax": { + "version": "1.1.5", + "from": "sax@1.1.5" + }, + "url": { + "version": "0.10.3", + "from": "url@0.10.3", + "dependencies": { + "punycode": { + "version": "1.3.2", + "from": "punycode@1.3.2" + } + } + }, + "uuid": { + "version": "3.0.0", + "from": "uuid@3.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz" + }, + "xml2js": { + "version": "0.4.15", + "from": "xml2js@0.4.15" + }, + "xmlbuilder": { + "version": "2.6.2", + "from": "xmlbuilder@2.6.2", + "dependencies": { + "lodash": { + "version": "3.5.0", + "from": "lodash@~3.5.0" + } + } } } } @@ -2562,67 +2283,56 @@ }, "optimist": { "version": "0.6.1", - "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "from": "optimist@0.6.1", "dependencies": { "wordwrap": { "version": "0.0.3", - "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz" + "from": "wordwrap@~0.0.2" }, "minimist": { "version": "0.0.10", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" + "from": "minimist@~0.0.1" } } }, "passport": { "version": "0.3.2", - "from": "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz", - "resolved": "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz", + "from": "passport@^0.3.2", "dependencies": { "passport-strategy": { "version": "1.0.0", - "from": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz" + "from": "passport-strategy@1.x.x" }, "pause": { "version": "0.0.1", - "from": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz" + "from": "pause@0.0.1" } } }, "passport-ldapauth": { "version": "0.6.0", - "from": "https://registry.npmjs.org/passport-ldapauth/-/passport-ldapauth-0.6.0.tgz", - "resolved": "https://registry.npmjs.org/passport-ldapauth/-/passport-ldapauth-0.6.0.tgz", + "from": "passport-ldapauth@^0.6.0", "dependencies": { "passport-strategy": { "version": "1.0.0", - "from": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz" + "from": "passport-strategy@1.x.x" }, "ldapauth-fork": { - "version": "2.5.3", - "from": "https://registry.npmjs.org/ldapauth-fork/-/ldapauth-fork-2.5.3.tgz", - "resolved": "https://registry.npmjs.org/ldapauth-fork/-/ldapauth-fork-2.5.3.tgz", + "version": "2.5.5", + "from": "ldapauth-fork@~2.5.0", "dependencies": { "bcryptjs": { "version": "2.3.0", - "from": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz", + "from": "bcryptjs@2.3.0", "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz" }, "lru-cache": { "version": "3.2.0", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz", + "from": "lru-cache@3.2.0", "dependencies": { "pseudomap": { "version": "1.0.2", - "from": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz" + "from": "pseudomap@^1.0.1" } } } @@ -2632,20 +2342,17 @@ }, "passport-local": { "version": "1.0.0", - "from": "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz", + "from": "passport-local@^1.0.0", "dependencies": { "passport-strategy": { "version": "1.0.0", - "from": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz" + "from": "passport-strategy@1.x.x" } } }, "passport-saml": { "version": "0.15.0", - "from": "passport-saml@", - "resolved": "https://registry.npmjs.org/passport-saml/-/passport-saml-0.15.0.tgz", + "from": "passport-saml@^0.15.0", "dependencies": { "passport-strategy": { "version": "1.0.0", @@ -2658,7 +2365,6 @@ "xml2js": { "version": "0.4.17", "from": "xml2js@0.4.x", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz", "dependencies": { "sax": { "version": "1.2.1", @@ -2666,32 +2372,35 @@ }, "xmlbuilder": { "version": "4.2.1", - "from": "xmlbuilder@^4.1.0", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz" + "from": "xmlbuilder@^4.1.0" } } }, "xml-crypto": { - "version": "0.8.4", + "version": "0.8.5", "from": "xml-crypto@0.8.x", + "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-0.8.5.tgz", "dependencies": { "xmldom": { "version": "0.1.19", "from": "xmldom@=0.1.19" }, "xpath.js": { - "version": "1.0.6", - "from": "xpath.js@>=0.0.3" + "version": "1.0.7", + "from": "xpath.js@>=0.0.3", + "resolved": "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz" } } }, "xmldom": { - "version": "0.1.22", - "from": "xmldom@0.1.x" + "version": "0.1.27", + "from": "xmldom@0.1.x", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz" }, "xmlbuilder": { "version": "2.5.2", "from": "xmlbuilder@2.5.x", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.2.tgz", "dependencies": { "lodash": { "version": "3.2.0", @@ -2702,6 +2411,7 @@ "xml-encryption": { "version": "0.7.4", "from": "xml-encryption@~0.7", + "resolved": "https://registry.npmjs.org/xml-encryption/-/xml-encryption-0.7.4.tgz", "dependencies": { "ejs": { "version": "0.8.8", @@ -2713,165 +2423,44 @@ }, "xpath": { "version": "0.0.5", - "from": "xpath@0.0.5", - "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.5.tgz" + "from": "xpath@0.0.5" }, "node-forge": { "version": "0.2.24", - "from": "node-forge@0.2.24", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.2.24.tgz" + "from": "node-forge@0.2.24" } } } } }, - "pg": { - "version": "6.0.3", - "from": "https://registry.npmjs.org/pg/-/pg-6.0.3.tgz", - "resolved": "https://registry.npmjs.org/pg/-/pg-6.0.3.tgz", - "dependencies": { - "buffer-writer": { - "version": "1.0.1", - "from": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.1.tgz" - }, - "packet-reader": { - "version": "0.2.0", - "from": "https://registry.npmjs.org/packet-reader/-/packet-reader-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-0.2.0.tgz" - }, - "pg-connection-string": { - "version": "0.1.3", - "from": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz" - }, - "pg-pool": { - "version": "1.4.0", - "from": "https://registry.npmjs.org/pg-pool/-/pg-pool-1.4.0.tgz", - "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-1.4.0.tgz", - "dependencies": { - "generic-pool": { - "version": "2.4.2", - "from": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.2.tgz", - "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.2.tgz" - }, - "object-assign": { - "version": "4.1.0", - "from": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" - } - } - }, - "pg-types": { - "version": "1.11.0", - "from": "https://registry.npmjs.org/pg-types/-/pg-types-1.11.0.tgz", - "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-1.11.0.tgz", - "dependencies": { - "ap": { - "version": "0.2.0", - "from": "https://registry.npmjs.org/ap/-/ap-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/ap/-/ap-0.2.0.tgz" - }, - "postgres-array": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/postgres-array/-/postgres-array-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-1.0.0.tgz" - }, - "postgres-bytea": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz" - }, - "postgres-date": { - "version": "1.0.3", - "from": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.3.tgz" - }, - "postgres-interval": { - "version": "1.0.2", - "from": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.0.2.tgz", - "dependencies": { - "xtend": { - "version": "4.0.1", - "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" - } - } - } - } - }, - "pgpass": { - "version": "0.0.6", - "from": "https://registry.npmjs.org/pgpass/-/pgpass-0.0.6.tgz", - "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-0.0.6.tgz", - "dependencies": { - "split": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/split/-/split-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/split/-/split-1.0.0.tgz", - "dependencies": { - "through": { - "version": "2.3.8", - "from": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz" - } - } - } - } - }, - "semver": { - "version": "4.3.2", - "from": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz" - } - } - }, - "pg-hstore": { - "version": "2.3.2", - "from": "https://registry.npmjs.org/pg-hstore/-/pg-hstore-2.3.2.tgz", - "resolved": "https://registry.npmjs.org/pg-hstore/-/pg-hstore-2.3.2.tgz", - "dependencies": { - "underscore": { - "version": "1.8.3", - "from": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz" - } - } - }, "redback": { "version": "0.4.0", - "from": "https://registry.npmjs.org/redback/-/redback-0.4.0.tgz", - "resolved": "https://registry.npmjs.org/redback/-/redback-0.4.0.tgz" + "from": "redback@0.4.0" }, "redis": { "version": "0.10.1", - "from": "https://registry.npmjs.org/redis/-/redis-0.10.1.tgz", - "resolved": "https://registry.npmjs.org/redis/-/redis-0.10.1.tgz" + "from": "redis@0.10.1" }, "redis-sharelatex": { "version": "0.0.9", - "from": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-0.0.9.tgz", - "resolved": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-0.0.9.tgz", + "from": "redis-sharelatex@0.0.9", "dependencies": { "chai": { "version": "1.9.1", - "from": "https://registry.npmjs.org/chai/-/chai-1.9.1.tgz", + "from": "chai@1.9.1", "resolved": "https://registry.npmjs.org/chai/-/chai-1.9.1.tgz", "dependencies": { "assertion-error": { "version": "1.0.0", - "from": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz" + "from": "assertion-error@1.0.0" }, "deep-eql": { "version": "0.1.3", - "from": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz", + "from": "deep-eql@0.1.3", "dependencies": { "type-detect": { "version": "0.1.1", - "from": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz", + "from": "type-detect@0.1.1", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz" } } @@ -2880,195 +2469,176 @@ }, "coffee-script": { "version": "1.8.0", - "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz", + "from": "coffee-script@1.8.0", "dependencies": { "mkdirp": { "version": "0.3.5", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", + "from": "mkdirp@~0.3.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" } } }, "grunt-contrib-coffee": { "version": "0.11.1", - "from": "https://registry.npmjs.org/grunt-contrib-coffee/-/grunt-contrib-coffee-0.11.1.tgz", - "resolved": "https://registry.npmjs.org/grunt-contrib-coffee/-/grunt-contrib-coffee-0.11.1.tgz", + "from": "grunt-contrib-coffee@0.11.1", "dependencies": { "coffee-script": { "version": "1.7.1", - "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz", + "from": "coffee-script@~1.7.0", "dependencies": { "mkdirp": { "version": "0.3.5", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", + "from": "mkdirp@~0.3.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" } } }, "chalk": { "version": "0.5.1", - "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", + "from": "chalk@~0.5.0", "dependencies": { "ansi-styles": { "version": "1.1.0", - "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz" + "from": "ansi-styles@^1.1.0" }, "escape-string-regexp": { "version": "1.0.5", - "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + "from": "escape-string-regexp@^1.0.0" }, "has-ansi": { "version": "0.1.0", - "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", + "from": "has-ansi@^0.1.0", "dependencies": { "ansi-regex": { "version": "0.2.1", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" + "from": "ansi-regex@^0.2.0" } } }, "strip-ansi": { "version": "0.3.0", - "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", + "from": "strip-ansi@^0.3.0", "dependencies": { "ansi-regex": { "version": "0.2.1", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" + "from": "ansi-regex@^0.2.0" } } }, "supports-color": { "version": "0.2.0", - "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz" + "from": "supports-color@^0.2.0" } } }, "lodash": { "version": "2.4.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz" + "from": "lodash@~2.4.1" } } }, "grunt-mocha-test": { "version": "0.12.0", - "from": "https://registry.npmjs.org/grunt-mocha-test/-/grunt-mocha-test-0.12.0.tgz", - "resolved": "https://registry.npmjs.org/grunt-mocha-test/-/grunt-mocha-test-0.12.0.tgz", + "from": "grunt-mocha-test@0.12.0", "dependencies": { "hooker": { "version": "0.2.3", - "from": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz", - "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" + "from": "hooker@~0.2.3" }, "fs-extra": { "version": "0.11.1", - "from": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.11.1.tgz", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.11.1.tgz", + "from": "fs-extra@~0.11.1", "dependencies": { "ncp": { "version": "0.6.0", - "from": "https://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz" + "from": "ncp@^0.6.0" }, "mkdirp": { "version": "0.5.1", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "from": "mkdirp@^0.5.0", "dependencies": { "minimist": { "version": "0.0.8", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "from": "minimist@0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" } } }, "jsonfile": { - "version": "2.3.1", - "from": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.3.1.tgz", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.3.1.tgz" + "version": "2.4.0", + "from": "jsonfile@^2.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "dependencies": { + "graceful-fs": { + "version": "4.1.11", + "from": "graceful-fs@^4.1.6", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz" + } + } }, "rimraf": { "version": "2.5.4", - "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", + "from": "rimraf@^2.2.8", "dependencies": { "glob": { - "version": "7.0.5", - "from": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", + "version": "7.1.1", + "from": "glob@^7.0.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", "dependencies": { "fs.realpath": { "version": "1.0.0", - "from": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + "from": "fs.realpath@^1.0.0" }, "inflight": { - "version": "1.0.5", - "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", + "version": "1.0.6", + "from": "inflight@^1.0.4", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" }, "minimatch": { "version": "3.0.3", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "from": "minimatch@^3.0.2", "dependencies": { "brace-expansion": { "version": "1.1.6", - "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "from": "brace-expansion@^1.0.0", "dependencies": { "balanced-match": { "version": "0.4.2", - "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + "from": "balanced-match@^0.4.1" }, "concat-map": { "version": "0.0.1", - "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "from": "concat-map@0.0.1" } } } } }, "once": { - "version": "1.3.3", - "from": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "version": "1.4.0", + "from": "once@^1.3.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "path-is-absolute": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" + "version": "1.0.1", + "from": "path-is-absolute@^1.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" } } } @@ -3080,89 +2650,80 @@ }, "mocha": { "version": "1.21.4", - "from": "https://registry.npmjs.org/mocha/-/mocha-1.21.4.tgz", + "from": "mocha@1.21.4", "resolved": "https://registry.npmjs.org/mocha/-/mocha-1.21.4.tgz", "dependencies": { "commander": { "version": "2.0.0", - "from": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz", + "from": "commander@2.0.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz" }, "growl": { "version": "1.8.1", - "from": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz" + "from": "growl@1.8.x" }, "jade": { "version": "0.26.3", - "from": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz", + "from": "jade@0.26.3", "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz", "dependencies": { "commander": { "version": "0.6.1", - "from": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz", + "from": "commander@0.6.1", "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz" }, "mkdirp": { "version": "0.3.0", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", + "from": "mkdirp@0.3.0", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz" } } }, "diff": { "version": "1.0.7", - "from": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz" + "from": "diff@1.0.7" }, "debug": { - "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.6.0", + "from": "debug@*", "dependencies": { "ms": { - "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.2", + "from": "ms@0.7.2" } } }, "mkdirp": { "version": "0.3.5", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", + "from": "mkdirp@~0.3.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" }, "glob": { "version": "3.2.3", - "from": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz", + "from": "glob@3.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz", "dependencies": { "minimatch": { "version": "0.2.14", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "from": "minimatch@~0.2.11", "dependencies": { "lru-cache": { "version": "2.7.3", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" + "from": "lru-cache@2" }, "sigmund": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + "from": "sigmund@~1.0.0" } } }, "graceful-fs": { "version": "2.0.3", - "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz" + "from": "graceful-fs@~2.0.0" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" } } } @@ -3170,69 +2731,57 @@ }, "redis": { "version": "0.12.1", - "from": "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz", - "resolved": "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz" + "from": "redis@0.12.1" }, "redis-sentinel": { "version": "0.1.1", - "from": "https://registry.npmjs.org/redis-sentinel/-/redis-sentinel-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/redis-sentinel/-/redis-sentinel-0.1.1.tgz", + "from": "redis-sentinel@0.1.1", "dependencies": { "redis": { "version": "0.11.0", - "from": "https://registry.npmjs.org/redis/-/redis-0.11.0.tgz", - "resolved": "https://registry.npmjs.org/redis/-/redis-0.11.0.tgz" + "from": "redis@0.11.x" }, "q": { "version": "0.9.2", - "from": "https://registry.npmjs.org/q/-/q-0.9.2.tgz", - "resolved": "https://registry.npmjs.org/q/-/q-0.9.2.tgz" + "from": "q@0.9.2" } } }, "sandboxed-module": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-1.0.1.tgz", + "from": "sandboxed-module@1.0.1", "dependencies": { "require-like": { "version": "0.1.2", - "from": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz", - "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz" + "from": "require-like@0.1.2" }, "stack-trace": { "version": "0.0.9", - "from": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz" + "from": "stack-trace@0.0.9" } } }, "sinon": { "version": "1.10.3", - "from": "https://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz", + "from": "sinon@1.10.3", "dependencies": { "formatio": { "version": "1.0.2", - "from": "https://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz", + "from": "formatio@~1.0", "dependencies": { "samsam": { "version": "1.1.3", - "from": "https://registry.npmjs.org/samsam/-/samsam-1.1.3.tgz", - "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.3.tgz" + "from": "samsam@~1.1" } } }, "util": { "version": "0.10.3", - "from": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "from": "util@>=0.10.3 <1", "dependencies": { "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "from": "inherits@2.0.1" } } } @@ -3240,215 +2789,148 @@ }, "underscore": { "version": "1.7.0", - "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz", + "from": "underscore@~1.7.0", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz" } } }, "request": { - "version": "2.74.0", - "from": "https://registry.npmjs.org/request/-/request-2.74.0.tgz", - "resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz", + "version": "2.79.0", + "from": "request@^2.69.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", "dependencies": { "aws-sign2": { "version": "0.6.0", - "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" + "from": "aws-sign2@~0.6.0" }, "aws4": { - "version": "1.4.1", - "from": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz" - }, - "bl": { - "version": "1.1.2", - "from": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", - "dependencies": { - "readable-stream": { - "version": "2.0.6", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "dependencies": { - "core-util-is": { - "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - }, - "isarray": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" - }, - "process-nextick-args": { - "version": "1.0.7", - "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" - }, - "string_decoder": { - "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - }, - "util-deprecate": { - "version": "1.0.2", - "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" - } - } - } - } + "version": "1.5.0", + "from": "aws4@^1.2.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz" }, "caseless": { "version": "0.11.0", - "from": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz" + "from": "caseless@~0.11.0" }, "combined-stream": { "version": "1.0.5", - "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", + "from": "combined-stream@~1.0.5", "dependencies": { "delayed-stream": { "version": "1.0.0", - "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" + "from": "delayed-stream@~1.0.0" } } }, "extend": { "version": "3.0.0", - "from": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz" + "from": "extend@~3.0.0" }, "forever-agent": { "version": "0.6.1", - "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" + "from": "forever-agent@~0.6.1" }, "form-data": { - "version": "1.0.0-rc4", - "from": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz", + "version": "2.1.2", + "from": "form-data@~2.1.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz", "dependencies": { - "async": { - "version": "1.5.2", - "from": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" + "asynckit": { + "version": "0.4.0", + "from": "asynckit@^0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz" } } }, "har-validator": { "version": "2.0.6", - "from": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", + "from": "har-validator@~2.0.6", "dependencies": { "chalk": { "version": "1.1.3", - "from": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "from": "chalk@^1.1.1", "dependencies": { "ansi-styles": { "version": "2.2.1", - "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" + "from": "ansi-styles@^2.2.1" }, "escape-string-regexp": { "version": "1.0.5", - "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + "from": "escape-string-regexp@^1.0.2" }, "has-ansi": { "version": "2.0.0", - "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "from": "has-ansi@^2.0.0", "dependencies": { "ansi-regex": { - "version": "2.0.0", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" + "version": "2.1.1", + "from": "ansi-regex@^2.0.0" } } }, "strip-ansi": { "version": "3.0.1", - "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "from": "strip-ansi@^3.0.0", "dependencies": { "ansi-regex": { - "version": "2.0.0", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" + "version": "2.1.1", + "from": "ansi-regex@^2.0.0" } } }, "supports-color": { "version": "2.0.0", - "from": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" + "from": "supports-color@^2.0.0" } } }, "commander": { "version": "2.9.0", - "from": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "from": "commander@^2.9.0", "dependencies": { "graceful-readlink": { "version": "1.0.1", - "from": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz" + "from": "graceful-readlink@>= 1.0.0" } } }, "is-my-json-valid": { - "version": "2.13.1", - "from": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz", + "version": "2.15.0", + "from": "is-my-json-valid@^2.12.4", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz", "dependencies": { "generate-function": { "version": "2.0.0", - "from": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz" + "from": "generate-function@^2.0.0" }, "generate-object-property": { "version": "1.2.0", - "from": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", + "from": "generate-object-property@^1.1.0", "dependencies": { "is-property": { "version": "1.0.2", - "from": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz" + "from": "is-property@^1.0.0" } } }, "jsonpointer": { - "version": "2.0.0", - "from": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz" + "version": "4.0.1", + "from": "jsonpointer@^4.0.0", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz" }, "xtend": { "version": "4.0.1", - "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" + "from": "xtend@^4.0.0" } } }, "pinkie-promise": { "version": "2.0.1", - "from": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "from": "pinkie-promise@^2.0.0", "dependencies": { "pinkie": { "version": "2.0.4", - "from": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" + "from": "pinkie@^2.0.0" } } } @@ -3456,107 +2938,95 @@ }, "hawk": { "version": "3.1.3", - "from": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "from": "hawk@~3.1.3", "dependencies": { "hoek": { "version": "2.16.3", - "from": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" + "from": "hoek@2.x.x" }, "boom": { "version": "2.10.1", - "from": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" + "from": "boom@2.x.x" }, "cryptiles": { "version": "2.0.5", - "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz" + "from": "cryptiles@2.x.x" }, "sntp": { "version": "1.0.9", - "from": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz" + "from": "sntp@1.x.x" } } }, "http-signature": { "version": "1.1.1", - "from": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "from": "http-signature@~1.1.0", "dependencies": { "assert-plus": { "version": "0.2.0", - "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz" + "from": "assert-plus@^0.2.0" }, "jsprim": { - "version": "1.3.0", - "from": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz", + "version": "1.3.1", + "from": "jsprim@^1.2.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz", "dependencies": { "extsprintf": { "version": "1.0.2", - "from": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz" + "from": "extsprintf@1.0.2" }, "json-schema": { - "version": "0.2.2", - "from": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz" + "version": "0.2.3", + "from": "json-schema@0.2.3" }, "verror": { "version": "1.3.6", - "from": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz" + "from": "verror@1.3.6" } } }, "sshpk": { - "version": "1.9.2", - "from": "https://registry.npmjs.org/sshpk/-/sshpk-1.9.2.tgz", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.9.2.tgz", + "version": "1.10.2", + "from": "sshpk@^1.7.0", "dependencies": { "asn1": { "version": "0.2.3", - "from": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz" + "from": "asn1@~0.2.3" }, "assert-plus": { "version": "1.0.0", - "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + "from": "assert-plus@^1.0.0" }, "dashdash": { - "version": "1.14.0", - "from": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz" + "version": "1.14.1", + "from": "dashdash@^1.12.0", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz" }, "getpass": { "version": "0.1.6", - "from": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz" + "from": "getpass@^0.1.1" }, "jsbn": { "version": "0.1.0", - "from": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz" + "from": "jsbn@~0.1.0" }, "tweetnacl": { - "version": "0.13.3", - "from": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz" + "version": "0.14.5", + "from": "tweetnacl@~0.14.0", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz" }, "jodid25519": { "version": "1.0.2", - "from": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz" + "from": "jodid25519@^1.0.0" }, "ecc-jsbn": { "version": "0.1.1", - "from": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz" + "from": "ecc-jsbn@~0.1.1" + }, + "bcrypt-pbkdf": { + "version": "1.0.0", + "from": "bcrypt-pbkdf@^1.0.0", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz" } } } @@ -3564,196 +3034,212 @@ }, "is-typedarray": { "version": "1.0.0", - "from": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" + "from": "is-typedarray@~1.0.0" }, "isstream": { "version": "0.1.2", - "from": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" + "from": "isstream@~0.1.2" }, "json-stringify-safe": { "version": "5.0.1", - "from": "json-stringify-safe@~5.0.0", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" + "from": "json-stringify-safe@~5.0.1" }, "mime-types": { - "version": "2.1.11", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "version": "2.1.14", + "from": "mime-types@~2.1.7", "dependencies": { "mime-db": { - "version": "1.23.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" + "version": "1.26.0", + "from": "mime-db@~1.26.0" } } }, - "node-uuid": { - "version": "1.4.7", - "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz" - }, "oauth-sign": { "version": "0.8.2", - "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz" + "from": "oauth-sign@~0.8.1" }, "qs": { - "version": "6.2.1", - "from": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz" + "version": "6.3.0", + "from": "qs@~6.3.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz" }, "stringstream": { "version": "0.0.5", - "from": "stringstream@~0.0.4", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz" + "from": "stringstream@~0.0.4" }, "tough-cookie": { - "version": "2.3.1", - "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz" + "version": "2.3.2", + "from": "tough-cookie@~2.3.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", + "dependencies": { + "punycode": { + "version": "1.4.1", + "from": "punycode@^1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz" + } + } }, "tunnel-agent": { "version": "0.4.3", - "from": "tunnel-agent@~0.4.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz" + "from": "tunnel-agent@~0.4.1" } } }, "requests": { "version": "0.1.7", - "from": "https://registry.npmjs.org/requests/-/requests-0.1.7.tgz", - "resolved": "https://registry.npmjs.org/requests/-/requests-0.1.7.tgz", + "from": "requests@^0.1.7", "dependencies": { "axo": { - "version": "0.0.1", - "from": "https://registry.npmjs.org/axo/-/axo-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/axo/-/axo-0.0.1.tgz" + "version": "0.0.2", + "from": "axo@0.0.x", + "resolved": "https://registry.npmjs.org/axo/-/axo-0.0.2.tgz" }, "eventemitter3": { "version": "1.1.1", - "from": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.1.1.tgz" + "from": "eventemitter3@1.1.x" }, "extendible": { "version": "0.1.1", - "from": "https://registry.npmjs.org/extendible/-/extendible-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/extendible/-/extendible-0.1.1.tgz" + "from": "extendible@0.1.x" }, "hang": { "version": "1.0.0", - "from": "https://registry.npmjs.org/hang/-/hang-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/hang/-/hang-1.0.0.tgz" + "from": "hang@1.0.x" }, "loads": { "version": "0.0.4", - "from": "https://registry.npmjs.org/loads/-/loads-0.0.4.tgz", - "resolved": "https://registry.npmjs.org/loads/-/loads-0.0.4.tgz", + "from": "loads@0.0.x", "dependencies": { "failure": { "version": "1.1.1", - "from": "https://registry.npmjs.org/failure/-/failure-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/failure/-/failure-1.1.1.tgz" + "from": "failure@1.1.x" }, "one-time": { "version": "0.0.4", - "from": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz" + "from": "one-time@0.0.x" }, "xhr-response": { "version": "1.0.1", - "from": "https://registry.npmjs.org/xhr-response/-/xhr-response-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/xhr-response/-/xhr-response-1.0.1.tgz" + "from": "xhr-response@1.0.x" }, "xhr-status": { "version": "1.0.0", - "from": "https://registry.npmjs.org/xhr-status/-/xhr-status-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/xhr-status/-/xhr-status-1.0.0.tgz" + "from": "xhr-status@1.0.x" } } }, "xhr-send": { "version": "1.0.0", - "from": "https://registry.npmjs.org/xhr-send/-/xhr-send-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/xhr-send/-/xhr-send-1.0.0.tgz" + "from": "xhr-send@1.0.x" } } }, "rimraf": { "version": "2.2.6", - "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz", + "from": "rimraf@2.2.6", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz" }, "sanitizer": { "version": "0.1.1", - "from": "https://registry.npmjs.org/sanitizer/-/sanitizer-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/sanitizer/-/sanitizer-0.1.1.tgz" + "from": "sanitizer@0.1.1" }, "sequelize": { - "version": "3.23.6", - "from": "https://registry.npmjs.org/sequelize/-/sequelize-3.23.6.tgz", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-3.23.6.tgz", + "version": "3.29.0", + "from": "sequelize@^3.2.0", "dependencies": { "bluebird": { - "version": "3.4.1", - "from": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.1.tgz", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.1.tgz" + "version": "3.4.7", + "from": "bluebird@^3.3.4", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz" }, "depd": { "version": "1.1.0", - "from": "depd@~1.1.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz" + "from": "depd@~1.1.0" }, "dottie": { "version": "1.1.1", - "from": "https://registry.npmjs.org/dottie/-/dottie-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/dottie/-/dottie-1.1.1.tgz" + "from": "dottie@^1.0.0" }, "generic-pool": { "version": "2.4.2", - "from": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.2.tgz", + "from": "generic-pool@2.4.2", "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.2.tgz" }, "inflection": { "version": "1.10.0", - "from": "https://registry.npmjs.org/inflection/-/inflection-1.10.0.tgz", - "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.10.0.tgz" + "from": "inflection@^1.6.0" }, "lodash": { "version": "4.12.0", - "from": "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz", + "from": "lodash@4.12.0", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz" }, "moment": { - "version": "2.14.1", - "from": "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz" + "version": "2.17.1", + "from": "moment@^2.13.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz" }, "moment-timezone": { - "version": "0.5.5", - "from": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.5.tgz", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.5.tgz" + "version": "0.5.11", + "from": "moment-timezone@^0.5.4" }, "node-uuid": { "version": "1.4.7", - "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz" + "from": "node-uuid@~1.4.0" }, "retry-as-promised": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-2.0.1.tgz", + "version": "2.2.0", + "from": "retry-as-promised@^2.0.0", + "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-2.2.0.tgz", "dependencies": { + "cross-env": { + "version": "3.1.4", + "from": "cross-env@^3.1.2", + "dependencies": { + "cross-spawn": { + "version": "3.0.1", + "from": "cross-spawn@^3.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", + "dependencies": { + "lru-cache": { + "version": "4.0.2", + "from": "lru-cache@^4.0.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz", + "dependencies": { + "pseudomap": { + "version": "1.0.2", + "from": "pseudomap@^1.0.1" + }, + "yallist": { + "version": "2.0.0", + "from": "yallist@^2.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz" + } + } + }, + "which": { + "version": "1.2.12", + "from": "which@^1.2.9", + "resolved": "https://registry.npmjs.org/which/-/which-1.2.12.tgz", + "dependencies": { + "isexe": { + "version": "1.1.2", + "from": "isexe@^1.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz" + } + } + } + } + } + } + }, "debug": { - "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.6.0", + "from": "debug@^2.2.0", "dependencies": { "ms": { - "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.2", + "from": "ms@0.7.2" } } } @@ -3761,170 +3247,155 @@ }, "semver": { "version": "5.3.0", - "from": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz" + "from": "semver@~5.3.0" }, "shimmer": { "version": "1.1.0", - "from": "https://registry.npmjs.org/shimmer/-/shimmer-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.1.0.tgz" + "from": "shimmer@1.1.0" }, "terraformer-wkt-parser": { - "version": "1.1.0", - "from": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.1.0.tgz", + "version": "1.1.2", + "from": "terraformer-wkt-parser@^1.1.0", + "resolved": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.1.2.tgz", "dependencies": { "terraformer": { - "version": "1.0.5", - "from": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.5.tgz" + "version": "1.0.7", + "from": "terraformer@~1.0.5", + "resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.7.tgz" } } }, "toposort-class": { "version": "1.0.1", - "from": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz" + "from": "toposort-class@^1.0.1" }, "validator": { - "version": "5.5.0", - "from": "https://registry.npmjs.org/validator/-/validator-5.5.0.tgz", - "resolved": "https://registry.npmjs.org/validator/-/validator-5.5.0.tgz" + "version": "5.7.0", + "from": "validator@^5.2.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-5.7.0.tgz" }, "wkx": { "version": "0.2.0", - "from": "https://registry.npmjs.org/wkx/-/wkx-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.2.0.tgz" + "from": "wkx@0.2.0" } } }, "settings-sharelatex": { "version": "1.0.0", - "from": "settings-sharelatex@git+https://github.com/sharelatex/settings-sharelatex.git#cbc5e41c1dbe6789721a14b3fdae05bf22546559", + "from": "settings-sharelatex@git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0", "resolved": "git+https://github.com/sharelatex/settings-sharelatex.git#cbc5e41c1dbe6789721a14b3fdae05bf22546559", "dependencies": { "coffee-script": { "version": "1.6.0", - "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz" + "from": "coffee-script@1.6.0" } } }, "sixpack-client": { "version": "1.0.0", - "from": "https://registry.npmjs.org/sixpack-client/-/sixpack-client-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/sixpack-client/-/sixpack-client-1.0.0.tgz" + "from": "sixpack-client@^1.0.0" }, "temp": { "version": "0.8.3", - "from": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz", - "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz", + "from": "temp@^0.8.3", "dependencies": { "os-tmpdir": { - "version": "1.0.1", - "from": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz" + "version": "1.0.2", + "from": "os-tmpdir@^1.0.0", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz" } } }, "underscore": { "version": "1.6.0", - "from": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", + "from": "underscore@1.6.0", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, + "uuid": { + "version": "3.0.1", + "from": "uuid@^3.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz" + }, "v8-profiler": { "version": "5.6.5", - "from": "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.6.5.tgz", - "resolved": "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.6.5.tgz", + "from": "v8-profiler@^5.2.3", "dependencies": { "nan": { - "version": "2.4.0", - "from": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz" + "version": "2.5.1", + "from": "nan@^2.3.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz" }, "node-pre-gyp": { - "version": "0.6.29", - "from": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.29.tgz", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.29.tgz", + "version": "0.6.32", + "from": "node-pre-gyp@^0.6.5", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz", "dependencies": { "mkdirp": { "version": "0.5.1", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "from": "mkdirp@~0.5.1", "dependencies": { "minimist": { "version": "0.0.8", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "from": "minimist@0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" } } }, "nopt": { "version": "3.0.6", - "from": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "from": "nopt@~3.0.6", "dependencies": { "abbrev": { "version": "1.0.9", - "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" + "from": "abbrev@1" } } }, "npmlog": { - "version": "3.1.2", - "from": "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz", + "version": "4.0.2", + "from": "npmlog@^4.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz", "dependencies": { "are-we-there-yet": { "version": "1.1.2", - "from": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz", + "from": "are-we-there-yet@~1.1.2", "dependencies": { "delegates": { "version": "1.0.0", - "from": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz" + "from": "delegates@^1.0.0" }, "readable-stream": { - "version": "2.1.4", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", + "version": "2.2.2", + "from": "readable-stream@^2.0.0 || ^1.1.13", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz", "dependencies": { "buffer-shims": { "version": "1.0.0", - "from": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" + "from": "buffer-shims@^1.0.0" }, "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "1.0.0", - "from": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + "from": "isarray@~1.0.0" + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@~2.0.1" }, "process-nextick-args": { "version": "1.0.7", - "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" + "from": "process-nextick-args@~1.0.6" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "util-deprecate": { "version": "1.0.2", - "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + "from": "util-deprecate@~1.0.1" } } } @@ -3932,65 +3403,52 @@ }, "console-control-strings": { "version": "1.1.0", - "from": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz" + "from": "console-control-strings@~1.1.0" }, "gauge": { - "version": "2.6.0", - "from": "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz", + "version": "2.7.2", + "from": "gauge@~2.7.1", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz", "dependencies": { "aproba": { "version": "1.0.4", - "from": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz" + "from": "aproba@^1.0.3" }, - "has-color": { - "version": "0.1.7", - "from": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz", - "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz" + "supports-color": { + "version": "0.2.0", + "from": "supports-color@^0.2.0" }, "has-unicode": { "version": "2.0.1", - "from": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz" + "from": "has-unicode@^2.0.0" }, "object-assign": { - "version": "4.1.0", - "from": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + "version": "4.1.1", + "from": "object-assign@^4.1.0" }, "signal-exit": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz" + "version": "3.0.2", + "from": "signal-exit@^3.0.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz" }, "string-width": { - "version": "1.0.1", - "from": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz", + "version": "1.0.2", + "from": "string-width@^1.0.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "dependencies": { "code-point-at": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz", - "dependencies": { - "number-is-nan": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz" - } - } + "version": "1.1.0", + "from": "code-point-at@^1.0.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" }, "is-fullwidth-code-point": { "version": "1.0.0", - "from": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "from": "is-fullwidth-code-point@^1.0.0", "dependencies": { "number-is-nan": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz" + "version": "1.0.1", + "from": "number-is-nan@^1.0.0", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" } } } @@ -3998,231 +3456,198 @@ }, "strip-ansi": { "version": "3.0.1", - "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "from": "strip-ansi@^3.0.1", "dependencies": { "ansi-regex": { - "version": "2.0.0", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" + "version": "2.1.1", + "from": "ansi-regex@^2.0.0" } } }, "wide-align": { "version": "1.1.0", - "from": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz" + "from": "wide-align@^1.1.0" } } }, "set-blocking": { "version": "2.0.0", - "from": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" + "from": "set-blocking@~2.0.0" } } }, "rc": { "version": "1.1.6", - "from": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz", + "from": "rc@~1.1.6", "dependencies": { "deep-extend": { "version": "0.4.1", - "from": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz" + "from": "deep-extend@~0.4.0" }, "ini": { "version": "1.3.4", - "from": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz" + "from": "ini@~1.3.0" }, "minimist": { "version": "1.2.0", - "from": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" + "from": "minimist@^1.2.0" }, "strip-json-comments": { "version": "1.0.4", - "from": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz" + "from": "strip-json-comments@~1.0.4" } } }, "rimraf": { "version": "2.5.4", - "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", + "from": "rimraf@~2.5.4", "dependencies": { "glob": { - "version": "7.0.5", - "from": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", + "version": "7.1.1", + "from": "glob@^7.0.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", "dependencies": { "fs.realpath": { "version": "1.0.0", - "from": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + "from": "fs.realpath@^1.0.0" }, "inflight": { - "version": "1.0.5", - "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", + "version": "1.0.6", + "from": "inflight@^1.0.4", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" }, "minimatch": { "version": "3.0.3", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "from": "minimatch@^3.0.0", "dependencies": { "brace-expansion": { "version": "1.1.6", - "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "from": "brace-expansion@^1.0.0", "dependencies": { "balanced-match": { "version": "0.4.2", - "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + "from": "balanced-match@^0.4.1" }, "concat-map": { "version": "0.0.1", - "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "from": "concat-map@0.0.1" } } } } }, "once": { - "version": "1.3.3", - "from": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "version": "1.4.0", + "from": "once@^1.3.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "path-is-absolute": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" + "version": "1.0.1", + "from": "path-is-absolute@^1.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" } } } } }, "semver": { - "version": "5.2.0", - "from": "https://registry.npmjs.org/semver/-/semver-5.2.0.tgz", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.2.0.tgz" + "version": "5.3.0", + "from": "semver@~5.3.0" }, "tar": { "version": "2.2.1", - "from": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "from": "tar@~2.2.1", "dependencies": { "block-stream": { "version": "0.0.9", - "from": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz" + "from": "block-stream@*" }, "fstream": { "version": "1.0.10", - "from": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz", + "from": "fstream@^1.0.2", "dependencies": { "graceful-fs": { - "version": "4.1.5", - "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.5.tgz", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.5.tgz" + "version": "4.1.11", + "from": "graceful-fs@^4.1.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz" } } }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" } } }, "tar-pack": { - "version": "3.1.4", - "from": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.4.tgz", - "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.4.tgz", + "version": "3.3.0", + "from": "tar-pack@~3.3.0", + "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz", "dependencies": { "debug": { "version": "2.2.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "from": "debug@~2.2.0", "dependencies": { "ms": { "version": "0.7.1", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "from": "ms@0.7.1" } } }, "fstream": { "version": "1.0.10", - "from": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz", + "from": "fstream@~1.0.10", "dependencies": { "graceful-fs": { - "version": "4.1.5", - "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.5.tgz", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.5.tgz" + "version": "4.1.11", + "from": "graceful-fs@^4.1.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" } } }, "fstream-ignore": { "version": "1.0.5", - "from": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz", + "from": "fstream-ignore@~1.0.5", "dependencies": { "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@2" }, "minimatch": { "version": "3.0.3", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "from": "minimatch@^3.0.0", "dependencies": { "brace-expansion": { "version": "1.1.6", - "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "from": "brace-expansion@^1.0.0", "dependencies": { "balanced-match": { "version": "0.4.2", - "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + "from": "balanced-match@^0.4.1" }, "concat-map": { "version": "0.0.1", - "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "from": "concat-map@0.0.1" } } } @@ -4232,62 +3657,52 @@ }, "once": { "version": "1.3.3", - "from": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "from": "once@~1.3.3", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "from": "wrappy@1" } } }, "readable-stream": { - "version": "2.1.4", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", + "version": "2.1.5", + "from": "readable-stream@~2.1.4", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz", "dependencies": { "buffer-shims": { "version": "1.0.0", - "from": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" + "from": "buffer-shims@^1.0.0" }, "core-util-is": { "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + "from": "core-util-is@~1.0.0" }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@~2.0.1" }, "isarray": { "version": "1.0.0", - "from": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + "from": "isarray@~1.0.0" }, "process-nextick-args": { "version": "1.0.7", - "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" + "from": "process-nextick-args@~1.0.6" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "util-deprecate": { "version": "1.0.2", - "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + "from": "util-deprecate@~1.0.1" } } }, "uid-number": { "version": "0.0.6", - "from": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz", - "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz" + "from": "uid-number@~0.0.6" } } } @@ -4297,13 +3712,11 @@ }, "xml2js": { "version": "0.2.0", - "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.0.tgz", + "from": "xml2js@0.2.0", "dependencies": { "sax": { "version": "1.2.1", - "from": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz" + "from": "sax@>=0.1.1" } } } diff --git a/services/web/package.json b/services/web/package.json index cfd2379f73..0e3c444a75 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -42,7 +42,6 @@ "mongojs": "0.18.2", "mongoose": "4.1.0", "multer": "^0.1.8", - "node-uuid": "1.4.1", "nodemailer": "2.1.0", "nodemailer-sendgrid-transport": "^0.2.0", "nodemailer-ses-transport": "^1.3.0", @@ -64,7 +63,8 @@ "underscore": "1.6.0", "v8-profiler": "^5.2.3", "xml2js": "0.2.0", - "passport-saml": "^0.15.0" + "passport-saml": "^0.15.0", + "uuid": "^3.0.1" }, "devDependencies": { "bunyan": "0.22.1", From abb4ef14d866bb091ba312579e11eb7841bd9a2a Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 26 Jan 2017 15:08:30 +0100 Subject: [PATCH 03/15] Streamline the update/rendering process to not do extra work --- .../views/project/editor/review-panel.jade | 1 - .../track-changes/TrackChangesManager.coffee | 55 ++++++++++++------- .../controllers/ReviewPanelController.coffee | 6 +- 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/services/web/app/views/project/editor/review-panel.jade b/services/web/app/views/project/editor/review-panel.jade index 9b31516b3f..590c1a6776 100644 --- a/services/web/app/views/project/editor/review-panel.jade +++ b/services/web/app/views/project/editor/review-panel.jade @@ -41,7 +41,6 @@ .rp-entry-list-inner .rp-entry-wrapper( ng-repeat="(entry_id, entry) in reviewPanel.entries[editor.open_doc_id]" - ng-if="!(entry.type === 'comment' && reviewPanel.commentThreads[entry.thread_id].resolved === true)" ) div(ng-if="entry.type === 'insert' || entry.type === 'delete'") change-entry( diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee index 2d57100cc5..ed15da2958 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee @@ -35,8 +35,8 @@ define [ @$scope.$on "comment:remove", (e, comment_id) => @removeCommentId(comment_id) - @$scope.$on "comment:resolve_thread", (e, thread_id) => - @resolveCommentByThreadId(thread_id) + @$scope.$on "comment:resolve_threads", (e, thread_ids) => + @resolveCommentByThreadIds(thread_ids) @$scope.$on "comment:unresolve_thread", (e, thread_id) => @unresolveCommentByThreadId(thread_id) @@ -105,29 +105,45 @@ define [ # ace has updated @rangesTracker.on "insert:added", (change) => sl_console.log "[insert:added]", change - setTimeout () => @_onInsertAdded(change) + setTimeout () => + @_onInsertAdded(change) + @broadcastChange() @rangesTracker.on "insert:removed", (change) => sl_console.log "[insert:removed]", change - setTimeout () => @_onInsertRemoved(change) + setTimeout () => + @_onInsertRemoved(change) + @broadcastChange() @rangesTracker.on "delete:added", (change) => sl_console.log "[delete:added]", change - setTimeout () => @_onDeleteAdded(change) + setTimeout () => + @_onDeleteAdded(change) + @broadcastChange() @rangesTracker.on "delete:removed", (change) => sl_console.log "[delete:removed]", change - setTimeout () => @_onDeleteRemoved(change) + setTimeout () => + @_onDeleteRemoved(change) + @broadcastChange() @rangesTracker.on "changes:moved", (changes) => sl_console.log "[changes:moved]", changes - setTimeout () => @_onChangesMoved(changes) + setTimeout () => + @_onChangesMoved(changes) + @broadcastChange() @rangesTracker.on "comment:added", (comment) => sl_console.log "[comment:added]", comment - setTimeout () => @_onCommentAdded(comment) + setTimeout () => + @_onCommentAdded(comment) + @broadcastChange() @rangesTracker.on "comment:moved", (comment) => sl_console.log "[comment:moved]", comment - setTimeout () => @_onCommentMoved(comment) + setTimeout () => + @_onCommentMoved(comment) + @broadcastChange() @rangesTracker.on "comment:removed", (comment) => sl_console.log "[comment:removed]", comment - setTimeout () => @_onCommentRemoved(comment) + setTimeout () => + @_onCommentRemoved(comment) + @broadcastChange() @rangesTracker.on "clear", () => @clearAnnotations() @@ -150,6 +166,8 @@ define [ for comment in @rangesTracker.comments @_onCommentAdded(comment) + + @broadcastChange() addComment: (offset, content, thread_id) -> op = { c: content, p: offset, t: thread_id } @@ -190,15 +208,20 @@ define [ removeCommentId: (comment_id) -> @rangesTracker.removeCommentId(comment_id) - resolveCommentByThreadId: (thread_id) -> + resolveCommentByThreadIds: (thread_ids) -> + resolve_ids = {} + for id in thread_ids + resolve_ids[id] = true for comment in @rangesTracker?.comments or [] - if comment.op.t == thread_id + if resolve_ids[comment.op.t] @_onCommentRemoved(comment) + @broadcastChange() unresolveCommentByThreadId: (thread_id) -> for comment in @rangesTracker?.comments or [] if comment.op.t == thread_id @_onCommentAdded(comment) + @broadcastChange() checkMapping: () -> # TODO: reintroduce this check @@ -303,7 +326,6 @@ define [ background_marker_id = session.addMarker background_range, "track-changes-marker track-changes-added-marker", "text" callout_marker_id = @_createCalloutMarker(start, "track-changes-added-marker-callout") @changeIdToMarkerIdMap[change.id] = { background_marker_id, callout_marker_id } - @broadcastChange() _onDeleteAdded: (change) -> position = @_shareJsOffsetToAcePosition(change.op.p) @@ -318,7 +340,6 @@ define [ callout_marker_id = @_createCalloutMarker(position, "track-changes-deleted-marker-callout") @changeIdToMarkerIdMap[change.id] = { background_marker_id, callout_marker_id } - @broadcastChange() _onInsertRemoved: (change) -> {background_marker_id, callout_marker_id} = @changeIdToMarkerIdMap[change.id] @@ -326,7 +347,6 @@ define [ session = @editor.getSession() session.removeMarker background_marker_id session.removeMarker callout_marker_id - @broadcastChange() _onDeleteRemoved: (change) -> {background_marker_id, callout_marker_id} = @changeIdToMarkerIdMap[change.id] @@ -334,7 +354,6 @@ define [ session = @editor.getSession() session.removeMarker background_marker_id session.removeMarker callout_marker_id - @broadcastChange() _onCommentAdded: (comment) -> if @rangesTracker.resolvedThreadIds[comment.op.t] @@ -350,7 +369,6 @@ define [ background_marker_id = session.addMarker background_range, "track-changes-marker track-changes-comment-marker", "text" callout_marker_id = @_createCalloutMarker(start, "track-changes-comment-marker-callout") @changeIdToMarkerIdMap[comment.id] = { background_marker_id, callout_marker_id } - @broadcastChange() _onCommentRemoved: (comment) -> if @changeIdToMarkerIdMap[comment.id]? @@ -360,7 +378,6 @@ define [ session = @editor.getSession() session.removeMarker background_marker_id session.removeMarker callout_marker_id - @broadcastChange() _aceRangeToShareJs: (range) -> lines = @editor.getSession().getDocument().getLines 0, range.row @@ -385,14 +402,12 @@ define [ end = start @_updateMarker(change.id, start, end) @editor.renderer.updateBackMarkers() - @broadcastChange() _onCommentMoved: (comment) -> start = @_shareJsOffsetToAcePosition(comment.op.p) end = @_shareJsOffsetToAcePosition(comment.op.p + comment.op.c.length) @_updateMarker(comment.id, start, end) @editor.renderer.updateBackMarkers() - @broadcastChange() _updateMarker: (change_id, start, end) -> return if !@changeIdToMarkerIdMap[change_id]? diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee index 5dc2cd3715..45b2e7294e 100644 --- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee +++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee @@ -222,8 +222,10 @@ define [ delete delete_changes[comment.id] if $scope.reviewPanel.resolvedThreadIds[comment.op.t] new_comment = resolvedComments[comment.id] ?= {} + delete entries[comment.id] else new_comment = entries[comment.id] ?= {} + delete resolvedComments[comment.id] new_entry = { type: "comment" thread_id: comment.op.t @@ -356,7 +358,7 @@ define [ thread.resolved_by_user = formatUser(user) thread.resolved_at = new Date() $scope.reviewPanel.resolvedThreadIds[thread_id] = true - $scope.$broadcast "comment:resolve_thread", thread_id + $scope.$broadcast "comment:resolve_threads", [thread_id] _onCommentReopened = (thread_id) -> thread = getThread(thread_id) @@ -477,9 +479,9 @@ define [ for comment in thread.messages formatComment(comment) if thread.resolved_by_user? - $scope.$broadcast "comment:resolve_thread", thread_id thread.resolved_by_user = formatUser(thread.resolved_by_user) $scope.reviewPanel.resolvedThreadIds[thread_id] = true + $scope.$broadcast "comment:resolve_threads", [thread_id] $scope.reviewPanel.commentThreads = threads $timeout () -> $scope.$broadcast "review-panel:layout" From 76328ff93f2292eb1e59ea7ebe9dc70197cbcfd1 Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 26 Jan 2017 15:12:59 +0100 Subject: [PATCH 04/15] Tell other clients when threads are deleted --- .../review-panel/controllers/ReviewPanelController.coffee | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee index 45b2e7294e..ac687386f8 100644 --- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee +++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee @@ -66,6 +66,10 @@ define [ ide.socket.on "reopen-thread", (thread_id) -> _onCommentReopened(thread_id) + ide.socket.on "delete-thread", (thread_id) -> + _onThreadDeleted(thread_id) + $scope.$apply () -> + ide.socket.on "edit-message", (thread_id, message_id, content) -> _onCommentEdited(thread_id, message_id, content) $scope.$apply () -> @@ -372,6 +376,7 @@ define [ _onThreadDeleted = (thread_id) -> delete $scope.reviewPanel.resolvedThreadIds[thread_id] delete $scope.reviewPanel.commentThreads[thread_id] + $scope.$broadcast "comment:remove", thread_id _onCommentEdited = (thread_id, comment_id, content) -> thread = getThread(thread_id) @@ -396,7 +401,6 @@ define [ 'X-CSRF-Token': window.csrfToken } }) - $scope.$broadcast "comment:remove", entry_id event_tracking.sendMB "rp-comment-delete" $scope.saveEdit = (thread_id, comment) -> From 0479b01b9d641ccc1a8e78ea31dba804d3c1c1f7 Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 26 Jan 2017 16:04:08 +0100 Subject: [PATCH 05/15] Jump to code when clicking on review panel entries --- .../views/project/editor/review-panel.jade | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/services/web/app/views/project/editor/review-panel.jade b/services/web/app/views/project/editor/review-panel.jade index 9b31516b3f..1ef55c19c5 100644 --- a/services/web/app/views/project/editor/review-panel.jade +++ b/services/web/app/views/project/editor/review-panel.jade @@ -50,6 +50,7 @@ on-reject="rejectChange(entry_id);" on-accept="acceptChange(entry_id);" on-indicator-click="toggleReviewPanel();" + ng-click="gotoEntry(editor.open_doc_id, entry)" permissions="permissions" ) @@ -62,6 +63,7 @@ on-indicator-click="toggleReviewPanel();" on-save-edit="saveEdit(entry.thread_id, comment)" on-delete="deleteComment(entry.thread_id, comment)" + ng-click="gotoEntry(editor.open_doc_id, entry)" permissions="permissions" ng-if="!reviewPanel.loadingThreads" ) @@ -150,28 +152,28 @@ script(type='text/ng-template', id='changeEntryTemplate') i.rp-icon-delete(ng-switch-when="delete") .rp-entry-details .rp-entry-description(ng-switch="entry.type") - span(ng-switch-when="insert") Added  + span(ng-switch-when="insert", stop-propagation="click") Added  ins.rp-content-highlight {{ entry.content | limitTo:(isCollapsed ? contentLimit : entry.content.length) }} a.rp-collapse-toggle( href ng-if="needsCollapsing" ng-click="toggleCollapse();" ) {{ isCollapsed ? '... (show all)' : ' (show less)' }} - span(ng-switch-when="delete") Deleted  + span(ng-switch-when="delete", stop-propagation="click") Deleted  del.rp-content-highlight {{ entry.content | limitTo:(isCollapsed ? contentLimit : entry.content.length) }} a.rp-collapse-toggle( href ng-if="needsCollapsing" ng-click="toggleCollapse();" ) {{ isCollapsed ? '... (show all)' : ' (show less)' }} - .rp-entry-metadata + .rp-entry-metadata(stop-propagation="click") | {{ entry.metadata.ts | date : 'MMM d, y h:mm a' }} •  span.rp-entry-user(style="color: hsl({{ user.hue }}, 70%, 40%);") {{ user.name }} .rp-entry-actions(ng-if="permissions.write") - a.rp-entry-button(href, ng-click="onReject();") + a.rp-entry-button(href, ng-click="onReject();", stop-propagation="click") i.fa.fa-times |  Reject - a.rp-entry-button(href, ng-click="onAccept();") + a.rp-entry-button(href, ng-click="onAccept();", stop-propagation="click") i.fa.fa-check |  Accept @@ -196,7 +198,7 @@ script(type='text/ng-template', id='commentEntryTemplate') ng-repeat="comment in threads[entry.thread_id].messages track by comment.id" ) p.rp-comment-content - span(ng-if="!comment.editing") + span(ng-if="!comment.editing", stop-propagation="click") span.rp-entry-user( style="color: hsl({{ comment.user.hue }}, 70%, 40%);", ) {{ comment.user.name }}:  @@ -214,16 +216,16 @@ script(type='text/ng-template', id='commentEntryTemplate') span(ng-if="!comment.deleting") {{ comment.timestamp | date : 'MMM d, y h:mm a' }} span.rp-comment-actions(ng-if="comment.user.isSelf && !comment.deleting") |  •  - a(href, ng-click="startEditing(comment)") Edit + a(href, ng-click="startEditing(comment)", stop-propagation="click") Edit span(ng-if="threads[entry.thread_id].messages.length > 1") |  •  - a(href, ng-click="confirmDelete(comment)") Delete + a(href, ng-click="confirmDelete(comment)", stop-propagation="click") Delete span.rp-confim-delete(ng-if="comment.user.isSelf && comment.deleting") | Are you sure? | •  - a(href, ng-click="doDelete(comment)") Delete + a(href, ng-click="doDelete(comment)", stop-propagation="click") Delete |  •  - a(href, ng-click="cancelDelete(comment)") Cancel + a(href, ng-click="cancelDelete(comment)", stop-propagation="click") Cancel .rp-loading(ng-if="threads[entry.thread_id].submitting") i.fa.fa-spinner.fa-spin @@ -239,6 +241,7 @@ script(type='text/ng-template', id='commentEntryTemplate') button.rp-entry-button( ng-click="animateAndCallOnResolve();" ng-if="permissions.comment && permissions.write" + stop-propagation="click" ) i.fa.fa-inbox |  Resolve @@ -246,6 +249,7 @@ script(type='text/ng-template', id='commentEntryTemplate') ng-click="onReply();" ng-if="permissions.comment" ng-disabled="!entry.replyContent.length" + stop-propagation="click" ) i.fa.fa-reply |  Reply From 68aab6e05cf196afd49263c07227660565123692 Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 26 Jan 2017 16:13:21 +0100 Subject: [PATCH 06/15] Don't use code check on .bib files --- .../web/public/coffee/ide/editor/directives/aceEditor.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee index 41c70b4dee..248d8bec38 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee @@ -279,7 +279,7 @@ define [ session.setUseWrapMode(true) # use syntax validation only when explicitly set - if scope.syntaxValidation? and syntaxValidationEnabled + if scope.syntaxValidation? and syntaxValidationEnabled and !scope.fileName.match(/\.bib$/) session.setOption("useWorker", scope.syntaxValidation); # now attach session to editor From 15ad3f476905cef1e30981d439a92591a9476ce0 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Thu, 26 Jan 2017 16:11:02 +0000 Subject: [PATCH 07/15] Avoid stopping propagation, check event target instead. --- .../views/project/editor/review-panel.jade | 28 +++++++++---------- .../directives/changeEntry.coffee | 5 ++++ .../directives/commentEntry.coffee | 5 ++++ 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/services/web/app/views/project/editor/review-panel.jade b/services/web/app/views/project/editor/review-panel.jade index 1ef55c19c5..0e71858ffb 100644 --- a/services/web/app/views/project/editor/review-panel.jade +++ b/services/web/app/views/project/editor/review-panel.jade @@ -50,7 +50,7 @@ on-reject="rejectChange(entry_id);" on-accept="acceptChange(entry_id);" on-indicator-click="toggleReviewPanel();" - ng-click="gotoEntry(editor.open_doc_id, entry)" + on-body-click="gotoEntry(editor.open_doc_id, entry)" permissions="permissions" ) @@ -63,7 +63,7 @@ on-indicator-click="toggleReviewPanel();" on-save-edit="saveEdit(entry.thread_id, comment)" on-delete="deleteComment(entry.thread_id, comment)" - ng-click="gotoEntry(editor.open_doc_id, entry)" + on-body-click="gotoEntry(editor.open_doc_id, entry)" permissions="permissions" ng-if="!reviewPanel.loadingThreads" ) @@ -152,28 +152,28 @@ script(type='text/ng-template', id='changeEntryTemplate') i.rp-icon-delete(ng-switch-when="delete") .rp-entry-details .rp-entry-description(ng-switch="entry.type") - span(ng-switch-when="insert", stop-propagation="click") Added  + span(ng-switch-when="insert") Added  ins.rp-content-highlight {{ entry.content | limitTo:(isCollapsed ? contentLimit : entry.content.length) }} a.rp-collapse-toggle( href ng-if="needsCollapsing" ng-click="toggleCollapse();" ) {{ isCollapsed ? '... (show all)' : ' (show less)' }} - span(ng-switch-when="delete", stop-propagation="click") Deleted  + span(ng-switch-when="delete") Deleted  del.rp-content-highlight {{ entry.content | limitTo:(isCollapsed ? contentLimit : entry.content.length) }} a.rp-collapse-toggle( href ng-if="needsCollapsing" ng-click="toggleCollapse();" ) {{ isCollapsed ? '... (show all)' : ' (show less)' }} - .rp-entry-metadata(stop-propagation="click") + .rp-entry-metadata | {{ entry.metadata.ts | date : 'MMM d, y h:mm a' }} •  span.rp-entry-user(style="color: hsl({{ user.hue }}, 70%, 40%);") {{ user.name }} .rp-entry-actions(ng-if="permissions.write") - a.rp-entry-button(href, ng-click="onReject();", stop-propagation="click") + a.rp-entry-button(href, ng-click="onReject();") i.fa.fa-times |  Reject - a.rp-entry-button(href, ng-click="onAccept();", stop-propagation="click") + a.rp-entry-button(href, ng-click="onAccept();") i.fa.fa-check |  Accept @@ -193,12 +193,12 @@ script(type='text/ng-template', id='commentEntryTemplate') .rp-loading(ng-if="!threads[entry.thread_id].submitting && (!threads[entry.thread_id] || threads[entry.thread_id].messages.length == 0)") | No comments - div + .rp-comment-loaded .rp-comment( ng-repeat="comment in threads[entry.thread_id].messages track by comment.id" ) p.rp-comment-content - span(ng-if="!comment.editing", stop-propagation="click") + span(ng-if="!comment.editing") span.rp-entry-user( style="color: hsl({{ comment.user.hue }}, 70%, 40%);", ) {{ comment.user.name }}:  @@ -216,16 +216,16 @@ script(type='text/ng-template', id='commentEntryTemplate') span(ng-if="!comment.deleting") {{ comment.timestamp | date : 'MMM d, y h:mm a' }} span.rp-comment-actions(ng-if="comment.user.isSelf && !comment.deleting") |  •  - a(href, ng-click="startEditing(comment)", stop-propagation="click") Edit + a(href, ng-click="startEditing(comment)") Edit span(ng-if="threads[entry.thread_id].messages.length > 1") |  •  - a(href, ng-click="confirmDelete(comment)", stop-propagation="click") Delete + a(href, ng-click="confirmDelete(comment)") Delete span.rp-confim-delete(ng-if="comment.user.isSelf && comment.deleting") | Are you sure? | •  - a(href, ng-click="doDelete(comment)", stop-propagation="click") Delete + a(href, ng-click="doDelete(comment)") Delete |  •  - a(href, ng-click="cancelDelete(comment)", stop-propagation="click") Cancel + a(href, ng-click="cancelDelete(comment)") Cancel .rp-loading(ng-if="threads[entry.thread_id].submitting") i.fa.fa-spinner.fa-spin @@ -241,7 +241,6 @@ script(type='text/ng-template', id='commentEntryTemplate') button.rp-entry-button( ng-click="animateAndCallOnResolve();" ng-if="permissions.comment && permissions.write" - stop-propagation="click" ) i.fa.fa-inbox |  Resolve @@ -249,7 +248,6 @@ script(type='text/ng-template', id='commentEntryTemplate') ng-click="onReply();" ng-if="permissions.comment" ng-disabled="!entry.replyContent.length" - stop-propagation="click" ) i.fa.fa-reply |  Reply diff --git a/services/web/public/coffee/ide/review-panel/directives/changeEntry.coffee b/services/web/public/coffee/ide/review-panel/directives/changeEntry.coffee index 96f5e50016..d7bdabdc42 100644 --- a/services/web/public/coffee/ide/review-panel/directives/changeEntry.coffee +++ b/services/web/public/coffee/ide/review-panel/directives/changeEntry.coffee @@ -11,11 +11,16 @@ define [ onAccept: "&" onReject: "&" onIndicatorClick: "&" + onBodyClick: "&" link: (scope, element, attrs) -> scope.contentLimit = 40 scope.isCollapsed = true scope.needsCollapsing = false + element.on "click", (e) -> + if $(e.target).is('.rp-entry, .rp-entry-description, .rp-entry-body') + scope.onBodyClick() + scope.toggleCollapse = () -> scope.isCollapsed = !scope.isCollapsed $timeout () -> diff --git a/services/web/public/coffee/ide/review-panel/directives/commentEntry.coffee b/services/web/public/coffee/ide/review-panel/directives/commentEntry.coffee index 7c7811d553..b2f09c96af 100644 --- a/services/web/public/coffee/ide/review-panel/directives/commentEntry.coffee +++ b/services/web/public/coffee/ide/review-panel/directives/commentEntry.coffee @@ -13,10 +13,15 @@ define [ onIndicatorClick: "&" onSaveEdit: "&" onDelete: "&" + onBodyClick: "&" link: (scope, element, attrs) -> scope.state = animating: false + element.on "click", (e) -> + if $(e.target).is('.rp-entry, .rp-comment-loaded, .rp-comment-content, .rp-comment-reply, .rp-entry-metadata') + scope.onBodyClick() + scope.handleCommentReplyKeyPress = (ev) -> if ev.keyCode == 13 and !ev.shiftKey and !ev.ctrlKey and !ev.metaKey ev.preventDefault() From b086d7afa246d7997759e4f365614c73d85b2e18 Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 27 Jan 2017 16:26:58 +0100 Subject: [PATCH 08/15] Refactor rate limiting code around sending invites --- .../CollaboratorsInviteController.coffee | 57 ++++---- .../CollaboratorsInviteHandler.coffee | 2 +- .../Collaborators/CollaboratorsRouter.coffee | 4 +- .../coffee/Features/Email/EmailBuilder.coffee | 8 +- .../Subscription/LimitationsManager.coffee | 21 +-- .../CollaboratorsInviteControllerTests.coffee | 123 ++++++++++-------- .../LimitationsManagerTests.coffee | 35 ++++- 7 files changed, 149 insertions(+), 101 deletions(-) diff --git a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee index 1fde81f5c9..a2314da57f 100644 --- a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee +++ b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee @@ -23,7 +23,7 @@ module.exports = CollaboratorsInviteController = return next(err) res.json({invites: invites}) - _checkShouldInviteEmail: (sendingUser, email, callback=(err, shouldAllowInvite)->) -> + _checkShouldInviteEmail: (email, callback=(err, shouldAllowInvite)->) -> if Settings.restrictInvitesToExistingAccounts == true logger.log {email}, "checking if user exists with this email" UserGetter.getUser {email: email}, {_id: 1}, (err, user) -> @@ -31,19 +31,20 @@ module.exports = CollaboratorsInviteController = userExists = user? and user?._id? callback(null, userExists) else - UserGetter.getUser sendingUser._id, {features:1, _id:1}, (err, user)-> - if err? - return callback(err) - collabLimit = user?.features?.collaborators || 1 - if collabLimit == -1 - collabLimit = 20 - collabLimit = collabLimit * 10 - opts = - endpointName: "invite_to_project" - timeInterval: 60 * 30 - subjectName: sendingUser._id - throttle: collabLimit - rateLimiter.addCount opts, callback + callback(null, true) + + _checkRateLimit: (user_id, callback = (error) ->) -> + LimitationsManager.allowedNumberOfCollaboratorsForUser user_id, (err, collabLimit = 1)-> + return callback(err) if err? + if collabLimit == -1 + collabLimit = 20 + collabLimit = collabLimit * 10 + opts = + endpointName: "invite-to-project-by-user-id" + timeInterval: 60 * 30 + subjectName: user_id + throttle: collabLimit + rateLimiter.addCount opts, callback inviteToProject: (req, res, next) -> projectId = req.params.Project_id @@ -64,20 +65,24 @@ module.exports = CollaboratorsInviteController = if !email? or email == "" logger.log {projectId, email, sendingUserId}, "invalid email address" return res.sendStatus(400) - CollaboratorsInviteController._checkShouldInviteEmail sendingUser, email, (err, shouldAllowInvite)-> - if err? - logger.err {err, email, projectId, sendingUserId}, "error checking if we can invite this email address" - return next(err) - if !shouldAllowInvite - logger.log {email, projectId, sendingUserId}, "not allowed to send an invite to this email address" - return res.json {invite: null, error: 'cannot_invite_non_user'} - CollaboratorsInviteHandler.inviteToProject projectId, sendingUser, email, privileges, (err, invite) -> + CollaboratorsInviteController._checkRateLimit sendingUserId, (error, underRateLimit) -> + return next(error) if error? + if !underRateLimit + return res.sendStatus(429) + CollaboratorsInviteController._checkShouldInviteEmail email, (err, shouldAllowInvite)-> if err? - logger.err {projectId, email, sendingUserId}, "error creating project invite" + logger.err {err, email, projectId, sendingUserId}, "error checking if we can invite this email address" return next(err) - logger.log {projectId, email, sendingUserId}, "invite created" - EditorRealTimeController.emitToRoom(projectId, 'project:membership:changed', {invites: true}) - return res.json {invite: invite} + if !shouldAllowInvite + logger.log {email, projectId, sendingUserId}, "not allowed to send an invite to this email address" + return res.json {invite: null, error: 'cannot_invite_non_user'} + CollaboratorsInviteHandler.inviteToProject projectId, sendingUser, email, privileges, (err, invite) -> + if err? + logger.err {projectId, email, sendingUserId}, "error creating project invite" + return next(err) + logger.log {projectId, email, sendingUserId}, "invite created" + EditorRealTimeController.emitToRoom(projectId, 'project:membership:changed', {invites: true}) + return res.json {invite: invite} revokeInvite: (req, res, next) -> projectId = req.params.Project_id diff --git a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteHandler.coffee b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteHandler.coffee index 0e6cd8876c..ecca8ab86f 100644 --- a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteHandler.coffee +++ b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteHandler.coffee @@ -80,7 +80,7 @@ module.exports = CollaboratorsInviteHandler = # Send email and notification in background CollaboratorsInviteHandler._sendMessages projectId, sendingUser, invite, (err) -> if err? - logger.err {projectId, email}, "error sending messages for invite" + logger.err {err, projectId, email}, "error sending messages for invite" callback(null, invite) diff --git a/services/web/app/coffee/Features/Collaborators/CollaboratorsRouter.coffee b/services/web/app/coffee/Features/Collaborators/CollaboratorsRouter.coffee index 8b130d27db..ea7e1f89f8 100644 --- a/services/web/app/coffee/Features/Collaborators/CollaboratorsRouter.coffee +++ b/services/web/app/coffee/Features/Collaborators/CollaboratorsRouter.coffee @@ -22,13 +22,13 @@ module.exports = webRouter.post( '/project/:Project_id/invite', RateLimiterMiddlewear.rateLimit({ - endpointName: "invite-to-project" + endpointName: "invite-to-project-by-project-id" params: ["Project_id"] maxRequests: 100 timeInterval: 60 * 10 }), RateLimiterMiddlewear.rateLimit({ - endpointName: "invite-to-project-ip" + endpointName: "invite-to-project-by-ip" ipOnly:true maxRequests: 100 timeInterval: 60 * 10 diff --git a/services/web/app/coffee/Features/Email/EmailBuilder.coffee b/services/web/app/coffee/Features/Email/EmailBuilder.coffee index 5360adb7a8..0a06a2a175 100644 --- a/services/web/app/coffee/Features/Email/EmailBuilder.coffee +++ b/services/web/app/coffee/Features/Email/EmailBuilder.coffee @@ -97,7 +97,7 @@ Thank you templates.projectInvite = - subject: _.template "<%= project.name.slice(0, 40) %> - shared by <%= owner.email %>" + subject: _.template "<%= project.name %> - shared by <%= owner.email %>" layout: BaseWithHeaderEmailLayout type:"notification" plainTextTemplate: _.template """ @@ -111,16 +111,16 @@ Thank you """ compiledTemplate: (opts) -> SingleCTAEmailBody({ - title: "#{ opts.project.name.slice(0, 40) } – shared by #{ opts.owner.email }" + title: "#{ opts.project.name } – shared by #{ opts.owner.email }" greeting: "Hi," - message: "#{ opts.owner.email } wants to share “#{ opts.project.name.slice(0, 40) }” with you." + message: "#{ opts.owner.email } wants to share “#{ opts.project.name }” with you." secondaryMessage: null ctaText: "View project" ctaURL: opts.inviteUrl gmailGoToAction: target: opts.inviteUrl name: "View project" - description: "Join #{ opts.project.name.slice(0, 40) } at ShareLaTeX" + description: "Join #{ opts.project.name } at ShareLaTeX" }) templates.completeJoinGroupAccount = diff --git a/services/web/app/coffee/Features/Subscription/LimitationsManager.coffee b/services/web/app/coffee/Features/Subscription/LimitationsManager.coffee index 59a0748f36..ec29b9257a 100644 --- a/services/web/app/coffee/Features/Subscription/LimitationsManager.coffee +++ b/services/web/app/coffee/Features/Subscription/LimitationsManager.coffee @@ -1,20 +1,25 @@ logger = require("logger-sharelatex") Project = require("../../models/Project").Project -User = require("../../models/User").User +UserGetter = require("../User/UserGetter") SubscriptionLocator = require("./SubscriptionLocator") Settings = require("settings-sharelatex") CollaboratorsHandler = require("../Collaborators/CollaboratorsHandler") CollaboratorsInvitesHandler = require("../Collaborators/CollaboratorsInviteHandler") module.exports = - allowedNumberOfCollaboratorsInProject: (project_id, callback) -> - getOwnerOfProject project_id, (error, owner)-> + Project.findById project_id, 'owner_ref', (error, project) => return callback(error) if error? - if owner.features? and owner.features.collaborators? - callback null, owner.features.collaborators + @allowedNumberOfCollaboratorsForUser project.owner_ref, callback + + allowedNumberOfCollaboratorsForUser: (user_id, callback) -> + UserGetter.getUser user_id, {features: 1}, (error, user) -> + return callback(error) if error? + if user.features? and user.features.collaborators? + callback null, user.features.collaborators else callback null, Settings.defaultPlanCode.collaborators + canAddXCollaborators: (project_id, x_collaborators, callback = (error, allowed)->) -> @allowedNumberOfCollaboratorsInProject project_id, (error, allowed_number) => @@ -63,8 +68,4 @@ module.exports = logger.log user_id:user_id, limitReached:limitReached, currentTotal: subscription.member_ids.length, membersLimit: subscription.membersLimit, "checking if subscription members limit has been reached" callback(err, limitReached, subscription) -getOwnerOfProject = (project_id, callback)-> - Project.findById project_id, 'owner_ref', (error, project) -> - return callback(error) if error? - User.findById project.owner_ref, (error, owner) -> - callback(error, owner) +getOwnerIdOfProject = (project_id, callback)-> diff --git a/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee b/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee index bc1cb2e3b4..453296b3d6 100644 --- a/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee @@ -114,7 +114,8 @@ describe "CollaboratorsInviteController", -> describe 'when all goes well', -> beforeEach -> - @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(2, null, true) + @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(1, null, true) + @CollaboratorsInviteController._checkRateLimit = sinon.stub().yields(null, true) @LimitationsManager.canAddXCollaborators = sinon.stub().callsArgWith(2, null, true) @CollaboratorsInviteController.inviteToProject @req, @res, @next @@ -128,7 +129,7 @@ describe "CollaboratorsInviteController", -> it 'should have called _checkShouldInviteEmail', -> @CollaboratorsInviteController._checkShouldInviteEmail.callCount.should.equal 1 - @CollaboratorsInviteController._checkShouldInviteEmail.calledWith(@sendingUser, @targetEmail).should.equal true + @CollaboratorsInviteController._checkShouldInviteEmail.calledWith(@targetEmail).should.equal true it 'should have called inviteToProject', -> @CollaboratorsInviteHandler.inviteToProject.callCount.should.equal 1 @@ -141,7 +142,8 @@ describe "CollaboratorsInviteController", -> describe 'when the user is not allowed to add more collaborators', -> beforeEach -> - @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(2, null, true) + @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(1, null, true) + @CollaboratorsInviteController._checkRateLimit = sinon.stub().yields(null, true) @LimitationsManager.canAddXCollaborators = sinon.stub().callsArgWith(2, null, false) @CollaboratorsInviteController.inviteToProject @req, @res, @next @@ -159,7 +161,8 @@ describe "CollaboratorsInviteController", -> describe 'when canAddXCollaborators produces an error', -> beforeEach -> - @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(2, null, true) + @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(1, null, true) + @CollaboratorsInviteController._checkRateLimit = sinon.stub().yields(null, true) @err = new Error('woops') @LimitationsManager.canAddXCollaborators = sinon.stub().callsArgWith(2, @err) @CollaboratorsInviteController.inviteToProject @req, @res, @next @@ -178,7 +181,8 @@ describe "CollaboratorsInviteController", -> describe 'when inviteToProject produces an error', -> beforeEach -> - @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(2, null, true) + @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(1, null, true) + @CollaboratorsInviteController._checkRateLimit = sinon.stub().yields(null, true) @err = new Error('woops') @CollaboratorsInviteHandler.inviteToProject = sinon.stub().callsArgWith(4, @err) @CollaboratorsInviteController.inviteToProject @req, @res, @next @@ -193,7 +197,7 @@ describe "CollaboratorsInviteController", -> it 'should have called _checkShouldInviteEmail', -> @CollaboratorsInviteController._checkShouldInviteEmail.callCount.should.equal 1 - @CollaboratorsInviteController._checkShouldInviteEmail.calledWith(@sendingUser, @targetEmail).should.equal true + @CollaboratorsInviteController._checkShouldInviteEmail.calledWith(@targetEmail).should.equal true it 'should have called inviteToProject', -> @CollaboratorsInviteHandler.inviteToProject.callCount.should.equal 1 @@ -202,7 +206,8 @@ describe "CollaboratorsInviteController", -> describe 'when _checkShouldInviteEmail disallows the invite', -> beforeEach -> - @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(2, null, false) + @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(1, null, false) + @CollaboratorsInviteController._checkRateLimit = sinon.stub().yields(null, true) @LimitationsManager.canAddXCollaborators = sinon.stub().callsArgWith(2, null, true) @CollaboratorsInviteController.inviteToProject @req, @res, @next @@ -212,7 +217,7 @@ describe "CollaboratorsInviteController", -> it 'should have called _checkShouldInviteEmail', -> @CollaboratorsInviteController._checkShouldInviteEmail.callCount.should.equal 1 - @CollaboratorsInviteController._checkShouldInviteEmail.calledWith(@sendingUser, @targetEmail).should.equal true + @CollaboratorsInviteController._checkShouldInviteEmail.calledWith(@targetEmail).should.equal true it 'should not have called inviteToProject', -> @CollaboratorsInviteHandler.inviteToProject.callCount.should.equal 0 @@ -220,7 +225,8 @@ describe "CollaboratorsInviteController", -> describe 'when _checkShouldInviteEmail produces an error', -> beforeEach -> - @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(2, new Error('woops')) + @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(1, new Error('woops')) + @CollaboratorsInviteController._checkRateLimit = sinon.stub().yields(null, true) @LimitationsManager.canAddXCollaborators = sinon.stub().callsArgWith(2, null, true) @CollaboratorsInviteController.inviteToProject @req, @res, @next @@ -230,7 +236,7 @@ describe "CollaboratorsInviteController", -> it 'should have called _checkShouldInviteEmail', -> @CollaboratorsInviteController._checkShouldInviteEmail.callCount.should.equal 1 - @CollaboratorsInviteController._checkShouldInviteEmail.calledWith(@sendingUser, @targetEmail).should.equal true + @CollaboratorsInviteController._checkShouldInviteEmail.calledWith(@targetEmail).should.equal true it 'should not have called inviteToProject', -> @CollaboratorsInviteHandler.inviteToProject.callCount.should.equal 0 @@ -240,7 +246,8 @@ describe "CollaboratorsInviteController", -> beforeEach -> @req.session.user = {_id: 'abc', email: 'me@example.com'} @req.body.email = 'me@example.com' - @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(2, null, true) + @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(1, null, true) + @CollaboratorsInviteController._checkRateLimit = sinon.stub().yields(null, true) @LimitationsManager.canAddXCollaborators = sinon.stub().callsArgWith(2, null, true) @CollaboratorsInviteController.inviteToProject @req, @res, @next @@ -261,6 +268,22 @@ describe "CollaboratorsInviteController", -> it 'should not have called emitToRoom', -> @EditorRealTimeController.emitToRoom.callCount.should.equal 0 + describe 'when _checkRateLimit returns false', -> + + beforeEach -> + @CollaboratorsInviteController._checkShouldInviteEmail = sinon.stub().callsArgWith(1, null, true) + @CollaboratorsInviteController._checkRateLimit = sinon.stub().yields(null, false) + @LimitationsManager.canAddXCollaborators = sinon.stub().callsArgWith(2, null, true) + @CollaboratorsInviteController.inviteToProject @req, @res, @next + + it 'should send a 429 response', -> + @res.sendStatus.calledWith(429).should.equal true + + it 'should not call inviteToProject', -> + @CollaboratorsInviteHandler.inviteToProject.called.should.equal false + + it 'should not call emitToRoom', -> + @EditorRealTimeController.emitToRoom.called.should.equal false describe "viewInvite", -> @@ -679,13 +702,12 @@ describe "CollaboratorsInviteController", -> beforeEach -> @email = 'user@example.com' - describe 'when we should be restricting to existing accounts', -> beforeEach -> @settings.restrictInvitesToExistingAccounts = true @call = (callback) => - @CollaboratorsInviteController._checkShouldInviteEmail {}, @email, callback + @CollaboratorsInviteController._checkShouldInviteEmail @email, callback describe 'when user account is present', -> @@ -730,46 +752,43 @@ describe "CollaboratorsInviteController", -> expect(shouldAllow).to.equal undefined done() - describe 'when we should not be restricting on only registered users but do rate limit', -> + describe '_checkRateLimit', -> + beforeEach -> + @settings.restrictInvitesToExistingAccounts = false + @sendingUserId = "32312313" + @LimitationsManager.allowedNumberOfCollaboratorsForUser = sinon.stub() + @LimitationsManager.allowedNumberOfCollaboratorsForUser.withArgs(@sendingUserId).yields(null, 17) - beforeEach -> - @settings.restrictInvitesToExistingAccounts = false - @sendingUser = - _id:"32312313" - features: - collaborators:17.8 - @UserGetter.getUser = sinon.stub().callsArgWith(2, null, @sendingUser) + it 'should callback with `true` when rate limit under', (done) -> + @RateLimiter.addCount = sinon.stub().callsArgWith(1, null, true) + @CollaboratorsInviteController._checkRateLimit @sendingUserId, (err, result)=> + @RateLimiter.addCount.called.should.equal true + result.should.equal true + done() - it 'should callback with `true` when rate limit under', (done) -> - @RateLimiter.addCount = sinon.stub().callsArgWith(1, null, true) - @CollaboratorsInviteController._checkShouldInviteEmail @sendingUser, @email, (err, result)=> - @RateLimiter.addCount.called.should.equal true - result.should.equal true - done() + it 'should callback with `false` when rate limit hit', (done) -> + @RateLimiter.addCount = sinon.stub().callsArgWith(1, null, false) + @CollaboratorsInviteController._checkRateLimit @sendingUserId, (err, result)=> + @RateLimiter.addCount.called.should.equal true + result.should.equal false + done() + + it 'should call rate limiter with 10x the collaborators', (done) -> + @RateLimiter.addCount = sinon.stub().callsArgWith(1, null, true) + @CollaboratorsInviteController._checkRateLimit @sendingUserId, (err, result)=> + @RateLimiter.addCount.args[0][0].throttle.should.equal(170) + done() - it 'should callback with `false` when rate limit hit', (done) -> - @RateLimiter.addCount = sinon.stub().callsArgWith(1, null, false) - @CollaboratorsInviteController._checkShouldInviteEmail @sendingUser, @email, (err, result)=> - @RateLimiter.addCount.called.should.equal true - result.should.equal false - done() - - it 'should call rate limiter with 10x the collaborators', (done) -> - @RateLimiter.addCount = sinon.stub().callsArgWith(1, null, true) - @CollaboratorsInviteController._checkShouldInviteEmail @sendingUser, @email, (err, result)=> - @RateLimiter.addCount.args[0][0].throttle.should.equal(178) - done() + it 'should call rate limiter with 200 when collaborators is -1', (done) -> + @LimitationsManager.allowedNumberOfCollaboratorsForUser.withArgs(@sendingUserId).yields(null, -1) + @RateLimiter.addCount = sinon.stub().callsArgWith(1, null, true) + @CollaboratorsInviteController._checkRateLimit @sendingUserId, (err, result)=> + @RateLimiter.addCount.args[0][0].throttle.should.equal(200) + done() - it 'should call rate limiter with 200 when collaborators is -1', (done) -> - @sendingUser.features.collaborators = -1 - @RateLimiter.addCount = sinon.stub().callsArgWith(1, null, true) - @CollaboratorsInviteController._checkShouldInviteEmail @sendingUser, @email, (err, result)=> - @RateLimiter.addCount.args[0][0].throttle.should.equal(200) - done() - - it 'should call rate limiter with 10 when user has no collaborators set', (done) -> - delete @sendingUser.features - @RateLimiter.addCount = sinon.stub().callsArgWith(1, null, true) - @CollaboratorsInviteController._checkShouldInviteEmail @sendingUser, @email, (err, result)=> - @RateLimiter.addCount.args[0][0].throttle.should.equal(10) - done() \ No newline at end of file + it 'should call rate limiter with 10 when user has no collaborators set', (done) -> + @LimitationsManager.allowedNumberOfCollaboratorsForUser.withArgs(@sendingUserId).yields(null) + @RateLimiter.addCount = sinon.stub().callsArgWith(1, null, true) + @CollaboratorsInviteController._checkRateLimit @sendingUserId, (err, result)=> + @RateLimiter.addCount.args[0][0].throttle.should.equal(10) + done() \ No newline at end of file diff --git a/services/web/test/UnitTests/coffee/Subscription/LimitationsManagerTests.coffee b/services/web/test/UnitTests/coffee/Subscription/LimitationsManagerTests.coffee index 93f00afad5..f81433e156 100644 --- a/services/web/test/UnitTests/coffee/Subscription/LimitationsManagerTests.coffee +++ b/services/web/test/UnitTests/coffee/Subscription/LimitationsManagerTests.coffee @@ -6,17 +6,17 @@ Settings = require("settings-sharelatex") describe "LimitationsManager", -> beforeEach -> - @project = { _id: "project-id" } - @user = { _id: "user-id", features:{} } + @project = { _id: @project_id = "project-id" } + @user = { _id: @user_id = "user-id", features:{} } @Project = findById: (project_id, fields, callback) => if project_id == @project_id callback null, @project else callback null, null - @User = - findById: (user_id, callback) => - if user_id == @user.id + @UserGetter = + getUser: (user_id, filter, callback) => + if user_id == @user_id callback null, @user else callback null, null @@ -26,7 +26,7 @@ describe "LimitationsManager", -> @LimitationsManager = SandboxedModule.require modulePath, requires: '../../models/Project' : Project: @Project - '../../models/User' : User: @User + '../User/UserGetter' : @UserGetter './SubscriptionLocator':@SubscriptionLocator 'settings-sharelatex' : @Settings = {} "../Collaborators/CollaboratorsHandler": @CollaboratorsHandler = {} @@ -37,6 +37,7 @@ describe "LimitationsManager", -> describe "when the project is owned by a user without a subscription", -> beforeEach -> @Settings.defaultPlanCode = collaborators: 23 + @project.owner_ref = @user_id delete @user.features @callback = sinon.stub() @LimitationsManager.allowedNumberOfCollaboratorsInProject(@project_id, @callback) @@ -46,6 +47,7 @@ describe "LimitationsManager", -> describe "when the project is owned by a user with a subscription", -> beforeEach -> + @project.owner_ref = @user_id @user.features = collaborators: 21 @callback = sinon.stub() @@ -53,6 +55,27 @@ describe "LimitationsManager", -> it "should return the number of collaborators the user is allowed", -> @callback.calledWith(null, @user.features.collaborators).should.equal true + + describe "allowedNumberOfCollaboratorsForUser", -> + describe "when the user has no features", -> + beforeEach -> + @Settings.defaultPlanCode = collaborators: 23 + delete @user.features + @callback = sinon.stub() + @LimitationsManager.allowedNumberOfCollaboratorsForUser(@user_id, @callback) + + it "should return the default number", -> + @callback.calledWith(null, @Settings.defaultPlanCode.collaborators).should.equal true + + describe "when the user has features", -> + beforeEach -> + @user.features = + collaborators: 21 + @callback = sinon.stub() + @LimitationsManager.allowedNumberOfCollaboratorsForUser(@user_id, @callback) + + it "should return the number of collaborators the user is allowed", -> + @callback.calledWith(null, @user.features.collaborators).should.equal true describe "canAddXCollaborators", -> beforeEach -> From d9b774bb9b02e8c3cd2f08bac8fea6d9c9ca53fe Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 27 Jan 2017 17:12:17 +0100 Subject: [PATCH 09/15] Sycn track changes based on doc state, not editor state --- services/web/public/coffee/ide/editor/Document.coffee | 3 +++ services/web/public/coffee/ide/editor/EditorManager.coffee | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/editor/Document.coffee b/services/web/public/coffee/ide/editor/Document.coffee index 9d7eca813a..1de01b5467 100644 --- a/services/web/public/coffee/ide/editor/Document.coffee +++ b/services/web/public/coffee/ide/editor/Document.coffee @@ -84,6 +84,9 @@ define [ setTrackingChanges: (track_changes) -> @doc.track_changes = track_changes + getTrackingChanges: () -> + !!@doc.track_changes + setTrackChangesIdSeeds: (id_seeds) -> @doc.track_changes_id_seeds = id_seeds diff --git a/services/web/public/coffee/ide/editor/EditorManager.coffee b/services/web/public/coffee/ide/editor/EditorManager.coffee index 22fcef1a69..9b658ac87b 100644 --- a/services/web/public/coffee/ide/editor/EditorManager.coffee +++ b/services/web/public/coffee/ide/editor/EditorManager.coffee @@ -162,7 +162,7 @@ define [ @_syncTimeout = null want = @$scope.editor.wantTrackChanges - have = @$scope.editor.trackChanges + have = doc.getTrackingChanges() if want == have return From 30618d33db61295a9c0c9f2467a80a25fe74abb7 Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 27 Jan 2017 17:13:11 +0100 Subject: [PATCH 10/15] Add in extra check to set ui state --- services/web/public/coffee/ide/editor/EditorManager.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/services/web/public/coffee/ide/editor/EditorManager.coffee b/services/web/public/coffee/ide/editor/EditorManager.coffee index 9b658ac87b..3b6672fae8 100644 --- a/services/web/public/coffee/ide/editor/EditorManager.coffee +++ b/services/web/public/coffee/ide/editor/EditorManager.coffee @@ -164,6 +164,7 @@ define [ want = @$scope.editor.wantTrackChanges have = doc.getTrackingChanges() if want == have + @$scope.editor.trackChanges = want return do tryToggle = () => From 9663df3457b68fc539d2e6fefdd458a98ddc3988 Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 30 Jan 2017 16:00:32 +0100 Subject: [PATCH 11/15] Jump to text when clicking change icon as well --- .../coffee/ide/review-panel/directives/changeEntry.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/review-panel/directives/changeEntry.coffee b/services/web/public/coffee/ide/review-panel/directives/changeEntry.coffee index d7bdabdc42..9dc1ef2a37 100644 --- a/services/web/public/coffee/ide/review-panel/directives/changeEntry.coffee +++ b/services/web/public/coffee/ide/review-panel/directives/changeEntry.coffee @@ -18,7 +18,7 @@ define [ scope.needsCollapsing = false element.on "click", (e) -> - if $(e.target).is('.rp-entry, .rp-entry-description, .rp-entry-body') + if $(e.target).is('.rp-entry, .rp-entry-description, .rp-entry-body, .rp-entry-action-icon i') scope.onBodyClick() scope.toggleCollapse = () -> From 21986694d8eb4ae8b5a794cbaeeac4d547a01250 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Mon, 30 Jan 2017 15:13:03 +0000 Subject: [PATCH 12/15] update gitignore --- services/web/modules/.gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/services/web/modules/.gitignore b/services/web/modules/.gitignore index b90beee9f7..1d30263cb3 100644 --- a/services/web/modules/.gitignore +++ b/services/web/modules/.gitignore @@ -2,3 +2,11 @@ */test/unit/js */index.js ldap +admin-panel +groovehq +launchpad +learn-wiki +references-search +sharelatex-saml +templates +tpr-webmodule From b0dd7475b0e1cd779c634998f689f39a9bd4a89b Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Tue, 31 Jan 2017 14:57:22 +0000 Subject: [PATCH 13/15] fix pug syntax --- services/web/app/views/admin/index.pug | 4 ++-- services/web/app/views/contact-us-modal.pug | 10 +++++----- services/web/app/views/layout.pug | 2 +- services/web/app/views/layout/footer.pug | 6 +++--- services/web/app/views/layout/navbar.pug | 2 +- .../web/app/views/project/editor/chat.pug | 2 +- .../web/app/views/project/editor/editor.pug | 6 +++--- .../app/views/project/editor/file-tree.pug | 12 +++++------ .../web/app/views/project/editor/header.pug | 6 +++--- .../app/views/project/editor/left-menu.pug | 6 +++--- services/web/app/views/project/editor/pdf.pug | 14 ++++++------- .../web/app/views/project/editor/share.pug | 6 +++--- .../web/app/views/project/invite/show.pug | 6 +++--- .../app/views/project/list/project-list.pug | 8 ++++---- services/web/app/views/referal/bonus.pug | 12 +++++------ services/web/app/views/restore.pug | 4 ++-- services/web/app/views/scribtex-modal.pug | 2 +- services/web/app/views/sentry.pug | 6 +++--- .../web/app/views/subscriptions/dashboard.pug | 20 +++++++++---------- services/web/app/views/subscriptions/new.pug | 2 +- .../views/subscriptions/upgradeToAnnual.pug | 2 +- services/web/app/views/user/activate.pug | 2 +- services/web/app/views/user/login.pug | 2 +- services/web/app/views/user/settings.pug | 2 +- 24 files changed, 72 insertions(+), 72 deletions(-) diff --git a/services/web/app/views/admin/index.pug b/services/web/app/views/admin/index.pug index 0fa9017cc1..050829e9d7 100644 --- a/services/web/app/views/admin/index.pug +++ b/services/web/app/views/admin/index.pug @@ -28,10 +28,10 @@ block content tab(heading="Open Sockets") .row-spaced ul - -each agents, url in openSockets + each agents, url in openSockets li #{url} - total : #{agents.length} ul - -each agent in agents + each agent in agents li #{agent} tab(heading="Close Editor") diff --git a/services/web/app/views/contact-us-modal.pug b/services/web/app/views/contact-us-modal.pug index f4fd8938b7..d3e5aa0e87 100644 --- a/services/web/app/views/contact-us-modal.pug +++ b/services/web/app/views/contact-us-modal.pug @@ -24,10 +24,10 @@ script(type='text/ng-template', id='supportModalTemplate') a.contact-suggestion-list-item(ng-href="{{ suggestion.url }}", ng-click="clickSuggestionLink(suggestion.url);" target="_blank") span(ng-bind-html="suggestion.name") i.fa.fa-angle-right - label.desc(ng-show="'#{getUserEmail()}'.length < 1") + label.desc(ng-show="'"+getUserEmail()+"'.length < 1") | #{translate("email")} - .form-group(ng-show="'#{getUserEmail()}'.length < 1") - input.field.text.medium.span8.form-control(ng-model="form.email", ng-init="form.email = '#{getUserEmail()}'", type='email', spellcheck='false', value='', maxlength='255', tabindex='2') + .form-group(ng-show="'"+getUserEmail()+"'.length < 1") + input.field.text.medium.span8.form-control(ng-model="form.email", ng-init="form.email = '"+getUserEmail()+"'", type='email', spellcheck='false', value='', maxlength='255', tabindex='2') label#title12.desc | #{translate("project_url")} (#{translate("optional")}) .form-group @@ -37,6 +37,6 @@ script(type='text/ng-template', id='supportModalTemplate') .form-group textarea.field.text.medium.span8.form-control(ng-model="form.message",type='text', value='', tabindex='4', onkeyup='') .form-group.text-center - input.btn-success.btn.btn-lg(type='submit', ng-disabled="sending", ng-click="contactUs()" value='#{translate("contact_us")}') + input.btn-success.btn.btn-lg(type='submit', ng-disabled="sending", ng-click="contactUs()" value=translate("contact_us")) span(ng-show="sent") - p #{translate("request_sent_thank_you")} \ No newline at end of file + p #{translate("request_sent_thank_you")} diff --git a/services/web/app/views/layout.pug b/services/web/app/views/layout.pug index 8f4d1263db..7276c0ae5c 100644 --- a/services/web/app/views/layout.pug +++ b/services/web/app/views/layout.pug @@ -30,7 +30,7 @@ html(itemscope, itemtype='http://schema.org/Product') meta(itemprop="name", content="ShareLaTeX, the Online LaTeX Editor") -if (typeof(meta) == "undefined") - meta(itemprop="description", name="description", content='#{translate("site_description")}') + meta(itemprop="description", name="description", content=translate("site_description")) -else meta(itemprop="description", name="description" , content=meta) diff --git a/services/web/app/views/layout/footer.pug b/services/web/app/views/layout/footer.pug index efd64b6f6e..62a98ecfaa 100644 --- a/services/web/app/views/layout/footer.pug +++ b/services/web/app/views/layout/footer.pug @@ -13,9 +13,9 @@ footer.site-footer data-toggle="dropdown", aria-haspopup="true", aria-expanded="false", - tooltip="#{translate('language')}" + tooltip=translate('language') ) - figure(class="sprite-icon sprite-icon-lang sprite-icon-#{currentLngCode}") + figure(class="sprite-icon sprite-icon-lang sprite-icon-"+currentLngCode) ul.dropdown-menu(role="menu") li.dropdown-header #{translate("language")} @@ -23,7 +23,7 @@ footer.site-footer if !subdomainDetails.hide li.lngOption a.menu-indent(href=subdomainDetails.url+currentUrl) - figure(class="sprite-icon sprite-icon-lang sprite-icon-#{subdomainDetails.lngCode}") + figure(class="sprite-icon sprite-icon-lang sprite-icon-"+subdomainDetails.lngCode) | #{translate(subdomainDetails.lngCode)} //- img(src="/img/flags/24/.png") each item in nav.left_footer diff --git a/services/web/app/views/layout/navbar.pug b/services/web/app/views/layout/navbar.pug index 4d78d02fba..54509d6565 100644 --- a/services/web/app/views/layout/navbar.pug +++ b/services/web/app/views/layout/navbar.pug @@ -4,7 +4,7 @@ nav.navbar.navbar-default button.navbar-toggle(ng-init="navCollapsed = true", ng-click="navCollapsed = !navCollapsed", ng-class="{active: !navCollapsed}") i.fa.fa-bars if settings.nav.custom_logo - a(href='/', style='background-image:url("#{settings.nav.custom_logo}")').navbar-brand + a(href='/', style='background-image:url("'+settings.nav.custom_logo+'")').navbar-brand else if (nav.title) a(href='/').navbar-title #{nav.title} else diff --git a/services/web/app/views/project/editor/chat.pug b/services/web/app/views/project/editor/chat.pug index 47a1752834..fcd47a81e3 100644 --- a/services/web/app/views/project/editor/chat.pug +++ b/services/web/app/views/project/editor/chat.pug @@ -50,7 +50,7 @@ aside.chat( .new-message textarea( - placeholder="#{translate('your_message')}...", + placeholder=translate('your_message')+"...", on-enter="sendMessage()", ng-model="newMessageContent", ng-click="resetUnreadMessages()" diff --git a/services/web/app/views/project/editor/editor.pug b/services/web/app/views/project/editor/editor.pug index bcb778fda4..98a2840069 100644 --- a/services/web/app/views/project/editor/editor.pug +++ b/services/web/app/views/project/editor/editor.pug @@ -70,7 +70,7 @@ div.full-size( ng-controller="PdfSynctexController" ) a.btn.btn-default.btn-xs( - tooltip="#{translate('go_to_code_location_in_pdf')}" + tooltip=translate('go_to_code_location_in_pdf') tooltip-placement="right" tooltip-append-to-body="true" ng-click="syncToPdf()" @@ -78,7 +78,7 @@ div.full-size( i.fa.fa-long-arrow-right br a.btn.btn-default.btn-xs( - tooltip-html="'#{translate('go_to_pdf_location_in_code')}'" + tooltip-html="'"+translate('go_to_pdf_location_in_code')+"'" tooltip-placement="right" tooltip-append-to-body="true" ng-click="syncToCode()" @@ -90,4 +90,4 @@ div.full-size( ng-show="ui.view == 'pdf'" ) include ./pdf - \ No newline at end of file + diff --git a/services/web/app/views/project/editor/file-tree.pug b/services/web/app/views/project/editor/file-tree.pug index 92af8b627d..03c2bd79b7 100644 --- a/services/web/app/views/project/editor/file-tree.pug +++ b/services/web/app/views/project/editor/file-tree.pug @@ -3,21 +3,21 @@ aside#file-tree(ng-controller="FileTreeController", ng-class="{ 'multi-selected' a( href, ng-click="openNewDocModal()", - tooltip-html="'#{translate('new_file').replace(' ', '
')}'", + tooltip-html="'"+translate('new_file').replace(' ', '
')+"'", tooltip-placement="bottom" ) i.fa.fa-file a( href, ng-click="openNewFolderModal()", - tooltip-html="'#{translate('new_folder').replace(' ', '
')}'", + tooltip-html="'"+translate('new_folder').replace(' ', '
')+"'", tooltip-placement="bottom" ) i.fa.fa-folder a( href, ng-click="openUploadFileModal()", - tooltip="#{translate('upload')}", + tooltip=translate('upload'), tooltip-placement="bottom" ) i.fa.fa-upload @@ -26,7 +26,7 @@ aside#file-tree(ng-controller="FileTreeController", ng-class="{ 'multi-selected' a( href, ng-click="startRenamingSelected()", - tooltip="#{translate('rename')}", + tooltip=translate('rename'), tooltip-placement="bottom", ng-show="multiSelectedCount == 0" ) @@ -34,7 +34,7 @@ aside#file-tree(ng-controller="FileTreeController", ng-class="{ 'multi-selected' a( href, ng-click="openDeleteModalForSelected()", - tooltip="#{translate('delete')}", + tooltip=translate('delete'), tooltip-placement="bottom", tooltip-append-to-body="true" ) @@ -431,4 +431,4 @@ script(type='text/ng-template', id='invalidFileNameModalTemplate') .modal-footer button.btn.btn-default( ng-click="$close()" - ) #{translate('ok')} \ No newline at end of file + ) #{translate('ok')} diff --git a/services/web/app/views/project/editor/header.pug b/services/web/app/views/project/editor/header.pug index 601b18e9cf..475ba1da52 100644 --- a/services/web/app/views/project/editor/header.pug +++ b/services/web/app/views/project/editor/header.pug @@ -45,7 +45,7 @@ header.toolbar.toolbar-header.toolbar-with-labels( ng-if="permissions.admin", href='#', tooltip-placement="bottom", - tooltip="#{translate('rename')}", + tooltip=translate('rename'), tooltip-append-to-body="true", ng-click="startRenaming()", ng-show="!state.renaming" @@ -71,7 +71,7 @@ header.toolbar.toolbar-header.toolbar-with-labels( span.dropdown(dropdown, ng-if="onlineUsersArray.length >= 4") span.online-user.online-user-multi( dropdown-toggle, - tooltip="#{translate('connected_users')}", + tooltip=translate('connected_users'), tooltip-placement="left" ) strong {{ onlineUsersArray.length }} @@ -121,4 +121,4 @@ header.toolbar.toolbar-header.toolbar-with-labels( span.label.label-info( ng-show="unreadMessages > 0" ) {{ unreadMessages }} - p.toolbar-label #{translate("chat")} \ No newline at end of file + p.toolbar-label #{translate("chat")} diff --git a/services/web/app/views/project/editor/left-menu.pug b/services/web/app/views/project/editor/left-menu.pug index 80d5c606ab..4e86b31620 100644 --- a/services/web/app/views/project/editor/left-menu.pug +++ b/services/web/app/views/project/editor/left-menu.pug @@ -24,7 +24,7 @@ aside#left-menu.full-size( | PDF div.link-disabled( ng-if="!pdf.url" - tooltip="#{translate('please_compile_pdf_before_download')}" + tooltip=translate('please_compile_pdf_before_download') tooltip-placement="bottom" ) i.fa.fa-file-pdf-o.fa-2x @@ -47,7 +47,7 @@ aside#left-menu.full-size( a(href, ng-if="pdf.url" ,ng-click="openWordCountModal()") i.fa.fa-fw.fa-eye span    #{translate("word_count")} - a.link-disabled(href, ng-if="!pdf.url" , tooltip="#{translate('please_compile_pdf_before_word_count')}") + a.link-disabled(href, ng-if="!pdf.url" , tooltip=translate('please_compile_pdf_before_word_count')) i.fa.fa-fw.fa-eye span.link-disabled    #{translate("word_count")} @@ -200,7 +200,7 @@ script(type='text/ng-template', id='wordCountModalTemplate') span   #{translate("loading")}... div.pdf-disabled( ng-if="!pdf.url" - tooltip="#{translate('please_compile_pdf_before_word_count')}" + tooltip=translate('please_compile_pdf_before_word_count') tooltip-placement="bottom" ) div(ng-if="!status.loading") diff --git a/services/web/app/views/project/editor/pdf.pug b/services/web/app/views/project/editor/pdf.pug index 074856bd7c..ba03f068a6 100644 --- a/services/web/app/views/project/editor/pdf.pug +++ b/services/web/app/views/project/editor/pdf.pug @@ -2,7 +2,7 @@ div.full-size.pdf(ng-controller="PdfController") .toolbar.toolbar-tall .btn-group( dropdown, - tooltip-html="'#{translate('recompile_pdf')} ({{modifierKey}} + Enter)'" + tooltip-html="'"+translate('recompile_pdf')+" ({{modifierKey}} + Enter)'" tooltip-class="keyboard-tooltip" tooltip-popup-delay="500" tooltip-append-to-body="true" @@ -53,7 +53,7 @@ div.full-size.pdf(ng-controller="PdfController") href ng-click="stop()" ng-show="pdf.compiling", - tooltip="#{translate('stop_compile')}" + tooltip=translate('stop_compile') tooltip-placement="bottom" ) i.fa.fa-stop() @@ -61,7 +61,7 @@ div.full-size.pdf(ng-controller="PdfController") href ng-click="toggleLogs()" ng-class="{ 'active': shouldShowLogs == true }" - tooltip="#{translate('logs_and_output_files')}" + tooltip=translate('logs_and_output_files') tooltip-placement="bottom" ) i.fa.fa-file-text-o @@ -77,7 +77,7 @@ div.full-size.pdf(ng-controller="PdfController") ng-href="{{pdf.downloadUrl || pdf.url}}" target="_blank" ng-if="pdf.url" - tooltip="#{translate('download_pdf')}" + tooltip=translate('download_pdf') tooltip-placement="bottom" ) i.fa.fa-download @@ -87,7 +87,7 @@ div.full-size.pdf(ng-controller="PdfController") href, ng-click="switchToFlatLayout()" ng-show="ui.pdfLayout == 'sideBySide'" - tooltip="#{translate('full_screen')}" + tooltip=translate('full_screen') tooltip-placement="bottom" tooltip-append-to-body="true" ) @@ -96,7 +96,7 @@ div.full-size.pdf(ng-controller="PdfController") href, ng-click="switchToSideBySideLayout()" ng-show="ui.pdfLayout == 'flat'" - tooltip="#{translate('split_screen')}" + tooltip=translate('split_screen') tooltip-placement="bottom" tooltip-append-to-body="true" ) @@ -233,7 +233,7 @@ div.full-size.pdf(ng-controller="PdfController") .files-dropdown-container a.btn.btn-default.btn-sm( href, - tooltip="#{translate('clear_cached_files')}", + tooltip=translate('clear_cached_files'), tooltip-placement="top", tooltip-append-to-body="true", ng-click="openClearCacheModal()" diff --git a/services/web/app/views/project/editor/share.pug b/services/web/app/views/project/editor/share.pug index 78fb69c333..32e0404afc 100644 --- a/services/web/app/views/project/editor/share.pug +++ b/services/web/app/views/project/editor/share.pug @@ -38,7 +38,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate') .col-xs-1 a( href - tooltip="#{translate('remove_collaborator')}" + tooltip=translate('remove_collaborator') tooltip-placement="bottom" ng-click="removeMember(member)" ) @@ -55,7 +55,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate') .col-xs-1 a( href - tooltip="#{translate('revoke_invite')}" + tooltip=translate('revoke_invite') tooltip-placement="bottom" ng-click="revokeInvite(invite)" ) @@ -66,7 +66,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate') .form-group tags-input( template="shareTagTemplate" - placeholder="#{settings.customisation.shareProjectPlaceholder || 'joe@example.com, sue@example.com, ...'}" + placeholder=settings.customisation.shareProjectPlaceholder || 'joe@example.com, sue@example.com, ...' ng-model="inputs.contacts" focus-on="open" display-property="display" diff --git a/services/web/app/views/project/invite/show.pug b/services/web/app/views/project/invite/show.pug index eed30d3d19..d129fe015d 100644 --- a/services/web/app/views/project/invite/show.pug +++ b/services/web/app/views/project/invite/show.pug @@ -20,12 +20,12 @@ block content form.form( name="acceptForm", method="POST", - action="/project/#{invite.projectId}/invite/token/#{invite.token}/accept" + action="/project/"+invite.projectId+"/invite/token/"+invite.token+"/accept" ) input(name='_csrf', type='hidden', value=csrfToken) - input(name='token', type='hidden', value="#{invite.token}") + input(name='token', type='hidden', value=invite.token) .form-group.text-center button.btn.btn-lg.btn-primary(type="submit") | #{translate("join_project")} .form-group.text-center - \ No newline at end of file + diff --git a/services/web/app/views/project/list/project-list.pug b/services/web/app/views/project/list/project-list.pug index 01007213d0..0bb93e8336 100644 --- a/services/web/app/views/project/list/project-list.pug +++ b/services/web/app/views/project/list/project-list.pug @@ -6,7 +6,7 @@ form.project-search.form-horizontal(role="form") .form-group.has-feedback.has-feedback-left.col-md-7.col-xs-12 input.form-control.col-md-7.col-xs-12( - placeholder="#{translate('search_projects')}…", + placeholder=translate('search_projects')+"…", autofocus='autofocus', ng-model="searchText.value", focus-on='search:clear', @@ -25,7 +25,7 @@ .btn-group(ng-hide="selectedProjects.length < 1") a.btn.btn-default( href, - tooltip="#{translate('download')}", + tooltip=translate('download'), tooltip-placement="bottom", tooltip-append-to-body="true", ng-click="downloadSelectedProjects()" @@ -33,7 +33,7 @@ i.fa.fa-cloud-download a.btn.btn-default( href, - tooltip="#{translate('delete')}", + tooltip=translate('delete'), tooltip-placement="bottom", tooltip-append-to-body="true", ng-click="openArchiveProjectsModal()" @@ -45,7 +45,7 @@ href, data-toggle="dropdown", dropdown-toggle, - tooltip="#{translate('add_to_folders')}", + tooltip=translate('add_to_folders'), tooltip-append-to-body="true", tooltip-placement="bottom" ) diff --git a/services/web/app/views/referal/bonus.pug b/services/web/app/views/referal/bonus.pug index 5b0183d9c1..f3a65c6bc4 100644 --- a/services/web/app/views/referal/bonus.pug +++ b/services/web/app/views/referal/bonus.pug @@ -24,7 +24,7 @@ block content .row .col-md-8.col-md-offset-2.bonus-banner .title - a(href='https://twitter.com/share?text=is%20trying%20out%20the%20online%20LaTeX%20Editor%20ShareLaTeX&url=#{encodeURIComponent(buildReferalUrl("t"))}&counturl=https://www.sharelatex.com', target="_blank").twitter Tweet + a(href='https://twitter.com/share?text=is%20trying%20out%20the%20online%20LaTeX%20Editor%20ShareLaTeX&url='+encodeURIComponent(buildReferalUrl("t"))+'&counturl=https://www.sharelatex.com', target="_blank").twitter Tweet .row .col-md-8.col-md-offset-2.bonus-banner @@ -34,12 +34,12 @@ block content .row .col-md-8.col-md-offset-2.bonus-banner .title - a(href="https://plus.google.com/share?url=#{encodeURIComponent(buildReferalUrl('gp'))}", onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600');return false;").google-plus #{translate("share_us_on_googleplus")} + a(href="https://plus.google.com/share?url="+encodeURIComponent(buildReferalUrl('gp')), onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600');return false;").google-plus #{translate("share_us_on_googleplus")} .row .col-md-8.col-md-offset-2.bonus-banner .title - a(href='mailto:?subject=Online LaTeX editor you may like &body=Hey, I have been using the online LaTeX editor ShareLaTeX recently and thought you might like to check it out. #{encodeURIComponent(buildReferalUrl("e"))}', title='Share by Email').email #{translate("email_us_to_your_friends")} + a(href='mailto:?subject=Online LaTeX editor you may like &body=Hey, I have been using the online LaTeX editor ShareLaTeX recently and thought you might like to check it out. '+encodeURIComponent(buildReferalUrl("e")), title='Share by Email').email #{translate("email_us_to_your_friends")} .row .col-md-8.col-md-offset-2.bonus-banner @@ -58,9 +58,9 @@ block content .col-md-10.col-md-offset-1.bonus-banner(style="position: relative; height: 30px; margin-top: 20px;") - for (var i = 0; i <= 10; i++) { - if (refered_user_count == i) - .number(style="left: #{i}0%").active #{i} + .number(style="left: "+i+"0%").active #{i} - else - .number(style="left: #{i}0%") #{i} + .number(style="left: "+i+"0%") #{i} - } .row.ab-bonus @@ -68,7 +68,7 @@ block content .progress - if (refered_user_count == 0) div(style="text-align: center; padding: 4px;") #{translate("spread_the_word_and_fill_bar")} - .progress-bar.progress-bar-info(style="width: #{refered_user_count}0%") + .progress-bar.progress-bar-info(style="width: "+refered_user_count+"0%") .row.ab-bonus .col-md-10.col-md-offset-1.bonus-banner(style="position: relative; height: 70px;") diff --git a/services/web/app/views/restore.pug b/services/web/app/views/restore.pug index 51c0ee03fc..1cd7ad458a 100644 --- a/services/web/app/views/restore.pug +++ b/services/web/app/views/restore.pug @@ -19,11 +19,11 @@ block content .row-fluid table.table - -each project in projects + each project in projects tr - project_id = project._id.toString() td(width="50%") #{project.name} td(width="25%") - a.btn(href="/project/#{project_id}/zip") Download latest version as Zip + a.btn(href="/project/"+project_id+"/zip") Download latest version as Zip include general/small-footer diff --git a/services/web/app/views/scribtex-modal.pug b/services/web/app/views/scribtex-modal.pug index 1d4e2ce005..3efbf19314 100644 --- a/services/web/app/views/scribtex-modal.pug +++ b/services/web/app/views/scribtex-modal.pug @@ -5,4 +5,4 @@ script(type='text/ng-template', id='scribtexModalTemplate') p ScribTeX has moved to https://scribtex.sharelatex.com. Please update your bookmarks. p(style="text-align: center") You can find the page you were looking for here: p(style="text-align: center") - a(href="https://scribtex.sharelatex.com#{scribtexPath}", style="font-size: 16px") https://scribtex.sharelatex.com#{scribtexPath} \ No newline at end of file + a(href="https://scribtex.sharelatex.com"+scribtexPath, style="font-size: 16px") https://scribtex.sharelatex.com#{scribtexPath} diff --git a/services/web/app/views/sentry.pug b/services/web/app/views/sentry.pug index 0a51686015..5399252cd9 100644 --- a/services/web/app/views/sentry.pug +++ b/services/web/app/views/sentry.pug @@ -1,12 +1,12 @@ - if (typeof(sentrySrc) != "undefined") - if (sentrySrc.match(/^([a-z]+:)?\/\//i)) - script(src="#{sentrySrc}") + script(src=sentrySrc) - else - script(src=buildJsPath("libs/#{sentrySrc}", {fingerprint:false})) + script(src=buildJsPath("libs/"+sentrySrc, {fingerprint:false})) - if (typeof(sentrySrc) != "undefined") script(type="text/javascript"). if (typeof(Raven) != "undefined" && Raven.config) { - Raven.config("#{sentryPublicDSN}", { + Raven.config(sentryPublicDSN, { tags: { 'commit': '@@COMMIT@@', 'build': '@@RELEASE@@' }, release: '@@RELEASE@@', // Ignore list based off: https://gist.github.com/1878283 diff --git a/services/web/app/views/subscriptions/dashboard.pug b/services/web/app/views/subscriptions/dashboard.pug index 3448dc9072..fb4f834c34 100644 --- a/services/web/app/views/subscriptions/dashboard.pug +++ b/services/web/app/views/subscriptions/dashboard.pug @@ -12,7 +12,7 @@ block scripts mixin printPlan(plan) -if (!plan.hideFromUsers) - tr(ng-controller="ChangePlanFormController", ng-init="plan=#{JSON.stringify(plan)}", ng-show="shouldShowPlan(plan.planCode)") + tr(ng-controller="ChangePlanFormController", ng-init="plan="+JSON.stringify(plan), ng-show="shouldShowPlan(plan.planCode)") td strong #{plan.name} td {{refreshPrice(plan.planCode)}} @@ -22,18 +22,18 @@ mixin printPlan(plan) | {{prices[plan.planCode]}} / #{translate("month")} td -if (subscription.state == "free-trial") - a(href="/user/subscription/new?planCode=#{plan.planCode}").btn.btn-success #{translate("subscribe_to_this_plan")} + a(href="/user/subscription/new?planCode="+plan.planCode).btn.btn-success #{translate("subscribe_to_this_plan")} -else if (typeof(subscription.planCode) != "undefined" && plan.planCode == subscription.planCode.split("_")[0]) button.btn.disabled #{translate("your_plan")} -else form - input(type="hidden", ng-model="plan_code", name="plan_code", value="#{plan.planCode}") + input(type="hidden", ng-model="plan_code", name="plan_code", value=plan.planCode) input(type="submit", ng-click="changePlan()", value=translate("change_to_this_plan")).btn.btn-success mixin printPlans(plans) - -each plan in plans - mixin printPlan(plan) + each plan in plans + +printPlan(plan) block content .content.content-alt(ng-cloak) @@ -46,7 +46,7 @@ block content |   | #{translate("your_billing_details_were_saved")} .card(ng-if="view == 'overview'") - .page-header(x-current-plan="#{subscription.planCode}") + .page-header(x-current-plan=subscription.planCode) h1 #{translate("your_subscription")} - if (subscription && user._id+'' == subscription.admin_id+'') @@ -97,9 +97,9 @@ block content th !{translate("name")} th !{translate("price")} th - mixin printPlans(plans.studentAccounts) - mixin printPlans(plans.individualMonthlyPlans) - mixin printPlans(plans.individualAnnualPlans) + +printPlans(plans.studentAccounts) + +printPlans(plans.individualMonthlyPlans) + +printPlans(plans.individualAnnualPlans) each groupSubscription in groupSubscriptions @@ -107,7 +107,7 @@ block content div p !{translate("member_of_group_subscription", {admin_email: "" + groupSubscription.admin_id.email + ""})} span - button.btn.btn-danger(ng-click="removeSelfFromGroup('#{groupSubscription.admin_id._id}')") #{translate("leave_group")} + button.btn.btn-danger(ng-click="removeSelfFromGroup('"+groupSubscription.admin_id._id+"')") #{translate("leave_group")} -if(subscription.groupPlan && user._id+'' == subscription.admin_id+'') div diff --git a/services/web/app/views/subscriptions/new.pug b/services/web/app/views/subscriptions/new.pug index 1465b24c82..2d410f8fba 100644 --- a/services/web/app/views/subscriptions/new.pug +++ b/services/web/app/views/subscriptions/new.pug @@ -164,7 +164,7 @@ block content ng-change="updateCountry()" required ) - mixin countries_options() + +countries_options() span.input-feedback-message {{ simpleCCForm.country.$error.required ? 'This field is required' : '' }} if (showVatField) diff --git a/services/web/app/views/subscriptions/upgradeToAnnual.pug b/services/web/app/views/subscriptions/upgradeToAnnual.pug index d92290ad0e..0ce41856f7 100644 --- a/services/web/app/views/subscriptions/upgradeToAnnual.pug +++ b/services/web/app/views/subscriptions/upgradeToAnnual.pug @@ -6,7 +6,7 @@ block content .container(ng-controller="AnnualUpgradeController") .row(ng-cloak) .col-md-6.col-md-offset-3 - .card(ng-init="planName = #{JSON.stringify(planName)}") + .card(ng-init="planName = "+JSON.stringify(planName)) .page-header h1.text-centered #{translate("move_to_annual_billing")} div(ng-hide="upgradeComplete") diff --git a/services/web/app/views/user/activate.pug b/services/web/app/views/user/activate.pug index 7961876389..8b60b10471 100644 --- a/services/web/app/views/user/activate.pug +++ b/services/web/app/views/user/activate.pug @@ -36,7 +36,7 @@ block content placeholder="email@example.com" required, ng-model="email", - ng-init="email = #{JSON.stringify(email)}", + ng-init="email = "+JSON.stringify(email), ng-model-options="{ updateOn: 'blur' }", disabled ) diff --git a/services/web/app/views/user/login.pug b/services/web/app/views/user/login.pug index 8339f27189..823299d660 100644 --- a/services/web/app/views/user/login.pug +++ b/services/web/app/views/user/login.pug @@ -19,7 +19,7 @@ block content placeholder='email@example.com', ng-model="email", ng-model-options="{ updateOn: 'blur' }", - ng-init="email = #{JSON.stringify(email)}", + ng-init="email = "+JSON.stringify(email), focus="true" ) span.small.text-primary(ng-show="loginForm.email.$invalid && loginForm.email.$dirty") diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug index 310912cf07..a4217d8ca4 100644 --- a/services/web/app/views/user/settings.pug +++ b/services/web/app/views/user/settings.pug @@ -28,7 +28,7 @@ block content placeholder="email@example.com" required, ng-model="email", - ng-init="email = #{JSON.stringify(user.email)}", + ng-init="email = "+JSON.stringify(user.email), ng-model-options="{ updateOn: 'blur' }" ) span.small.text-primary(ng-show="settingsForm.email.$invalid && settingsForm.email.$dirty") From efdd777c891e0cb440cbb6e5778b1d42560c87d5 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Tue, 31 Jan 2017 15:43:53 +0000 Subject: [PATCH 14/15] Add a _headLinks block to layout --- services/web/app/views/layout.pug | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/web/app/views/layout.pug b/services/web/app/views/layout.pug index 7276c0ae5c..75c96ff276 100644 --- a/services/web/app/views/layout.pug +++ b/services/web/app/views/layout.pug @@ -21,6 +21,8 @@ html(itemscope, itemtype='http://schema.org/Product') link(rel="icon", href="/favicon.ico") link(rel='stylesheet', href=buildCssPath('/style.css')) + block _headLinks + if settings.i18n.subdomainLang each subdomainDetails in settings.i18n.subdomainLang if !subdomainDetails.hide From 5be65431f7bd553523179c54164f6fc23f682493 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Wed, 1 Feb 2017 10:55:01 +0000 Subject: [PATCH 15/15] Fix sentry config --- services/web/app/views/sentry.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/views/sentry.pug b/services/web/app/views/sentry.pug index 5399252cd9..9e10d7837e 100644 --- a/services/web/app/views/sentry.pug +++ b/services/web/app/views/sentry.pug @@ -6,7 +6,7 @@ - if (typeof(sentrySrc) != "undefined") script(type="text/javascript"). if (typeof(Raven) != "undefined" && Raven.config) { - Raven.config(sentryPublicDSN, { + Raven.config("#{sentryPublicDSN}", { tags: { 'commit': '@@COMMIT@@', 'build': '@@RELEASE@@' }, release: '@@RELEASE@@', // Ignore list based off: https://gist.github.com/1878283