Nuke the local uuid implementation

next-virtuoso
Alex Gleason 2 years ago
parent 7882bbf98f
commit 2ebf4777c2
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7

@ -1,12 +1,11 @@
import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet } from 'immutable'; import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet } from 'immutable';
import { defineMessages } from 'react-intl'; import { defineMessages } from 'react-intl';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import { v4 as uuid } from 'uuid';
import { patchMe } from 'soapbox/actions/me'; import { patchMe } from 'soapbox/actions/me';
import { isLoggedIn } from 'soapbox/utils/auth'; import { isLoggedIn } from 'soapbox/utils/auth';
import uuid from '../uuid';
import { showAlertForError } from './alerts'; import { showAlertForError } from './alerts';
import snackbar from './snackbar'; import snackbar from './snackbar';

@ -1,4 +1,5 @@
import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable'; import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
import { v4 as uuid } from 'uuid';
import { tagHistory } from 'soapbox/settings'; import { tagHistory } from 'soapbox/settings';
import { PLEROMA } from 'soapbox/utils/features'; import { PLEROMA } from 'soapbox/utils/features';
@ -55,7 +56,6 @@ import { SETTING_CHANGE, FE_NAME } from '../actions/settings';
import { REDRAFT } from '../actions/statuses'; import { REDRAFT } from '../actions/statuses';
import { TIMELINE_DELETE } from '../actions/timelines'; import { TIMELINE_DELETE } from '../actions/timelines';
import { unescapeHTML } from '../utils/html'; import { unescapeHTML } from '../utils/html';
import uuid from '../uuid';
const initialState = ImmutableMap({ const initialState = ImmutableMap({
id: null, id: null,

@ -1,5 +0,0 @@
'use strict';
export default function uuid(a) {
return a ? (a^Math.random() * 16 >> a / 4).toString(16) : ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, uuid);
}
Loading…
Cancel
Save