From 194d3de3a01e51a756c842222ef84c769e2216ca Mon Sep 17 00:00:00 2001 From: Chris Boette Date: Thu, 13 Jul 2017 22:24:48 -0500 Subject: [PATCH] refactor(all): replace node-uuid with uuid Replace the deprecated node-uuid module with uuid. Closes #108 --- broid-alexa/lib/core/Adapter.js | 2 +- broid-alexa/package.json | 6 +++--- broid-alexa/src/core/Adapter.ts | 2 +- broid-alexa/yarn.lock | 24 +++++++++++++--------- broid-callr/lib/core/Adapter.js | 2 +- broid-callr/lib/core/Parser.js | 2 +- broid-callr/package.json | 6 +++--- broid-callr/src/core/Adapter.ts | 2 +- broid-callr/src/core/Parser.ts | 2 +- broid-callr/yarn.lock | 24 +++++++++++++--------- broid-discord/lib/core/Adapter.js | 2 +- broid-discord/package.json | 6 +++--- broid-discord/src/core/Adapter.ts | 2 +- broid-discord/yarn.lock | 24 +++++++++++++--------- broid-flowdock/lib/core/Adapter.js | 2 +- broid-flowdock/lib/core/Parser.js | 2 +- broid-flowdock/package.json | 6 +++--- broid-flowdock/src/core/Adapter.ts | 2 +- broid-flowdock/src/core/Parser.ts | 2 +- broid-flowdock/yarn.lock | 22 +++++++++++++------- broid-gitter/lib/core/Adapter.js | 2 +- broid-gitter/lib/core/Parser.js | 2 +- broid-gitter/package.json | 6 +++--- broid-gitter/src/core/Adapter.ts | 2 +- broid-gitter/src/core/Parser.ts | 2 +- broid-gitter/yarn.lock | 24 +++++++++++++--------- broid-google-assistant/lib/core/Adapter.js | 2 +- broid-google-assistant/lib/core/Parser.js | 2 +- broid-google-assistant/package.json | 6 +++--- broid-google-assistant/src/core/Adapter.ts | 2 +- broid-google-assistant/src/core/Parser.ts | 2 +- broid-google-assistant/yarn.lock | 24 +++++++++++++--------- broid-groupme/lib/core/Adapter.js | 2 +- broid-groupme/lib/core/Parser.js | 2 +- broid-groupme/package.json | 6 +++--- broid-groupme/src/core/Adapter.ts | 2 +- broid-groupme/src/core/Parser.ts | 2 +- broid-groupme/yarn.lock | 24 +++++++++++++--------- broid-irc/lib/core/Adapter.js | 2 +- broid-irc/lib/core/Parser.js | 2 +- broid-irc/lib/test/Parser.js | 2 +- broid-irc/package.json | 6 +++--- broid-irc/src/core/Adapter.ts | 2 +- broid-irc/src/core/Parser.ts | 2 +- broid-irc/src/test/Parser.ts | 2 +- broid-irc/yarn.lock | 20 +++++++++--------- broid-kik/lib/core/Adapter.js | 2 +- broid-kik/lib/core/Parser.js | 2 +- broid-kik/package.json | 6 +++--- broid-kik/src/core/Adapter.ts | 2 +- broid-kik/src/core/Parser.ts | 2 +- broid-kik/yarn.lock | 24 +++++++++++++--------- broid-line/lib/core/Adapter.js | 2 +- broid-line/lib/core/Parser.js | 2 +- broid-line/package.json | 6 +++--- broid-line/src/core/Adapter.ts | 2 +- broid-line/src/core/Parser.ts | 2 +- broid-line/yarn.lock | 24 +++++++++++++--------- broid-messenger/lib/core/Adapter.js | 2 +- broid-messenger/lib/core/Parser.js | 2 +- broid-messenger/package.json | 6 +++--- broid-messenger/src/core/Adapter.ts | 2 +- broid-messenger/src/core/Parser.ts | 2 +- broid-messenger/yarn.lock | 20 +++++++++--------- broid-ms-teams/lib/core/Adapter.js | 2 +- broid-ms-teams/lib/core/Parser.js | 2 +- broid-ms-teams/package.json | 6 +++--- broid-ms-teams/src/core/Adapter.ts | 2 +- broid-ms-teams/src/core/Parser.ts | 2 +- broid-ms-teams/yarn.lock | 20 +++++++++--------- broid-nexmo/lib/core/Adapter.js | 2 +- broid-nexmo/lib/core/Parser.js | 2 +- broid-nexmo/package.json | 6 +++--- broid-nexmo/src/core/Adapter.ts | 2 +- broid-nexmo/src/core/Parser.ts | 2 +- broid-nexmo/yarn.lock | 24 +++++++++++++--------- broid-schemas/package.json | 2 +- broid-schemas/yarn.lock | 16 +++++++++------ broid-skype/lib/core/Adapter.js | 2 +- broid-skype/lib/core/Parser.js | 2 +- broid-skype/package.json | 6 +++--- broid-skype/src/core/Adapter.ts | 2 +- broid-skype/src/core/Parser.ts | 2 +- broid-skype/yarn.lock | 24 +++++++++++++--------- broid-slack/lib/core/Adapter.js | 2 +- broid-slack/lib/core/Parser.js | 2 +- broid-slack/lib/core/helpers.js | 2 +- broid-slack/package.json | 6 +++--- broid-slack/src/core/Adapter.ts | 2 +- broid-slack/src/core/Parser.ts | 2 +- broid-slack/src/core/helpers.ts | 2 +- broid-slack/yarn.lock | 24 +++++++++++++--------- broid-telegram/lib/core/Adapter.js | 2 +- broid-telegram/lib/core/Parser.js | 2 +- broid-telegram/package.json | 6 +++--- broid-telegram/src/core/Adapter.ts | 2 +- broid-telegram/src/core/Parser.ts | 2 +- broid-telegram/yarn.lock | 24 +++++++++++++--------- broid-twilio/lib/core/Adapter.js | 2 +- broid-twilio/lib/core/Parser.js | 2 +- broid-twilio/package.json | 6 +++--- broid-twilio/src/core/Adapter.ts | 2 +- broid-twilio/src/core/Parser.ts | 2 +- broid-twilio/yarn.lock | 22 +++++++++++++------- broid-twitter/lib/core/Adapter.js | 2 +- broid-twitter/lib/core/Parser.js | 2 +- broid-twitter/package.json | 6 +++--- broid-twitter/src/core/Adapter.ts | 2 +- broid-twitter/src/core/Parser.ts | 2 +- broid-twitter/yarn.lock | 24 +++++++++++++--------- broid-utils/package.json | 2 +- broid-utils/yarn.lock | 16 +++++++++------ broid-viber/lib/core/Adapter.js | 2 +- broid-viber/lib/core/Parser.js | 2 +- broid-viber/package.json | 4 ++-- broid-viber/src/core/Adapter.ts | 2 +- broid-viber/src/core/Parser.ts | 2 +- broid-viber/yarn.lock | 24 +++++++++++++--------- broid-wechat/lib/core/Adapter.js | 2 +- broid-wechat/package.json | 4 ++-- broid-wechat/src/core/Adapter.ts | 2 +- broid-wechat/yarn.lock | 20 +++++++++--------- 122 files changed, 424 insertions(+), 344 deletions(-) diff --git a/broid-alexa/lib/core/Adapter.js b/broid-alexa/lib/core/Adapter.js index 332afa7f..ad50ac20 100644 --- a/broid-alexa/lib/core/Adapter.js +++ b/broid-alexa/lib/core/Adapter.js @@ -5,7 +5,7 @@ const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const events_1 = require("events"); const express_1 = require("express"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const Rx_1 = require("rxjs/Rx"); const Parser_1 = require("./Parser"); diff --git a/broid-alexa/package.json b/broid-alexa/package.json index 002505cd..375bbc46 100755 --- a/broid-alexa/package.json +++ b/broid-alexa/package.json @@ -45,8 +45,8 @@ "@types/bluebird-global": "^3.5.1", "@types/moment": "^2.13.0", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.18.1", "concurrently": "^3.1.0", "copyfiles": "^1.2.0", @@ -65,9 +65,9 @@ "bluebird": "^3.4.7", "body-parser": "^1.16.0", "express": "^4.14.0", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", - "rxjs": "^5.0.2" + "rxjs": "^5.0.2", + "uuid": "^3.1.0" }, "ava": { "files": [ diff --git a/broid-alexa/src/core/Adapter.ts b/broid-alexa/src/core/Adapter.ts index 9e3e5dfd..e66c3514 100644 --- a/broid-alexa/src/core/Adapter.ts +++ b/broid-alexa/src/core/Adapter.ts @@ -4,9 +4,9 @@ import { Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import { EventEmitter } from 'events'; import { Router } from 'express'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { IAdapter, IAdapterOptions } from './interfaces'; import { Parser } from './Parser'; diff --git a/broid-alexa/yarn.lock b/broid-alexa/yarn.lock index 688c9e38..e1b53419 100644 --- a/broid-alexa/yarn.lock +++ b/broid-alexa/yarn.lock @@ -69,13 +69,11 @@ dependencies: moment "*" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -83,6 +81,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2413,10 +2417,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3626,6 +3626,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-callr/lib/core/Adapter.js b/broid-callr/lib/core/Adapter.js index ada6a6a2..bd3fd1ec 100644 --- a/broid-callr/lib/core/Adapter.js +++ b/broid-callr/lib/core/Adapter.js @@ -6,7 +6,7 @@ const Promise = require("bluebird"); const Callr = require("callr"); const EventEmitter = require("events"); const express_1 = require("express"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const Rx_1 = require("rxjs/Rx"); const Parser_1 = require("./Parser"); diff --git a/broid-callr/lib/core/Parser.js b/broid-callr/lib/core/Parser.js index b6fe32a0..1b6002e7 100644 --- a/broid-callr/lib/core/Parser.js +++ b/broid-callr/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-callr/package.json b/broid-callr/package.json index 33944f25..d7fbff72 100644 --- a/broid-callr/package.json +++ b/broid-callr/package.json @@ -47,15 +47,15 @@ "body-parser": "^1.15.2", "callr": "^1.0.0", "express": "^4.14.0", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", "rxjs": "^5.0.2", - "sinon": "^2.1.0" + "sinon": "^2.1.0", + "uuid": "^3.1.0" }, "devDependencies": { "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.17.0", "concurrently": "^3.1.0", "copyfiles": "^1.0.0", diff --git a/broid-callr/src/core/Adapter.ts b/broid-callr/src/core/Adapter.ts index 6d00a230..2d70ba43 100644 --- a/broid-callr/src/core/Adapter.ts +++ b/broid-callr/src/core/Adapter.ts @@ -5,9 +5,9 @@ import * as Promise from 'bluebird'; import * as Callr from 'callr'; import * as EventEmitter from 'events'; import { Router } from 'express'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { IAdapterOptions, ICallrWebHookEvent } from './interfaces'; import { Parser } from './Parser'; diff --git a/broid-callr/src/core/Parser.ts b/broid-callr/src/core/Parser.ts index 1b2cc49c..1e5b7baa 100644 --- a/broid-callr/src/core/Parser.ts +++ b/broid-callr/src/core/Parser.ts @@ -5,8 +5,8 @@ import { import { cleanNulls, fileInfo, isUrl, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; import { ICallrWebHookEvent } from './interfaces'; diff --git a/broid-callr/yarn.lock b/broid-callr/yarn.lock index a403781a..c771c2be 100644 --- a/broid-callr/yarn.lock +++ b/broid-callr/yarn.lock @@ -21,13 +21,11 @@ request "^2.81.0" valid-url "^1.0.9" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -35,6 +33,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2557,10 +2561,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3796,6 +3796,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-discord/lib/core/Adapter.js b/broid-discord/lib/core/Adapter.js index 30404405..08d3319b 100644 --- a/broid-discord/lib/core/Adapter.js +++ b/broid-discord/lib/core/Adapter.js @@ -4,7 +4,7 @@ const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const Discordie = require("discordie"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const request = require("request-promise"); const Rx_1 = require("rxjs/Rx"); diff --git a/broid-discord/package.json b/broid-discord/package.json index 61d00efc..3511957b 100644 --- a/broid-discord/package.json +++ b/broid-discord/package.json @@ -44,8 +44,8 @@ "@types/bluebird": "^3.5.2", "@types/bluebird-global": "^3.5.1", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.17.0", "concurrently": "^3.1.0", "copyfiles": "^1.0.0", @@ -62,11 +62,11 @@ "@broid/utils": "^1.1.1", "bluebird": "^3.4.7", "discordie": "^0.11.0", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", "request-promise": "^4.1.1", "rxjs": "^5.0.2", - "sinon": "^2.1.0" + "sinon": "^2.1.0", + "uuid": "^3.1.0" }, "ava": { "files": [ diff --git a/broid-discord/src/core/Adapter.ts b/broid-discord/src/core/Adapter.ts index 2eec111c..419ac400 100644 --- a/broid-discord/src/core/Adapter.ts +++ b/broid-discord/src/core/Adapter.ts @@ -3,10 +3,10 @@ import { Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import * as Discordie from 'discordie'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import * as request from 'request-promise'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; const Events: any = Discordie.Events; import { IAdapterOptions, IChannelInformations, IUserInformations } from './interfaces'; diff --git a/broid-discord/yarn.lock b/broid-discord/yarn.lock index d16d2009..35905ed0 100644 --- a/broid-discord/yarn.lock +++ b/broid-discord/yarn.lock @@ -31,13 +31,11 @@ version "3.5.2" resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.2.tgz#ecf1104217495e50fe0b588d538146cd6f733b89" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -45,6 +43,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2456,10 +2460,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3679,6 +3679,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-flowdock/lib/core/Adapter.js b/broid-flowdock/lib/core/Adapter.js index 9478b767..7f8f4fbc 100644 --- a/broid-flowdock/lib/core/Adapter.js +++ b/broid-flowdock/lib/core/Adapter.js @@ -4,7 +4,7 @@ const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const flowdock = require("flowdock"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const Rx_1 = require("rxjs/Rx"); const Parser_1 = require("./Parser"); diff --git a/broid-flowdock/lib/core/Parser.js b/broid-flowdock/lib/core/Parser.js index 601536bb..a9ab1d16 100644 --- a/broid-flowdock/lib/core/Parser.js +++ b/broid-flowdock/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-flowdock/package.json b/broid-flowdock/package.json index 835edcb0..ce4caf31 100644 --- a/broid-flowdock/package.json +++ b/broid-flowdock/package.json @@ -42,8 +42,8 @@ }, "devDependencies": { "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.17.0", "concurrently": "^3.1.0", "copyfiles": "^1.0.0", @@ -60,9 +60,9 @@ "@broid/utils": "^1.1.1", "bluebird": "^3.4.7", "flowdock": "^0.9.0", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", - "rxjs": "^5.0.2" + "rxjs": "^5.0.2", + "uuid": "^3.1.0" }, "ava": { "files": [ diff --git a/broid-flowdock/src/core/Adapter.ts b/broid-flowdock/src/core/Adapter.ts index 0325e2b3..01f5c109 100644 --- a/broid-flowdock/src/core/Adapter.ts +++ b/broid-flowdock/src/core/Adapter.ts @@ -3,9 +3,9 @@ import { Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import * as flowdock from 'flowdock'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { IAdapterOptions } from './interfaces'; import { Parser } from './Parser'; diff --git a/broid-flowdock/src/core/Parser.ts b/broid-flowdock/src/core/Parser.ts index 0fc26018..d6dd9581 100644 --- a/broid-flowdock/src/core/Parser.ts +++ b/broid-flowdock/src/core/Parser.ts @@ -5,8 +5,8 @@ import { import { cleanNulls, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; export class Parser { public serviceID: string; diff --git a/broid-flowdock/yarn.lock b/broid-flowdock/yarn.lock index d671dc2d..1f00a335 100644 --- a/broid-flowdock/yarn.lock +++ b/broid-flowdock/yarn.lock @@ -21,13 +21,11 @@ request "^2.81.0" valid-url "^1.0.9" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -35,6 +33,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2505,7 +2509,7 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7, node-uuid@~1.4.0: +node-uuid@~1.4.0: version "1.4.8" resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" @@ -3662,6 +3666,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-gitter/lib/core/Adapter.js b/broid-gitter/lib/core/Adapter.js index 9a7991cd..e416d635 100644 --- a/broid-gitter/lib/core/Adapter.js +++ b/broid-gitter/lib/core/Adapter.js @@ -5,7 +5,7 @@ const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const events_1 = require("events"); const Gitter = require("node-gitter"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const Rx_1 = require("rxjs/Rx"); const Parser_1 = require("./Parser"); diff --git a/broid-gitter/lib/core/Parser.js b/broid-gitter/lib/core/Parser.js index dc3feed6..ec414d17 100644 --- a/broid-gitter/lib/core/Parser.js +++ b/broid-gitter/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-gitter/package.json b/broid-gitter/package.json index cdb51981..09066d3b 100755 --- a/broid-gitter/package.json +++ b/broid-gitter/package.json @@ -42,8 +42,8 @@ }, "devDependencies": { "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.18.1", "concurrently": "^3.1.0", "copyfiles": "^1.2.0", @@ -60,9 +60,9 @@ "@broid/utils": "^1.1.1", "bluebird": "^3.4.7", "node-gitter": "^2.0.5", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", - "rxjs": "^5.0.2" + "rxjs": "^5.0.2", + "uuid": "^3.1.0" }, "ava": { "files": [ diff --git a/broid-gitter/src/core/Adapter.ts b/broid-gitter/src/core/Adapter.ts index a3a6c40d..03089415 100644 --- a/broid-gitter/src/core/Adapter.ts +++ b/broid-gitter/src/core/Adapter.ts @@ -4,9 +4,9 @@ import { Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import { EventEmitter } from 'events'; import * as Gitter from 'node-gitter'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { IAdapterOptions } from './interfaces'; import { Parser } from './Parser'; diff --git a/broid-gitter/src/core/Parser.ts b/broid-gitter/src/core/Parser.ts index 7d119a1a..14cb355a 100644 --- a/broid-gitter/src/core/Parser.ts +++ b/broid-gitter/src/core/Parser.ts @@ -2,8 +2,8 @@ import { default as schemas, IActivityStream } from '@broid/schemas'; import { cleanNulls, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; export class Parser { public serviceID: string; diff --git a/broid-gitter/yarn.lock b/broid-gitter/yarn.lock index f2836874..b5dca89b 100644 --- a/broid-gitter/yarn.lock +++ b/broid-gitter/yarn.lock @@ -53,13 +53,11 @@ request "^2.81.0" valid-url "^1.0.9" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -67,6 +65,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2282,10 +2286,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3409,6 +3409,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-google-assistant/lib/core/Adapter.js b/broid-google-assistant/lib/core/Adapter.js index 1b104d5c..81ab0f40 100644 --- a/broid-google-assistant/lib/core/Adapter.js +++ b/broid-google-assistant/lib/core/Adapter.js @@ -6,7 +6,7 @@ const actionsSdk = require("actions-on-google"); const Promise = require("bluebird"); const events_1 = require("events"); const express_1 = require("express"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const Rx_1 = require("rxjs/Rx"); const Parser_1 = require("./Parser"); diff --git a/broid-google-assistant/lib/core/Parser.js b/broid-google-assistant/lib/core/Parser.js index a3ff3d70..2ffc2be2 100644 --- a/broid-google-assistant/lib/core/Parser.js +++ b/broid-google-assistant/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, username, logLevel) { diff --git a/broid-google-assistant/package.json b/broid-google-assistant/package.json index 45fb6e47..2c225faa 100755 --- a/broid-google-assistant/package.json +++ b/broid-google-assistant/package.json @@ -44,8 +44,8 @@ "@types/bluebird": "^3.5.2", "@types/bluebird-global": "^3.5.1", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.18.1", "concurrently": "^3.1.0", "copyfiles": "^1.2.0", @@ -65,9 +65,9 @@ "bluebird": "^3.4.7", "body-parser": "^1.16.0", "express": "^4.14.0", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", - "rxjs": "^5.0.2" + "rxjs": "^5.0.2", + "uuid": "^3.1.0" }, "ava": { "files": [ diff --git a/broid-google-assistant/src/core/Adapter.ts b/broid-google-assistant/src/core/Adapter.ts index 5a310fd9..cfa3dc08 100644 --- a/broid-google-assistant/src/core/Adapter.ts +++ b/broid-google-assistant/src/core/Adapter.ts @@ -5,9 +5,9 @@ import * as actionsSdk from 'actions-on-google'; import * as Promise from 'bluebird'; import { EventEmitter } from 'events'; import { Router } from 'express'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { IAdapterOptions } from './interfaces'; import { Parser } from './Parser'; diff --git a/broid-google-assistant/src/core/Parser.ts b/broid-google-assistant/src/core/Parser.ts index 6ae07a25..4faaed8e 100644 --- a/broid-google-assistant/src/core/Parser.ts +++ b/broid-google-assistant/src/core/Parser.ts @@ -3,8 +3,8 @@ import { cleanNulls, Logger } from '@broid/utils'; import * as actionsSdk from 'actions-on-google'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; export class Parser { public serviceID: string; diff --git a/broid-google-assistant/yarn.lock b/broid-google-assistant/yarn.lock index a5166e8c..5988d527 100644 --- a/broid-google-assistant/yarn.lock +++ b/broid-google-assistant/yarn.lock @@ -63,13 +63,11 @@ version "3.5.2" resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.2.tgz#ecf1104217495e50fe0b588d538146cd6f733b89" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -77,6 +75,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2417,10 +2421,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3630,6 +3630,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-groupme/lib/core/Adapter.js b/broid-groupme/lib/core/Adapter.js index b78c0b15..04e2691d 100644 --- a/broid-groupme/lib/core/Adapter.js +++ b/broid-groupme/lib/core/Adapter.js @@ -5,7 +5,7 @@ const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const events_1 = require("events"); const express_1 = require("express"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const PromiseMemoize = require("promise-memoize"); const R = require("ramda"); const Rx_1 = require("rxjs/Rx"); diff --git a/broid-groupme/lib/core/Parser.js b/broid-groupme/lib/core/Parser.js index 36a62ae5..56cc6222 100644 --- a/broid-groupme/lib/core/Parser.js +++ b/broid-groupme/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-groupme/package.json b/broid-groupme/package.json index e4ae3966..2a1fd722 100644 --- a/broid-groupme/package.json +++ b/broid-groupme/package.json @@ -45,8 +45,8 @@ "@types/bluebird-global": "^3.5.1", "@types/moment": "^2.13.0", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.18.1", "concurrently": "^3.1.0", "copyfiles": "^1.2.0", @@ -66,12 +66,12 @@ "body-parser": "^1.16.0", "express": "^4.14.0", "nexmo": "^1.2.0", - "node-uuid": "^1.4.7", "promise-memoize": "^1.1.0", "ramda": "^0.23.0", "request": "^2.79.0", "request-promise": "^4.1.1", - "rxjs": "^5.0.2" + "rxjs": "^5.0.2", + "uuid": "^3.1.0" }, "ava": { "files": [ diff --git a/broid-groupme/src/core/Adapter.ts b/broid-groupme/src/core/Adapter.ts index e09aa52b..93b2c444 100644 --- a/broid-groupme/src/core/Adapter.ts +++ b/broid-groupme/src/core/Adapter.ts @@ -4,10 +4,10 @@ import { Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import { EventEmitter } from 'events'; import { Router } from 'express'; -import * as uuid from 'node-uuid'; import * as PromiseMemoize from 'promise-memoize'; import * as R from 'ramda'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { getGroups, postMessage } from './client'; import { IAdapterOptions } from './interfaces'; diff --git a/broid-groupme/src/core/Parser.ts b/broid-groupme/src/core/Parser.ts index 86a0b3be..3fb68954 100644 --- a/broid-groupme/src/core/Parser.ts +++ b/broid-groupme/src/core/Parser.ts @@ -6,8 +6,8 @@ import { import { cleanNulls, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; import { IAttachment, IGroupParsed, IMessage } from './interfaces'; diff --git a/broid-groupme/yarn.lock b/broid-groupme/yarn.lock index cdbf450b..05b6fe4d 100644 --- a/broid-groupme/yarn.lock +++ b/broid-groupme/yarn.lock @@ -69,13 +69,11 @@ dependencies: moment "*" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -83,6 +81,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2470,10 +2474,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3705,6 +3705,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-irc/lib/core/Adapter.js b/broid-irc/lib/core/Adapter.js index ee41d180..e12e7c7a 100644 --- a/broid-irc/lib/core/Adapter.js +++ b/broid-irc/lib/core/Adapter.js @@ -5,7 +5,7 @@ const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const events_1 = require("events"); const irc = require("irc"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const Rx_1 = require("rxjs/Rx"); const Parser_1 = require("./Parser"); class Adapter { diff --git a/broid-irc/lib/core/Parser.js b/broid-irc/lib/core/Parser.js index e0b950aa..67ec683d 100644 --- a/broid-irc/lib/core/Parser.js +++ b/broid-irc/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, username, serviceID, logLevel) { diff --git a/broid-irc/lib/test/Parser.js b/broid-irc/lib/test/Parser.js index 31d711b5..843aa750 100644 --- a/broid-irc/lib/test/Parser.js +++ b/broid-irc/lib/test/Parser.js @@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", { value: true }); const ava_1 = require("ava"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const sinon = require("sinon"); const Parser_1 = require("../core/Parser"); const groupMessage = require("./fixtures/group-message.json"); diff --git a/broid-irc/package.json b/broid-irc/package.json index 79e28190..a7cde3ab 100644 --- a/broid-irc/package.json +++ b/broid-irc/package.json @@ -45,8 +45,8 @@ "@types/bluebird-global": "^3.5.1", "@types/irc": "^0.3.32", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.18.1", "concurrently": "^3.1.0", "copyfiles": "^1.2.0", @@ -65,9 +65,9 @@ "bluebird": "^3.4.7", "irc": "^0.5.2", "mimetype": "^0.0.8", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", - "rxjs": "^5.0.2" + "rxjs": "^5.0.2", + "uuid": "^3.1.0" }, "ava": { "files": [ diff --git a/broid-irc/src/core/Adapter.ts b/broid-irc/src/core/Adapter.ts index 447613d2..fc24835d 100644 --- a/broid-irc/src/core/Adapter.ts +++ b/broid-irc/src/core/Adapter.ts @@ -7,8 +7,8 @@ import { Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import { EventEmitter } from 'events'; import * as irc from 'irc'; -import * as uuid from 'node-uuid'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { IAdapterOptions } from './interfaces'; import { Parser } from './Parser'; diff --git a/broid-irc/src/core/Parser.ts b/broid-irc/src/core/Parser.ts index e6d68055..009b524a 100644 --- a/broid-irc/src/core/Parser.ts +++ b/broid-irc/src/core/Parser.ts @@ -5,8 +5,8 @@ import { import { cleanNulls, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; export class Parser { public serviceID: string; diff --git a/broid-irc/src/test/Parser.ts b/broid-irc/src/test/Parser.ts index ef00a938..6835d243 100644 --- a/broid-irc/src/test/Parser.ts +++ b/broid-irc/src/test/Parser.ts @@ -1,6 +1,6 @@ import ava from 'ava'; -import * as uuid from 'node-uuid'; import * as sinon from 'sinon'; +import * as uuid from 'uuid'; import { Parser } from '../core/Parser'; diff --git a/broid-irc/yarn.lock b/broid-irc/yarn.lock index f8bbec6a..f974853b 100644 --- a/broid-irc/yarn.lock +++ b/broid-irc/yarn.lock @@ -69,12 +69,6 @@ dependencies: "@types/node" "*" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" - "@types/node@*", "@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -83,6 +77,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2280,10 +2280,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3410,6 +3406,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-kik/lib/core/Adapter.js b/broid-kik/lib/core/Adapter.js index 54f6004b..82b6b7dc 100644 --- a/broid-kik/lib/core/Adapter.js +++ b/broid-kik/lib/core/Adapter.js @@ -5,7 +5,7 @@ const utils_1 = require("@broid/utils"); const KikBot = require("@kikinteractive/kik"); const Promise = require("bluebird"); const express_1 = require("express"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const Rx_1 = require("rxjs/Rx"); const url = require("url"); diff --git a/broid-kik/lib/core/Parser.js b/broid-kik/lib/core/Parser.js index d6558ed0..7fd69c1c 100644 --- a/broid-kik/lib/core/Parser.js +++ b/broid-kik/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-kik/package.json b/broid-kik/package.json index 86fa2a1d..0199fe33 100644 --- a/broid-kik/package.json +++ b/broid-kik/package.json @@ -46,16 +46,16 @@ "@kikinteractive/kik": "^2.2.0", "bluebird": "^3.4.7", "express": "^4.15.2", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", - "rxjs": "^5.0.2" + "rxjs": "^5.0.2", + "uuid": "^3.1.0" }, "devDependencies": { "@types/bluebird": "^3.5.2", "@types/bluebird-global": "^3.5.1", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.17.0", "concurrently": "^3.1.0", "copyfiles": "^1.0.0", diff --git a/broid-kik/src/core/Adapter.ts b/broid-kik/src/core/Adapter.ts index 0a577c88..d5e6f6d9 100644 --- a/broid-kik/src/core/Adapter.ts +++ b/broid-kik/src/core/Adapter.ts @@ -4,10 +4,10 @@ import { Logger } from '@broid/utils'; import * as KikBot from '@kikinteractive/kik'; import * as Promise from 'bluebird'; import { Router } from 'express'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import { Observable } from 'rxjs/Rx'; import * as url from 'url'; +import * as uuid from 'uuid'; import { IAdapterOptions } from './interfaces'; import { Parser } from './Parser'; diff --git a/broid-kik/src/core/Parser.ts b/broid-kik/src/core/Parser.ts index fcc50c19..4a71763a 100644 --- a/broid-kik/src/core/Parser.ts +++ b/broid-kik/src/core/Parser.ts @@ -2,8 +2,8 @@ import { default as schemas, IActivityStream } from '@broid/schemas'; import { cleanNulls, concat, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; export class Parser { public serviceID: string; diff --git a/broid-kik/yarn.lock b/broid-kik/yarn.lock index c7b9ba83..c95ca2d7 100644 --- a/broid-kik/yarn.lock +++ b/broid-kik/yarn.lock @@ -38,13 +38,11 @@ version "3.5.3" resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.3.tgz#a2c28be02c0855f526e43785fa326f282402e290" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.18" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.18.tgz#cd67f27d3dc0cfb746f0bdd5e086c4c5d55be173" @@ -52,6 +50,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2569,10 +2573,6 @@ node-uuid@1.4.7: version "1.4.7" resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.7.tgz#6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3783,6 +3783,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-line/lib/core/Adapter.js b/broid-line/lib/core/Adapter.js index 8f37866c..666712ed 100644 --- a/broid-line/lib/core/Adapter.js +++ b/broid-line/lib/core/Adapter.js @@ -5,7 +5,7 @@ const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const express_1 = require("express"); const LineBot = require("line-messaging"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const Rx_1 = require("rxjs/Rx"); const Parser_1 = require("./Parser"); diff --git a/broid-line/lib/core/Parser.js b/broid-line/lib/core/Parser.js index 59545dc7..c9743cd0 100644 --- a/broid-line/lib/core/Parser.js +++ b/broid-line/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-line/package.json b/broid-line/package.json index 29a3ee10..e661cefe 100644 --- a/broid-line/package.json +++ b/broid-line/package.json @@ -47,16 +47,16 @@ "body-parser": "^1.17.1", "express": "^4.15.2", "line-messaging": "^1.1.8", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", - "rxjs": "^5.0.2" + "rxjs": "^5.0.2", + "uuid": "^3.1.0" }, "devDependencies": { "@types/bluebird": "^3.5.2", "@types/bluebird-global": "^3.5.1", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.17.0", "concurrently": "^3.1.0", "copyfiles": "^1.0.0", diff --git a/broid-line/src/core/Adapter.ts b/broid-line/src/core/Adapter.ts index e5772bba..4a7b27a7 100644 --- a/broid-line/src/core/Adapter.ts +++ b/broid-line/src/core/Adapter.ts @@ -4,9 +4,9 @@ import { Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import { Router } from 'express'; import * as LineBot from 'line-messaging'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { IAdapterOptions } from './interfaces'; import { Parser } from './Parser'; diff --git a/broid-line/src/core/Parser.ts b/broid-line/src/core/Parser.ts index 933d670a..b7164075 100644 --- a/broid-line/src/core/Parser.ts +++ b/broid-line/src/core/Parser.ts @@ -7,8 +7,8 @@ import { cleanNulls, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; export class Parser { public serviceID: string; diff --git a/broid-line/yarn.lock b/broid-line/yarn.lock index 18fb4fdd..3e32bc56 100644 --- a/broid-line/yarn.lock +++ b/broid-line/yarn.lock @@ -31,13 +31,11 @@ version "3.5.2" resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.2.tgz#ecf1104217495e50fe0b588d538146cd6f733b89" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -45,6 +43,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2555,10 +2559,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3763,6 +3763,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-messenger/lib/core/Adapter.js b/broid-messenger/lib/core/Adapter.js index efed0d15..d32a8f98 100644 --- a/broid-messenger/lib/core/Adapter.js +++ b/broid-messenger/lib/core/Adapter.js @@ -5,7 +5,7 @@ const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const events_1 = require("events"); const express_1 = require("express"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const rp = require("request-promise"); const Rx_1 = require("rxjs/Rx"); diff --git a/broid-messenger/lib/core/Parser.js b/broid-messenger/lib/core/Parser.js index bbde39dd..49591d22 100644 --- a/broid-messenger/lib/core/Parser.js +++ b/broid-messenger/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-messenger/package.json b/broid-messenger/package.json index 1bf24c8e..dea15b61 100644 --- a/broid-messenger/package.json +++ b/broid-messenger/package.json @@ -47,20 +47,20 @@ "body-parser": "^1.15.2", "eventemitter3": "^2.0.2", "express": "^4.14.0", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", "request": "^2.79.0", "request-promise": "^4.1.1", "rxjs": "^5.0.2", - "sinon": "^2.1.0" + "sinon": "^2.1.0", + "uuid": "^3.1.0" }, "devDependencies": { "@types/bluebird": "^3.5.2", "@types/bluebird-global": "^3.5.1", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", "@types/request-promise": "^4.1.35", + "@types/uuid": "^3.0.0", "ava": "^0.17.0", "concurrently": "^3.1.0", "copyfiles": "^1.0.0", diff --git a/broid-messenger/src/core/Adapter.ts b/broid-messenger/src/core/Adapter.ts index be01409b..ab45b786 100644 --- a/broid-messenger/src/core/Adapter.ts +++ b/broid-messenger/src/core/Adapter.ts @@ -3,10 +3,10 @@ import { concat, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import { EventEmitter } from 'events'; import { Router } from 'express'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import * as rp from 'request-promise'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { createAttachment, createButtons, parseQuickReplies } from './helpers'; import { IAdapterOptions, IWebHookEvent } from './interfaces'; diff --git a/broid-messenger/src/core/Parser.ts b/broid-messenger/src/core/Parser.ts index 418e15bf..f5e39ab7 100644 --- a/broid-messenger/src/core/Parser.ts +++ b/broid-messenger/src/core/Parser.ts @@ -7,8 +7,8 @@ import { import { capitalizeFirstLetter, cleanNulls, concat, fileInfo, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; import { IWebHookEvent } from './interfaces'; diff --git a/broid-messenger/yarn.lock b/broid-messenger/yarn.lock index 607731c0..376cf54b 100644 --- a/broid-messenger/yarn.lock +++ b/broid-messenger/yarn.lock @@ -37,12 +37,6 @@ dependencies: "@types/node" "*" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" - "@types/node@*", "@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -65,6 +59,12 @@ "@types/form-data" "*" "@types/node" "*" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2587,10 +2587,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3844,6 +3840,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-ms-teams/lib/core/Adapter.js b/broid-ms-teams/lib/core/Adapter.js index 6b447783..406294cc 100644 --- a/broid-ms-teams/lib/core/Adapter.js +++ b/broid-ms-teams/lib/core/Adapter.js @@ -5,7 +5,7 @@ const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const botbuilder = require("botbuilder"); const express_1 = require("express"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const Rx_1 = require("rxjs/Rx"); const Parser_1 = require("./Parser"); diff --git a/broid-ms-teams/lib/core/Parser.js b/broid-ms-teams/lib/core/Parser.js index c9e4a0de..c5b5a226 100644 --- a/broid-ms-teams/lib/core/Parser.js +++ b/broid-ms-teams/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-ms-teams/package.json b/broid-ms-teams/package.json index 3d433e84..a42ed2f7 100644 --- a/broid-ms-teams/package.json +++ b/broid-ms-teams/package.json @@ -47,18 +47,18 @@ "body-parser": "^1.15.2", "botbuilder": "^3.5.1", "express": "^4.14.0", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", "rxjs": "^5.0.2", - "sinon": "^2.1.0" + "sinon": "^2.1.0", + "uuid": "^3.1.0" }, "devDependencies": { "@types/bluebird": "^3.5.2", "@types/bluebird-global": "^3.5.1", "@types/express": "^4.0.35", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.17.0", "concurrently": "^3.1.0", "copyfiles": "^1.0.0", diff --git a/broid-ms-teams/src/core/Adapter.ts b/broid-ms-teams/src/core/Adapter.ts index b5ea2da3..95d10072 100644 --- a/broid-ms-teams/src/core/Adapter.ts +++ b/broid-ms-teams/src/core/Adapter.ts @@ -4,9 +4,9 @@ import { fileInfo, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import * as botbuilder from 'botbuilder'; import { Router } from 'express'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { IAdapterOptions } from './interfaces'; import { Parser } from './Parser'; diff --git a/broid-ms-teams/src/core/Parser.ts b/broid-ms-teams/src/core/Parser.ts index a94038f7..534572cf 100644 --- a/broid-ms-teams/src/core/Parser.ts +++ b/broid-ms-teams/src/core/Parser.ts @@ -6,8 +6,8 @@ import { import { cleanNulls, fileInfo, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; export class Parser { public serviceID: string; diff --git a/broid-ms-teams/yarn.lock b/broid-ms-teams/yarn.lock index d2c36aa0..60f8aee3 100644 --- a/broid-ms-teams/yarn.lock +++ b/broid-ms-teams/yarn.lock @@ -48,12 +48,6 @@ version "0.0.29" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-0.0.29.tgz#fbcfd330573b912ef59eeee14602bface630754b" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" - "@types/node@*", "@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -69,6 +63,12 @@ "@types/express-serve-static-core" "*" "@types/mime" "*" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2696,10 +2696,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3976,6 +3972,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-nexmo/lib/core/Adapter.js b/broid-nexmo/lib/core/Adapter.js index 906c72e2..78b3cb18 100644 --- a/broid-nexmo/lib/core/Adapter.js +++ b/broid-nexmo/lib/core/Adapter.js @@ -6,7 +6,7 @@ const Promise = require("bluebird"); const events_1 = require("events"); const express_1 = require("express"); const Nexmo = require("nexmo"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const Rx_1 = require("rxjs/Rx"); const Parser_1 = require("./Parser"); diff --git a/broid-nexmo/lib/core/Parser.js b/broid-nexmo/lib/core/Parser.js index a636f5ae..e1777523 100644 --- a/broid-nexmo/lib/core/Parser.js +++ b/broid-nexmo/lib/core/Parser.js @@ -4,7 +4,7 @@ const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const moment = require("moment"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-nexmo/package.json b/broid-nexmo/package.json index 83b5da6c..cfbc0a0a 100755 --- a/broid-nexmo/package.json +++ b/broid-nexmo/package.json @@ -45,8 +45,8 @@ "@types/bluebird-global": "^3.5.1", "@types/moment": "^2.13.0", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.18.1", "concurrently": "^3.1.0", "copyfiles": "^1.2.0", @@ -67,9 +67,9 @@ "express": "^4.14.0", "moment": "^2.17.1", "nexmo": "^1.2.0", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", - "rxjs": "^5.0.2" + "rxjs": "^5.0.2", + "uuid": "^3.1.0" }, "ava": { "files": [ diff --git a/broid-nexmo/src/core/Adapter.ts b/broid-nexmo/src/core/Adapter.ts index 1fc7d50d..3eaddfb9 100644 --- a/broid-nexmo/src/core/Adapter.ts +++ b/broid-nexmo/src/core/Adapter.ts @@ -5,9 +5,9 @@ import * as Promise from 'bluebird'; import { EventEmitter } from 'events'; import { Router } from 'express'; import * as Nexmo from 'nexmo'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { IAdapterOptions } from './interfaces'; import { Parser } from './Parser'; diff --git a/broid-nexmo/src/core/Parser.ts b/broid-nexmo/src/core/Parser.ts index 6a1755e2..dd4f19d0 100644 --- a/broid-nexmo/src/core/Parser.ts +++ b/broid-nexmo/src/core/Parser.ts @@ -3,8 +3,8 @@ import { cleanNulls, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import * as moment from 'moment'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; export class Parser { public serviceID: string; diff --git a/broid-nexmo/yarn.lock b/broid-nexmo/yarn.lock index c755cb69..ec3c2567 100644 --- a/broid-nexmo/yarn.lock +++ b/broid-nexmo/yarn.lock @@ -69,13 +69,11 @@ dependencies: moment "*" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -83,6 +81,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2466,10 +2470,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3679,6 +3679,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-schemas/package.json b/broid-schemas/package.json index e2a27ffe..f7a3a4f1 100644 --- a/broid-schemas/package.json +++ b/broid-schemas/package.json @@ -46,8 +46,8 @@ "@types/bluebird": "^3.5.2", "@types/bluebird-global": "^3.5.1", "@types/node": "^7.0.11", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "concurrently": "^3.1.0", "js-yaml": "^3.8.1", "json-minify": "^1.0.0", diff --git a/broid-schemas/yarn.lock b/broid-schemas/yarn.lock index 9b0c3cac..0268e237 100644 --- a/broid-schemas/yarn.lock +++ b/broid-schemas/yarn.lock @@ -12,13 +12,11 @@ version "3.5.2" resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.2.tgz#ecf1104217495e50fe0b588d538146cd6f733b89" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.11": +"@types/node@^7.0.11": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -26,6 +24,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + agent-base@2: version "2.0.1" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-2.0.1.tgz#bd8f9e86a8eb221fffa07bd14befd55df142815e" diff --git a/broid-skype/lib/core/Adapter.js b/broid-skype/lib/core/Adapter.js index 5c6ede11..726db456 100644 --- a/broid-skype/lib/core/Adapter.js +++ b/broid-skype/lib/core/Adapter.js @@ -5,7 +5,7 @@ const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const botbuilder = require("botbuilder"); const express_1 = require("express"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const Rx_1 = require("rxjs/Rx"); const Parser_1 = require("./Parser"); diff --git a/broid-skype/lib/core/Parser.js b/broid-skype/lib/core/Parser.js index c9e4a0de..c5b5a226 100644 --- a/broid-skype/lib/core/Parser.js +++ b/broid-skype/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-skype/package.json b/broid-skype/package.json index ce9fac28..c6bb1973 100644 --- a/broid-skype/package.json +++ b/broid-skype/package.json @@ -47,17 +47,17 @@ "body-parser": "^1.15.2", "botbuilder": "^3.5.1", "express": "^4.14.0", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", "rxjs": "^5.0.2", - "sinon": "^2.1.0" + "sinon": "^2.1.0", + "uuid": "^3.1.0" }, "devDependencies": { "@types/bluebird": "^3.5.2", "@types/bluebird-global": "^3.5.1", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.17.0", "concurrently": "^3.1.0", "copyfiles": "^1.0.0", diff --git a/broid-skype/src/core/Adapter.ts b/broid-skype/src/core/Adapter.ts index 821f8b9c..f40c083d 100644 --- a/broid-skype/src/core/Adapter.ts +++ b/broid-skype/src/core/Adapter.ts @@ -4,9 +4,9 @@ import { fileInfo, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import * as botbuilder from 'botbuilder'; import { Router } from 'express'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { IAdapterOptions } from './interfaces'; import { Parser } from './Parser'; diff --git a/broid-skype/src/core/Parser.ts b/broid-skype/src/core/Parser.ts index baba819e..87768bdb 100644 --- a/broid-skype/src/core/Parser.ts +++ b/broid-skype/src/core/Parser.ts @@ -6,8 +6,8 @@ import { import { cleanNulls, fileInfo, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; export class Parser { public serviceID: string; diff --git a/broid-skype/yarn.lock b/broid-skype/yarn.lock index 1ac4dde9..000337d3 100644 --- a/broid-skype/yarn.lock +++ b/broid-skype/yarn.lock @@ -31,13 +31,11 @@ version "3.5.2" resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.2.tgz#ecf1104217495e50fe0b588d538146cd6f733b89" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -45,6 +43,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2672,10 +2676,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3952,6 +3952,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-slack/lib/core/Adapter.js b/broid-slack/lib/core/Adapter.js index eec8ae98..4ce2eb94 100644 --- a/broid-slack/lib/core/Adapter.js +++ b/broid-slack/lib/core/Adapter.js @@ -6,7 +6,7 @@ const client_1 = require("@slack/client"); const Promise = require("bluebird"); const events_1 = require("events"); const express_1 = require("express"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const rp = require("request-promise"); const Rx_1 = require("rxjs/Rx"); diff --git a/broid-slack/lib/core/Parser.js b/broid-slack/lib/core/Parser.js index b87f51df..d0528fbd 100644 --- a/broid-slack/lib/core/Parser.js +++ b/broid-slack/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-slack/lib/core/helpers.js b/broid-slack/lib/core/helpers.js index 4b56fb71..3e7022f4 100644 --- a/broid-slack/lib/core/helpers.js +++ b/broid-slack/lib/core/helpers.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); function createActions(buttons) { return R.map((button) => { diff --git a/broid-slack/package.json b/broid-slack/package.json index 0743355d..04b7f160 100644 --- a/broid-slack/package.json +++ b/broid-slack/package.json @@ -47,17 +47,17 @@ "bluebird": "^3.4.7", "body-parser": "^1.15.2", "express": "^4.14.0", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", "request": "^2.79.0", "request-promise": "^4.1.1", "rxjs": "^5.0.2", - "sinon": "^2.1.0" + "sinon": "^2.1.0", + "uuid": "^3.1.0" }, "devDependencies": { "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.17.0", "concurrently": "^3.1.0", "copyfiles": "^1.0.0", diff --git a/broid-slack/src/core/Adapter.ts b/broid-slack/src/core/Adapter.ts index ebcb33ae..812b00c6 100644 --- a/broid-slack/src/core/Adapter.ts +++ b/broid-slack/src/core/Adapter.ts @@ -5,10 +5,10 @@ import { CLIENT_EVENTS, RTM_EVENTS, RtmClient, WebClient } from '@slack/client'; import * as Promise from 'bluebird'; import { EventEmitter } from 'events'; import { Router } from 'express'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import * as rp from 'request-promise'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { createActions, createSendMessage, parseWebHookEvent } from './helpers'; import { diff --git a/broid-slack/src/core/Parser.ts b/broid-slack/src/core/Parser.ts index 820c98e8..ddb711a4 100644 --- a/broid-slack/src/core/Parser.ts +++ b/broid-slack/src/core/Parser.ts @@ -6,8 +6,8 @@ import { cleanNulls, fileInfo, isUrl, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; import { IMessage } from './interfaces'; diff --git a/broid-slack/src/core/helpers.ts b/broid-slack/src/core/helpers.ts index 3ee46884..3ae310a8 100644 --- a/broid-slack/src/core/helpers.ts +++ b/broid-slack/src/core/helpers.ts @@ -1,8 +1,8 @@ import { concat } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; import { ISlackAction, IWebHookEvent } from './interfaces'; diff --git a/broid-slack/yarn.lock b/broid-slack/yarn.lock index ed135c35..abafde89 100644 --- a/broid-slack/yarn.lock +++ b/broid-slack/yarn.lock @@ -38,13 +38,11 @@ winston "^2.1.1" ws "^1.0.1" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -52,6 +50,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2586,10 +2590,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3878,6 +3878,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-telegram/lib/core/Adapter.js b/broid-telegram/lib/core/Adapter.js index acde819b..7528949e 100644 --- a/broid-telegram/lib/core/Adapter.js +++ b/broid-telegram/lib/core/Adapter.js @@ -5,7 +5,7 @@ const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const express_1 = require("express"); const TelegramBot = require("node-telegram-bot-api"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const request = require("request-promise"); const Rx_1 = require("rxjs/Rx"); diff --git a/broid-telegram/lib/core/Parser.js b/broid-telegram/lib/core/Parser.js index 08317e93..191ad433 100644 --- a/broid-telegram/lib/core/Parser.js +++ b/broid-telegram/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-telegram/package.json b/broid-telegram/package.json index 857fa730..f777c132 100644 --- a/broid-telegram/package.json +++ b/broid-telegram/package.json @@ -47,19 +47,19 @@ "body-parser": "^1.17.1", "express": "^4.15.2", "node-telegram-bot-api": "^0.25.0", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", "request": "^2.79.0", "request-promise": "^4.1.1", "rxjs": "^5.0.2", - "sinon": "^2.1.0" + "sinon": "^2.1.0", + "uuid": "^3.1.0" }, "devDependencies": { "@types/bluebird": "^3.5.2", "@types/bluebird-global": "^3.5.1", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.17.0", "concurrently": "^3.1.0", "copyfiles": "^1.0.0", diff --git a/broid-telegram/src/core/Adapter.ts b/broid-telegram/src/core/Adapter.ts index b105e860..05f76d59 100644 --- a/broid-telegram/src/core/Adapter.ts +++ b/broid-telegram/src/core/Adapter.ts @@ -4,10 +4,10 @@ import { Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import { Router } from 'express'; import * as TelegramBot from 'node-telegram-bot-api'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import * as request from 'request-promise'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { IAdapterOptions } from './interfaces'; import { Parser } from './Parser'; diff --git a/broid-telegram/src/core/Parser.ts b/broid-telegram/src/core/Parser.ts index 9b923b2e..8d0c61dd 100644 --- a/broid-telegram/src/core/Parser.ts +++ b/broid-telegram/src/core/Parser.ts @@ -5,8 +5,8 @@ import { import { cleanNulls, concat, fileInfo, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; export class Parser { public serviceID: string; diff --git a/broid-telegram/yarn.lock b/broid-telegram/yarn.lock index 9ac3bb0d..02298e53 100644 --- a/broid-telegram/yarn.lock +++ b/broid-telegram/yarn.lock @@ -31,13 +31,11 @@ version "3.5.2" resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.2.tgz#ecf1104217495e50fe0b588d538146cd6f733b89" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -45,6 +43,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2591,10 +2595,6 @@ node-telegram-bot-api@^0.25.0: request "^2.69.0" request-promise "^4.1.1" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3848,6 +3848,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-twilio/lib/core/Adapter.js b/broid-twilio/lib/core/Adapter.js index 60659ae9..4d9653d7 100644 --- a/broid-twilio/lib/core/Adapter.js +++ b/broid-twilio/lib/core/Adapter.js @@ -5,7 +5,7 @@ const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const events_1 = require("events"); const express_1 = require("express"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const Rx_1 = require("rxjs/Rx"); const twilio = require("twilio"); diff --git a/broid-twilio/lib/core/Parser.js b/broid-twilio/lib/core/Parser.js index d15e5afd..60c2f9c1 100644 --- a/broid-twilio/lib/core/Parser.js +++ b/broid-twilio/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-twilio/package.json b/broid-twilio/package.json index 93f22944..bd081111 100644 --- a/broid-twilio/package.json +++ b/broid-twilio/package.json @@ -46,17 +46,17 @@ "bluebird": "^3.4.7", "body-parser": "^1.15.2", "express": "^4.14.0", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", "rxjs": "^5.0.2", - "twilio": "^2.11.1" + "twilio": "^2.11.1", + "uuid": "^3.1.0" }, "devDependencies": { "@types/bluebird": "^3.5.2", "@types/bluebird-global": "^3.5.1", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.17.0", "concurrently": "^3.1.0", "copyfiles": "^1.0.0", diff --git a/broid-twilio/src/core/Adapter.ts b/broid-twilio/src/core/Adapter.ts index 053857cc..4468123e 100644 --- a/broid-twilio/src/core/Adapter.ts +++ b/broid-twilio/src/core/Adapter.ts @@ -4,10 +4,10 @@ import { Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import { EventEmitter } from 'events'; import { Router } from 'express'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import { Observable } from 'rxjs/Rx'; import * as twilio from 'twilio'; +import * as uuid from 'uuid'; import { IAdapterOptions, ITwilioWebHookEvent } from './interfaces'; import { Parser } from './Parser'; diff --git a/broid-twilio/src/core/Parser.ts b/broid-twilio/src/core/Parser.ts index ab3aebe2..56750a1e 100644 --- a/broid-twilio/src/core/Parser.ts +++ b/broid-twilio/src/core/Parser.ts @@ -5,8 +5,8 @@ import { import { cleanNulls, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; import { ITwilioMedia, ITwilioWebHookEvent } from './interfaces'; diff --git a/broid-twilio/yarn.lock b/broid-twilio/yarn.lock index b9215320..886ddaa4 100644 --- a/broid-twilio/yarn.lock +++ b/broid-twilio/yarn.lock @@ -31,13 +31,11 @@ version "3.5.2" resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.2.tgz#ecf1104217495e50fe0b588d538146cd6f733b89" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -45,6 +43,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2662,7 +2666,7 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7, node-uuid@~1.4.7: +node-uuid@~1.4.7: version "1.4.8" resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" @@ -3943,6 +3947,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-twitter/lib/core/Adapter.js b/broid-twitter/lib/core/Adapter.js index 52461349..09517c49 100644 --- a/broid-twitter/lib/core/Adapter.js +++ b/broid-twitter/lib/core/Adapter.js @@ -4,7 +4,7 @@ const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const fs = require("fs"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const rp = require("request-promise"); const Rx_1 = require("rxjs/Rx"); diff --git a/broid-twitter/lib/core/Parser.js b/broid-twitter/lib/core/Parser.js index 66715284..34c204be 100644 --- a/broid-twitter/lib/core/Parser.js +++ b/broid-twitter/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-twitter/package.json b/broid-twitter/package.json index 4ab56004..1939c4e5 100644 --- a/broid-twitter/package.json +++ b/broid-twitter/package.json @@ -42,8 +42,8 @@ }, "devDependencies": { "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.17.0", "concurrently": "^3.1.0", "copyfiles": "^1.0.0", @@ -59,12 +59,12 @@ "@broid/schemas": "^1.0.1", "@broid/utils": "^1.1.1", "bluebird": "^3.4.7", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", "request-promise": "^4.1.1", "rxjs": "^5.0.2", "sinon": "^2.1.0", - "twitter": "^1.7.0" + "twitter": "^1.7.0", + "uuid": "^3.1.0" }, "ava": { "files": [ diff --git a/broid-twitter/src/core/Adapter.ts b/broid-twitter/src/core/Adapter.ts index dd56c21b..5f1e0cc4 100644 --- a/broid-twitter/src/core/Adapter.ts +++ b/broid-twitter/src/core/Adapter.ts @@ -3,11 +3,11 @@ import { Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import * as fs from 'fs'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import * as rp from 'request-promise'; import { Observable } from 'rxjs/Rx'; import * as Twitter from 'twitter'; +import * as uuid from 'uuid'; import { IAdapterOptions, ITwitterSendParameters } from './interfaces'; import { Parser } from './Parser'; diff --git a/broid-twitter/src/core/Parser.ts b/broid-twitter/src/core/Parser.ts index 98c2d0db..fa1938e7 100644 --- a/broid-twitter/src/core/Parser.ts +++ b/broid-twitter/src/core/Parser.ts @@ -5,8 +5,8 @@ import { import { cleanNulls, fileInfo, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; export class Parser { public serviceID: string; diff --git a/broid-twitter/yarn.lock b/broid-twitter/yarn.lock index 1eae8abd..e122c689 100644 --- a/broid-twitter/yarn.lock +++ b/broid-twitter/yarn.lock @@ -21,13 +21,11 @@ request "^2.81.0" valid-url "^1.0.9" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -35,6 +33,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2387,10 +2391,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3568,6 +3568,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-utils/package.json b/broid-utils/package.json index 8b4ebad7..c2eaef0e 100644 --- a/broid-utils/package.json +++ b/broid-utils/package.json @@ -51,8 +51,8 @@ "@types/bluebird": "^3.5.2", "@types/bluebird-global": "^3.5.1", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "concurrently": "^3.1.0", "nsp": "^2.6.3", "tslint": "^4.3.1", diff --git a/broid-utils/yarn.lock b/broid-utils/yarn.lock index 4f51749e..39eb980d 100644 --- a/broid-utils/yarn.lock +++ b/broid-utils/yarn.lock @@ -12,13 +12,11 @@ version "3.5.2" resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.2.tgz#ecf1104217495e50fe0b588d538146cd6f733b89" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -26,6 +24,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + agent-base@2: version "2.0.1" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-2.0.1.tgz#bd8f9e86a8eb221fffa07bd14befd55df142815e" diff --git a/broid-viber/lib/core/Adapter.js b/broid-viber/lib/core/Adapter.js index 389bd29b..b8ebdae0 100644 --- a/broid-viber/lib/core/Adapter.js +++ b/broid-viber/lib/core/Adapter.js @@ -4,7 +4,7 @@ const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); const express_1 = require("express"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); const Rx_1 = require("rxjs/Rx"); const viber_bot_1 = require("viber-bot"); diff --git a/broid-viber/lib/core/Parser.js b/broid-viber/lib/core/Parser.js index d0829647..c9e56612 100644 --- a/broid-viber/lib/core/Parser.js +++ b/broid-viber/lib/core/Parser.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const schemas_1 = require("@broid/schemas"); const utils_1 = require("@broid/utils"); const Promise = require("bluebird"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const R = require("ramda"); class Parser { constructor(serviceName, serviceID, logLevel) { diff --git a/broid-viber/package.json b/broid-viber/package.json index edc325e5..e7a33a0f 100644 --- a/broid-viber/package.json +++ b/broid-viber/package.json @@ -44,16 +44,16 @@ "@broid/schemas": "^1.0.1", "@broid/utils": "^1.1.1", "bluebird": "^3.4.7", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", "rxjs": "^5.0.2", "sinon": "^2.1.0", + "uuid": "^3.1.0", "viber-bot": "^1.0.6" }, "devDependencies": { "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", + "@types/uuid": "^3.0.0", "ava": "^0.17.0", "concurrently": "^3.1.0", "copyfiles": "^1.0.0", diff --git a/broid-viber/src/core/Adapter.ts b/broid-viber/src/core/Adapter.ts index 74cc59d2..82f6014e 100644 --- a/broid-viber/src/core/Adapter.ts +++ b/broid-viber/src/core/Adapter.ts @@ -3,9 +3,9 @@ import { Logger } from '@broid/utils'; import * as Promise from 'bluebird'; import { Router } from 'express'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; import { Observable } from 'rxjs/Rx'; +import * as uuid from 'uuid'; import { Bot, Events, Message } from 'viber-bot'; import { IAdapterOptions } from './interfaces'; diff --git a/broid-viber/src/core/Parser.ts b/broid-viber/src/core/Parser.ts index 1a8e0788..bdc6ab52 100644 --- a/broid-viber/src/core/Parser.ts +++ b/broid-viber/src/core/Parser.ts @@ -5,8 +5,8 @@ import { import { cleanNulls, fileInfo, Logger } from '@broid/utils'; import * as Promise from 'bluebird'; -import * as uuid from 'node-uuid'; import * as R from 'ramda'; +import * as uuid from 'uuid'; export class Parser { public serviceID: string; diff --git a/broid-viber/yarn.lock b/broid-viber/yarn.lock index 55190c53..6e3a8eb0 100644 --- a/broid-viber/yarn.lock +++ b/broid-viber/yarn.lock @@ -21,13 +21,11 @@ request "^2.81.0" valid-url "^1.0.9" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" +"@types/node@*": + version "8.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.12.tgz#0560c3e8c9e3da0aa07d0b86e0b0a02b5fd29480" -"@types/node@*", "@types/node@^7.0.12": +"@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -35,6 +33,12 @@ version "0.0.5" resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.5.tgz#8b381e3363de9db3cb89d3b62f23b73cfb56bc0b" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2560,10 +2564,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3803,6 +3803,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" diff --git a/broid-wechat/lib/core/Adapter.js b/broid-wechat/lib/core/Adapter.js index f3c27110..30e409f1 100644 --- a/broid-wechat/lib/core/Adapter.js +++ b/broid-wechat/lib/core/Adapter.js @@ -7,7 +7,7 @@ const crypto = require("crypto"); const events_1 = require("events"); const express_1 = require("express"); const fs = require("fs-extra"); -const uuid = require("node-uuid"); +const uuid = require("uuid"); const path = require("path"); const R = require("ramda"); const request = require("request"); diff --git a/broid-wechat/package.json b/broid-wechat/package.json index 6a40e3d3..8f126835 100644 --- a/broid-wechat/package.json +++ b/broid-wechat/package.json @@ -47,10 +47,10 @@ "@types/fs-extra": "^0.0.37", "@types/glob": "^5.0.30", "@types/node": "^7.0.12", - "@types/node-uuid": "^0.0.28", "@types/ramda": "^0.0.5", "@types/request": "^0.0.40", "@types/tmp": "^0.0.32", + "@types/uuid": "^3.0.0", "ava": "^0.18.1", "concurrently": "^3.1.0", "copyfiles": "^1.2.0", @@ -73,11 +73,11 @@ "express-xml-bodyparser": "^0.3.0", "fs-extra": "^2.0.0", "mimetype": "^0.0.8", - "node-uuid": "^1.4.7", "ramda": "^0.23.0", "request": "^2.80.0", "rxjs": "^5.0.2", "tmp": "^0.0.31", + "uuid": "^3.1.0", "wechat-api": "git+https://git@github.com/node-webot/wechat-api.git#295ad45e199ef93610c4d3a9350de6992a932d8c" }, "ava": { diff --git a/broid-wechat/src/core/Adapter.ts b/broid-wechat/src/core/Adapter.ts index 5009999a..6f90d47b 100644 --- a/broid-wechat/src/core/Adapter.ts +++ b/broid-wechat/src/core/Adapter.ts @@ -6,12 +6,12 @@ import * as crypto from 'crypto'; import { EventEmitter } from 'events'; import { Router } from 'express'; import * as fs from 'fs-extra'; -import * as uuid from 'node-uuid'; import * as path from 'path'; import * as R from 'ramda'; import * as request from 'request'; import { Observable } from 'rxjs/Rx'; import * as tmp from 'tmp'; +import * as uuid from 'uuid'; import * as WeChat from 'wechat-api'; import { IAdapterOptions } from './interfaces'; diff --git a/broid-wechat/yarn.lock b/broid-wechat/yarn.lock index a98cb0eb..7af1722f 100644 --- a/broid-wechat/yarn.lock +++ b/broid-wechat/yarn.lock @@ -103,12 +103,6 @@ version "2.0.29" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-2.0.29.tgz#5002e14f75e2d71e564281df0431c8c1b4a2a36a" -"@types/node-uuid@^0.0.28": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/node-uuid/-/node-uuid-0.0.28.tgz#41655b5ce63b2f3374c4e826b4dd21e729058e3d" - dependencies: - "@types/node" "*" - "@types/node@*", "@types/node@^7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" @@ -135,6 +129,12 @@ version "0.0.32" resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.0.32.tgz#0d3cb31022f8427ea58c008af32b80da126ca4e3" +"@types/uuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.0.0.tgz#be93b14bcf97f59c079a9e58754960b5efd946c3" + dependencies: + "@types/node" "*" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -2526,10 +2526,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -node-uuid@^1.4.7: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodesecurity-npm-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9" @@ -3791,6 +3787,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200"