gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12282 from dhcodes/fix/refactor-node-uuid-to-uuid

Browse Source 
change node-uuid to uuid
This commit is contained in:
Berkeley Martinez
2016-12-30 18:07:04 -08:00
committed by GitHub
parent 62841a4a78 79a8c412f1
commit c223827dbe
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/models/user.js
View File

@ -1,5 +1,5 @@
import { Observable } from 'rx'; import { Observable } from 'rx';
import uuid from 'node-uuid'; import uuid from 'uuid';
import moment from 'moment'; import moment from 'moment';
import dedent from 'dedent'; import dedent from 'dedent';
import debugFactory from 'debug'; import debugFactory from 'debug';

2
package.json
View File

@ -74,7 +74,6 @@
"morgan": "^1.6.1", "morgan": "^1.6.1",
"mousetrap": "^1.6.0", "mousetrap": "^1.6.0",
"node-emoji": "^1.4.1", "node-emoji": "^1.4.1",
"node-uuid": "^1.4.3",
"nodemailer": "^2.1.0", "nodemailer": "^2.1.0",
"nodemailer-ses-transport": "^1.3.0", "nodemailer-ses-transport": "^1.3.0",
"normalize-url": "^1.3.1", "normalize-url": "^1.3.1",
@ -117,6 +116,7 @@
"sanitize-html": "^1.11.1", "sanitize-html": "^1.11.1",
"snyk": "^1.19.1", "snyk": "^1.19.1",
"store": "https://github.com/berkeleytrue/store.js.git#feature/noop-server", "store": "https://github.com/berkeleytrue/store.js.git#feature/noop-server",
"uuid": "^3.0.1",
"validator": "^6.0.0" "validator": "^6.0.0"
}, },
"devDependencies": { "devDependencies": {

2
seed/loopbackMigration.js
View File

@ -1,7 +1,7 @@
/* eslint-disable no-process-exit */ /* eslint-disable no-process-exit */
require('dotenv').load(); require('dotenv').load();
var Rx = require('rx'), var Rx = require('rx'),
uuid = require('node-uuid'), uuid = require('uuid'),
assign = require('lodash/object/assign'), assign = require('lodash/object/assign'),
mongodb = require('mongodb'), mongodb = require('mongodb'),
secrets = require('../config/secrets'); secrets = require('../config/secrets');

2
server/component-passport.js
View File

@ -1,7 +1,7 @@
import passport from 'passport'; import passport from 'passport';
import { PassportConfigurator } from 'loopback-component-passport'; import { PassportConfigurator } from 'loopback-component-passport';
import passportProviders from './passport-providers'; import passportProviders from './passport-providers';
import uuid from 'node-uuid'; import uuid from 'uuid';
import { generateKey } from 'loopback-component-passport/lib/models/utils'; import { generateKey } from 'loopback-component-passport/lib/models/utils';
import { import {