Merge pull request #32 from starknet-io/update_cairo_js

Update highlight.js and highlightjs-cairo plugin.

package.json

@@ -41,8 +41,8 @@
     "gulp-uglify": "~3.0",
     "gulp-vinyl-zip": "~2.2",
     "handlebars": "~4.7",
-    "highlight.js": "11.4.0",
-    "highlightjs-cairo": "^0.2.0",
+    "highlight.js": "^9.18.3",
+    "highlightjs-cairo": "^0.4.0",
     "js-yaml": "~3.13",
     "merge-stream": "~2.0",
     "postcss-calc": "~7.0",

preview-src/index.adoc

@@ -75,6 +75,18 @@ Voila!
 
 How about some code?
 
+[source,cairo]
+----
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {
+        let result = 2 + 2;
+        assert!(result == 4, "result is not 4");
+    }
+}
+----
+
 [,js]
 ----
 vfs

src/js/vendor/highlight.bundle.js

@@ -1,9 +1,9 @@
 ;(function () {
   'use strict'
 
-  var hljs = require('highlight.js/lib/core')
-  var hljsDefineCairo = require('highlightjs-cairo')  // Require the highlightjs-cairo module
+  const hljsDefineCairo = require('highlightjs-cairo'); // Require the highlightjs-cairo module
 
+  var hljs = require('highlight.js/lib/highlight')
   hljs.registerLanguage('asciidoc', require('highlight.js/lib/languages/asciidoc'))
   hljs.registerLanguage('bash', require('highlight.js/lib/languages/bash'))
   hljs.registerLanguage('clojure', require('highlight.js/lib/languages/clojure'))
@@ -37,8 +37,7 @@
   hljs.registerLanguage('xml', require('highlight.js/lib/languages/xml'))
   hljs.registerLanguage('yaml', require('highlight.js/lib/languages/yaml'))
   hljsDefineCairo(hljs);  // Use the highlightjs-cairo module to define Cairo in hljs
-
-  ;[].slice.call(document.querySelectorAll('pre code.hljs')).forEach(function (node) {
-    hljs.highlightElement(node)
+  ;[].slice.call(document.querySelectorAll('pre code.hljs[data-lang]')).forEach(function (node) {
+    hljs.highlightBlock(node)
   })
 })()

yarn.lock

@@ -4075,17 +4075,15 @@
   "resolved" "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz"
   "version" "1.1.0"
 
-"highlight.js@^11.0.0", "[email protected]":
-  "integrity" "sha512-nawlpCBCSASs7EdvZOYOYVkJpGmAOKMYZgZtUqSRqodZE0GRVcFKwo1RcpeOemqh9hyttTdd5wDBwHkuSyUfnA=="
-  "resolved" "https://registry.npmjs.org/highlight.js/-/highlight.js-11.4.0.tgz"
-  "version" "11.4.0"
-
-"highlightjs-cairo@^0.2.0":
-  "integrity" "sha512-gO0934JCapWreOPAKsjC9RNUVV6cwSDrk3YMFaCjjeIKr1iAR1yi/ssevNgwTKWnkAVM1O7AAu4CmE/4qaBREQ=="
-  "resolved" "https://registry.npmjs.org/highlightjs-cairo/-/highlightjs-cairo-0.2.0.tgz"
-  "version" "0.2.0"
-  dependencies:
-    "highlight.js" "^11.0.0"
+"highlight.js@^9.18.3":
+  "integrity" "sha512-zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ=="
+  "resolved" "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.3.tgz"
+  "version" "9.18.3"
+
+"highlightjs-cairo@^0.4.0":
+  "integrity" "sha512-d2w8A+02Asq9QIAI6XOyxgKXCzqC/MMNreRjb7Ia2mhpjzVDbU7JaXK+hMlJkVs1MaqKuD1mTLQ7HxAlcOenSw=="
+  "resolved" "https://registry.npmjs.org/highlightjs-cairo/-/highlightjs-cairo-0.4.0.tgz"
+  "version" "0.4.0"
 
 "hmac-drbg@^1.0.1":
   "integrity" "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE="