Skip to content

chore(docs): update highlight.js to v10 #6148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 7, 2020
Merged

chore(docs): update highlight.js to v10 #6148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ updates:
ignore:
- dependency-name: "bootstrap"
versions: [">=5.0.0"]
- dependency-name: "highlight.js"
versions: [">=10.0.0"]
- dependency-name: "prettier"
versions: [">1.14.3"]
- dependency-name: "@vue/test-utils"
Expand Down
17 changes: 10 additions & 7 deletions docs/nuxt.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
const fs = require('fs')
const path = require('path')
const marked = require('marked')
const hljs = require('highlight.js/lib/highlight.js')
const hljs = require('highlight.js/lib/core')
const { BASE_URL, GA_TRACKING_ID, TWITTER_HANDLE } = require('./constants')

// Import only the languages we need from "highlight.js"
hljs.registerLanguage('bash', require('highlight.js/lib/languages/bash')) // Includes sh
hljs.registerLanguage('css', require('highlight.js/lib/languages/css'))
hljs.registerLanguage('javascript', require('highlight.js/lib/languages/javascript'))
hljs.registerLanguage('typescript', require('highlight.js/lib/languages/typescript'))
hljs.registerLanguage('json', require('highlight.js/lib/languages/json'))
hljs.registerLanguage('xml', require('highlight.js/lib/languages/xml')) // Includes HTML
hljs.registerLanguage('css', require('highlight.js/lib/languages/css'))
hljs.registerLanguage('plaintext', require('highlight.js/lib/languages/plaintext'))
hljs.registerLanguage('scss', require('highlight.js/lib/languages/scss'))
hljs.registerLanguage('bash', require('highlight.js/lib/languages/bash')) // Includes sh
hljs.registerLanguage('shell', require('highlight.js/lib/languages/shell'))
hljs.registerLanguage('plaintext', require('highlight.js/lib/languages/plaintext'))
hljs.registerLanguage('typescript', require('highlight.js/lib/languages/typescript'))
hljs.registerLanguage('xml', require('highlight.js/lib/languages/xml')) // Includes HTML

// --- Constants ---

Expand Down Expand Up @@ -238,7 +238,10 @@ module.exports = {
'b-carousel-slide': 'img-src',
'b-embed': 'src'
}
}
},

// Transpile dependencies for legacy browser support (i.e. IE 11)
transpile: [({ isLegacy }) => isLegacy && 'highlight.js']
},

loading: {
Expand Down
41 changes: 20 additions & 21 deletions docs/utils/hljs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
import hljs from 'highlight.js/lib/highlight.js'

// import only the languages we need for hljs
import hljsJS from 'highlight.js/lib/languages/javascript'
import hljsTS from 'highlight.js/lib/languages/typescript'
import hljsJSON from 'highlight.js/lib/languages/json'
import hljsXML from 'highlight.js/lib/languages/xml'
import hljsCSS from 'highlight.js/lib/languages/css'
import hljsSCSS from 'highlight.js/lib/languages/scss'
import hljsBash from 'highlight.js/lib/languages/bash'
import hljsShell from 'highlight.js/lib/languages/shell'
import hljsPlaintext from 'highlight.js/lib/languages/plaintext'
import hljs from 'highlight.js/lib/core'
// Import only the languages we need from "highlight.js"
import bash from 'highlight.js/lib/languages/bash' // Includes sh
import css from 'highlight.js/lib/languages/css'
import javascript from 'highlight.js/lib/languages/javascript'
import json from 'highlight.js/lib/languages/json'
import plaintext from 'highlight.js/lib/languages/plaintext'
import scss from 'highlight.js/lib/languages/scss'
import shell from 'highlight.js/lib/languages/shell'
import typescript from 'highlight.js/lib/languages/typescript'
import xml from 'highlight.js/lib/languages/xml' // Includes HTML

// Register languages
hljs.registerLanguage('javascript', hljsJS)
hljs.registerLanguage('typescript', hljsTS)
hljs.registerLanguage('json', hljsJSON)
hljs.registerLanguage('xml', hljsXML) // includes HTML
hljs.registerLanguage('css', hljsCSS)
hljs.registerLanguage('scss', hljsSCSS)
hljs.registerLanguage('bash', hljsBash) // includes sh
hljs.registerLanguage('shell', hljsShell)
hljs.registerLanguage('plaintext', hljsPlaintext)
hljs.registerLanguage('bash', bash)
hljs.registerLanguage('css', css)
hljs.registerLanguage('javascript', javascript)
hljs.registerLanguage('json', json)
hljs.registerLanguage('plaintext', plaintext)
hljs.registerLanguage('scss', scss)
hljs.registerLanguage('shell', shell)
hljs.registerLanguage('typescript', typescript)
hljs.registerLanguage('xml', xml)

export default hljs
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
"eslint-plugin-vue": "^7.2.0",
"esm": "^3.2.25",
"execa": "^5.0.0",
"highlight.js": "^9.18.5",
"highlight.js": "^10.4.1",
"html-loader": "^1.3.2",
"husky": "^4.3.5",
"improved-yarn-audit": "^2.3.1",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6937,10 +6937,10 @@ hex-color-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==

highlight.js@^9.18.5:
version "9.18.5"
resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825"
integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==
highlight.js@^10.4.1:
version "10.4.1"
resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0"
integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==

hmac-drbg@^1.0.0:
version "1.0.1"
Expand Down