Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contentcuration/contentcuration/frontend/shared/data/db.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Dexie from 'dexie';
import 'dexie-observable';
import uuidv4 from 'uuid/v4';
import { v4 as uuidv4 } from 'uuid';
import { APP_ID } from './constants';

if (process.env.NODE_ENV !== 'production') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import sortBy from 'lodash/sortBy';
import uniq from 'lodash/uniq';
import uniqBy from 'lodash/uniqBy';

import uuidv4 from 'uuid/v4';
import { v4 as uuidv4 } from 'uuid';
import {
CHANGE_TYPES,
CHANGES_TABLE,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mapState } from 'vuex';
import uuidv4 from 'uuid/v4';
import { v4 as uuidv4 } from 'uuid';
import { DraggableIdentityHelper } from 'shared/vuex/draggablePlugin/module/utils';

export default {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Vue from 'vue';
import vueCustomElement from 'vue-custom-element';
import uuid from 'uuid/v4';
import { v4 as uuidv4 } from 'uuid';

export default VueComponent => {
const dashed = camel => camel.replace(/([a-zA-Z])(?=[A-Z])/g, '$1-').toLowerCase();
Expand All @@ -18,7 +18,7 @@ export default VueComponent => {

// a hack to prevent squire from merging custom element spans
// see here: https://github.com/nhn/tui.editor/blob/master/libs/squire/source/Node.js#L92-L101
this.classList.add(`markdown-field-${uuid()}`);
this.classList.add(`markdown-field-${uuidv4()}`);

// pass innerHTML of host element as the `markdown` property
this.observer = new MutationObserver(mutations => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventEmitter } from 'events';
import uuidv4 from 'uuid/v4';
import { v4 as uuidv4 } from 'uuid';
import IndexedDBPlugin, {
commitListener,
dispatchListener,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"spark-md5": "^3.0.0",
"store2": "^2.14.2",
"string-strip-html": "8.3.0",
"uuid": "^3.3.3",
"uuid": "^8.3.2",
"vue": "^2.6.12",
"vue-croppa": "^1.3.8",
"vue-custom-element": "https://github.com/learningequality/vue-custom-element.git#master",
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12177,7 +12177,7 @@ utrie@^1.0.2:
dependencies:
base64-arraybuffer "^1.0.2"

uuid@^3.3.2, uuid@^3.3.3:
uuid@^3.3.2:
version "3.4.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
Expand Down