From 33381330ba90c69e6fe2ea61b75757edd9bcf83b Mon Sep 17 00:00:00 2001
From: Jon Kilroy <jkilroy@gmail.com>
Date: Sat, 19 Sep 2020 13:43:50 -0500
Subject: [PATCH] Update uuid and highlight.js (#253)

---
 package.json                               |  4 ++--
 tests/dummy/app/controllers/application.js |  2 +-
 tests/dummy/app/modifiers/highlight.js     |  2 +-
 yarn.lock                                  | 13 ++++---------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index dd0e902..cbefdd5 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "eslint": "^7.8.0",
     "eslint-plugin-ember": "^9.0.0",
     "eslint-plugin-node": "^11.1.0",
-    "highlight.js": "^9.12.0",
+    "highlight.js": "^10.2.0",
     "husky": "^4.2.1",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
@@ -56,7 +56,7 @@
     "pretty-quick": "^2.0.1",
     "qunit-dom": "^1.4.0",
     "sass": "^1.22.1",
-    "uuid": "^7.0.1"
+    "uuid": "^8.3.0"
   },
   "dependencies": {
     "@ember/render-modifiers": "^1.0.1",
diff --git a/tests/dummy/app/controllers/application.js b/tests/dummy/app/controllers/application.js
index e32688a..03daff5 100644
--- a/tests/dummy/app/controllers/application.js
+++ b/tests/dummy/app/controllers/application.js
@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
 import { action } from '@ember/object';
-import uuidv1 from 'uuid/v1';
+import { v1 as uuidv1 } from 'uuid';
 
 export default class ApplicationController extends Controller {
   @action
diff --git a/tests/dummy/app/modifiers/highlight.js b/tests/dummy/app/modifiers/highlight.js
index 17574c9..04b5c54 100644
--- a/tests/dummy/app/modifiers/highlight.js
+++ b/tests/dummy/app/modifiers/highlight.js
@@ -1,5 +1,5 @@
 import { modifier } from 'ember-modifier';
-import hljs from 'highlight.js/lib/highlight';
+import hljs from 'highlight.js/lib/core';
 import handlebars from 'highlight.js/lib/languages/handlebars';
 
 hljs.registerLanguage('handlebars', handlebars);
diff --git a/yarn.lock b/yarn.lock
index 318992c..0d4b053 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6776,10 +6776,10 @@ heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3, heimdalljs@^0.2.5, heim
   dependencies:
     rsvp "~3.2.1"
 
-highlight.js@^9.12.0:
-  version "9.18.3"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.3.tgz#a1a0a2028d5e3149e2380f8a865ee8516703d634"
-  integrity sha512-zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ==
+highlight.js@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.2.0.tgz#367151bcf813adebc54822f1cb51d2e1e599619f"
+  integrity sha512-OryzPiqqNCfO/wtFo619W+nPYALM6u7iCQkum4bqRmmlcTikOkmlL06i009QelynBPAlNByTQU6cBB2cOBQtCw==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -11335,11 +11335,6 @@ uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
-  integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
-
 uuid@^8.3.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"