From 2ff791826f0f790b267d95ac0909ffa99bbaa18d Mon Sep 17 00:00:00 2001 From: yan Date: Wed, 3 May 2017 21:23:33 +0000 Subject: [PATCH] switch from node-uuid to uuid fix https://github.com/brave/browser-laptop/issues/8667 Test Plan: N/A --- app/filtering.js | 2 +- app/ledger.js | 2 +- package.json | 2 +- test/unit/app/common/lib/ledgerExportUtilTest.js | 2 +- tools/lib/transactionHelpers.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/filtering.js b/app/filtering.js index 00ed780b2f..c3509b82e1 100644 --- a/app/filtering.js +++ b/app/filtering.js @@ -25,7 +25,7 @@ const {isSessionPartition} = require('../js/state/frameStateUtil') const ipcMain = electron.ipcMain const dialog = electron.dialog const app = electron.app -const uuid = require('node-uuid') +const uuid = require('uuid') const path = require('path') const getOrigin = require('../js/state/siteUtil').getOrigin const {adBlockResourceName} = require('./adBlock') diff --git a/app/ledger.js b/app/ledger.js index c874794e17..4d0c24f59b 100644 --- a/app/ledger.js +++ b/app/ledger.js @@ -52,7 +52,7 @@ const querystring = require('querystring') const random = require('random-lib') const tldjs = require('tldjs') const underscore = require('underscore') -const uuid = require('node-uuid') +const uuid = require('uuid') const appActions = require('../js/actions/appActions') const appConfig = require('../js/constants/appConfig') diff --git a/package.json b/package.json index 1d543bc98c..2da1ccbdff 100644 --- a/package.json +++ b/package.json @@ -175,7 +175,6 @@ "node-gyp": "^3.2.1", "node-libs-browser": "^1.0.0", "node-static": "^0.7.7", - "node-uuid": "^1.4.7", "nsp": "^2.2.0", "pre-commit": "brave/pre-commit", "react-addons-perf": "^15.2.1", @@ -187,6 +186,7 @@ "standard": "9.0.0", "style-loader": "^0.13.0", "uglify-js-harmony": "^2.7.5", + "uuid": "^3.0.1", "webdriverio": "4.2.5", "webpack": "^1.12.9", "webpack-dev-server": "^1.14.0", diff --git a/test/unit/app/common/lib/ledgerExportUtilTest.js b/test/unit/app/common/lib/ledgerExportUtilTest.js index 84793f3cd3..f31c1b5bbd 100644 --- a/test/unit/app/common/lib/ledgerExportUtilTest.js +++ b/test/unit/app/common/lib/ledgerExportUtilTest.js @@ -1,7 +1,7 @@ /* global describe, it, before */ const assert = require('assert') const underscore = require('underscore') -const uuid = require('node-uuid') +const uuid = require('uuid') const moment = require('moment') require('../../../braveUnit') diff --git a/tools/lib/transactionHelpers.js b/tools/lib/transactionHelpers.js index acb20837d5..0fe8afa804 100644 --- a/tools/lib/transactionHelpers.js +++ b/tools/lib/transactionHelpers.js @@ -76,7 +76,7 @@ const generateTransaction = function () { } /** code for generating transaction object components **/ -const uuid = require('node-uuid') +const uuid = require('uuid') const crypto = require('crypto') const randomBytes = crypto.randomBytes