diff --git a/.eslintrc.js b/.eslintrc.js index 31180638..5bba0c76 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -29,15 +29,24 @@ module.exports = { ], rules: { // allow paren-less arrow functions - 'arrow-parens': 0, + 'arrow-parens': "off", // allow async-await - 'generator-star-spacing': 0, + 'generator-star-spacing': "off", // allow console - 'no-console': 0, + 'no-console': "off", // allow debugger during development - 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0, + 'no-debugger': process.env.NODE_ENV === 'production' ? "error" : "off", + 'no-return-assign': "warn", + 'no-new': "warn", // disallow semicolons - semi: [2, "never"] + semi: [2, "never"], + 'require-atomic-updates': "off", + // TODO: fix these errors someday + 'prefer-const': "off", + 'no-new': "off", + 'no-mixed-operators': "off", + 'no-prototype-builtins': "off", + "no-return-await": "off" }, settings: { 'import/resolver': { diff --git a/package.json b/package.json index 693c6eda..9d958afe 100644 --- a/package.json +++ b/package.json @@ -158,35 +158,35 @@ }, "dependencies": { "@hfelix/electron-localshortcut": "^3.1.1", - "@octokit/rest": "^16.28.2", - "arg": "^4.1.0", + "@octokit/rest": "^16.28.5", + "arg": "^4.1.1", "axios": "^0.19.0", - "chokidar": "^3.0.1", - "codemirror": "^5.46.0", + "chokidar": "^3.0.2", + "codemirror": "^5.48.2", "command-exists": "^1.2.8", - "dayjs": "^1.8.14", + "dayjs": "^1.8.15", "dom-autoscroller": "^2.3.4", "dompurify": "^1.0.11", "dragula": "^3.7.2", "electron-is-accelerator": "^0.1.2", "electron-log": "^3.0.6", - "electron-store": "^3.3.0", + "electron-store": "^4.0.0", "electron-window-state": "^5.0.3", "element-resize-detector": "^1.2.0", - "element-ui": "^2.9.1", + "element-ui": "^2.10.1", "file-icons-js": "^1.0.3", - "flowchart.js": "^1.12.0", - "fs-extra": "^8.0.1", + "flowchart.js": "^1.12.1", + "fs-extra": "^8.1.0", "fuzzaldrin": "^2.1.0", "github-markdown-css": "^3.0.1", "html-tags": "^3.0.0", "katex": "^0.10.2", "keyboard-layout": "^2.0.16", - "keytar": "^4.10.0", + "keytar": "^4.12.0", "mermaid": "^8.0.0", "plist": "^3.0.1", "popper.js": "^1.15.0", - "prismjs": "^1.16.0", + "prismjs": "^1.17.1", "snabbdom": "^0.7.3", "snabbdom-to-html": "^5.1.1", "source-map-support": "^0.5.12", @@ -194,19 +194,19 @@ "turndown-plugin-gfm": "^1.0.2", "underscore": "^1.9.1", "vega": "^5.4.0", - "vega-embed": "^4.2.0", + "vega-embed": "^4.2.1", "vega-lite": "^3.3.0", "view-image": "^0.0.1", - "vscode-ripgrep": "^1.2.5", + "vscode-ripgrep": "^1.5.5", "vue": "^2.6.10", "vue-electron": "^1.0.6", - "vue-router": "^3.0.6", + "vue-router": "^3.0.7", "vuex": "^3.1.1" }, "devDependencies": { "@markedjs/html-differ": "^2.0.1", "babel-core": "^6.26.3", - "babel-eslint": "^10.0.1", + "babel-eslint": "^10.0.2", "babel-loader": "^7.1.5", "babel-plugin-component": "^1.1.1", "babel-plugin-istanbul": "^5.1.1", @@ -224,24 +224,24 @@ "del": "^4.1.1", "devtron": "^1.4.0", "dotenv": "^8.0.0", - "electron": "^5.0.4", - "electron-builder": "^20.40.2", + "electron": "^5.0.7", + "electron-builder": "^21.1.1", "electron-devtools-installer": "^2.2.4", - "electron-rebuild": "^1.8.4", - "electron-updater": "^4.0.6", - "eslint": "^5.16.0", - "eslint-config-standard": "^12.0.0", + "electron-rebuild": "^1.8.5", + "electron-updater": "^4.1.2", + "eslint": "^6.1.0", + "eslint-config-standard": "^13.0.1", "eslint-friendly-formatter": "^4.0.1", "eslint-import-resolver-alias": "^1.1.2", - "eslint-loader": "^2.1.2", - "eslint-plugin-html": "^5.0.4", - "eslint-plugin-import": "^2.17.2", - "eslint-plugin-node": "^9.0.1", - "eslint-plugin-promise": "^4.1.1", + "eslint-loader": "^2.2.1", + "eslint-plugin-html": "^6.0.0", + "eslint-plugin-import": "^2.18.2", + "eslint-plugin-node": "^9.1.0", + "eslint-plugin-promise": "^4.2.1", "eslint-plugin-standard": "^4.0.0", - "eslint-plugin-vue": "^5.2.2", - "esm": "^3.2.22", - "file-loader": "^3.0.1", + "eslint-plugin-vue": "^5.2.3", + "esm": "^3.2.25", + "file-loader": "^4.1.0", "git-revision-webpack-plugin": "^3.0.3", "html-webpack-plugin": "^3.2.0", "inject-loader": "^4.0.1", @@ -254,30 +254,30 @@ "karma-spec-reporter": "0.0.32", "karma-webpack": "^3.0.5", "license-checker": "^25.0.1", - "marked": "^0.6.2", - "mini-css-extract-plugin": "^0.6.0", - "mocha": "^6.1.4", + "marked": "^0.7.0", + "mini-css-extract-plugin": "^0.8.0", + "mocha": "^6.2.0", "multispinner": "^0.2.1", - "node-fetch": "^2.5.0", + "node-fetch": "^2.6.0", "node-loader": "^0.6.0", "postcss-loader": "^3.0.0", "postcss-preset-env": "^6.6.0", "raw-loader": "^2.0.0", "require-dir": "^1.2.0", - "spectron": "^5.0.0", + "spectron": "^7.0.0", "style-loader": "^0.23.1", "svg-sprite-loader": "^4.1.6", - "svgo": "^1.2.2", - "svgo-loader": "^2.2.0", + "svgo": "^1.3.0", + "svgo-loader": "^2.2.1", "to-string-loader": "^1.1.5", "url-loader": "^1.1.2", "vue-html-loader": "^1.2.4", - "vue-loader": "^15.7.0", + "vue-loader": "^15.7.1", "vue-style-loader": "^4.1.2", "vue-template-compiler": "^2.6.10", - "webpack": "^4.31.0", + "webpack": "^4.36.1", "webpack-bundle-analyzer": "^3.3.2", - "webpack-cli": "^3.3.2", + "webpack-cli": "^3.3.6", "webpack-dev-server": "^3.7.2", "webpack-hot-middleware": "^2.25.0", "webpack-merge": "^4.2.1" diff --git a/src/common/envPaths.js b/src/common/envPaths.js index f0f989b0..ecee4b78 100644 --- a/src/common/envPaths.js +++ b/src/common/envPaths.js @@ -1,7 +1,6 @@ import path from 'path' class EnvPaths { - /** * @param {string} userDataPath The user data path. * @returns diff --git a/src/common/filesystem/index.js b/src/common/filesystem/index.js index 959ecc61..3b2aa27f 100644 --- a/src/common/filesystem/index.js +++ b/src/common/filesystem/index.js @@ -11,7 +11,7 @@ export const exists = async p => { try { await fs.access(p) return true - } catch(_) { + } catch (_) { return false } } diff --git a/src/common/filesystem/paths.js b/src/common/filesystem/paths.js index 8991b13c..4f82171a 100644 --- a/src/common/filesystem/paths.js +++ b/src/common/filesystem/paths.js @@ -56,7 +56,6 @@ export const isMarkdownFile = filepath => { return isFile(filepath) && hasMarkdownExtension(filepath) } - /** * Returns true if the path is a markdown file or symbolic link to a markdown file. * diff --git a/src/main/app/accessor.js b/src/main/app/accessor.js index 834d91bb..6a701735 100644 --- a/src/main/app/accessor.js +++ b/src/main/app/accessor.js @@ -5,11 +5,10 @@ import Keybindings from '../keyboard/shortcutHandler' import AppMenu from '../menu' class Accessor { - /** * @param {AppEnvironment} appEnvironment The application environment instance. */ - constructor(appEnvironment) { + constructor (appEnvironment) { const userDataPath = appEnvironment.paths.userDataPath this.env = appEnvironment diff --git a/src/main/app/env.js b/src/main/app/env.js index e1f490a8..e47e7b2a 100644 --- a/src/main/app/env.js +++ b/src/main/app/env.js @@ -10,7 +10,6 @@ const patchEnvPath = () => { } export class AppEnvironment { - constructor (options) { this._id = envId++ this._appPaths = new AppPaths(options.userDataPath) @@ -24,7 +23,7 @@ export class AppEnvironment { * * @returns {number} Returns an unique identifier. */ - get id() { + get id () { return this._id } diff --git a/src/main/app/index.js b/src/main/app/index.js index 9eddc2d4..5058efef 100644 --- a/src/main/app/index.js +++ b/src/main/app/index.js @@ -17,14 +17,13 @@ import EditorWindow from '../windows/editor' import SettingWindow from '../windows/setting' class App { - /** * @param {Accessor} accessor The application accessor for application instances. * @param {arg.Result} args Parsed application arguments. */ constructor (accessor, args) { this._accessor = accessor - this._args = args || {_: []} + this._args = args || { _: [] } this._openFilesCache = [] this._openFilesTimer = null this._windowManager = this._accessor.windowManager @@ -78,7 +77,7 @@ class App { app.on('open-file', this.openFile) // macOS only - app.on('ready', this.ready) + app.on('ready', this.ready) app.on('window-all-closed', () => { // Close all the image path watcher @@ -271,7 +270,7 @@ class App { * @param {boolean} openFilesInSameWindow Open all files in the same window with * the first directory and discard other directories. */ - _openPathList (pathsToOpen, openFilesInSameWindow=false) { + _openPathList (pathsToOpen, openFilesInSameWindow = false) { const { _windowManager } = this const openFilesInNewWindow = this._accessor.preferences.getItem('openFilesInNewWindow') @@ -372,12 +371,11 @@ class App { const { rootDirectory, fileList } = item this._createEditorWindow(rootDirectory, fileList) } - } + } else { + // Open each file and directory in a new window. - // Open each file and directory in a new window. - else { for (const pathname of filesToOpen) { - this._createEditorWindow(null, [ pathname ]) + this._createEditorWindow(null, [pathname]) } for (const item of directoriesToOpen) { @@ -441,7 +439,7 @@ class App { ipcMain.on('app-open-file-by-id', (windowId, filePath) => { const openFilesInNewWindow = this._accessor.preferences.getItem('openFilesInNewWindow') if (openFilesInNewWindow) { - this._createEditorWindow(null, [ filePath ]) + this._createEditorWindow(null, [filePath]) } else { const editor = this._windowManager.get(windowId) if (editor) { @@ -458,8 +456,8 @@ class App { if (editor) { editor.openTabsFromPaths( fileList.map(p => normalizeMarkdownPath(p)) - .filter(i => i && !i.isDir) - .map(i => i.path)) + .filter(i => i && !i.isDir) + .map(i => i.path)) } } }) @@ -467,7 +465,7 @@ class App { ipcMain.on('app-open-markdown-by-id', (windowId, data) => { const openFilesInNewWindow = this._accessor.preferences.getItem('openFilesInNewWindow') if (openFilesInNewWindow) { - this._createEditorWindow(null, [], [ data ]) + this._createEditorWindow(null, [], [data]) } else { const editor = this._windowManager.get(windowId) if (editor) { @@ -504,6 +502,7 @@ class App { } }) }) + ipcMain.on('mt::open-setting-window', () => { ipcMain.emit('app-create-settings-window') }) diff --git a/src/main/app/paths.js b/src/main/app/paths.js index 0e7bd1a0..9b7d244c 100644 --- a/src/main/app/paths.js +++ b/src/main/app/paths.js @@ -3,7 +3,6 @@ import EnvPaths from 'common/envPaths' import { ensureDirSync } from 'common/filesystem' class AppPaths extends EnvPaths { - /** * Configure and sets all application paths. * diff --git a/src/main/app/windowManager.js b/src/main/app/windowManager.js index 025f7b07..d10b6a61 100644 --- a/src/main/app/windowManager.js +++ b/src/main/app/windowManager.js @@ -5,7 +5,7 @@ import Watcher, { WATCHER_STABILITY_THRESHOLD, WATCHER_STABILITY_POLL_INTERVAL } import { WindowType } from '../windows/base' class WindowActivityList { - constructor() { + constructor () { // Oldest Newest // , ... , this._buf = [] @@ -51,13 +51,12 @@ class WindowActivityList { } class WindowManager extends EventEmitter { - /** * * @param {AppMenu} appMenu The application menu instance. * @param {Preference} preferences The preference instance. */ - constructor(appMenu, preferences) { + constructor (appMenu, preferences) { super() this._appMenu = appMenu @@ -137,7 +136,7 @@ class WindowManager extends EventEmitter { window.removeAllListeners('window-focus') this._windowActivity.delete(windowId) - let nextWindowId = this._windowActivity.getNewest() + const nextWindowId = this._windowActivity.getNewest() this.setActiveWindow(nextWindowId) _windows.delete(windowId) @@ -232,7 +231,7 @@ class WindowManager extends EventEmitter { const lastActiveEditorId = this.getActiveEditorId() // editor id or null if (this.windowCount <= 1) { - return [ { windowId: lastActiveEditorId, fileList } ] + return [{ windowId: lastActiveEditorId, fileList }] } // Array of scores, same order like fileList. diff --git a/src/main/cli/index.js b/src/main/cli/index.js index 51c8cc15..2531df51 100644 --- a/src/main/cli/index.js +++ b/src/main/cli/index.js @@ -12,7 +12,7 @@ const cli = () => { let argv = process.argv.slice(1) if (process.env.NODE_ENV === 'development') { // Don't pass electron development arguments to Mark Text and change user data path. - argv = [ '--user-data-dir', path.join(getPath('appData'), 'marktext-dev') ] + argv = ['--user-data-dir', path.join(getPath('appData'), 'marktext-dev')] } const args = parseArgs(argv, true) diff --git a/src/main/config.js b/src/main/config.js index a71ecd33..ae907b8c 100644 --- a/src/main/config.js +++ b/src/main/config.js @@ -21,7 +21,7 @@ export const defaultPreferenceWinOptions = { height: 650, webPreferences: { nodeIntegration: true, - webSecurity: false, + webSecurity: false }, fullscreenable: false, fullscreen: false, diff --git a/src/main/dataCenter/index.js b/src/main/dataCenter/index.js index 6bfda077..0a4e2f62 100644 --- a/src/main/dataCenter/index.js +++ b/src/main/dataCenter/index.js @@ -171,21 +171,21 @@ class DataCenter extends EventEmitter { ipcMain.on('mt::ask-for-modify-image-folder-path', e => { const win = BrowserWindow.fromWebContents(e.sender) const folder = dialog.showOpenDialog(win, { - properties: [ 'openDirectory', 'createDirectory' ] + properties: ['openDirectory', 'createDirectory'] }) if (folder && folder[0]) { this.setItem('imageFolderPath', folder[0]) } }) - ipcMain.on('mt::set-user-data', (e, userData) =>{ + ipcMain.on('mt::set-user-data', (e, userData) => { this.setItems(userData) }) ipcMain.on('mt::ask-for-image-path', e => { const win = BrowserWindow.fromWebContents(e.sender) const files = dialog.showOpenDialog(win, { - properties: [ 'openFile' ], + properties: ['openFile'], filters: [{ name: 'Images', extensions: IMAGE_EXTENSIONS diff --git a/src/main/filesystem/index.js b/src/main/filesystem/index.js index 690c0160..cbaa6f60 100644 --- a/src/main/filesystem/index.js +++ b/src/main/filesystem/index.js @@ -24,7 +24,7 @@ export const normalizeAndResolvePath = pathname => { export const writeFile = (pathname, content, extension) => { if (!pathname) { - return Promise.reject('[ERROR] Cannot save file without path.') + return Promise.reject(new Error('[ERROR] Cannot save file without path.')) } pathname = !extension || pathname.endsWith(extension) ? pathname : `${pathname}${extension}` diff --git a/src/main/filesystem/watcher.js b/src/main/filesystem/watcher.js index e746444f..bb95a4e1 100644 --- a/src/main/filesystem/watcher.js +++ b/src/main/filesystem/watcher.js @@ -35,7 +35,7 @@ const add = async (win, pathname, type, endOfLine) => { try { const data = await loadMarkdownFile(pathname, endOfLine) file.data = data - } catch(err) { + } catch (err) { // Only notify user about opened files. if (type === 'file') { win.webContents.send('AGANI::show-notification', { @@ -124,7 +124,6 @@ const unlinkDir = (win, pathname, type) => { } class Watcher { - /** * @param {Preference} preferences The preference instance. */ @@ -306,7 +305,7 @@ class Watcher { * @param {string} pathname The path to ignore. * @param {number} [duration] The duration in ms to ignore the changed event. */ - ignoreChangedEvent (windowId, pathname, duration=WATCHER_STABILITY_THRESHOLD + WATCHER_STABILITY_POLL_INTERVAL + 1000) { + ignoreChangedEvent (windowId, pathname, duration = WATCHER_STABILITY_THRESHOLD + WATCHER_STABILITY_POLL_INTERVAL + 1000) { this._ignoreChangeEvents.push({ windowId, pathname, duration, start: new Date() }) } diff --git a/src/main/keyboard/index.js b/src/main/keyboard/index.js index 0cb70c33..9612f0d4 100644 --- a/src/main/keyboard/index.js +++ b/src/main/keyboard/index.js @@ -19,7 +19,7 @@ export const getVirtualLetters = () => { // Full list of supported virtual keys: // https://github.com/parro-it/keyboardevent-from-electron-accelerator/blob/afdbd57bead1e139d7bd03c763778dce6ca8c35d/main.js#L104 const currentKeymap = getCurrentKeymap() - let vkeys = {} + const vkeys = {} for (const key in currentKeymap) { // TODO(fxha): Possibly, we can fix more broken accelerators without apply a manually fix later. if (!key.startsWith('Key')) { diff --git a/src/main/keyboard/shortcutHandler.js b/src/main/keyboard/shortcutHandler.js index 964823e4..954a9043 100644 --- a/src/main/keyboard/shortcutHandler.js +++ b/src/main/keyboard/shortcutHandler.js @@ -14,7 +14,6 @@ import { getKeyboardLanguage, getVirtualLetters } from '../keyboard' // Upgrade Heading: Ctrl+= -> points to Ctrl+Plus which is ok; Ctrl+Plus is broken class Keybindings { - /** * @param {string} userDataPath The user data path. */ @@ -282,7 +281,7 @@ class Keybindings { export const parseMenu = menuTemplate => { const { submenu, accelerator, click, id, visible } = menuTemplate - let items = [] + const items = [] if (Array.isArray(menuTemplate)) { for (const item of menuTemplate) { const subitems = parseMenu(item) diff --git a/src/main/menu/actions/file.js b/src/main/menu/actions/file.js index 991cae9b..cc7fec0d 100644 --- a/src/main/menu/actions/file.js +++ b/src/main/menu/actions/file.js @@ -398,7 +398,7 @@ export const importFile = async win => { } dialog.showOpenDialog(win, { - properties: [ 'openFile' ], + properties: ['openFile'], filters: [{ name: 'All Files', extensions: PANDOC_EXTENSIONS diff --git a/src/main/menu/actions/format.js b/src/main/menu/actions/format.js index 07d90c21..d21ce896 100644 --- a/src/main/menu/actions/format.js +++ b/src/main/menu/actions/format.js @@ -2,13 +2,13 @@ import { ipcMain } from 'electron' import { getMenuItemById } from '../../menu' const MENU_ID_FORMAT_MAP = { - 'strongMenuItem': 'strong', - 'emphasisMenuItem': 'em', - 'inlineCodeMenuItem': 'inline_code', - 'strikeMenuItem': 'del', - 'hyperlinkMenuItem': 'link', - 'imageMenuItem': 'image', - 'mathMenuItem': 'inline_math' + strongMenuItem: 'strong', + emphasisMenuItem: 'em', + inlineCodeMenuItem: 'inline_code', + strikeMenuItem: 'del', + hyperlinkMenuItem: 'link', + imageMenuItem: 'image', + mathMenuItem: 'inline_math' } const selectFormat = formats => { diff --git a/src/main/menu/actions/paragraph.js b/src/main/menu/actions/paragraph.js index 605a2318..42030129 100644 --- a/src/main/menu/actions/paragraph.js +++ b/src/main/menu/actions/paragraph.js @@ -12,21 +12,21 @@ const DISABLE_LABELS = [ ] const MENU_ID_MAP = { - 'heading1MenuItem': 'h1', - 'heading2MenuItem': 'h2', - 'heading3MenuItem': 'h3', - 'heading4MenuItem': 'h4', - 'heading5MenuItem': 'h5', - 'heading6MenuItem': 'h6', - 'tableMenuItem': 'figure', - 'codeFencesMenuItem': 'pre', - 'quoteBlockMenuItem': 'blockquote', - 'orderListMenuItem': 'ol', - 'bulletListMenuItem': 'ul', - 'taskListMenuItem': 'ul', - 'paragraphMenuItem': 'p', - 'horizontalLineMenuItem': 'hr', - 'frontMatterMenuItem': 'pre' + heading1MenuItem: 'h1', + heading2MenuItem: 'h2', + heading3MenuItem: 'h3', + heading4MenuItem: 'h4', + heading5MenuItem: 'h5', + heading6MenuItem: 'h6', + tableMenuItem: 'figure', + codeFencesMenuItem: 'pre', + quoteBlockMenuItem: 'blockquote', + orderListMenuItem: 'ol', + bulletListMenuItem: 'ul', + taskListMenuItem: 'ul', + paragraphMenuItem: 'p', + horizontalLineMenuItem: 'hr', + frontMatterMenuItem: 'pre' } const setParagraphMenuItemStatus = bool => { diff --git a/src/main/menu/index.js b/src/main/menu/index.js index 93ce59b8..151487aa 100644 --- a/src/main/menu/index.js +++ b/src/main/menu/index.js @@ -14,7 +14,6 @@ export const MenuType = { } class AppMenu { - /** * @param {Preference} preferences The preferences instances. * @param {Keybindings} keybindings The keybindings instances. @@ -43,7 +42,7 @@ class AppMenu { if (isOsxOrWindows) app.addRecentDocument(filePath) if (isOsx) return - let recentDocuments = this.getRecentlyUsedDocuments() + const recentDocuments = this.getRecentlyUsedDocuments() const index = recentDocuments.indexOf(filePath) let needSave = index !== 0 if (index > 0) { @@ -74,7 +73,7 @@ class AppMenu { } try { - let recentDocuments = JSON.parse(fs.readFileSync(RECENTS_PATH, 'utf-8')) + const recentDocuments = JSON.parse(fs.readFileSync(RECENTS_PATH, 'utf-8')) .filter(f => f && (isFile(f) || isDirectory(f))) if (recentDocuments.length > MAX_RECENTLY_USED_DOCUMENTS) { diff --git a/src/main/menu/templates/file.js b/src/main/menu/templates/file.js index d6ffb362..014b97ab 100755 --- a/src/main/menu/templates/file.js +++ b/src/main/menu/templates/file.js @@ -6,7 +6,7 @@ import { isOsx } from '../../config' export default function (keybindings, userPreference, recentlyUsedFiles) { const { autoSave } = userPreference.getAll() - let fileMenu = { + const fileMenu = { label: 'File', submenu: [{ label: 'New Tab', @@ -39,7 +39,7 @@ export default function (keybindings, userPreference, recentlyUsedFiles) { } if (!isOsx) { - let recentlyUsedMenu = { + const recentlyUsedMenu = { label: 'Open Recent', submenu: [] } @@ -150,7 +150,7 @@ export default function (keybindings, userPreference, recentlyUsedFiles) { userSetting(menuItem, browserWindow) } }, { - type: 'separator', + type: 'separator' }, { label: 'Close Tab', accelerator: keybindings.getAccelerator('fileCloseTab'), diff --git a/src/main/menu/templates/index.js b/src/main/menu/templates/index.js index 20b04e2a..37578abf 100644 --- a/src/main/menu/templates/index.js +++ b/src/main/menu/templates/index.js @@ -13,12 +13,12 @@ export dockMenu from './dock' /** * Create the setting window menu. - * + * * @param {Keybindings} keybindings The keybindings instance */ export const configSettingMenu = (keybindings) => { return [ - ...(process.platform === 'darwin' ? [ marktext(keybindings) ] : []), + ...(process.platform === 'darwin' ? [marktext(keybindings)] : []), prefEdit(keybindings), help() ] @@ -33,7 +33,7 @@ export const configSettingMenu = (keybindings) => { */ export default function (keybindings, preferences, recentlyUsedFiles) { return [ - ...(process.platform === 'darwin' ? [ marktext(keybindings) ] : []), + ...(process.platform === 'darwin' ? [marktext(keybindings)] : []), file(keybindings, preferences, recentlyUsedFiles), edit(keybindings, preferences), paragraph(keybindings), diff --git a/src/main/menu/templates/view.js b/src/main/menu/templates/view.js index cc93d874..de100c93 100755 --- a/src/main/menu/templates/view.js +++ b/src/main/menu/templates/view.js @@ -2,7 +2,7 @@ import { ipcMain } from 'electron' import * as actions from '../actions/view' export default function (keybindings) { - let viewMenu = { + const viewMenu = { label: 'View', submenu: [{ id: 'sourceCodeModeMenuItem', diff --git a/src/main/preferences/index.js b/src/main/preferences/index.js index df7ab1b9..c856accd 100644 --- a/src/main/preferences/index.js +++ b/src/main/preferences/index.js @@ -24,7 +24,6 @@ const isDarkSystemMode = () => { const PREFERENCES_FILE_NAME = 'preferences' class Preference extends EventEmitter { - /** * @param {AppPaths} userDataPath The path instance. * diff --git a/src/main/utils/index.js b/src/main/utils/index.js index cdb86775..d317e5b8 100644 --- a/src/main/utils/index.js +++ b/src/main/utils/index.js @@ -11,7 +11,7 @@ export const getUniqueId = () => { export const getRecommendTitleFromMarkdownString = markdown => { const tokens = markdown.match(/#{1,6} {1,}(.+)(?:\n|$)/g) if (!tokens) return '' - let headers = tokens.map(t => { + const headers = tokens.map(t => { const matches = t.trim().match(/(#{1,6}) {1,}(.+)/) return { level: matches[1].length, diff --git a/src/main/windows/base.js b/src/main/windows/base.js index 377c36b1..e90ff9dd 100644 --- a/src/main/windows/base.js +++ b/src/main/windows/base.js @@ -25,7 +25,6 @@ export const WindowLifecycle = { } class BaseWindow extends EventEmitter { - /** * @param {Accessor} accessor The application accessor for application instances. */ diff --git a/src/main/windows/editor.js b/src/main/windows/editor.js index 4a68e438..b15d995f 100644 --- a/src/main/windows/editor.js +++ b/src/main/windows/editor.js @@ -9,7 +9,6 @@ import { TITLE_BAR_HEIGHT, editorWinOptions, isLinux, isOsx } from '../config' import { loadMarkdownFile } from '../filesystem/markdown' class EditorWindow extends BaseWindow { - /** * @param {Accessor} accessor The application accessor for application instances. */ @@ -195,7 +194,7 @@ class EditorWindow extends BaseWindow { openTabsFromPaths (filePaths) { if (!filePaths || filePaths.length === 0) return - const fileList = filePaths.map(p => ({filePath: p, options: {}, selected: false})) + const fileList = filePaths.map(p => ({ filePath: p, options: {}, selected: false })) fileList[0].selected = true this.openTabs(fileList) } @@ -237,7 +236,7 @@ class EditorWindow extends BaseWindow { * @param {[boolean]} selected Whether the tab should become the selected tab (true if not set). * @param {[string]} markdown The markdown string. */ - openUntitledTab (selected=true, markdown='') { + openUntitledTab (selected = true, markdown = '') { if (this.lifecycle === WindowLifecycle.QUITTED) return if (this.lifecycle === WindowLifecycle.READY) { @@ -405,11 +404,11 @@ class EditorWindow extends BaseWindow { case 'material-dark': return '#34393f' case 'ulysses': - return '#f3f3f3' + return '#f3f3f3' case 'graphite': return '#f7f7f7' case 'one-dark': - return '#282c34' + return '#282c34' case 'light': default: return '#ffffff' diff --git a/src/main/windows/setting.js b/src/main/windows/setting.js index 6d6a4b5a..2f6f3dca 100644 --- a/src/main/windows/setting.js +++ b/src/main/windows/setting.js @@ -6,7 +6,6 @@ import { centerWindowOptions } from './utils' import { TITLE_BAR_HEIGHT, defaultPreferenceWinOptions, isLinux, isOsx } from '../config' class SettingWindow extends BaseWindow { - /** * @param {Accessor} accessor The application accessor for application instances. */ diff --git a/src/muya/lib/config/index.js b/src/muya/lib/config/index.js index e715220a..69b60828 100644 --- a/src/muya/lib/config/index.js +++ b/src/muya/lib/config/index.js @@ -189,20 +189,20 @@ export const DEFAULT_TURNDOWN_CONFIG = { } export const FORMAT_MARKER_MAP = { - 'em': '*', - 'inline_code': '`', - 'strong': '**', - 'del': '~~', - 'inline_math': '$', - 'u': { + em: '*', + inline_code: '`', + strong: '**', + del: '~~', + inline_math: '$', + u: { open: '', close: '' }, - 'sub': { + sub: { open: '', close: '' }, - 'sup': { + sup: { open: '', close: '' } diff --git a/src/muya/lib/contentState/arrowCtrl.js b/src/muya/lib/contentState/arrowCtrl.js index 60f47869..7a96160b 100644 --- a/src/muya/lib/contentState/arrowCtrl.js +++ b/src/muya/lib/contentState/arrowCtrl.js @@ -2,7 +2,7 @@ import { EVENT_KEYS, CLASS_OR_ID } from '../config' import { findNearestParagraph } from '../selection/dom' import selection from '../selection' -// If the next block is header, put cursor after the `#{1,6} *` +// If the next block is header, put cursor after the `#{1,6} *` const adjustOffset = (offset, block, event) => { if (/^span$/.test(block.type) && block.functionType === 'atxLine' && event.key === EVENT_KEYS.ArrowDown) { const match = /^\s{0,3}(?:#{1,6})(?:\s{1,}|$)/.exec(block.text) @@ -151,7 +151,7 @@ const arrowCtrl = ContentState => { : (event.key === EVENT_KEYS.ArrowUp ? activeBlock.text.length : 0) - + offset = adjustOffset(offset, activeBlock, event) const key = activeBlock.type === 'p' diff --git a/src/muya/lib/contentState/backspaceCtrl.js b/src/muya/lib/contentState/backspaceCtrl.js index 4c541a81..784843cb 100644 --- a/src/muya/lib/contentState/backspaceCtrl.js +++ b/src/muya/lib/contentState/backspaceCtrl.js @@ -118,7 +118,7 @@ const backspaceCtrl = ContentState => { if (this.isSelectAll()) { event.preventDefault() - this.blocks = [ this.createBlockP() ] + this.blocks = [this.createBlockP()] this.init() this.render() diff --git a/src/muya/lib/contentState/clickCtrl.js b/src/muya/lib/contentState/clickCtrl.js index b411fb7d..d3c934ef 100644 --- a/src/muya/lib/contentState/clickCtrl.js +++ b/src/muya/lib/contentState/clickCtrl.js @@ -124,7 +124,7 @@ const clickCtrl = ContentState => { eventCenter.dispatch('format-click', { event, formatType, - data, + data }) } } diff --git a/src/muya/lib/contentState/containerCtrl.js b/src/muya/lib/contentState/containerCtrl.js index 447b7a92..eeb34809 100644 --- a/src/muya/lib/contentState/containerCtrl.js +++ b/src/muya/lib/contentState/containerCtrl.js @@ -1,11 +1,11 @@ const LINE_BREAKS_REG = /\n/ const FUNCTION_TYPE_LANG = { - 'multiplemath': 'latex', - 'flowchart': 'yaml', - 'mermaid': 'yaml', - 'sequence': 'yaml', + multiplemath: 'latex', + flowchart: 'yaml', + mermaid: 'yaml', + sequence: 'yaml', 'vega-lite': 'yaml', - 'html': 'markup' + html: 'markup' } const containerCtrl = ContentState => { diff --git a/src/muya/lib/contentState/copyCutCtrl.js b/src/muya/lib/contentState/copyCutCtrl.js index a07c346f..56a9c5a7 100644 --- a/src/muya/lib/contentState/copyCutCtrl.js +++ b/src/muya/lib/contentState/copyCutCtrl.js @@ -184,7 +184,7 @@ const copyCutCtrl = ContentState => { const table = this.getTableBlock() if (!table) return const listIndentation = this.listIndentation - const markdown = new ExportMarkdown([ table ], listIndentation).generate() + const markdown = new ExportMarkdown([table], listIndentation).generate() event.clipboardData.setData('text/html', '') event.clipboardData.setData('text/plain', markdown) break diff --git a/src/muya/lib/contentState/deleteCtrl.js b/src/muya/lib/contentState/deleteCtrl.js index 85cb9a03..46950f2b 100644 --- a/src/muya/lib/contentState/deleteCtrl.js +++ b/src/muya/lib/contentState/deleteCtrl.js @@ -30,7 +30,7 @@ const deleteCtrl = ContentState => { } startBlock.text += nextBlock.text - const toBeRemoved = [ nextBlock ] + const toBeRemoved = [nextBlock] let parent = this.getParent(nextBlock) let target = nextBlock diff --git a/src/muya/lib/contentState/dragDropCtrl.js b/src/muya/lib/contentState/dragDropCtrl.js index badf1594..74f5df70 100644 --- a/src/muya/lib/contentState/dragDropCtrl.js +++ b/src/muya/lib/contentState/dragDropCtrl.js @@ -60,7 +60,8 @@ const dragDropCtrl = ContentState => { ContentState.prototype.dragoverHandler = function (event) { // Cancel to allow tab drag&drop. if (!event.dataTransfer.types.length) { - return event.dataTransfer.dropEffect = 'none' + event.dataTransfer.dropEffect = 'none' + return } if (event.dataTransfer.types.includes('text/uri-list')) { @@ -163,7 +164,7 @@ const dragDropCtrl = ContentState => { this.stateRender.urlMap.set(nSrc, src) } const imageWrapper = this.muya.container.querySelector(`span[data-id=${id}]`) - + if (imageWrapper) { const imageInfo = getImageInfo(imageWrapper) this.replaceImage(imageInfo, { diff --git a/src/muya/lib/contentState/emojiCtrl.js b/src/muya/lib/contentState/emojiCtrl.js index c27d2580..7881091b 100644 --- a/src/muya/lib/contentState/emojiCtrl.js +++ b/src/muya/lib/contentState/emojiCtrl.js @@ -15,7 +15,7 @@ const emojiCtrl = ContentState => { delta = end - offset return token.children && Array.isArray(token.children) && token.children.length ? findEmojiToken(token.children, offset) - : token + : token } } } diff --git a/src/muya/lib/contentState/enterCtrl.js b/src/muya/lib/contentState/enterCtrl.js index 4bee7fc0..8ea648d1 100644 --- a/src/muya/lib/contentState/enterCtrl.js +++ b/src/muya/lib/contentState/enterCtrl.js @@ -167,7 +167,6 @@ const enterCtrl = ContentState => { cb: () => {} }) this.selectedImage = null - return } } @@ -285,7 +284,7 @@ const enterCtrl = ContentState => { start: { key, offset }, end: { key, offset } } - return this.partialRender([ block ]) + return this.partialRender([block]) } const getFirstBlockInNextRow = row => { @@ -368,7 +367,7 @@ const enterCtrl = ContentState => { }) const headerContent = this.createBlock('span', { text: post, - functionType: block.headingStyle === 'atx'? 'atxLine' : 'paragraphContent' + functionType: block.headingStyle === 'atx' ? 'atxLine' : 'paragraphContent' }) this.appendChild(newBlock, headerContent) if (block.marker) { @@ -394,10 +393,10 @@ const enterCtrl = ContentState => { break } case left === 0 && right === 0: { - // paragraph is empty - return this.enterInEmptyParagraph(block) + // paragraph is empty + return this.enterInEmptyParagraph(block) } - case left !== 0 && right === 0: + case left !== 0 && right === 0: case left === 0 && right !== 0: { // cursor at end of paragraph or at begin of paragraph if (type === 'li') { @@ -447,9 +446,9 @@ const enterCtrl = ContentState => { // If block is pre block when updated, need to focus it. const preParagraphBlock = getParagraphBlock(block) const blockNeedFocus = this.codeBlockUpdate(preParagraphBlock) - let tableNeedFocus = this.tableBlockUpdate(preParagraphBlock) - let htmlNeedFocus = this.updateHtmlBlock(preParagraphBlock) - let mathNeedFocus = this.updateMathBlock(preParagraphBlock) + const tableNeedFocus = this.tableBlockUpdate(preParagraphBlock) + const htmlNeedFocus = this.updateHtmlBlock(preParagraphBlock) + const mathNeedFocus = this.updateMathBlock(preParagraphBlock) let cursorBlock switch (true) { diff --git a/src/muya/lib/contentState/formatCtrl.js b/src/muya/lib/contentState/formatCtrl.js index f31648f4..9de30672 100644 --- a/src/muya/lib/contentState/formatCtrl.js +++ b/src/muya/lib/contentState/formatCtrl.js @@ -27,7 +27,7 @@ const getOffset = (offset, { range: { start, end }, type, tag, anchor, alt }) => if (dis >= 0 && dis < OPEN_MARKER_LEN) return -dis if (dis >= OPEN_MARKER_LEN && dis <= len - CLOSE_MARKER_LEN) return -OPEN_MARKER_LEN if (dis > len - CLOSE_MARKER_LEN && dis <= len) return len - dis - OPEN_MARKER_LEN - CLOSE_MARKER_LEN - if (dis > len) return - OPEN_MARKER_LEN - CLOSE_MARKER_LEN + if (dis > len) return -OPEN_MARKER_LEN - CLOSE_MARKER_LEN break } case 'link': { diff --git a/src/muya/lib/contentState/index.js b/src/muya/lib/contentState/index.js index 89ff87ab..4f42dc99 100644 --- a/src/muya/lib/contentState/index.js +++ b/src/muya/lib/contentState/index.js @@ -63,9 +63,9 @@ class ContentState { // Use to cache the keys which you don't want to remove. this.exemption = new Set() - this.blocks = [ this.createBlockP() ] + this.blocks = [this.createBlockP()] this.stateRender = new StateRender(muya) - this.renderRange = [ null, null ] + this.renderRange = [null, null] this.currentCursor = null // you'll select the outmost block of current cursor when you click the front icon. this.selectedBlock = null @@ -166,7 +166,7 @@ class ContentState { const startOutMostBlock = this.findOutMostBlock(startBlock) const endOutMostBlock = this.findOutMostBlock(endBlock) - this.renderRange = [ startOutMostBlock.preSibling, endOutMostBlock.nextSibling ] + this.renderRange = [startOutMostBlock.preSibling, endOutMostBlock.nextSibling] } postRender () { @@ -193,7 +193,7 @@ class ContentState { partialRender (isRenderCursor = true) { const { blocks, searchMatches: { matches, index } } = this const activeBlocks = this.getActiveBlocks() - const [ startKey, endKey ] = this.renderRange + const [startKey, endKey] = this.renderRange matches.forEach((m, i) => { m.active = i === index }) @@ -326,6 +326,7 @@ class ContentState { } return null } + // return block and its parents getParents (block) { const result = [] @@ -399,6 +400,7 @@ class ContentState { this.removeBlock(block) } } + // help func in removeBlocks findFigure (block) { if (block.type === 'figure') { @@ -490,7 +492,7 @@ class ContentState { } getActiveBlocks () { - let result = [] + const result = [] let block = this.getBlock(this.cursor.start.key) if (block) result.push(block) while (block && block.parent) { diff --git a/src/muya/lib/contentState/inputCtrl.js b/src/muya/lib/contentState/inputCtrl.js index 41114231..3492b8d8 100644 --- a/src/muya/lib/contentState/inputCtrl.js +++ b/src/muya/lib/contentState/inputCtrl.js @@ -9,10 +9,10 @@ const BRACKET_HASH = { '[': ']', '(': ')', '*': '*', - '_': '_', + _: '_', '"': '"', '\'': '\'', - '$': '$', + $: '$', '~': '~' } @@ -21,10 +21,10 @@ const BACK_HASH = { ']': '[', ')': '(', '*': '*', - '_': '_', + _: '_', '"': '"', '\'': '\'', - '$': '$', + $: '$', '~': '~' } @@ -86,7 +86,7 @@ const inputCtrl = ContentState => { const key = start.key const block = this.getBlock(key) const paragraph = document.querySelector(`#${key}`) - let text = getTextContent(paragraph, [ CLASS_OR_ID['AG_MATH_RENDER'], CLASS_OR_ID['AG_RUBY_RENDER'] ]) + let text = getTextContent(paragraph, [CLASS_OR_ID['AG_MATH_RENDER'], CLASS_OR_ID['AG_RUBY_RENDER']]) let needRender = false let needRenderAll = false @@ -186,7 +186,7 @@ const inputCtrl = ContentState => { /^\* /.test(text) && preInputChar === '*' && postInputChar === '*' - ) { + ) { text = text.substring(0, offset) + text.substring(offset + 1) needRender = true } diff --git a/src/muya/lib/contentState/paragraphCtrl.js b/src/muya/lib/contentState/paragraphCtrl.js index 3bb1e584..68c8df32 100644 --- a/src/muya/lib/contentState/paragraphCtrl.js +++ b/src/muya/lib/contentState/paragraphCtrl.js @@ -209,7 +209,7 @@ const paragraphCtrl = ContentState => { ContentState.prototype.handleCodeBlockMenu = function () { const { start, end, affiliation } = this.selectionChange(this.cursor) - let startBlock = this.getBlock(start.key) + const startBlock = this.getBlock(start.key) const endBlock = this.getBlock(end.key) const startParents = this.getParents(startBlock) const endParents = this.getParents(endBlock) @@ -323,7 +323,7 @@ const paragraphCtrl = ContentState => { lang, functionType: 'codeLine' }) - + this.appendChild(codeBlock, codeLine) }) const inputBlock = this.createBlock('span', { @@ -547,12 +547,12 @@ const paragraphCtrl = ContentState => { headingStyle }) const headerContent = this.createBlock('span', { - text: headingStyle === 'atx'? newText.replace(/\n/g, ' ') : newText, - functionType: headingStyle === 'atx'? 'atxLine' : 'paragraphContent' + text: headingStyle === 'atx' ? newText.replace(/\n/g, ' ') : newText, + functionType: headingStyle === 'atx' ? 'atxLine' : 'paragraphContent' }) this.appendChild(header, headerContent) key = headerContent.key - + this.insertBefore(header, parent) this.removeBlock(parent) } else { diff --git a/src/muya/lib/contentState/pasteCtrl.js b/src/muya/lib/contentState/pasteCtrl.js index b5e3224e..171cfe7e 100644 --- a/src/muya/lib/contentState/pasteCtrl.js +++ b/src/muya/lib/contentState/pasteCtrl.js @@ -26,7 +26,7 @@ const pasteCtrl = ContentState => { if (list) { if ( list.listType === fragment.listType && - listItem.bulletMarkerOrDelimiter === fragment.children[0].bulletMarkerOrDelimiter + listItem.bulletMarkerOrDelimiter === fragment.children[0].bulletMarkerOrDelimiter ) { return 'MERGE' } else { @@ -87,7 +87,7 @@ const pasteCtrl = ContentState => { if (this.selectedImage) { this.replaceImage(this.selectedImage, { alt: id, - src: imagePath, + src: imagePath }) } else { this.insertImage({ @@ -311,7 +311,7 @@ const pasteCtrl = ContentState => { case 'pasteAsPlainText': { const lines = text.trim().split(LINE_BREAKS_REG) let htmlBlock = null - + if (!startBlock.text || lines.length > 1) { htmlBlock = this.createBlockP((startBlock.text ? lines.slice(1) : lines).join('\n')) } @@ -377,9 +377,9 @@ const pasteCtrl = ContentState => { // No matter copy loose list to tight list or vice versa, the result is one loose list. if (targetListType !== originListType) { if (!targetListType) { - firstFragment.children.forEach(item => item.isLooseListItem = true) + firstFragment.children.forEach(item => (item.isLooseListItem = true)) } else { - originList.children.forEach(item => item.isLooseListItem = true) + originList.children.forEach(item => (item.isLooseListItem = true)) } } @@ -422,7 +422,7 @@ const pasteCtrl = ContentState => { } else { startBlock.text += text } - + tailFragments.forEach(block => { this.insertAfter(block, target) target = block diff --git a/src/muya/lib/contentState/searchCtrl.js b/src/muya/lib/contentState/searchCtrl.js index 20e93d72..a0f0d595 100644 --- a/src/muya/lib/contentState/searchCtrl.js +++ b/src/muya/lib/contentState/searchCtrl.js @@ -70,7 +70,7 @@ const searchCtrl = ContentState => { ContentState.prototype.search = function (value, opt = {}) { value = value.trim() - let matches = [] + const matches = [] const { caseSensitive, highlightIndex } = Object.assign(defaultSearchOption, opt) const { blocks } = this const search = blocks => { diff --git a/src/muya/lib/contentState/tabCtrl.js b/src/muya/lib/contentState/tabCtrl.js index 9a759ebc..d2764d71 100644 --- a/src/muya/lib/contentState/tabCtrl.js +++ b/src/muya/lib/contentState/tabCtrl.js @@ -112,7 +112,7 @@ const tabCtrl = ContentState => { let target = this.getNextSibling(listItem) while (target) { this.appendChild(newList, target) - let temp = target + const temp = target target = this.getNextSibling(target) this.removeBlock(temp, list) } @@ -185,7 +185,6 @@ const tabCtrl = ContentState => { const tokens = tokenizer(text, [], false, labels) let result = null const walkTokens = tkns => { - for (const token of tkns) { const { marker, type, range, children, srcAndTitle, hrefAndTitle, backlash, closeTag, isFullLink, label } = token const { start, end } = range diff --git a/src/muya/lib/contentState/tableBlockCtrl.js b/src/muya/lib/contentState/tableBlockCtrl.js index efb54bd6..3c5348e4 100644 --- a/src/muya/lib/contentState/tableBlockCtrl.js +++ b/src/muya/lib/contentState/tableBlockCtrl.js @@ -260,7 +260,7 @@ const tableBlockCtrl = ContentState => { if (target === 'row') { if (action === 'insert') { - let newRow = (location === 'previous' && block.type === 'th') + const newRow = (location === 'previous' && block.type === 'th') ? createRow(column, true) : createRow(column, false) if (location === 'previous') { diff --git a/src/muya/lib/contentState/updateCtrl.js b/src/muya/lib/contentState/updateCtrl.js index ce06c690..eaa1ec81 100644 --- a/src/muya/lib/contentState/updateCtrl.js +++ b/src/muya/lib/contentState/updateCtrl.js @@ -234,7 +234,7 @@ const updateCtrl = ContentState => { this.removeBlock(nextSibling) this.removeBlock(block) const isLooseListItem = preSibling.children.some(c => c.isLooseListItem) - preSibling.children.forEach(c => c.isLooseListItem = isLooseListItem) + preSibling.children.forEach(c => (c.isLooseListItem = isLooseListItem)) } else if ( preSibling && this.checkSameMarkerOrDelimiter(preSibling, bulletMarkerOrDelimiter) @@ -242,7 +242,7 @@ const updateCtrl = ContentState => { this.appendChild(preSibling, newListItemBlock) this.removeBlock(block) const isLooseListItem = preSibling.children.some(c => c.isLooseListItem) - preSibling.children.forEach(c => c.isLooseListItem = isLooseListItem) + preSibling.children.forEach(c => (c.isLooseListItem = isLooseListItem)) } else if ( nextSibling && this.checkSameMarkerOrDelimiter(nextSibling, bulletMarkerOrDelimiter) @@ -250,7 +250,7 @@ const updateCtrl = ContentState => { this.insertBefore(newListItemBlock, nextSibling.children[0]) this.removeBlock(block) const isLooseListItem = nextSibling.children.some(c => c.isLooseListItem) - nextSibling.children.forEach(c => c.isLooseListItem = isLooseListItem) + nextSibling.children.forEach(c => (c.isLooseListItem = isLooseListItem)) } else { // Create a new list when changing list type, bullet or list delimiter const listBlock = this.createBlock(wrapperTag, { @@ -284,7 +284,7 @@ const updateCtrl = ContentState => { } } if (TASK_LIST_REG.test(listItemText)) { - const [,,tasklist,,,,] = listItemText.match(INLINE_UPDATE_REG) || [] + const [,, tasklist,,,,] = listItemText.match(INLINE_UPDATE_REG) || [] // eslint-disable-line comma-spacing return this.updateTaskListItem(block, 'tasklist', tasklist) } else { return block @@ -420,7 +420,7 @@ const updateCtrl = ContentState => { const text = line.text const lines = text.split('\n') - let setextLines = [] + const setextLines = [] const postParagraphLines = [] let setextLineHasPushed = false @@ -467,7 +467,7 @@ const updateCtrl = ContentState => { const text = line.text const lines = text.split('\n') const preParagraphLines = [] - let quoteLines = [] + const quoteLines = [] let quoteLinesHasPushed = false for (const l of lines) { @@ -490,7 +490,7 @@ const updateCtrl = ContentState => { } const headerContent = this.createBlock('span', { text: quoteLines.join('\n'), - functionType: block.headingStyle === 'setext'? 'paragraphContent' : 'atxLine' + functionType: block.headingStyle === 'setext' ? 'paragraphContent' : 'atxLine' }) this.appendChild(quoteParagraphBlock, headerContent) } else { diff --git a/src/muya/lib/eventHandler/event.js b/src/muya/lib/eventHandler/event.js index ae9f300a..be367214 100644 --- a/src/muya/lib/eventHandler/event.js +++ b/src/muya/lib/eventHandler/event.js @@ -5,6 +5,7 @@ class EventCenter { this.events = [] this.listeners = {} } + /** * [attachDOMEvent] bind event listener to target, and return a unique ID, * this ID @@ -22,6 +23,7 @@ class EventCenter { }) return eventId } + /** * [detachDOMEvent removeEventListener] * @param {[type]} eventId [unique eventId] @@ -34,12 +36,14 @@ class EventCenter { target.removeEventListener(event, listener, capture) } } + /** * [detachAllDomEvents remove all the DOM events handler] */ detachAllDomEvents () { this.events.forEach(event => this.detachDOMEvent(event.eventId)) } + /** * inner method for subscribe and subscribeOnce */ @@ -49,15 +53,17 @@ class EventCenter { if (listeners && Array.isArray(listeners)) { listeners.push(handler) } else { - this.listeners[event] = [ handler ] + this.listeners[event] = [handler] } } + /** * [subscribe] subscribe custom event */ subscribe (event, listener) { this._subscribe(event, listener) } + /** * [unsubscribe] unsubscribe custom event */ @@ -68,12 +74,14 @@ class EventCenter { listeners.splice(index, 1) } } + /** * [subscribeOnce] usbscribe event and listen once */ subscribeOnce (event, listener) { this._subscribe(event, listener, true) } + /** * dispatch custom event */ @@ -88,6 +96,7 @@ class EventCenter { }) } } + // Determine whether the event has been bind checkHasBind (cTarget, cEvent, cListener, cCapture) { for (const { target, event, listener, capture } of this.events) { diff --git a/src/muya/lib/index.js b/src/muya/lib/index.js index 41fe2a52..0f655d62 100644 --- a/src/muya/lib/index.js +++ b/src/muya/lib/index.js @@ -13,9 +13,11 @@ import './assets/styles/index.css' class Muya { static plugins = [] + static use (plugin) { this.plugins.push(plugin) } + constructor (container, options) { this.options = Object.assign({}, MUYA_DEFAULT_OPTION, options) const { markdown } = this.options @@ -64,7 +66,7 @@ class Muya { // Callback function to execute when mutations are observed const callback = (mutationsList, observer) => { - for(const mutation of mutationsList) { + for (const mutation of mutationsList) { if (mutation.type === 'childList') { const { removedNodes, target } = mutation // If the code executes any of the following `if` statements, the editor has gone wrong. diff --git a/src/muya/lib/parser/marked/blockRules.js b/src/muya/lib/parser/marked/blockRules.js index 4d200c91..f212815f 100644 --- a/src/muya/lib/parser/marked/blockRules.js +++ b/src/muya/lib/parser/marked/blockRules.js @@ -15,16 +15,16 @@ export const block = { nptable: noop, blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/, list: /^( {0,3})(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/, - html: '^ {0,3}(?:' // optional indentation - + '<(script|pre|style)[\\s>][\\s\\S]*?(?:[^\\n]*\\n+|$)' // (1) - + '|comment[^\\n]*(\\n+|$)' // (2) - + '|<\\?[\\s\\S]*?\\?>\\n*' // (3) - + '|\\n*' // (4) - + '|\\n*' // (5) - + '|)[\\s\\S]*?(?:\\n{2,}|$)' // (6) - + '|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$)' // (7) open tag - + '|(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$)' // (7) closing tag - + ')', + html: '^ {0,3}(?:' + // optional indentation + '<(script|pre|style)[\\s>][\\s\\S]*?(?:[^\\n]*\\n+|$)' + // (1) + '|comment[^\\n]*(\\n+|$)' + // (2) + '|<\\?[\\s\\S]*?\\?>\\n*' + // (3) + '|\\n*' + // (4) + '|\\n*' + // (5) + '|)[\\s\\S]*?(?:\\n{2,}|$)' + // (6) + '|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$)' + // (7) open tag + '|(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$)' + // (7) closing tag + ')', def: /^ {0,3}\[(label)\]: *\n? *]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/, table: noop, lheading: /^([^\n]+)\n {0,3}(=|-){2,} *(?:\n+|$)/, @@ -38,19 +38,19 @@ export const block = { block._label = /(?!\s*\])(?:\\[\[\]]|[^\[\]])+/ block._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/ -block.def = edit(block.def). - replace('label', block._label). - replace('title', block._title). - getRegex() +block.def = edit(block.def) + .replace('label', block._label) + .replace('title', block._title) + .getRegex() block.checkbox = /^\[([ xX])\] +/ block.bullet = /(?:[*+-]|\d{1,9}(?:\.|\)))/ // patched: support "(" as ordered list delimiter too // patched: fix https://github.com/marktext/marktext/issues/831#issuecomment-477719256 // block.item = /^( *)(bull) ?[^\n]*(?:\n(?!\1bull ?)[^\n]*)*/ block.item = /^(( {0,3})(bull) [^\n]*(?:\n(?!(\2bull |\2bull\n))[^\n]*)*|( {0,3})(bull)(?:\n(?!(\2bull |\2bull\n)))*)/ -block.item = edit(block.item, 'gm'). - replace(/bull/g, block.bullet). - getRegex() +block.item = edit(block.item, 'gm') + .replace(/bull/g, block.bullet) + .getRegex() block.list = edit(block.list) .replace(/bull/g, block.bullet) @@ -58,12 +58,12 @@ block.list = edit(block.list) .replace('def', '\\n+(?=' + block.def.source + ')') .getRegex() -block._tag = 'address|article|aside|base|basefont|blockquote|body|caption' - + '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption' - + '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe' - + '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option' - + '|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr' - + '|track|ul' +block._tag = 'address|article|aside|base|basefont|blockquote|body|caption' + + '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption' + + '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe' + + '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option' + + '|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr' + + '|track|ul' block._comment = // block.html = edit(block.html, 'i') .replace('comment', block._comment) @@ -98,9 +98,9 @@ export const gfm = Object.assign({}, normal, { }) gfm.paragraph = edit(block.paragraph) - .replace('(?!', '(?!' - + gfm.fences.source.replace('\\1', '\\2') + '|' - + block.list.source.replace('\\1', '\\3') + '|') + .replace('(?!', '(?!' + + gfm.fences.source.replace('\\1', '\\2') + '|' + + block.list.source.replace('\\1', '\\3') + '|') .getRegex() /** @@ -118,14 +118,14 @@ export const tables = Object.assign({}, gfm, { export const pedantic = Object.assign({}, normal, { html: edit( - '^ *(?:comment *(?:\\n|\\s*$)' - + '|<(tag)[\\s\\S]+? *(?:\\n{2,}|\\s*$)' // closed tag - + '|\\s]*)*?/?> *(?:\\n{2,}|\\s*$))') + '^ *(?:comment *(?:\\n|\\s*$)' + + '|<(tag)[\\s\\S]+? *(?:\\n{2,}|\\s*$)' + // closed tag + '|\\s]*)*?/?> *(?:\\n{2,}|\\s*$))') .replace('comment', block._comment) - .replace(/tag/g, '(?!(?:' - + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub' - + '|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)' - + '\\b)\\w+(?!:|[^\\w\\s@]*@)\\b') + .replace(/tag/g, '(?!(?:' + + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub' + + '|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)' + + '\\b)\\w+(?!:|[^\\w\\s@]*@)\\b') .getRegex(), def: /^ *\[([^\]]+)\]: *]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/ }) diff --git a/src/muya/lib/parser/marked/index.js b/src/muya/lib/parser/marked/index.js index 107b4810..6bf37206 100644 --- a/src/muya/lib/parser/marked/index.js +++ b/src/muya/lib/parser/marked/index.js @@ -13,8 +13,8 @@ function marked (src, opt = {}) { throw new Error('marked(): input parameter is undefined or null') } if (typeof src !== 'string') { - throw new Error('marked(): input parameter is of type ' - + Object.prototype.toString.call(src) + ', string expected') + throw new Error('marked(): input parameter is of type ' + + Object.prototype.toString.call(src) + ', string expected') } try { diff --git a/src/muya/lib/parser/marked/inlineLexer.js b/src/muya/lib/parser/marked/inlineLexer.js index e59b530f..409d91c4 100644 --- a/src/muya/lib/parser/marked/inlineLexer.js +++ b/src/muya/lib/parser/marked/inlineLexer.js @@ -39,7 +39,7 @@ function InlineLexer (links, options) { if (/^(?:autolink|code|tag)$/.test(key) && this.rules[key] instanceof RegExp) { this.highPriorityLinkRules[key] = this.rules[key] } - } + } } /** @@ -48,7 +48,7 @@ function InlineLexer (links, options) { InlineLexer.prototype.output = function (src) { // src = src - // .replace(/\u00a0/g, ' ') + // .replace(/\u00a0/g, ' ') const { disableInline, emoji, math } = this.options if (disableInline) { return escape(src) diff --git a/src/muya/lib/parser/marked/inlineRules.js b/src/muya/lib/parser/marked/inlineRules.js index 22d6570d..8575e38b 100644 --- a/src/muya/lib/parser/marked/inlineRules.js +++ b/src/muya/lib/parser/marked/inlineRules.js @@ -119,8 +119,8 @@ export const gfm = Object.assign({}, normal, { emoji: /^(:)([a-z_\d+-]+?)\1/ // not real GFM but put it in here }) -gfm.url = edit(gfm.url, 'i'). - replace('email', gfm._extended_email) +gfm.url = edit(gfm.url, 'i') + .replace('email', gfm._extended_email) .getRegex() /** diff --git a/src/muya/lib/parser/marked/lexer.js b/src/muya/lib/parser/marked/lexer.js index 9580c395..dabe1dfe 100644 --- a/src/muya/lib/parser/marked/lexer.js +++ b/src/muya/lib/parser/marked/lexer.js @@ -333,7 +333,7 @@ Lexer.prototype.token = function (src, top) { // Determine whether item is loose or not. If previous item is loose // this item is also loose. // A list is loose if any of its constituent list items are separated by blank lines, - // or if any of its constituent list items directly contain two block-level elements with a blank line between them. + // or if any of its constituent list items directly contain two block-level elements with a blank line between them. // loose = next = next || /^ *([*+-]|\d{1,9}(?:\.|\)))( +\S+\n\n(?!\s*$)|\n\n(?!\s*$))/.test(itemWithBullet) loose = next = next || /\n\n(?!\s*$)/.test(item) // Check if previous line ends with a new line. @@ -392,8 +392,8 @@ Lexer.prototype.token = function (src, top) { type: this.options.sanitize ? 'paragraph' : 'html', - pre: !this.options.sanitizer - && (cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style'), + pre: !this.options.sanitizer && + (cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style'), text: cap[0] }) continue diff --git a/src/muya/lib/parser/marked/parser.js b/src/muya/lib/parser/marked/parser.js index dba46461..33dcbeb8 100644 --- a/src/muya/lib/parser/marked/parser.js +++ b/src/muya/lib/parser/marked/parser.js @@ -1,7 +1,7 @@ import Renderer from './renderer' import InlineLexer from './inlineLexer' import Slugger from './slugger' -import TextRenderer from './textRenderer' +import TextRenderer from './textRenderer' import defaultOptions from './options' /** @@ -27,7 +27,7 @@ Parser.prototype.parse = function (src) { // use an InlineLexer with a TextRenderer to extract pure text this.inlineText = new InlineLexer( src.links, - Object.assign({}, this.options, {renderer: new TextRenderer()}) + Object.assign({}, this.options, { renderer: new TextRenderer() }) ) this.tokens = src.reverse() @@ -194,7 +194,7 @@ Parser.prototype.tok = function () { return this.renderer.paragraph(this.parseText()) } default: { - let errMsg = 'Token with "' + this.token.type + '" type was not found.' + const errMsg = 'Token with "' + this.token.type + '" type was not found.' if (this.options.silent) { console.error(errMsg) } else { diff --git a/src/muya/lib/parser/marked/renderer.js b/src/muya/lib/parser/marked/renderer.js index 6c50bf43..8f2fed92 100644 --- a/src/muya/lib/parser/marked/renderer.js +++ b/src/muya/lib/parser/marked/renderer.js @@ -42,7 +42,7 @@ Renderer.prototype.emoji = function (text, emoji) { Renderer.prototype.code = function (code, infostring, escaped, codeBlockStyle) { const lang = (infostring || '').match(/\S*/)[0] if (this.options.highlight) { - let out = this.options.highlight(code, lang) + const out = this.options.highlight(code, lang) if (out !== null && out !== code) { escaped = true code = out diff --git a/src/muya/lib/parser/marked/slugger.js b/src/muya/lib/parser/marked/slugger.js index 5d2718b5..35ec425c 100644 --- a/src/muya/lib/parser/marked/slugger.js +++ b/src/muya/lib/parser/marked/slugger.js @@ -18,7 +18,7 @@ Slugger.prototype.slug = function (value) { .replace(/\s/g, '-') if (this.seen.hasOwnProperty(slug)) { - let originalSlug = slug + const originalSlug = slug do { this.seen[originalSlug]++ slug = originalSlug + '-' + this.seen[originalSlug] diff --git a/src/muya/lib/parser/marked/textRenderer.js b/src/muya/lib/parser/marked/textRenderer.js index ea78fbe1..c47ee313 100644 --- a/src/muya/lib/parser/marked/textRenderer.js +++ b/src/muya/lib/parser/marked/textRenderer.js @@ -3,7 +3,7 @@ * returns only the textual part of the token */ -function TextRenderer() {} +function TextRenderer () {} // no need for block level renderers @@ -16,12 +16,12 @@ TextRenderer.prototype.text = function (text) { } TextRenderer.prototype.link = -TextRenderer.prototype.image = function(href, title, text) { +TextRenderer.prototype.image = function (href, title, text) { return '' + text } -TextRenderer.prototype.br = function() { +TextRenderer.prototype.br = function () { return '' } -export default TextRenderer \ No newline at end of file +export default TextRenderer diff --git a/src/muya/lib/parser/marked/utils.js b/src/muya/lib/parser/marked/utils.js index 1c0f2b32..18da6cca 100644 --- a/src/muya/lib/parser/marked/utils.js +++ b/src/muya/lib/parser/marked/utils.js @@ -31,7 +31,7 @@ escape.escapeReplaceNoEncode = /[<>"']|&(?!#?\w+;)/g export const unescape = function unescape (html) { // explicitly match decimal, hex, and named HTML entities - return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig, function(_, n) { + return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig, function (_, n) { n = n.toLowerCase() if (n === 'colon') return ':' if (n.charAt(0) === '#') { @@ -47,19 +47,19 @@ export const edit = function edit (regex, opt) { regex = regex.source || regex opt = opt || '' return { - replace: function(name, val) { + replace: function (name, val) { val = val.source || val val = val.replace(/(^|[^\[])\^/g, '$1') // eslint-disable-line no-useless-escape regex = regex.replace(name, val) return this }, - getRegex: function() { + getRegex: function () { return new RegExp(regex, opt) } } } -export const cleanUrl = function cleanUrl(sanitize, base, href) { +export const cleanUrl = function cleanUrl (sanitize, base, href) { if (sanitize) { let prot = '' try { @@ -84,7 +84,7 @@ export const cleanUrl = function cleanUrl(sanitize, base, href) { return href } -const resolveUrl = function resolveUrl(base, href) { +const resolveUrl = function resolveUrl (base, href) { if (!baseUrls[' ' + base]) { // we can ignore everything in base after the last slash of its path component, // but we might need to add _that_ @@ -105,18 +105,18 @@ const resolveUrl = function resolveUrl(base, href) { return base + href } } -let baseUrls = {} -let originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i +const baseUrls = {} +const originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i export const noop = function noop () {} noop.exec = noop -export const splitCells = function splitCells(tableRow, count) { +export const splitCells = function splitCells (tableRow, count) { // ensure that every cell-delimiting pipe has a space // before it to distinguish it from an escaped pipe - let row = tableRow.replace(/\|/g, function (match, offset, str) { - let escaped = false, - curr = offset + const row = tableRow.replace(/\|/g, function (match, offset, str) { + let escaped = false + let curr = offset while (--curr >= 0 && str[curr] === '\\') escaped = !escaped if (escaped) { // odd number of slashes means | is escaped @@ -126,9 +126,9 @@ export const splitCells = function splitCells(tableRow, count) { // add space before unescaped | return ' |' } - }), - cells = row.split(/ \|/), - i = 0 + }) + const cells = row.split(/ \|/) + let i = 0 if (cells.length > count) { cells.splice(count) @@ -146,7 +146,7 @@ export const splitCells = function splitCells(tableRow, count) { // Remove trailing 'c's. Equivalent to str.replace(/c*$/, ''). // /c*$/ is vulnerable to REDOS. // invert: Remove suffix of non-c chars instead. Default falsey. -export const rtrim = function rtrim(str, c, invert) { +export const rtrim = function rtrim (str, c, invert) { if (str.length === 0) { return '' } @@ -156,7 +156,7 @@ export const rtrim = function rtrim(str, c, invert) { // Step left until we fail to match the invert condition. while (suffLen < str.length) { - let currChar = str.charAt(str.length - suffLen - 1) + const currChar = str.charAt(str.length - suffLen - 1) if (currChar === c && !invert) { suffLen++ } else if (currChar !== c && invert) { @@ -169,7 +169,7 @@ export const rtrim = function rtrim(str, c, invert) { return str.substr(0, str.length - suffLen) } -export const findClosingBracket = function findClosingBracket(str, b) { +export const findClosingBracket = function findClosingBracket (str, b) { if (str.indexOf(b[1]) === -1) { return -1 } @@ -188,4 +188,3 @@ export const findClosingBracket = function findClosingBracket(str, b) { } return -1 } - diff --git a/src/muya/lib/parser/render/index.js b/src/muya/lib/parser/render/index.js index b4a2250e..465eeec3 100644 --- a/src/muya/lib/parser/render/index.js +++ b/src/muya/lib/parser/render/index.js @@ -109,8 +109,8 @@ class StateRender { async renderDiagram () { const cache = this.diagramCache const RENDER_MAP = { - 'flowchart': flowchart, - 'sequence': Diagram, + flowchart: flowchart, + sequence: Diagram, 'vega-lite': vegaEmbed } if (cache.size) { @@ -123,7 +123,9 @@ class StateRender { Object.assign(options, { theme: this.muya.options.sequenceTheme }) } else if (functionType === 'vega-lite') { Object.assign(options, { - actions: false, tooltip: false, renderer: 'svg', + actions: false, + tooltip: false, + renderer: 'svg', theme: this.muya.options.vegaTheme }) } @@ -206,10 +208,10 @@ class StateRender { /** * Only render one block. - * - * @param {object} block - * @param {array} activeBlocks - * @param {array} matches + * + * @param {object} block + * @param {array} activeBlocks + * @param {array} matches */ singleRender (block, activeBlocks, matches) { const selector = `#${block.key}` diff --git a/src/muya/lib/parser/render/renderBlock/renderContainerBlock.js b/src/muya/lib/parser/render/renderBlock/renderContainerBlock.js index e2a6ae26..9f1095d0 100644 --- a/src/muya/lib/parser/render/renderBlock/renderContainerBlock.js +++ b/src/muya/lib/parser/render/renderBlock/renderContainerBlock.js @@ -4,14 +4,14 @@ import { renderEditIcon } from './renderContainerEditIcon' import { h } from '../snabbdom' const PRE_BLOCK_HASH = { - 'fencecode': `.${CLASS_OR_ID['AG_FENCE_CODE']}`, - 'indentcode': `.${CLASS_OR_ID['AG_INDENT_CODE']}`, - 'html': `.${CLASS_OR_ID['AG_HTML_BLOCK']}`, - 'frontmatter': `.${CLASS_OR_ID['AG_FRONT_MATTER']}`, - 'multiplemath': `.${CLASS_OR_ID['AG_MULTIPLE_MATH']}`, - 'flowchart': `.${CLASS_OR_ID['AG_FLOWCHART']}`, - 'sequence': `.${CLASS_OR_ID['AG_SEQUENCE']}`, - 'mermaid': `.${CLASS_OR_ID['AG_MERMAID']}`, + fencecode: `.${CLASS_OR_ID['AG_FENCE_CODE']}`, + indentcode: `.${CLASS_OR_ID['AG_INDENT_CODE']}`, + html: `.${CLASS_OR_ID['AG_HTML_BLOCK']}`, + frontmatter: `.${CLASS_OR_ID['AG_FRONT_MATTER']}`, + multiplemath: `.${CLASS_OR_ID['AG_MULTIPLE_MATH']}`, + flowchart: `.${CLASS_OR_ID['AG_FLOWCHART']}`, + sequence: `.${CLASS_OR_ID['AG_SEQUENCE']}`, + mermaid: `.${CLASS_OR_ID['AG_MERMAID']}`, 'vega-lite': `.${CLASS_OR_ID['AG_VEGA_LITE']}` } diff --git a/src/muya/lib/parser/render/renderBlock/renderIcon.js b/src/muya/lib/parser/render/renderBlock/renderIcon.js index 5c72067e..d8d4c577 100644 --- a/src/muya/lib/parser/render/renderBlock/renderIcon.js +++ b/src/muya/lib/parser/render/renderBlock/renderIcon.js @@ -23,16 +23,16 @@ import mermaidIcon from '../../../assets/pngicon/mermaid/2.png' import vegaIcon from '../../../assets/pngicon/chart/2.png' const FUNCTION_TYPE_HASH = { - 'mermaid': mermaidIcon, - 'flowchart': flowchartIcon, - 'sequence': sequenceIcon, + mermaid: mermaidIcon, + flowchart: flowchartIcon, + sequence: sequenceIcon, 'vega-lite': vegaIcon, - 'table': newTableIcon, - 'html': htmlIcon, - 'multiplemath': mathblockIcon, - 'fencecode': codeIcon, - 'indentcode': codeIcon, - 'frontmatter': frontMatterIcon + table: newTableIcon, + html: htmlIcon, + multiplemath: mathblockIcon, + fencecode: codeIcon, + indentcode: codeIcon, + frontmatter: frontMatterIcon } export default function renderIcon (block) { diff --git a/src/muya/lib/parser/render/renderBlock/renderLeafBlock.js b/src/muya/lib/parser/render/renderBlock/renderLeafBlock.js index a3f63fb1..b9da4a1c 100644 --- a/src/muya/lib/parser/render/renderBlock/renderLeafBlock.js +++ b/src/muya/lib/parser/render/renderBlock/renderLeafBlock.js @@ -226,5 +226,5 @@ export default function renderLeafBlock (block, activeBlocks, matches, useCache return h(selector, data, [this.renderIcon(block), ...children]) } else { return h(selector, data, children) - } + } } diff --git a/src/muya/lib/parser/render/renderBlock/renderToolBar.js b/src/muya/lib/parser/render/renderBlock/renderToolBar.js index 7f883ef7..b99c11ef 100644 --- a/src/muya/lib/parser/render/renderBlock/renderToolBar.js +++ b/src/muya/lib/parser/render/renderBlock/renderToolBar.js @@ -50,7 +50,7 @@ const renderToolBar = (type, tools, activeBlocks) => { } }, iconVnode) }) - let selector = `div.ag-tool-${type}.${CLASS_OR_ID['AG_TOOL_BAR']}` + const selector = `div.ag-tool-${type}.${CLASS_OR_ID['AG_TOOL_BAR']}` return h(selector, { attrs: { diff --git a/src/muya/lib/parser/render/renderInlines/emoji.js b/src/muya/lib/parser/render/renderInlines/emoji.js index dc48f003..467e2870 100644 --- a/src/muya/lib/parser/render/renderInlines/emoji.js +++ b/src/muya/lib/parser/render/renderInlines/emoji.js @@ -8,8 +8,8 @@ export default function emoji (h, cursor, block, token, outerClass) { const validation = validEmoji(token.content) const finalClass = validation ? className : CLASS_OR_ID['AG_WARN'] const contentSelector = finalClass !== CLASS_OR_ID['AG_GRAY'] - ? `span.${finalClass}.${CLASS_OR_ID['AG_INLINE_RULE']}.${CLASS_OR_ID['AG_EMOJI_MARKED_TEXT']}` - : `span.${CLASS_OR_ID['AG_INLINE_RULE']}.${CLASS_OR_ID['AG_EMOJI_MARKED_TEXT']}` + ? `span.${finalClass}.${CLASS_OR_ID['AG_INLINE_RULE']}.${CLASS_OR_ID['AG_EMOJI_MARKED_TEXT']}` + : `span.${CLASS_OR_ID['AG_INLINE_RULE']}.${CLASS_OR_ID['AG_EMOJI_MARKED_TEXT']}` let startMarkerSelector = `span.${finalClass}.${CLASS_OR_ID['AG_EMOJI_MARKER']}` let endMarkerSelector = startMarkerSelector diff --git a/src/muya/lib/parser/render/renderInlines/hardLineBreak.js b/src/muya/lib/parser/render/renderInlines/hardLineBreak.js index 606a3cf5..748edf7c 100644 --- a/src/muya/lib/parser/render/renderInlines/hardLineBreak.js +++ b/src/muya/lib/parser/render/renderInlines/hardLineBreak.js @@ -11,7 +11,7 @@ export default function softLineBreak (h, cursor, block, token, outerClass) { ] } else { return [ - h(`span.${className}`, [ h(`span.${spaceClass}`, spaces), lineBreak ]) + h(`span.${className}`, [h(`span.${spaceClass}`, spaces), lineBreak]) ] } } diff --git a/src/muya/lib/parser/render/renderInlines/htmlRuby.js b/src/muya/lib/parser/render/renderInlines/htmlRuby.js index 54a48ebd..fc5f1aff 100644 --- a/src/muya/lib/parser/render/renderInlines/htmlRuby.js +++ b/src/muya/lib/parser/render/renderInlines/htmlRuby.js @@ -10,7 +10,6 @@ export default function htmlRuby (h, cursor, block, token, outerClass) { const previewSelector = `span.${CLASS_OR_ID['AG_RUBY_RENDER']}` - return children ? [ h(`span.${className}.${CLASS_OR_ID['AG_RUBY']}`, [ h(`span.${CLASS_OR_ID['AG_INLINE_RULE']}.${CLASS_OR_ID['AG_RUBY_TEXT']}`, content), diff --git a/src/muya/lib/parser/render/renderInlines/htmlTag.js b/src/muya/lib/parser/render/renderInlines/htmlTag.js index 8a7ee10e..5e4c0af4 100644 --- a/src/muya/lib/parser/render/renderInlines/htmlTag.js +++ b/src/muya/lib/parser/render/renderInlines/htmlTag.js @@ -13,9 +13,9 @@ export default function htmlTag (h, cursor, block, token, outerClass) { const anchor = Array.isArray(children) && tag !== 'ruby' // important ? children.reduce((acc, to) => { - const chunk = this[snakeToCamel(to.type)](h, cursor, block, to, className) - return Array.isArray(chunk) ? [...acc, ...chunk] : [...acc, chunk] - }, []) + const chunk = this[snakeToCamel(to.type)](h, cursor, block, to, className) + return Array.isArray(chunk) ? [...acc, ...chunk] : [...acc, chunk] + }, []) : '' switch (tag) { case 'img': { diff --git a/src/muya/lib/parser/rules.js b/src/muya/lib/parser/rules.js index 8dfedabf..3effd584 100644 --- a/src/muya/lib/parser/rules.js +++ b/src/muya/lib/parser/rules.js @@ -2,36 +2,36 @@ import { escapeCharacters } from './escapeCharacter' /* eslint-disable no-useless-escape */ export const beginRules = { - 'hr': /^(\*{3,}$|^\-{3,}$|^\_{3,}$)/, - 'code_fense': /^(`{3,})([^`]*)$/, - 'header': /(^ {0,3}#{1,6}(\s{1,}|$))/, - 'reference_definition': /^( {0,3}\[)([^\]]+?)(\\*)(\]: *)(]+)(>?)(?:( +)(["'(]?)([^\n"'\(\)]+)\9)?( *)$/, + hr: /^(\*{3,}$|^\-{3,}$|^\_{3,}$)/, + code_fense: /^(`{3,})([^`]*)$/, + header: /(^ {0,3}#{1,6}(\s{1,}|$))/, + reference_definition: /^( {0,3}\[)([^\]]+?)(\\*)(\]: *)(]+)(>?)(?:( +)(["'(]?)([^\n"'\(\)]+)\9)?( *)$/, // extra syntax (not belogs to GFM) - 'multiple_math': /^(\$\$)$/ + multiple_math: /^(\$\$)$/ } export const inlineRules = { - 'strong': /^(\*\*|__)(?=\S)([\s\S]*?[^\s\\])(\\*)\1(?!(\*|_))/, // can nest - 'em': /^(\*|_)(?=\S)([\s\S]*?[^\s\*\\])(\\*)\1(?!\1)/, // can nest - 'inline_code': /^(`{1,3})([^`]+?|.{2,})\1/, - 'image': /^(\!\[)(.*?)(\\*)\]\((.*?)(\\*)\)/, - 'link': /^(\[)((?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*?)(\\*)\]\((.*?)(\\*)\)/, // can nest - 'emoji': /^(:)([a-z_\d+-]+?)\1/, - 'del': /^(~{2})(?=\S)([\s\S]*?\S)(\\*)\1/, // can nest - 'auto_link': /^(https?:\/\/[^\s]+)(?=\s|$)/, - 'reference_link': /^\[([^\]]+?)(\\*)\](?:\[([^\]]*?)(\\*)\])?/, - 'reference_image': /^\!\[([^\]]+?)(\\*)\](?:\[([^\]]*?)(\\*)\])?/, - 'tail_header': /^(\s{1,}#{1,})(\s*)$/, - 'html_tag': /^(|(<([a-zA-Z]{1}[a-zA-Z\d-]*) *[_\.\-/:a-zA-Z\d='";\? *]* *(?:\/)?>)(?:([\s\S]*?)(<\/\3 *>))?)/, // raw html - 'html_escape': new RegExp(`^(${escapeCharacters.join('|')})`, 'i'), - 'soft_line_break': /^(\n)(?!\n)/, - 'hard_line_break': /^( {2,})(\n)(?!\n)/, + strong: /^(\*\*|__)(?=\S)([\s\S]*?[^\s\\])(\\*)\1(?!(\*|_))/, // can nest + em: /^(\*|_)(?=\S)([\s\S]*?[^\s\*\\])(\\*)\1(?!\1)/, // can nest + inline_code: /^(`{1,3})([^`]+?|.{2,})\1/, + image: /^(\!\[)(.*?)(\\*)\]\((.*?)(\\*)\)/, + link: /^(\[)((?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*?)(\\*)\]\((.*?)(\\*)\)/, // can nest + emoji: /^(:)([a-z_\d+-]+?)\1/, + del: /^(~{2})(?=\S)([\s\S]*?\S)(\\*)\1/, // can nest + auto_link: /^(https?:\/\/[^\s]+)(?=\s|$)/, + reference_link: /^\[([^\]]+?)(\\*)\](?:\[([^\]]*?)(\\*)\])?/, + reference_image: /^\!\[([^\]]+?)(\\*)\](?:\[([^\]]*?)(\\*)\])?/, + tail_header: /^(\s{1,}#{1,})(\s*)$/, + html_tag: /^(|(<([a-zA-Z]{1}[a-zA-Z\d-]*) *[_\.\-/:a-zA-Z\d='";\? *]* *(?:\/)?>)(?:([\s\S]*?)(<\/\3 *>))?)/, // raw html + html_escape: new RegExp(`^(${escapeCharacters.join('|')})`, 'i'), + soft_line_break: /^(\n)(?!\n)/, + hard_line_break: /^( {2,})(\n)(?!\n)/, // patched math marker `$` - 'backlash': /^(\\)([\\`*{}\[\]()#+\-.!_>~:\|\<\>$]{1})/, + backlash: /^(\\)([\\`*{}\[\]()#+\-.!_>~:\|\<\>$]{1})/, // extra (not belongs to GFM) - 'inline_math': /^(\$)([^\$]*?[^\$\\])(\\*)\1(?!\1)/ + inline_math: /^(\$)([^\$]*?[^\$\\])(\\*)\1(?!\1)/ } /* eslint-enable no-useless-escape */ diff --git a/src/muya/lib/parser/utils.js b/src/muya/lib/parser/utils.js index afe8d130..1d373a2c 100644 --- a/src/muya/lib/parser/utils.js +++ b/src/muya/lib/parser/utils.js @@ -108,7 +108,7 @@ export const parseSrcAndTitle = (text = '') => { const canOpenEmphasis = (src, marker, pending) => { const precededChar = pending.charAt(pending.length - 1) || '\n' const followedChar = src[marker.length] - // not followed by Unicode whitespace, + // not followed by Unicode whitespace, if (UNICODE_WHITESPACE_REG.test(followedChar)) { return false } @@ -127,7 +127,7 @@ const canOpenEmphasis = (src, marker, pending) => { const canCloseEmphasis = (src, offset, marker) => { const precededChar = src[offset - marker.length - 1] const followedChar = src[offset] || '\n' - // not preceded by Unicode whitespace, + // not preceded by Unicode whitespace, if (UNICODE_WHITESPACE_REG.test(precededChar)) { return false } diff --git a/src/muya/lib/prism/loadLanguage.js b/src/muya/lib/prism/loadLanguage.js index dab44137..377e97c1 100644 --- a/src/muya/lib/prism/loadLanguage.js +++ b/src/muya/lib/prism/loadLanguage.js @@ -66,7 +66,7 @@ function initLoadLanguage (Prism) { }) } if (arr && !arr.length) { - return Promise.reject('The first parameter should be a list of load languages or single language.') + return Promise.reject(new Error('The first parameter should be a list of load languages or single language.')) } if (!Array.isArray(arr)) { diff --git a/src/muya/lib/selection/dom.js b/src/muya/lib/selection/dom.js index bc431e03..3f64da33 100644 --- a/src/muya/lib/selection/dom.js +++ b/src/muya/lib/selection/dom.js @@ -51,7 +51,7 @@ export const getOffsetOfParagraph = (node, paragraph) => { do { preSibling = preSibling.previousSibling if (preSibling) { - offset += getTextContent(preSibling, [ CLASS_OR_ID['AG_MATH_RENDER'], CLASS_OR_ID['AG_RUBY_RENDER'] ]).length + offset += getTextContent(preSibling, [CLASS_OR_ID['AG_MATH_RENDER'], CLASS_OR_ID['AG_RUBY_RENDER']]).length } } while (preSibling) return (node === paragraph || node.parentNode === paragraph) @@ -72,7 +72,7 @@ export const findNearestParagraph = node => { export const findOutMostParagraph = node => { do { - let parentNode = node.parentNode + const parentNode = node.parentNode if (isMuyaEditorElement(parentNode) && isAganippeParagraph(node)) return node node = parentNode } while (node) diff --git a/src/muya/lib/selection/index.js b/src/muya/lib/selection/index.js index 6e95a9f9..8d7237b1 100644 --- a/src/muya/lib/selection/index.js +++ b/src/muya/lib/selection/index.js @@ -209,7 +209,7 @@ class Selection { // to move the cursor back to the start of the correct paragraph importSelectionMoveCursorPastBlocks (root, index = 1, range) { const treeWalker = this.doc.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, filterOnlyParentElements, false) - let startContainer = range.startContainer + const startContainer = range.startContainer let startBlock let targetNode let currIndex = 0 @@ -279,8 +279,8 @@ class Selection { const { left } = this.getCaretOffsets(root) const markedText = root.textContent const { type, info } = getCursorPositionWithinMarkedText(markedText, left) - let pre = markedText.slice(0, left) - let post = markedText.slice(left) + const pre = markedText.slice(0, left) + const post = markedText.slice(left) switch (type) { case 'OUT': return { @@ -425,7 +425,7 @@ class Selection { let count = 0 for (i = 0; i < len; i++) { const child = childNodes[i] - const textLength = getTextContent(child, [ CLASS_OR_ID['AG_MATH_RENDER'], CLASS_OR_ID['AG_RUBY_RENDER'] ]).length + const textLength = getTextContent(child, [CLASS_OR_ID['AG_MATH_RENDER'], CLASS_OR_ID['AG_RUBY_RENDER']]).length if (child.classList && child.classList.contains(CLASS_OR_ID['AG_FRONT_ICON'])) continue if (count + textLength >= offset) { if ( @@ -547,9 +547,9 @@ class Selection { aOffset = 0 if (preElement) { aOffset += getOffsetOfParagraph(preElement, anchorParagraph) - aOffset += getTextContent(preElement, [ CLASS_OR_ID['AG_MATH_RENDER'], CLASS_OR_ID['AG_RUBY_RENDER'] ]).length + aOffset += getTextContent(preElement, [CLASS_OR_ID['AG_MATH_RENDER'], CLASS_OR_ID['AG_RUBY_RENDER']]).length } - aOffset += getTextContent(imageWrapper, [ CLASS_OR_ID['AG_MATH_RENDER'], CLASS_OR_ID['AG_RUBY_RENDER'] ]).length + aOffset += getTextContent(imageWrapper, [CLASS_OR_ID['AG_MATH_RENDER'], CLASS_OR_ID['AG_RUBY_RENDER']]).length fOffset = aOffset } @@ -563,10 +563,10 @@ class Selection { aOffset = 0 if (preElement) { aOffset += getOffsetOfParagraph(preElement, anchorParagraph) - aOffset += getTextContent(preElement, [ CLASS_OR_ID['AG_MATH_RENDER'], CLASS_OR_ID['AG_RUBY_RENDER'] ]).length + aOffset += getTextContent(preElement, [CLASS_OR_ID['AG_MATH_RENDER'], CLASS_OR_ID['AG_RUBY_RENDER']]).length } if (anchorOffset === 3) { - aOffset += getTextContent(imageWrapper, [ CLASS_OR_ID['AG_MATH_RENDER'], CLASS_OR_ID['AG_RUBY_RENDER'] ]).length + aOffset += getTextContent(imageWrapper, [CLASS_OR_ID['AG_MATH_RENDER'], CLASS_OR_ID['AG_RUBY_RENDER']]).length } fOffset = aOffset } diff --git a/src/muya/lib/ui/codePicker/index.js b/src/muya/lib/ui/codePicker/index.js index b25e9638..83980fae 100644 --- a/src/muya/lib/ui/codePicker/index.js +++ b/src/muya/lib/ui/codePicker/index.js @@ -7,6 +7,7 @@ import './index.css' class CodePicker extends BaseScrollFloat { static pluginName = 'codePicker' + constructor (muya) { const name = 'ag-list-picker' super(muya, name) diff --git a/src/muya/lib/ui/emojiPicker/index.js b/src/muya/lib/ui/emojiPicker/index.js index b2272731..8ebc8bf7 100644 --- a/src/muya/lib/ui/emojiPicker/index.js +++ b/src/muya/lib/ui/emojiPicker/index.js @@ -5,6 +5,7 @@ import './index.css' class EmojiPicker extends BaseScrollFloat { static pluginName = 'emojiPicker' + constructor (muya) { const name = 'ag-emoji-picker' super(muya, name) diff --git a/src/muya/lib/ui/emojis/index.js b/src/muya/lib/ui/emojis/index.js index a025e890..1438884a 100644 --- a/src/muya/lib/ui/emojis/index.js +++ b/src/muya/lib/ui/emojis/index.js @@ -9,7 +9,7 @@ for (const emoji of emojis) { if (emojisForSearch[newEmoji.category]) { emojisForSearch[newEmoji.category].push(newEmoji) } else { - emojisForSearch[newEmoji.category] = [ newEmoji ] + emojisForSearch[newEmoji.category] = [newEmoji] } } diff --git a/src/muya/lib/ui/formatPicker/index.js b/src/muya/lib/ui/formatPicker/index.js index 05737e6f..676ebc28 100644 --- a/src/muya/lib/ui/formatPicker/index.js +++ b/src/muya/lib/ui/formatPicker/index.js @@ -16,6 +16,7 @@ const defaultOptions = { class FormatPicker extends BaseFloat { static pluginName = 'formatPicker' + constructor (muya, options = {}) { const name = 'ag-format-picker' const opts = Object.assign({}, defaultOptions, options) diff --git a/src/muya/lib/ui/frontMenu/index.js b/src/muya/lib/ui/frontMenu/index.js index 2dfbdba7..9f103061 100644 --- a/src/muya/lib/ui/frontMenu/index.js +++ b/src/muya/lib/ui/frontMenu/index.js @@ -20,6 +20,7 @@ const defaultOptions = { class FrontMenu extends BaseFloat { static pluginName = 'frontMenu' + constructor (muya, options = {}) { const name = 'ag-front-menu' const opts = Object.assign({}, defaultOptions, options) diff --git a/src/muya/lib/ui/imagePicker/index.js b/src/muya/lib/ui/imagePicker/index.js index 2a6e02e4..a2a309ed 100644 --- a/src/muya/lib/ui/imagePicker/index.js +++ b/src/muya/lib/ui/imagePicker/index.js @@ -14,6 +14,7 @@ const iconhash = { class ImagePathPicker extends BaseScrollFloat { static pluginName = 'imagePathPicker' + constructor (muya) { const name = 'ag-list-picker' super(muya, name) @@ -41,7 +42,7 @@ class ImagePathPicker extends BaseScrollFloat { render () { const { renderArray, oldVnode, scrollElement, activeItem } = this - let children = renderArray.map((item) => { + const children = renderArray.map((item) => { const { text, iconClass } = item const icon = h('div.icon-wrapper', h('svg', { attrs: { @@ -60,7 +61,7 @@ class ImagePathPicker extends BaseScrollFloat { 'xlink:href': iconhash[iconClass].url } })) - ) + ) const textEle = h('div.language', text) const selector = activeItem === item ? 'li.item.active' : 'li.item' return h(selector, { diff --git a/src/muya/lib/ui/imageSelector/index.js b/src/muya/lib/ui/imageSelector/index.js index 5a80edca..d47541a9 100644 --- a/src/muya/lib/ui/imageSelector/index.js +++ b/src/muya/lib/ui/imageSelector/index.js @@ -8,6 +8,7 @@ import './index.css' class ImageSelector extends BaseFloat { static pluginName = 'imageSelector' + constructor (muya) { const name = 'ag-image-selector' const options = { @@ -35,6 +36,7 @@ class ImageSelector extends BaseFloat { this.floatBox.classList.add('ag-image-selector-wrapper') this.listen() } + listen () { super.listen() const { eventCenter } = this.muya @@ -188,7 +190,7 @@ class ImageSelector extends BaseFloat { this.muya.eventCenter.dispatch('stateChange') } - async handleSelectButtonClick () { + async handleSelectButtonClick () { if (!this.muya.options.imagePathPicker) { console.warn('You need to add a imagePathPicker option') return diff --git a/src/muya/lib/ui/quickInsert/config.js b/src/muya/lib/ui/quickInsert/config.js index 722b2738..ea6ab724 100644 --- a/src/muya/lib/ui/quickInsert/config.js +++ b/src/muya/lib/ui/quickInsert/config.js @@ -30,7 +30,6 @@ const COMMAND_KEY = isOsx ? '⌘' : '⌃' // Caps Lock ⇪ // Fn - // Command (or Cmd) ⌘ // Shift ⇧ // Option (or Alt) ⌥ @@ -38,7 +37,6 @@ const COMMAND_KEY = isOsx ? '⌘' : '⌃' // Caps Lock ⇪ // Fn - export const quicInsertObj = { 'basic block': [{ title: 'Paragraph', @@ -59,7 +57,7 @@ export const quicInsertObj = { shortCut: `⌥${COMMAND_KEY}Y`, icon: frontMatterIcon }], - 'header': [{ + header: [{ title: 'Header 1', subTitle: '# Lorem Ipsum is simply ...', label: 'heading 1', @@ -146,7 +144,7 @@ export const quicInsertObj = { shortCut: `⌥${COMMAND_KEY}X`, icon: todoListIcon }], - 'diagram': [{ + diagram: [{ title: 'Vega Chart', subTitle: 'Render flow chart by vega-lite.js.', label: 'vega-lite', diff --git a/src/muya/lib/ui/quickInsert/index.js b/src/muya/lib/ui/quickInsert/index.js index 3c91962c..e760ee27 100644 --- a/src/muya/lib/ui/quickInsert/index.js +++ b/src/muya/lib/ui/quickInsert/index.js @@ -7,6 +7,7 @@ import './index.css' class QuickInsert extends BaseScrollFloat { static pluginName = 'quickInsert' + constructor (muya) { const name = 'ag-quick-insert' super(muya, name) @@ -121,8 +122,8 @@ class QuickInsert extends BaseScrollFloat { selectItem (item) { const { contentState } = this.muya this.block.text = '' - let { key } = this.block - let offset = 0 + const { key } = this.block + const offset = 0 contentState.cursor = { start: { key, offset }, end: { key, offset } diff --git a/src/muya/lib/ui/tablePicker/index.js b/src/muya/lib/ui/tablePicker/index.js index b9871a35..45e0b4e8 100644 --- a/src/muya/lib/ui/tablePicker/index.js +++ b/src/muya/lib/ui/tablePicker/index.js @@ -5,6 +5,7 @@ import { EVENT_KEYS } from '../../config' class TablePicker extends BaseFloat { static pluginName = 'tablePicker' + constructor (muya) { const name = 'ag-table-picker' super(muya, name) @@ -124,7 +125,7 @@ class TablePicker extends BaseFloat { keyupHandler (event, type) { let number = +this.select[type] - let value = +event.target.value + const value = +event.target.value if (event.key === EVENT_KEYS.ArrowUp) { number++ } else if (event.key === EVENT_KEYS.ArrowDown) { diff --git a/src/muya/lib/utils/exportHtml.js b/src/muya/lib/utils/exportHtml.js index 0770b5ea..dc362fc1 100644 --- a/src/muya/lib/utils/exportHtml.js +++ b/src/muya/lib/utils/exportHtml.js @@ -46,7 +46,7 @@ class ExportHtml { theme: 'default' }) mermaid.init(undefined, this.exportContainer.querySelectorAll('div.mermaid')) - if (this.muya){ + if (this.muya) { mermaid.initialize({ theme: this.muya.options.mermaidTheme }) @@ -56,8 +56,8 @@ class ExportHtml { async renderDiagram () { const selector = 'code.language-vega-lite, code.language-flowchart, code.language-sequence' const RENDER_MAP = { - 'flowchart': flowchart, - 'sequence': Diagram, + flowchart: flowchart, + sequence: Diagram, 'vega-lite': vegaEmbed } const codes = this.exportContainer.querySelectorAll(selector) @@ -74,7 +74,9 @@ class ExportHtml { Object.assign(options, { theme: 'hand' }) } else if (functionType === 'vega-lite') { Object.assign(options, { - actions: false, tooltip: false, renderer: 'svg', + actions: false, + tooltip: false, + renderer: 'svg', theme: 'latimes' // only render light theme }) } diff --git a/src/muya/lib/utils/exportMarkdown.js b/src/muya/lib/utils/exportMarkdown.js index 6ad3c244..eda337cd 100644 --- a/src/muya/lib/utils/exportMarkdown.js +++ b/src/muya/lib/utils/exportMarkdown.js @@ -327,7 +327,7 @@ class ExportMarkdown { } listInfo.listCount++ - const delimiter = bulletMarkerOrDelimiter ? bulletMarkerOrDelimiter : '.' + const delimiter = bulletMarkerOrDelimiter || '.' itemMarker = `${n}${delimiter} ` } diff --git a/src/muya/lib/utils/importMarkdown.js b/src/muya/lib/utils/importMarkdown.js index 23fb2d84..a9aaf9e6 100644 --- a/src/muya/lib/utils/importMarkdown.js +++ b/src/muya/lib/utils/importMarkdown.js @@ -38,13 +38,13 @@ const turnSoftBreakToSpan = html => { const params = [] let i = 0 const len = tokens.length - for (; i< len; i++) { + for (; i < len; i++) { let text = tokens[i] if (i === 0 && startLen !== 0) { text = '\n'.repeat(startLen) + text } else if (i === len - 1 && endLen !== 0) { text = text + '\n'.repeat(endLen) - } + } params.push(document.createTextNode(text)) if (i !== len - 1) { const softBreak = document.createElement('span') @@ -81,7 +81,7 @@ const importRegister = ContentState => { let token let block let value - let parentList = [ rootState ] + const parentList = [rootState] const languageLoaded = new Set() while ((token = tokens.shift())) { @@ -133,7 +133,7 @@ const importRegister = ContentState => { const headingContent = this.createBlock('span', { text: value, - functionType: headingStyle === 'atx'? 'atxLine' : 'paragraphContent' + functionType: headingStyle === 'atx' ? 'atxLine' : 'paragraphContent' }) this.appendChild(block, headingContent) @@ -363,8 +363,8 @@ const importRegister = ContentState => { const { anchor, focus } = this.cursor const anchorBlock = this.getBlock(anchor.key) const focusBlock = this.getBlock(focus.key) - let { text: anchorText } = anchorBlock - let { text: focusText } = focusBlock + const { text: anchorText } = anchorBlock + const { text: focusText } = focusBlock if (anchor.key === focus.key) { const minOffset = Math.min(anchor.offset, focus.offset) const maxOffset = Math.max(anchor.offset, focus.offset) diff --git a/src/renderer/codeMirror/modes.js b/src/renderer/codeMirror/modes.js index bbbbf19c..b0bd924d 100644 --- a/src/renderer/codeMirror/modes.js +++ b/src/renderer/codeMirror/modes.js @@ -1,331 +1,331 @@ const languages = [{ - 'name': 'objectivec', - 'mode': 'clike', - 'mime': 'text/x-objectivec' + name: 'objectivec', + mode: 'clike', + mime: 'text/x-objectivec' }, { - 'name': 'swift', - 'mode': 'swift', - 'mime': 'text/x-swift' + name: 'swift', + mode: 'swift', + mime: 'text/x-swift' }, { - 'name': 'c_cpp', - 'mode': 'clike', - 'mime': 'text/x-csrc' + name: 'c_cpp', + mode: 'clike', + mime: 'text/x-csrc' }, { - 'name': 'c', - 'mode': 'clike', - 'mime': 'text/x-csrc' + name: 'c', + mode: 'clike', + mime: 'text/x-csrc' }, { - 'name': 'c++', - 'mode': 'clike', - 'mime': 'text/x-c++src' + name: 'c++', + mode: 'clike', + mime: 'text/x-c++src' }, { - 'name': 'cmake', - 'mode': 'cmake', - 'mime': 'text/x-cmake' + name: 'cmake', + mode: 'cmake', + mime: 'text/x-cmake' }, { - 'name': 'lisp', - 'mode': 'commonlisp', - 'mime': 'text/x-common-lisp' + name: 'lisp', + mode: 'commonlisp', + mime: 'text/x-common-lisp' }, { - 'name': 'pascal', - 'mode': 'pascal', - 'mime': 'text/x-pascal' + name: 'pascal', + mode: 'pascal', + mime: 'text/x-pascal' }, { - 'name': 'eiffel', - 'mode': 'eiffel', - 'mime': 'text/x-eiffel' + name: 'eiffel', + mode: 'eiffel', + mime: 'text/x-eiffel' }, { - 'name': 'yaml', - 'mode': 'yaml', - 'mime': 'text/x-yaml' + name: 'yaml', + mode: 'yaml', + mime: 'text/x-yaml' }, { - 'name': 'xml', - 'mode': 'xml', - 'mime': 'application/xml' + name: 'xml', + mode: 'xml', + mime: 'application/xml' }, { - 'name': 'django', - 'mode': 'django', - 'mime': 'text/x-django' + name: 'django', + mode: 'django', + mime: 'text/x-django' }, { - 'name': 'clojure', - 'mode': 'clojure', - 'mime': 'text/x-clojure' + name: 'clojure', + mode: 'clojure', + mime: 'text/x-clojure' }, { - 'name': 'crystal', - 'mode': 'crystal', - 'mime': 'text/x-crystal' + name: 'crystal', + mode: 'crystal', + mime: 'text/x-crystal' }, { - 'name': 'ruby', - 'mode': 'ruby', - 'mime': 'text/x-ruby' + name: 'ruby', + mode: 'ruby', + mime: 'text/x-ruby' }, { - 'name': 'python', - 'mode': 'python', - 'mime': 'text/x-python' + name: 'python', + mode: 'python', + mime: 'text/x-python' }, { - 'name': 'sh', - 'mode': 'shell', - 'mime': 'text/x-sh' + name: 'sh', + mode: 'shell', + mime: 'text/x-sh' }, { /* alias */ - 'name': 'shell', - 'mode': 'shell', - 'mime': 'text/x-sh' + name: 'shell', + mode: 'shell', + mime: 'text/x-sh' }, { - 'name': 'less', - 'mode': 'css', - 'mime': 'text/css' + name: 'less', + mode: 'css', + mime: 'text/css' }, { - 'name': 'php', - 'mode': 'php', - 'mime': 'application/x-httpd-php' + name: 'php', + mode: 'php', + mime: 'application/x-httpd-php' }, { - 'name': 'json', - 'mode': 'javascript', - 'mime': 'application/json' + name: 'json', + mode: 'javascript', + mime: 'application/json' }, { - 'name': 'smarty', - 'mode': 'smarty', - 'mime': 'text/x-smarty' + name: 'smarty', + mode: 'smarty', + mime: 'text/x-smarty' }, { - 'name': 'cobol', - 'mode': 'cobol', - 'mime': 'text/x-cobol' + name: 'cobol', + mode: 'cobol', + mime: 'text/x-cobol' }, { - 'name': 'go', - 'mode': 'go', - 'mime': 'text/x-go' + name: 'go', + mode: 'go', + mime: 'text/x-go' }, { /* alias */ - 'name': 'golang', - 'mode': 'go', - 'mime': 'text/x-go' + name: 'golang', + mode: 'go', + mime: 'text/x-go' }, { - 'name': 'makefile', - 'mode': 'shell', /* makefile syntax is not supported by CodeMirror */ - 'mime': 'text/x-sh' + name: 'makefile', + mode: 'shell', /* makefile syntax is not supported by CodeMirror */ + mime: 'text/x-sh' }, { - 'name': 'ocaml', - 'mode': 'mllike', - 'mime': 'text/x-ocaml' + name: 'ocaml', + mode: 'mllike', + mime: 'text/x-ocaml' }, { - 'name': 'textile', - 'mode': 'textile', - 'mime': 'text/x-textile' + name: 'textile', + mode: 'textile', + mime: 'text/x-textile' }, { - 'name': 'd', - 'mode': 'd', - 'mime': 'text/x-d' + name: 'd', + mode: 'd', + mime: 'text/x-d' }, { - 'name': 'jade', - 'mode': 'pug', - 'mime': 'text/x-pug' + name: 'jade', + mode: 'pug', + mime: 'text/x-pug' }, { - 'name': 'lua', - 'mode': 'lua', - 'mime': 'text/x-lua' + name: 'lua', + mode: 'lua', + mime: 'text/x-lua' }, { - 'name': 'coffee', - 'mode': 'coffeescript', - 'mime': 'text/x-coffeescript' + name: 'coffee', + mode: 'coffeescript', + mime: 'text/x-coffeescript' }, { - 'name': 'html', - 'mode': 'htmlmixed', - 'mime': 'text/html' + name: 'html', + mode: 'htmlmixed', + mime: 'text/html' }, { - 'name': 'pgsql', - 'mode': 'sql', - 'mime': 'text/x-sql' + name: 'pgsql', + mode: 'sql', + mime: 'text/x-sql' }, { - 'name': 'haskell', - 'mode': 'haskell', - 'mime': 'text/x-haskell' + name: 'haskell', + mode: 'haskell', + mime: 'text/x-haskell' }, { - 'name': 'jsp', - 'mode': 'htmlembedded', - 'mime': 'application/x-jsp' + name: 'jsp', + mode: 'htmlembedded', + mime: 'application/x-jsp' }, { - 'name': 'tcl', - 'mode': 'tcl', - 'mime': 'text/x-tcl' + name: 'tcl', + mode: 'tcl', + mime: 'text/x-tcl' }, { - 'name': 'ini', - 'mode': 'properties', - 'mime': 'text/x-properties' + name: 'ini', + mode: 'properties', + mime: 'text/x-properties' }, { - 'name': 'jsoniq', - 'mode': 'javascript', - 'mime': 'application/json' + name: 'jsoniq', + mode: 'javascript', + mime: 'application/json' }, { - 'name': 'vhdl', - 'mode': 'vhdl', - 'mime': 'text/x-vhdl' + name: 'vhdl', + mode: 'vhdl', + mime: 'text/x-vhdl' }, { - 'name': 'verilog', - 'mode': 'verilog', - 'mime': 'text/x-systemverilog' + name: 'verilog', + mode: 'verilog', + mime: 'text/x-systemverilog' }, { - 'name': 'csharp', - 'mode': 'clike', - 'mime': 'text/x-csharp' + name: 'csharp', + mode: 'clike', + mime: 'text/x-csharp' }, { - 'name': 'rust', - 'mode': 'rust', - 'mime': 'text/x-rustsrc' + name: 'rust', + mode: 'rust', + mime: 'text/x-rustsrc' }, { - 'name': 'livescript', - 'mode': 'livescript', - 'mime': 'text/x-livescript' + name: 'livescript', + mode: 'livescript', + mime: 'text/x-livescript' }, { - 'name': 'jsx', - 'mode': 'jsx', - 'mime': 'text/jsx' + name: 'jsx', + mode: 'jsx', + mime: 'text/jsx' }, { - 'name': 'protobuf', - 'mode': 'protobuf', - 'mime': 'text/x-protobuf' + name: 'protobuf', + mode: 'protobuf', + mime: 'text/x-protobuf' }, { - 'name': 'markdown', - 'mode': 'gfm', - 'mime': 'text/x-gfm' + name: 'markdown', + mode: 'gfm', + mime: 'text/x-gfm' }, { - 'name': 'rst', - 'mode': 'rst', - 'mime': 'text/x-rst' + name: 'rst', + mode: 'rst', + mime: 'text/x-rst' }, { - 'name': 'LaTeX', - 'mode': 'stex', - 'mime': 'text/x-latex' + name: 'LaTeX', + mode: 'stex', + mime: 'text/x-latex' }, { - 'name': 'java', - 'mode': 'clike', - 'mime': 'text/x-java' + name: 'java', + mode: 'clike', + mime: 'text/x-java' }, { - 'name': 'kotlin', - 'mode': 'clike', - 'mime': 'text/x-kotlin' + name: 'kotlin', + mode: 'clike', + mime: 'text/x-kotlin' }, { - 'name': 'javascript', - 'mode': 'javascript', - 'mime': 'text/javascript' + name: 'javascript', + mode: 'javascript', + mime: 'text/javascript' }, { - 'name': 'erlang', - 'mode': 'erlang', - 'mime': 'text/x-erlang' + name: 'erlang', + mode: 'erlang', + mime: 'text/x-erlang' }, { - 'name': 'scheme', - 'mode': 'scheme', - 'mime': 'text/x-scheme' + name: 'scheme', + mode: 'scheme', + mime: 'text/x-scheme' }, { - 'name': 'sass', - 'mode': 'sass', - 'mime': 'text/x-sass' + name: 'sass', + mode: 'sass', + mime: 'text/x-sass' }, { - 'name': 'groovy', - 'mode': 'groovy', - 'mime': 'text/x-groovy' + name: 'groovy', + mode: 'groovy', + mime: 'text/x-groovy' }, { - 'name': 'julia', - 'mode': 'julia', - 'mime': 'text/x-julia' + name: 'julia', + mode: 'julia', + mime: 'text/x-julia' }, { - 'name': 'haml', - 'mode': 'haml', - 'mime': 'text/x-haml' + name: 'haml', + mode: 'haml', + mime: 'text/x-haml' }, { - 'name': 'powershell', - 'mode': 'powershell', - 'mime': 'application/x-powershell' + name: 'powershell', + mode: 'powershell', + mime: 'application/x-powershell' }, { - 'name': 'typescript', - 'mode': 'javascript', - 'mime': 'application/typescript' + name: 'typescript', + mode: 'javascript', + mime: 'application/typescript' }, { - 'name': 'dart', - 'mode': 'dart', - 'mime': 'application/dart' + name: 'dart', + mode: 'dart', + mime: 'application/dart' }, { - 'name': 'xquery', - 'mode': 'xquery', - 'mime': 'application/xquery' + name: 'xquery', + mode: 'xquery', + mime: 'application/xquery' }, { - 'name': 'elm', - 'mode': 'elm', - 'mime': 'text/x-elm' + name: 'elm', + mode: 'elm', + mime: 'text/x-elm' }, { - 'name': 'plsql', - 'mode': 'sql', - 'mime': 'text/x-plsql' + name: 'plsql', + mode: 'sql', + mime: 'text/x-plsql' }, { - 'name': 'forth', - 'mode': 'forth', - 'mime': 'text/x-forth' + name: 'forth', + mode: 'forth', + mime: 'text/x-forth' }, { - 'name': 'scala', - 'mode': 'clike', - 'mime': 'text/x-scala' + name: 'scala', + mode: 'clike', + mime: 'text/x-scala' }, { - 'name': 'perl', - 'mode': 'perl', - 'mime': 'text/x-perl' + name: 'perl', + mode: 'perl', + mime: 'text/x-perl' }, { - 'name': 'haxe', - 'mode': 'haxe', - 'mime': 'text/x-haxe' + name: 'haxe', + mode: 'haxe', + mime: 'text/x-haxe' }, { - 'name': 'rhtml', - 'mode': 'htmlembedded', - 'mime': 'application/x-erb' + name: 'rhtml', + mode: 'htmlembedded', + mime: 'application/x-erb' }, { - 'name': 'scss', - 'mode': 'css', - 'mime': 'text/x-scss' + name: 'scss', + mode: 'css', + mime: 'text/x-scss' }, { - 'name': 'sql', - 'mode': 'sql', - 'mime': 'text/x-sql' + name: 'sql', + mode: 'sql', + mime: 'text/x-sql' }, { - 'name': 'css', - 'mode': 'css', - 'mime': 'text/css' + name: 'css', + mode: 'css', + mime: 'text/css' }, { - 'name': 'tex', - 'mode': 'stex', - 'mime': 'text/x-stex' + name: 'tex', + mode: 'stex', + mime: 'text/x-stex' }, { - 'name': 'r', - 'mode': 'r', - 'mime': 'text/x-rsrc' + name: 'r', + mode: 'r', + mime: 'text/x-rsrc' }, { - 'name': 'diff', - 'mode': 'diff', - 'mime': 'text/x-diff' + name: 'diff', + mode: 'diff', + mime: 'text/x-diff' }, { - 'name': 'twig', - 'mode': 'twig', - 'mime': 'text/x-twig' + name: 'twig', + mode: 'twig', + mime: 'text/x-twig' }, { - 'name': 'matlab', - 'mode': 'octave', - 'mime': 'text/x-octave' + name: 'matlab', + mode: 'octave', + mime: 'text/x-octave' }, { - 'name': 'soy_template', - 'mode': 'soy', - 'mime': 'text/x-soy' + name: 'soy_template', + mode: 'soy', + mime: 'text/x-soy' }, { - 'name': 'dockerfile', - 'mode': 'dockerfile', - 'mime': 'text/x-dockerfile' + name: 'dockerfile', + mode: 'dockerfile', + mime: 'text/x-dockerfile' }, { - 'name': 'toml', - 'mode': 'toml', - 'mime': 'text/x-toml' + name: 'toml', + mode: 'toml', + mime: 'text/x-toml' }, { - 'name': 'pgp', - 'mode': 'asciiarmor', - 'mime': 'application/pgp' + name: 'pgp', + mode: 'asciiarmor', + mime: 'application/pgp' }, { - 'name': 'Nginx', - 'mode': 'nginx', - 'mime': 'text/x-nginx-conf' + name: 'Nginx', + mode: 'nginx', + mime: 'text/x-nginx-conf' }] export default languages diff --git a/src/renderer/components/about/index.vue b/src/renderer/components/about/index.vue index 9ccba9a3..3030a170 100644 --- a/src/renderer/components/about/index.vue +++ b/src/renderer/components/about/index.vue @@ -27,36 +27,36 @@ \ No newline at end of file + diff --git a/src/renderer/components/editorWithTabs/editor.vue b/src/renderer/components/editorWithTabs/editor.vue index c1c9259d..28614959 100644 --- a/src/renderer/components/editorWithTabs/editor.vue +++ b/src/renderer/components/editorWithTabs/editor.vue @@ -74,365 +74,351 @@ - diff --git a/src/renderer/components/recent/index.vue b/src/renderer/components/recent/index.vue index ee2af896..4f5d09db 100644 --- a/src/renderer/components/recent/index.vue +++ b/src/renderer/components/recent/index.vue @@ -14,19 +14,19 @@ - diff --git a/src/renderer/components/tweet/index.vue b/src/renderer/components/tweet/index.vue index fc9afffb..17e75037 100644 --- a/src/renderer/components/tweet/index.vue +++ b/src/renderer/components/tweet/index.vue @@ -67,56 +67,56 @@ - diff --git a/src/renderer/prefComponents/common/range/index.vue b/src/renderer/prefComponents/common/range/index.vue index 702cd4b8..dfbea239 100644 --- a/src/renderer/prefComponents/common/range/index.vue +++ b/src/renderer/prefComponents/common/range/index.vue @@ -97,4 +97,3 @@ export default { } } - diff --git a/src/renderer/prefComponents/common/select/index.vue b/src/renderer/prefComponents/common/select/index.vue index 36e78b41..4d39c014 100644 --- a/src/renderer/prefComponents/common/select/index.vue +++ b/src/renderer/prefComponents/common/select/index.vue @@ -104,4 +104,3 @@ div.el-select-dropdown { } } - diff --git a/src/renderer/prefComponents/common/separator/index.vue b/src/renderer/prefComponents/common/separator/index.vue index 3a3c89f7..76141a71 100644 --- a/src/renderer/prefComponents/common/separator/index.vue +++ b/src/renderer/prefComponents/common/separator/index.vue @@ -9,4 +9,3 @@ background: var(--editorColor04); } - diff --git a/src/renderer/prefComponents/common/titlebar.vue b/src/renderer/prefComponents/common/titlebar.vue index b34b8630..cc766e5b 100644 --- a/src/renderer/prefComponents/common/titlebar.vue +++ b/src/renderer/prefComponents/common/titlebar.vue @@ -11,20 +11,20 @@ - - diff --git a/src/renderer/prefComponents/imageUploader/index.vue b/src/renderer/prefComponents/imageUploader/index.vue index 4bb10b7a..d6e2ebb2 100644 --- a/src/renderer/prefComponents/imageUploader/index.vue +++ b/src/renderer/prefComponents/imageUploader/index.vue @@ -124,7 +124,7 @@ export default { shell.openExternal(link) }, save (type) { - const newImageBedConfig = Object.assign({}, this.imageBed, {[type]: this[type]}) + const newImageBedConfig = Object.assign({}, this.imageBed, { [type]: this[type] }) this.$store.dispatch('SET_USER_DATA', { type: 'imageBed', value: newImageBedConfig diff --git a/src/renderer/prefComponents/imageUploader/services.js b/src/renderer/prefComponents/imageUploader/services.js index 0eeafe10..4fe5a307 100644 --- a/src/renderer/prefComponents/imageUploader/services.js +++ b/src/renderer/prefComponents/imageUploader/services.js @@ -3,7 +3,7 @@ export default { // Dummy service used to opt-in real services. none: { - name: "", + name: '', isGdprCompliant: true, privacyUrl: '', tosUrl: '', @@ -14,7 +14,7 @@ export default { // Real services smms: { - name: "sm.ms", + name: 'sm.ms', isGdprCompliant: false, privacyUrl: '', tosUrl: 'https://sm.ms/about/', @@ -23,7 +23,7 @@ export default { agreedToLegalNotices: false }, github: { - name: "GitHub", + name: 'GitHub', isGdprCompliant: true, privacyUrl: 'https://github.com/site/privacy', tosUrl: 'https://github.com/site/terms', diff --git a/src/renderer/prefComponents/markdown/config.js b/src/renderer/prefComponents/markdown/config.js index 58a119b2..fb56bdd4 100644 --- a/src/renderer/prefComponents/markdown/config.js +++ b/src/renderer/prefComponents/markdown/config.js @@ -25,7 +25,7 @@ export const preferHeadingStyleOptions = [{ value: 'setext' }] -export const tabSizeOptions =[{ +export const tabSizeOptions = [{ label: '1', value: 1 }, { @@ -47,7 +47,7 @@ export const listIndentationOptions = [{ value: 'tab' }, { label: '1 space', - value: 1, + value: 1 }, { label: '2 spaces', value: 2 diff --git a/src/renderer/prefComponents/sideBar/index.vue b/src/renderer/prefComponents/sideBar/index.vue index c16ada97..82c79f6a 100644 --- a/src/renderer/prefComponents/sideBar/index.vue +++ b/src/renderer/prefComponents/sideBar/index.vue @@ -37,7 +37,7 @@ import { category, searchContent } from './config' export default { - data() { + data () { this.category = category return { currentCategory: 'general', @@ -53,35 +53,35 @@ export default { } }, methods: { - querySearch(queryString, cb) { - var restaurants = this.restaurants - var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants - // call callback return this results - cb(results) - }, - createFilter(queryString) { - return (restaurant) => { - return (restaurant.preference.toLowerCase().indexOf(queryString.toLowerCase()) >= 0) || + querySearch (queryString, cb) { + var restaurants = this.restaurants + var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants + // call callback return this results + cb(results) + }, + createFilter (queryString) { + return (restaurant) => { + return (restaurant.preference.toLowerCase().indexOf(queryString.toLowerCase()) >= 0) || (restaurant.category.toLowerCase().indexOf(queryString.toLowerCase()) >= 0) - } - }, - loadAll() { - return searchContent - }, - handleSelect(item) { - this.$router.push({ - path: `/preference/${item.category.toLowerCase()}` - }) - }, - handleCategoryItemClick (item) { - this.$router.push({ - path: item.path - }) } }, - mounted() { - this.restaurants = this.loadAll() + loadAll () { + return searchContent + }, + handleSelect (item) { + this.$router.push({ + path: `/preference/${item.category.toLowerCase()}` + }) + }, + handleCategoryItemClick (item) { + this.$router.push({ + path: item.path + }) } + }, + mounted () { + this.restaurants = this.loadAll() + } } diff --git a/src/renderer/prefComponents/theme/index.vue b/src/renderer/prefComponents/theme/index.vue index 78036a5d..f92074cd 100644 --- a/src/renderer/prefComponents/theme/index.vue +++ b/src/renderer/prefComponents/theme/index.vue @@ -15,7 +15,7 @@ Open the themes folder Open Folder - +
Import custom themes Import theme @@ -42,7 +42,7 @@ export default { }, computed: { ...mapState({ - 'theme': state => state.preferences.theme + theme: state => state.preferences.theme }) }, created () { diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js index ad8235d6..d13bfdc1 100644 --- a/src/renderer/router/index.js +++ b/src/renderer/router/index.js @@ -8,11 +8,12 @@ import Image from '@/prefComponents/image' import ImageUploader from '@/prefComponents/imageUploader' const routes = type => ([{ - path: '/', redirect: type === 'editor'? '/editor' : '/preference' + path: '/', redirect: type === 'editor' ? '/editor' : '/preference' }, { - path: '/editor', component: App + path: '/editor', component: App }, { - path: '/preference', component: Preference, + path: '/preference', + component: Preference, children: [{ path: '', component: General }, { diff --git a/src/renderer/services/notification/index.js b/src/renderer/services/notification/index.js index 8abbf869..40c98e9d 100644 --- a/src/renderer/services/notification/index.js +++ b/src/renderer/services/notification/index.js @@ -109,7 +109,7 @@ const notification = { const notices = document.querySelectorAll('.mt-notification') let i let hx = 0 - let len = notices.length + const len = notices.length for (i = 0; i < len; i++) { notices[i].style.transform = `translate(0, -${hx}px)` notices[i].style.zIndex = 10000 - i diff --git a/src/renderer/services/printService.js b/src/renderer/services/printService.js index 463b6714..9ebe728e 100644 --- a/src/renderer/services/printService.js +++ b/src/renderer/services/printService.js @@ -1,14 +1,13 @@ import { getImageInfo } from 'muya/lib/utils' class MarkdownPrint { - /** * Prepare document export and append a hidden print container to the window. * * @param {string} html HTML string * @param {boolean} [renderStatic] Render for static files like PDF documents */ - renderMarkdown (html, renderStatic=false) { + renderMarkdown (html, renderStatic = false) { this.clearup() const printContainer = document.createElement('article') printContainer.classList.add('print-container') diff --git a/src/renderer/store/editor.js b/src/renderer/store/editor.js index 6eabe880..5d806736 100644 --- a/src/renderer/store/editor.js +++ b/src/renderer/store/editor.js @@ -525,7 +525,7 @@ const actions = { } }) - ipcRenderer.on('mt::new-untitled-tab', (e, selected = true, markdown = '', ) => { + ipcRenderer.on('mt::new-untitled-tab', (e, selected = true, markdown = '') => { // Create a blank tab dispatch('NEW_UNTITLED_TAB', { markdown, selected }) }) @@ -802,7 +802,6 @@ const actions = { LISTEN_FOR_FILE_CHANGE ({ commit, state, rootState }) { ipcRenderer.on('AGANI::update-file', (e, { type, change }) => { - // TODO: A new "changed" notification from different files overwrite the old notification // and the old notification disappears. I think we should bind the notification to the tab. diff --git a/src/renderer/store/index.js b/src/renderer/store/index.js index ef88ad6b..261c7d31 100644 --- a/src/renderer/store/index.js +++ b/src/renderer/store/index.js @@ -19,7 +19,7 @@ const state = { platform: process.platform, // platform of system `darwin` | `win32` | `linux` appVersion: process.versions.MARKTEXT_VERSION_STRING, // Mark Text version string windowActive: true, // whether current window is active or focused - init: false, // whether Mark Text is initialized + init: false // whether Mark Text is initialized } const getters = {} diff --git a/src/renderer/store/preferences.js b/src/renderer/store/preferences.js index 38745f5d..dd099bf6 100644 --- a/src/renderer/store/preferences.js +++ b/src/renderer/store/preferences.js @@ -19,7 +19,7 @@ const state = { lineHeight: 1.6, codeFontSize: 14, codeFontFamily: 'DejaVu Sans Mono', - editorLineWidth: "", + editorLineWidth: '', autoPairBracket: true, autoPairMarkdownSyntax: true, @@ -44,7 +44,7 @@ const state = { sourceCodeModeEnabled: false, searchExclusions: [], - searchMaxFileSize: "", + searchMaxFileSize: '', searchIncludeHidden: false, searchNoIgnore: false, searchFollowSymlinks: true, diff --git a/src/renderer/util/day.js b/src/renderer/util/day.js index 50c58cb3..7763b3ae 100644 --- a/src/renderer/util/day.js +++ b/src/renderer/util/day.js @@ -7,4 +7,4 @@ import relativeTime from 'dayjs/esm/plugin/relativeTime' dayjs.extend(relativeTime) -export default dayjs \ No newline at end of file +export default dayjs diff --git a/src/renderer/util/fileSystem.js b/src/renderer/util/fileSystem.js index 2ee72eab..0e3fede1 100644 --- a/src/renderer/util/fileSystem.js +++ b/src/renderer/util/fileSystem.js @@ -97,7 +97,7 @@ export const uploadImage = async (pathname, image, preferences) => { re(res.data.data.url) }) - .catch(err => { + .catch(_ => { rj('Upload failed, the image will be copied to the image folder') }) } @@ -118,9 +118,9 @@ export const uploadImage = async (pathname, image, preferences) => { }).then(result => { re(result.data.content.download_url) }) - .catch(err => { - rj('Upload failed, the image will be copied to the image folder') - }) + .catch(_ => { + rj('Upload failed, the image will be copied to the image folder') + }) } const notification = () => { diff --git a/src/renderer/util/index.js b/src/renderer/util/index.js index a637ecb5..c1b12103 100644 --- a/src/renderer/util/index.js +++ b/src/renderer/util/index.js @@ -50,13 +50,13 @@ export const collection = { setItem (emoji) { const data = localStorage.getItem(DOTU_COLLECTION) if (data) { - let col = JSON.parse(data) + const col = JSON.parse(data) if (col.findIndex(c => c.link === emoji.link) === -1) { col.push(emoji) } localStorage.setItem(DOTU_COLLECTION, JSON.stringify(col)) } else { - localStorage.setItem(DOTU_COLLECTION, JSON.stringify([ emoji ])) + localStorage.setItem(DOTU_COLLECTION, JSON.stringify([emoji])) } }, getItems () { @@ -87,7 +87,7 @@ export const dotuHistory = { } localStorage.setItem(DOTU, JSON.stringify(history)) } else { - localStorage.setItem(DOTU, JSON.stringify([ value ])) + localStorage.setItem(DOTU, JSON.stringify([value])) } }, getItems () { @@ -138,9 +138,9 @@ export const adjustCursor = (cursor, preline, line, nextline) => { } export const animatedScrollTo = function (element, to, duration, callback) { - let start = element.scrollTop - let change = to - start - let animationStart = +new Date() + const start = element.scrollTop + const change = to - start + const animationStart = +new Date() let animating = true let lastpos = null @@ -185,7 +185,7 @@ export const hasKeys = obj => Object.keys(obj).length > 0 * @param {*} obj Object to clone * @param {Boolean} deepCopy Create a shallow (false) or deep copy (true) */ -export const cloneObj = (obj, deepCopy=true) => { +export const cloneObj = (obj, deepCopy = true) => { return deepCopy ? JSON.parse(JSON.stringify(obj)) : Object.assign({}, obj) } diff --git a/src/renderer/util/listToTree.js b/src/renderer/util/listToTree.js index f7ff7d4c..b2e57839 100644 --- a/src/renderer/util/listToTree.js +++ b/src/renderer/util/listToTree.js @@ -7,6 +7,7 @@ class Node { this.slug = slug this.children = [] } + // Add child node. addChild (node) { this.children.push(node) diff --git a/src/renderer/util/theme.js b/src/renderer/util/theme.js index 85fd2337..4d2539a0 100644 --- a/src/renderer/util/theme.js +++ b/src/renderer/util/theme.js @@ -28,7 +28,7 @@ const getThemeCluster = themeColor => { red = red.toString(16) green = green.toString(16) blue = blue.toString(16) - return `#${ red }${ green }${ blue }` + return `#${red}${green}${blue}` } } diff --git a/src/renderer/util/themeColor.js b/src/renderer/util/themeColor.js index d9a5d250..2d75b361 100644 --- a/src/renderer/util/themeColor.js +++ b/src/renderer/util/themeColor.js @@ -1,4 +1,4 @@ -import darkTheme from '../assets/themes/dark.theme.css' +import darkTheme from '../assets/themes/dark.theme.css' import graphiteTheme from '../assets/themes/graphite.theme.css' import materialDarkTheme from '../assets/themes/material-dark.theme.css' import oneDarkTheme from '../assets/themes/one-dark.theme.css' diff --git a/test/specs/commonMark/run.spec.js b/test/specs/commonMark/run.spec.js index 9efdca4f..e78f1f03 100644 --- a/test/specs/commonMark/run.spec.js +++ b/test/specs/commonMark/run.spec.js @@ -19,7 +19,7 @@ const getSpecs = async () => { return fetch(`https://spec.commonmark.org/${version}/spec.json`) .then(res => res.json()) - .then (specs => ({ specs, version })) + .then(specs => ({ specs, version })) } const getMarkedSpecs = async (version) => { diff --git a/test/specs/gfm/run.spec.js b/test/specs/gfm/run.spec.js index 63cc0de1..59e375d1 100644 --- a/test/specs/gfm/run.spec.js +++ b/test/specs/gfm/run.spec.js @@ -16,31 +16,31 @@ const htmlDiffer = new HtmlDiffer(options) const getSpecs = () => { return fetch('https://github.github.com/gfm/') - .then(res => res.text()) - .then(html => cheerio.load(html)) - .then($ => { - const version = $('.version').text().match(/\d+\.\d+/)[0] - if (!version) { - throw new Error('No version found') - } - const specs = [] - $('.extension').each((i, ext) => { - const section = $('.definition', ext).text().trim().replace(/^\d+\.\d+(.*?) \(extension\)[\s\S]*$/, '$1') - $('.example', ext).each((j, exa) => { - const example = +$(exa).attr('id').replace(/\D/g, '') - const markdown = $('.language-markdown', exa).text().trim() - const html = $('.language-html', exa).text().trim() - specs.push({ - section, - html, - markdown, - example + .then(res => res.text()) + .then(html => cheerio.load(html)) + .then($ => { + const version = $('.version').text().match(/\d+\.\d+/)[0] + if (!version) { + throw new Error('No version found') + } + const specs = [] + $('.extension').each((i, ext) => { + const section = $('.definition', ext).text().trim().replace(/^\d+\.\d+(.*?) \(extension\)[\s\S]*$/, '$1') + $('.example', ext).each((j, exa) => { + const example = +$(exa).attr('id').replace(/\D/g, '') + const markdown = $('.language-markdown', exa).text().trim() + const html = $('.language-html', exa).text().trim() + specs.push({ + section, + html, + markdown, + example + }) }) }) - }) - return [version, specs] - }) + return [version, specs] + }) } const getMarkedSpecs = async (version) => { diff --git a/test/unit/specs/markdown-basic.spec.js b/test/unit/specs/markdown-basic.spec.js index 65c8f82a..452aa967 100644 --- a/test/unit/specs/markdown-basic.spec.js +++ b/test/unit/specs/markdown-basic.spec.js @@ -4,8 +4,8 @@ import ExportMarkdown from '../../../src/muya/lib/utils/exportMarkdown' import { MUYA_DEFAULT_OPTION } from '../../../src/muya/lib/config' import * as templates from '../markdown' -const defaultOptions = { 'endOfLine': 'lf' } -const defaultOptionsCrlf = Object.assign({}, defaultOptions, { 'endOfLine': 'crlf' }) +const defaultOptions = { endOfLine: 'lf' } +const defaultOptionsCrlf = Object.assign({}, defaultOptions, { endOfLine: 'crlf' }) const createMuyaContext = options => { const ctx = {} diff --git a/test/unit/specs/markdown-list-indentation.spec.js b/test/unit/specs/markdown-list-indentation.spec.js index 1fe98ef6..84b3da79 100644 --- a/test/unit/specs/markdown-list-indentation.spec.js +++ b/test/unit/specs/markdown-list-indentation.spec.js @@ -166,7 +166,7 @@ sep verifyMarkdown(md, 4) }) -/* it('Indent by one tab', () => { + /* it('Indent by one tab', () => { const md = `start - foo @@ -193,7 +193,7 @@ sep \t\t\t1. foo ` verifyMarkdown(md, "tab") - })*/ + }) */ it('Indent using Daring Fireball Markdown Spec', () => { const md = `start @@ -221,6 +221,6 @@ sep 1. foo ` - verifyMarkdown(md, "dfm", md) + verifyMarkdown(md, 'dfm', md) }) }) diff --git a/yarn.lock b/yarn.lock index 9c0bf607..b9b5b14b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"7zip-bin@~4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.1.0.tgz#33eff662a5c39c0c2061170cc003c5120743fff0" - integrity sha512-AsnBZN3a8/JcNt+KPkGGODaA4c7l3W5+WpeKgGSbstSLxqWtTXqd1ieJGBQ8IFCtRg8DmmKUcSkIkUc0A4p3YA== +"7zip-bin@~5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" + integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA== "7zip@0.0.6": version "0.0.6" @@ -168,10 +168,10 @@ deprecation "^2.0.0" once "^1.4.0" -"@octokit/request@^4.0.1": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-4.1.0.tgz#e85dc377113baf2fe24433af8feb20e8a32e21b0" - integrity sha512-RvpQAba4i+BNH0z8i0gPRc1ShlHidj4puQjI/Tno6s+Q3/Mzb0XRSHJiOhpeFrZ22V7Mwjq1E7QS27P5CgpWYA== +"@octokit/request@^5.0.0": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.0.1.tgz#6705c9a883db0ac0f58cee717e806b6575d4a199" + integrity sha512-SHOk/APYpfrzV1RNf7Ux8SZi+vZXhMIB2dBr4TQR6ExMX8R4jcy/0gHw26HLe1dWV7Wxe9WzYyDSEC0XwnoCSQ== dependencies: "@octokit/endpoint" "^5.1.0" "@octokit/request-error" "^1.0.1" @@ -179,17 +179,17 @@ is-plain-object "^3.0.0" node-fetch "^2.3.0" once "^1.4.0" - universal-user-agent "^2.1.0" + universal-user-agent "^3.0.0" -"@octokit/rest@^16.28.2": - version "16.28.2" - resolved "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.2.tgz#3fc3b8700046ab29ab1e2a4bdf49f89e94f7ba27" - integrity sha512-csuYiHvJ1P/GFDadVn0QhwO83R1+YREjcwCY7ZIezB6aJTRIEidJZj+R7gAkUhT687cqYb4cXTZsDVu9F+Fmug== +"@octokit/rest@^16.28.5": + version "16.28.5" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.28.5.tgz#56a5a37fc45a6520199189ac3e5eb09420c0ef6f" + integrity sha512-W8hHSm6103c+lNdTuQBMKdZNDCOFFXJdatj92g2d6Hqk134EMDHRc02QWI/Fs1WGnWZ8Leb0QFbXPKO2njeevQ== dependencies: - "@octokit/request" "^4.0.1" + "@octokit/request" "^5.0.0" "@octokit/request-error" "^1.0.2" atob-lite "^2.0.0" - before-after-hook "^1.4.0" + before-after-hook "^2.0.0" btoa-lite "^1.0.0" deprecation "^2.0.0" lodash.get "^4.4.2" @@ -197,14 +197,31 @@ lodash.uniq "^4.5.0" octokit-pagination-methods "^1.1.0" once "^1.4.0" - universal-user-agent "^2.0.0" + universal-user-agent "^3.0.0" url-template "^2.0.8" +"@sindresorhus/is@^0.14.0": + version "0.14.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" + integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== + +"@szmarczak/http-timer@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== + dependencies: + defer-to-connect "^1.0.1" + "@types/clone@~0.1.30": version "0.1.30" resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614" integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ= +"@types/debug@^4.1.4": + version "4.1.4" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.4.tgz#56eec47706f0fd0b7c694eae2f3172e6b0b769da" + integrity sha512-D9MyoQFI7iP5VdpEyPZyjjqIJ8Y8EDNQFIFVLOmeg1rI1xiHOChyUPMPRUVfqFCerxfE+yS3vMyj37F6IdtOoQ== + "@types/events@*": version "3.0.0" resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" @@ -244,10 +261,15 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8" integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw== -"@vue/component-compiler-utils@^2.5.1": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz#aa46d2a6f7647440b0b8932434d22f12371e543b" - integrity sha512-IHjxt7LsOFYc0DkTncB7OXJL7UzwOLPPQCfEUNyxL2qt+tF12THV+EO33O1G2Uk4feMSWua3iD39Itszx0f0bw== +"@types/semver@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.0.1.tgz#a984b405c702fa5a7ec6abc56b37f2ba35ef5af6" + integrity sha512-ffCdcrEE5h8DqVxinQjo+2d1q+FV5z7iNtPofw3JsrltSoSVlOGaW0rY8XxtO9XukdTn8TaCGWmk2VFGhI70mg== + +"@vue/component-compiler-utils@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz#d16fa26b836c06df5baaeb45f3d80afc47e35634" + integrity sha512-am+04/0UX7ektcmvhYmrf84BDVAD8afFOf4asZjN84q8xzxFclbk5x0MtxuKGfp+zjN5WWPJn3fjFAWtDdIGSw== dependencies: consolidate "^0.15.1" hash-sum "^1.0.2" @@ -451,11 +473,6 @@ accessibility-developer-tools@^2.11.0: resolved "https://registry.yarnpkg.com/accessibility-developer-tools/-/accessibility-developer-tools-2.12.0.tgz#3da0cce9d6ec6373964b84f35db7cfc3df7ab514" integrity sha1-PaDM6dbsY3OWS4TzXbfPw996tRQ= -acorn-dynamic-import@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" - integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw== - acorn-globals@^4.1.0: version "4.3.2" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz#4e2c2313a597fd589720395f6354b41cd5ec8006" @@ -479,11 +496,16 @@ acorn@^5.5.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== -acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.5, acorn@^6.0.7: +acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.7: version "6.1.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f" integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA== +acorn@^6.2.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.1.tgz#3ed8422d6dec09e6121cc7a843ca86a330a86b51" + integrity sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q== + after@0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" @@ -494,12 +516,17 @@ ajv-errors@^1.0.0: resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== -ajv-keywords@^3.1.0, ajv-keywords@^3.4.0: +ajv-keywords@^3.1.0: version "3.4.0" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d" integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw== -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.5.5, ajv@^6.9.1, ajv@^6.9.2: +ajv-keywords@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" + integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== + +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.5.5, ajv@^6.9.1: version "6.10.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1" integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg== @@ -509,6 +536,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.5.5, ajv@^6.9.1, ajv@^6.9.2: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.10.1: + version "6.10.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52" + integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw== + dependencies: + fast-deep-equal "^2.0.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + align-text@^0.1.1, align-text@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" @@ -528,12 +565,12 @@ animation-frame-polyfill@^1.0.0: resolved "https://registry.yarnpkg.com/animation-frame-polyfill/-/animation-frame-polyfill-1.0.1.tgz#5f5ad993a78794bd176acde5b6dce62867410c9d" integrity sha1-X1rZk6eHlL0Xas3lttzmKGdBDJ0= -ansi-align@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" - integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38= +ansi-align@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" + integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw== dependencies: - string-width "^2.0.0" + string-width "^3.0.0" ansi-colors@3.2.3: version "3.2.3" @@ -603,40 +640,70 @@ anymatch@^3.0.1: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@2.6.6: - version "2.6.6" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.6.tgz#904b0576a510047d03f63c8a02c38eef47871180" - integrity sha512-G0Ee6xkbxV+fvM/7xXWIgSDjWAD4E/d/aNbxerq/TVsCyBIau/0VPmrEqBMyZv0NbTwLDW5aF/yHG+0ZEY77kA== +app-builder-bin@3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.4.0.tgz#620d7f941dad157206c267bb0b437fee43889b33" + integrity sha512-ZyQqfFnyjAmXep29PmuMIu2KvGlfHiziz2/I38zOFe5kqnkMqeNNn/qmnwD6wdCKKeHqBuZtoWQnft8q0YyLpw== -app-builder-lib@20.40.2, app-builder-lib@~20.40.0: - version "20.40.2" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.40.2.tgz#b0f0c82ed6a59bf660d861531b063a99d3e2b442" - integrity sha512-SAbfua8+L3pFbQp3QFpKV0PzHJPJqepROeX/FPrfdL02zxlw+BVOe6KfC3+UV6XUombWvVPG+SwG956vfIx/Cw== +app-builder-bin@3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.4.1.tgz#81a9268b8ec2fedd1e787052cbfd7ed3f497ae30" + integrity sha512-zyNWkkzxTtojn+kg0h9lr3IywicYfocEbJi35YkaVUsP1W5HkbIr+Ld1PoEuUJVrErNQAcLrv3KaXNL5BJLwwQ== + +app-builder-lib@21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.1.1.tgz#ab30bcbcf61541e46d68912cc48c65a89169c2aa" + integrity sha512-nG5w9xjv4c16ki+pyBPqJvUCtQY97XQNsA4dEBryq6vClwDTkwKrl7aS0cXjo3dsWKsf/5EIcLrV0tfIiXUqJA== dependencies: - "7zip-bin" "~4.1.0" - app-builder-bin "2.6.6" + "7zip-bin" "~5.0.3" async-exit-hook "^2.0.1" - bluebird-lst "^1.0.7" - builder-util "9.7.1" - builder-util-runtime "8.2.1" + bluebird-lst "^1.0.9" + builder-util "21.1.1" + builder-util-runtime "8.3.0" chromium-pickle-js "^0.2.0" debug "^4.1.1" - ejs "^2.6.1" - electron-osx-sign "0.4.11" - electron-publish "20.40.0" - fs-extra-p "^7.0.1" + ejs "^2.6.2" + electron-publish "21.1.1" + fs-extra "^8.1.0" hosted-git-info "^2.7.1" is-ci "^2.0.0" - isbinaryfile "^4.0.0" - js-yaml "^3.13.0" + isbinaryfile "^4.0.2" + js-yaml "^3.13.1" lazy-val "^1.0.4" minimatch "^3.0.4" normalize-package-data "^2.5.0" - plist "^3.0.1" - read-config-file "3.2.2" + read-config-file "4.0.1" sanitize-filename "^1.6.1" - semver "^6.0.0" - temp-file "^3.3.2" + semver "^6.2.0" + temp-file "^3.3.4" + +app-builder-lib@~21.1.1: + version "21.1.2" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.1.2.tgz#f93ccf7695836dd18150dac2410a37e949e6cd56" + integrity sha512-31LbXgyJ5UHOiWdN/WmhBLZTOIpw83c5CxY64uavy955SDnnKHueEdC11Np4mVilt8lnx2bL6mlzeeu5UbPdQQ== + dependencies: + "7zip-bin" "~5.0.3" + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.9" + builder-util "21.1.2" + builder-util-runtime "8.3.0" + chromium-pickle-js "^0.2.0" + debug "^4.1.1" + ejs "^2.6.2" + electron-publish "21.1.2" + fs-extra "^8.1.0" + hosted-git-info "^2.7.1" + is-ci "^2.0.0" + isbinaryfile "^4.0.2" + js-yaml "^3.13.1" + lazy-val "^1.0.4" + minimatch "^3.0.4" + normalize-package-data "^2.5.0" + read-config-file "5.0.0" + sanitize-filename "^1.6.1" + schema-utils "^2.0.1" + semver "^6.2.0" + temp-file "^3.3.4" aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" @@ -677,10 +744,10 @@ are-we-there-yet@~1.1.2: delegates "^1.0.0" readable-stream "^2.0.6" -arg@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.0.tgz#583c518199419e0037abb74062c37f8519e575f0" - integrity sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg== +arg@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.1.tgz#485f8e7c390ce4c5f78257dbea80d4be11feda4c" + integrity sha512-SlmP3fEA88MBv0PypnXZ8ZfJhwmDeIE3SP71j37AiXQBXYosPV0x6uISAaHYSlSVhmHOVkomen0tbGk6Anlebw== argparse@^1.0.7: version "1.0.10" @@ -812,7 +879,7 @@ astral-regex@^1.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== -async-each@^1.0.1, async-each@^1.0.3: +async-each@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== @@ -940,10 +1007,10 @@ babel-core@^6.26.0, babel-core@^6.26.3, babel-core@~6: slash "^1.0.0" source-map "^0.5.7" -babel-eslint@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz#919681dc099614cd7d31d45c8908695092a1faed" - integrity sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ== +babel-eslint@^10.0.2: + version "10.0.2" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.2.tgz#182d5ac204579ff0881684b040560fdcc1558456" + integrity sha512-UdsurWPtgiPgpJ06ryUnuaSXC2s0WoSZnQmEpbAH65XZSdwowgN5MvyP7e88nW07FYXv72erVtpBkxyDVKhH1Q== dependencies: "@babel/code-frame" "^7.0.0" "@babel/parser" "^7.0.0" @@ -1695,10 +1762,10 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -before-after-hook@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.4.0.tgz#2b6bf23dca4f32e628fd2747c10a37c74a4b484d" - integrity sha512-l5r9ir56nda3qu14nAXIlyq1MmUSs0meCIaFAh8HwkFwP1F8eToOuS3ah2VAHHcY04jaYD7FpJC5JTXHYRbkzg== +before-after-hook@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635" + integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A== better-assert@~1.0.0: version "1.0.2" @@ -1750,25 +1817,23 @@ blob@0.0.5: resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= +bluebird-lst@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" + integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw== dependencies: - inherits "~2.0.0" - -bluebird-lst@^1.0.6, bluebird-lst@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.7.tgz#f0babade9ef1dce3989b603f3796ff3b16b90d50" - integrity sha512-5ix04IbXVIZ6nSRM4aZnwQfk40Td0D57WAl8LfhnICF6XwT4efCZYh0veOHvfDmgpbqE4ju5L5XEAMIcAe13Kw== - dependencies: - bluebird "^3.5.3" + bluebird "^3.5.5" bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3: version "3.5.4" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714" integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw== +bluebird@^3.5.5: + version "3.5.5" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f" + integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w== + bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" @@ -1823,17 +1888,18 @@ boolbase@^1.0.0, boolbase@~1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= -boxen@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" - integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw== +boxen@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-3.2.0.tgz#fbdff0de93636ab4450886b6ff45b92d098f45eb" + integrity sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A== dependencies: - ansi-align "^2.0.0" - camelcase "^4.0.0" - chalk "^2.0.1" - cli-boxes "^1.0.0" - string-width "^2.0.0" + ansi-align "^3.0.0" + camelcase "^5.3.1" + chalk "^2.4.2" + cli-boxes "^2.2.0" + string-width "^3.0.0" term-size "^1.2.0" + type-fest "^0.3.0" widest-line "^2.0.0" brace-expansion@^1.1.7: @@ -2023,43 +2089,51 @@ buffer@^5.1.0: base64-js "^1.0.2" ieee754 "^1.1.4" -builder-util-runtime@8.2.1, builder-util-runtime@^8.2.1: - version "8.2.1" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.2.1.tgz#2d16be6cb040b3654d84b76487256158e60b6e3b" - integrity sha512-2TkeTcI9bDlK5azRZSJJNxhAgW1DK+JY3jHK0UWPxgJcan4GZSVDNNO3sXntNxrp+JAdPHMF14rzNd/G53lvqw== +builder-util-runtime@8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.3.0.tgz#f5fac9139af6facf42a21fbe4d3aebed88fda33e" + integrity sha512-CSOdsYqf4RXIHh1HANPbrZHlZ9JQJXSuDDloblZPcWQVN62inyYoTQuSmY3KrgefME2Sv3Kn2MxHvbGQHRf8Iw== dependencies: - bluebird-lst "^1.0.7" debug "^4.1.1" - fs-extra-p "^7.0.1" sax "^1.2.4" -builder-util-runtime@~8.1.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.1.1.tgz#f2f6fc43e33d26892bd491667fc746ad69bccc50" - integrity sha512-+ieS4PMB33vVE2S3ZNWBEQJ1zKmAs/agrBdh7XadE1lKLjrH4aXYuOh9OOGdxqIRldhlhNBaF+yKMMEFOdNVig== +builder-util@21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-21.1.1.tgz#45c0d0e1b51d1f85b835a1645f435722cbd9a1d6" + integrity sha512-+t6pbMo/COTYDfqfRDrWDi9tuPxBctb0S9PVt8Kgd+K0eqD1lvbF05rrkiQpXIrhb6cndXgcl3FG18Oqgy5YPg== dependencies: - bluebird-lst "^1.0.6" - debug "^4.1.1" - fs-extra-p "^7.0.0" - sax "^1.2.4" - -builder-util@9.7.1, builder-util@~9.7.1: - version "9.7.1" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.7.1.tgz#31234b48ac574eb1cd4b4eaa982c0480571eae7a" - integrity sha512-txpzYIeuHFjrOQWPTJDvhJYisIVGJdSG9ppccE+y7agT0YNhBlVHGnd8+HgFTajYE34xzB5zf1/zxiiDqSKSpA== - dependencies: - "7zip-bin" "~4.1.0" - app-builder-bin "2.6.6" - bluebird-lst "^1.0.7" - builder-util-runtime "^8.2.1" + "7zip-bin" "~5.0.3" + "@types/debug" "^4.1.4" + app-builder-bin "3.4.0" + bluebird-lst "^1.0.9" + builder-util-runtime "8.3.0" chalk "^2.4.2" debug "^4.1.1" - fs-extra-p "^7.0.1" + fs-extra "^8.1.0" is-ci "^2.0.0" - js-yaml "^3.13.0" - source-map-support "^0.5.11" + js-yaml "^3.13.1" + source-map-support "^0.5.12" stat-mode "^0.3.0" - temp-file "^3.3.2" + temp-file "^3.3.4" + +builder-util@21.1.2, builder-util@~21.1.1, builder-util@~21.1.2: + version "21.1.2" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-21.1.2.tgz#a2bee5c1f402d7048da901ebe68f2dacd8ac0903" + integrity sha512-HNUzZE4vnb3dk6+2bCvHkGSOJWb8Xy9HGdNu/zIlxpmwHztc62xjgOotQuZhHDXOMk4KCV0kSEyRC+lOeVaEMQ== + dependencies: + "7zip-bin" "~5.0.3" + "@types/debug" "^4.1.4" + app-builder-bin "3.4.1" + bluebird-lst "^1.0.9" + builder-util-runtime "8.3.0" + chalk "^2.4.2" + debug "^4.1.1" + fs-extra "^8.1.0" + is-ci "^2.0.0" + js-yaml "^3.13.1" + source-map-support "^0.5.12" + stat-mode "^0.3.0" + temp-file "^3.3.4" builtin-status-codes@^3.0.0: version "3.0.0" @@ -2111,6 +2185,19 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" +cacheable-request@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^3.0.0" + lowercase-keys "^2.0.0" + normalize-url "^4.1.0" + responselike "^1.0.2" + callsite@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" @@ -2147,12 +2234,7 @@ camelcase@^2.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= -camelcase@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= - -camelcase@^5.0.0, camelcase@^5.2.0: +camelcase@^5.0.0, camelcase@^5.2.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== @@ -2167,11 +2249,6 @@ caniuse-lite@^1.0.30000939, caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.300009 resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8" integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww== -capture-stack-trace@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d" - integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw== - caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -2207,6 +2284,15 @@ chai@^4.2.0: pathval "^1.1.0" type-detect "^4.0.5" +chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -2218,15 +2304,6 @@ chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - change-case@3.0.x: version "3.0.2" resolved "https://registry.yarnpkg.com/change-case/-/change-case-3.0.2.tgz#fd48746cce02f03f0a672577d1d3a8dc2eceb037" @@ -2345,19 +2422,18 @@ chokidar@^2.1.6: optionalDependencies: fsevents "^1.2.7" -chokidar@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.0.1.tgz#98fe9aa476c55d9aea7841d6325ffdb30e95b40c" - integrity sha512-2ww34sJWehnbpV0Q4k4V5Hh7juo7po6z7LUWkcIQnSGN1lHOL8GGtLtfwabKvLFQw/hbSUQ0u6V7OgGYgBzlkQ== +chokidar@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.2.tgz#0d1cd6d04eb2df0327446188cd13736a3367d681" + integrity sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA== dependencies: anymatch "^3.0.1" - async-each "^1.0.3" braces "^3.0.2" glob-parent "^5.0.0" is-binary-path "^2.1.0" is-glob "^4.0.1" normalize-path "^3.0.0" - readdirp "^3.0.2" + readdirp "^3.1.1" optionalDependencies: fsevents "^2.0.6" @@ -2378,11 +2454,6 @@ chromium-pickle-js@^0.2.0: resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU= -ci-info@^1.5.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" - integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== - ci-info@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" @@ -2421,10 +2492,10 @@ clean-css@4.2.x: dependencies: source-map "~0.6.0" -cli-boxes@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" - integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM= +cli-boxes@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d" + integrity sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w== cli-cursor@^1.0.2: version "1.0.2" @@ -2486,6 +2557,13 @@ cliui@^5.0.0: strip-ansi "^5.2.0" wrap-ansi "^5.1.0" +clone-response@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + dependencies: + mimic-response "^1.0.0" + clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" @@ -2515,10 +2593,10 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -codemirror@^5.46.0: - version "5.46.0" - resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.46.0.tgz#be3591572f88911e0105a007c324856a9ece0fb7" - integrity sha512-3QpMge0vg4QEhHW3hBAtCipJEWjTJrqLLXdIaWptJOblf1vHFeXLNtFhPai/uX2lnFCehWNk4yOdaMR853Z02w== +codemirror@^5.48.2: + version "5.48.2" + resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.48.2.tgz#a9dd3d426dea4cd59efd59cd98e20a9152a30922" + integrity sha512-i9VsmC8AfA5ji6EDIZ+aoSe4vt9FcwPLdHB1k1ItFbVyuOFRrcfvnoKqwZlC7EVA2UmTRiNEypE4Uo7YvzVY8Q== collection-visit@^1.0.0: version "1.0.0" @@ -2613,11 +2691,6 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= -compare-version@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" - integrity sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA= - component-bind@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" @@ -2683,10 +2756,10 @@ concat-stream@1.6.2, concat-stream@^1.5.0: readable-stream "^2.2.2" typedarray "^0.0.6" -conf@^4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/conf/-/conf-4.1.0.tgz#c7029f629d7158eaf03ae118484d100f878c28b2" - integrity sha512-/G++SsVVt4MkKYZ1E+XdNEyCYghM7e7SSgx4PA55lQrmJjUY1APGGfz42YX9YpRkhLFvlhkJ5S341FWsufZZ5w== +conf@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/conf/-/conf-5.0.0.tgz#6530308a36041bf010ab96b05a0f4aff5101c65d" + integrity sha512-lRNyt+iRD4plYaOSVTxu1zPWpaH0EOxgFIR1l3mpC/DGZ7XzhoGFMKmbl54LAgXcSu6knqWgOwdINkqm58N85A== dependencies: ajv "^6.10.0" dot-prop "^5.0.0" @@ -2696,10 +2769,10 @@ conf@^4.1.0: pkg-up "^3.0.1" write-file-atomic "^3.0.0" -configstore@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" - integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw== +configstore@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-4.0.0.tgz#5933311e95d3687efb592c528b922d9262d227e7" + integrity sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ== dependencies: dot-prop "^4.1.0" graceful-fs "^4.1.2" @@ -2895,13 +2968,6 @@ create-ecdh@^4.0.0: bn.js "^4.1.0" elliptic "^6.0.0" -create-error-class@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" - integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y= - dependencies: - capture-stack-trace "^1.0.0" - create-hash@^1.1.0, create-hash@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" @@ -2940,16 +3006,7 @@ cross-env@^5.2.0: cross-spawn "^6.0.5" is-windows "^1.0.0" -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^6.0.0, cross-spawn@^6.0.5: +cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== @@ -2960,6 +3017,15 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" +cross-spawn@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + cross-unzip@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/cross-unzip/-/cross-unzip-0.0.2.tgz#5183bc47a09559befcf98cc4657964999359372f" @@ -3065,14 +3131,6 @@ css-select@^2.0.0: domutils "^1.7.0" nth-check "^1.0.2" -css-tree@1.0.0-alpha.28: - version "1.0.0-alpha.28" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.28.tgz#8e8968190d886c9477bc8d61e96f61af3f7ffa7f" - integrity sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w== - dependencies: - mdn-data "~1.1.0" - source-map "^0.5.3" - css-tree@1.0.0-alpha.29: version "1.0.0-alpha.29" resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39" @@ -3081,10 +3139,13 @@ css-tree@1.0.0-alpha.29: mdn-data "~1.1.0" source-map "^0.5.3" -css-url-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz#83834230cc9f74c457de59eebd1543feeb83b7ec" - integrity sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w= +css-tree@1.0.0-alpha.33: + version "1.0.0-alpha.33" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.33.tgz#970e20e5a91f7a378ddd0fc58d0b6c8d4f3be93e" + integrity sha512-SPt57bh5nQnpsTBsx/IXbO14sRc9xXu5MtMAVuo0BaQQmyf0NupNPPSoMaqiAF5tDFafYsTkfeH4Q/HCKXkg4w== + dependencies: + mdn-data "2.0.4" + source-map "^0.5.3" css-value@~0.0.1: version "0.0.1" @@ -3492,10 +3553,10 @@ dateformat@^1.0.6: get-stdin "^4.0.1" meow "^3.3.0" -dayjs@^1.8.14: - version "1.8.14" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.14.tgz#43e4f62830c2c3342c3fcd25934dc9162dbe6f38" - integrity sha512-AVhDmRTe541iWirnoeFSSDDGvCT6HWaNQ4z2WmmzXMGZj6ph6ydao2teKq/eUtR43GPJXlYFD+C/SotG1P9wUQ== +dayjs@^1.8.15: + version "1.8.15" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.15.tgz#7121bc04e6a7f2621ed6db566be4a8aaf8c3913e" + integrity sha512-HYHCI1nohG52B45vCQg8Re3hNDZbMroWPkhz50yaX7Lu0ATyjGsTdoYZBpjED9ar6chqTx2dmSmM8A51mojnAg== de-indent@^1.0.2: version "1.0.2" @@ -3609,6 +3670,11 @@ defaults@^1.0.3: dependencies: clone "^1.0.2" +defer-to-connect@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.0.2.tgz#4bae758a314b034ae33902b5aac25a8dd6a8633e" + integrity sha512-k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw== + define-properties@^1.1.2, define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -3764,17 +3830,17 @@ dir-glob@^2.0.0: dependencies: path-type "^3.0.0" -dmg-builder@6.6.1: - version "6.6.1" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.6.1.tgz#d1761e36e624ebe3f6c57a8c4d728b95b51fb255" - integrity sha512-aIbpQG3es+gHTFtsBQE4fmSYVM60yewxJZsN6FhkAmAmNaoO45bEQNJZsRX0YE49+imiSC92mJmFAEP6iKE0Tg== +dmg-builder@21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-21.1.1.tgz#a30b2c6fe305f38bbbd06ac2cc0682e5423f7e50" + integrity sha512-WsafJ+LkG20ddVfKfNlJC6AMRKTvLMJhAwAmBHzb+KWhMZVs9/3QY2yd2BIpvWYRfUD/lWd+LmclTNWw7540Cw== dependencies: - app-builder-lib "~20.40.0" - bluebird-lst "^1.0.7" - builder-util "~9.7.1" - fs-extra-p "^7.0.1" - iconv-lite "^0.4.24" - js-yaml "^3.13.0" + app-builder-lib "~21.1.1" + bluebird-lst "^1.0.9" + builder-util "~21.1.1" + fs-extra "^8.1.0" + iconv-lite "^0.5.0" + js-yaml "^3.13.1" parse-color "^1.0.0" sanitize-filename "^1.6.1" @@ -3942,15 +4008,10 @@ dot-prop@^5.0.0: dependencies: is-obj "^1.0.0" -dotenv-expand@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275" - integrity sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU= - -dotenv@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064" - integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w== +dotenv-expand@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" + integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== dotenv@^8.0.0: version "8.0.0" @@ -4003,37 +4064,42 @@ ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ== +ejs@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.2.tgz#3a32c63d1cd16d11266cd4703b14fec4e74ab4f6" + integrity sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q== + ejs@~2.5.6: version "2.5.9" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.9.tgz#7ba254582a560d267437109a68354112475b0ce5" integrity sha512-GJCAeDBKfREgkBtgrYSf9hQy9kTb3helv0zGdzqhM7iAkW8FA/ZF97VQDbwFiwIT8MQLLOe5VlPZOEvZAqtUAQ== -electron-builder@^20.40.2: - version "20.40.2" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.40.2.tgz#434751bbb57be17513eb501848a52d2573a307bb" - integrity sha512-hnnBzyLXna+WpmT4MIoWVdRli43q09yqKOgzPJj0KrOoJZ7TIoY1aYSPvSg8VL5rSuTgdAWGL4rYd9zcq3YXMQ== +electron-builder@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-21.1.1.tgz#eecfd9473ee9ab58fd445a0eb512aef759d509e6" + integrity sha512-4A3h0dhqSranoX7cM0eqkzABeHABH9Nch12003XIZ9MUPV4jL97nK5WBbbVG06qglYTV9x62XAqPPDS+KBOsEg== dependencies: - app-builder-lib "20.40.2" - bluebird-lst "^1.0.7" - builder-util "9.7.1" - builder-util-runtime "8.2.1" + app-builder-lib "21.1.1" + bluebird-lst "^1.0.9" + builder-util "21.1.1" + builder-util-runtime "8.3.0" chalk "^2.4.2" - dmg-builder "6.6.1" - fs-extra-p "^7.0.1" + dmg-builder "21.1.1" + fs-extra "^8.1.0" is-ci "^2.0.0" lazy-val "^1.0.4" - read-config-file "3.2.2" + read-config-file "4.0.1" sanitize-filename "^1.6.1" - update-notifier "^2.5.0" - yargs "^13.2.2" + update-notifier "^3.0.1" + yargs "^13.3.0" -electron-chromedriver@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-3.0.0.tgz#ec0a17badb6c3529813c660bf91a43fb91407674" - integrity sha512-xWivZRiPTtDFJt+qXv7Ax/Dmhxj0iqESOxoLZ2szu3fv6k1vYDUDJUMHfdfVAke9D2gBRIgChuGb5j3YEt6hxQ== +electron-chromedriver@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-5.0.1.tgz#0c102a482f16bd47f54fcdd238cf64210395ff4a" + integrity sha512-w82q6KkIsKjzhcucllpxeulIxYn5rccNw43rpbMuZcgMQ0EPsckoYwUt7Gadmdi14xniZ+debN9SM8V1EUyaBQ== dependencies: - electron-download "^4.1.0" - extract-zip "^1.6.5" + electron-download "^4.1.1" + extract-zip "^1.6.7" electron-devtools-installer@^2.2.4: version "2.2.4" @@ -4045,7 +4111,7 @@ electron-devtools-installer@^2.2.4: rimraf "^2.5.2" semver "^5.3.0" -electron-download@^4.1.0: +electron-download@^4.1.0, electron-download@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-4.1.1.tgz#02e69556705cc456e520f9e035556ed5a015ebe8" integrity sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg== @@ -4070,73 +4136,73 @@ electron-log@^3.0.6: resolved "https://registry.npmjs.org/electron-log/-/electron-log-3.0.6.tgz#2291375572f6be5889f06fb32a35eab2930a1728" integrity sha512-osPLk8m9+Ylo0k/okevdHUGsKpCNGxg206TxG2Ch8slGvlTZLI0955Ig4e+nJ6fHVDxFMv5dWkn2y8hwi0aENg== -electron-osx-sign@0.4.11: - version "0.4.11" - resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.11.tgz#8377732fe7b207969f264b67582ee47029ce092f" - integrity sha512-VVd40nrnVqymvFrY9ZkOYgHJOvexHHYTR3di/SN+mjJ0OWhR1I8BRVj3U+Yamw6hnkZZNKZp52rqL5EFAAPFkQ== +electron-publish@21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-21.1.1.tgz#00acce2c60b45c2696e05852717a2fa7e9110a00" + integrity sha512-cM5XLFolIB5NnVpBKewcUM3Ggg+wm+LeKRYHjcB9ri58cbPKxaN+fRUXAZs3m1U9t7SIgjZy83sUSi3asxMXgQ== dependencies: - bluebird "^3.5.0" - compare-version "^0.1.2" - debug "^2.6.8" - isbinaryfile "^3.0.2" - minimist "^1.2.0" - plist "^3.0.1" - -electron-publish@20.40.0: - version "20.40.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.40.0.tgz#156eacd9b8bab563a3f8723e9b45214915a9681d" - integrity sha512-mkjtsIgftRszuT/8do8TszmddokDnu254OyTeL8nE780o/A8t68oXHZzvlTJ4AQ8uBOYrA87JDO/BFCWjnVArA== - dependencies: - bluebird-lst "^1.0.7" - builder-util "~9.7.1" - builder-util-runtime "^8.2.1" + bluebird-lst "^1.0.9" + builder-util "~21.1.1" + builder-util-runtime "8.3.0" chalk "^2.4.2" - fs-extra-p "^7.0.1" + fs-extra "^8.1.0" lazy-val "^1.0.4" - mime "^2.4.1" + mime "^2.4.4" -electron-rebuild@^1.8.4: - version "1.8.4" - resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.8.4.tgz#cd5384d38c2d6b4463103e375f3779d7abbae19b" - integrity sha512-QBUZg1due+R0bww5rNd4gEcsKczyhxyLrxSFZlKihwHRxaiHrGut532JAUe0fRz+VIU4WNSfNKyZ/ZwSGjaDhA== +electron-publish@21.1.2: + version "21.1.2" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-21.1.2.tgz#df206d96c7e598aa21e0f062474e3365030faf48" + integrity sha512-F5n+w4wREbp4lAGzq1SStnet6tQgFCsJNaYl3+SyF+GOTCWvNIfw+h6rfLykr4b3I3Um0KGa4j2QpLVhJTj7sQ== + dependencies: + bluebird-lst "^1.0.9" + builder-util "~21.1.2" + builder-util-runtime "8.3.0" + chalk "^2.4.2" + fs-extra "^8.1.0" + lazy-val "^1.0.4" + mime "^2.4.4" + +electron-rebuild@^1.8.5: + version "1.8.5" + resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.8.5.tgz#d15d0aa7f2151eb3f2935a596a92c0348984ba55" + integrity sha512-gDwRA3utfiPnFwBZ1z8M4SEMwsdsy6Bg4VGO2ohelMOIO0vxiCrDQ/FVdLk3h2g7fLb06QFUsQU+86jiTSmZxw== dependencies: colors "^1.3.3" debug "^4.1.1" detect-libc "^1.0.3" fs-extra "^7.0.1" - node-abi "^2.7.0" - node-gyp "^3.8.0" - ora "^3.0.0" + node-abi "^2.8.0" + node-gyp "^4.0.0" + ora "^3.4.0" spawn-rx "^3.0.0" - yargs "^12.0.5" + yargs "^13.2.2" -electron-store@^3.3.0: - version "3.3.0" - resolved "https://registry.npmjs.org/electron-store/-/electron-store-3.3.0.tgz#8727bad42ae0b6a95bdd702087878105ef5e8934" - integrity sha512-++k1MjcNya7e7Q/xHm2ys8t2CZZZJDMnihvsonbHJ/7WIQatVaspYzF0oDO0hUmMCNXhHaLbKduPBYkRDXVbXA== +electron-store@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-4.0.0.tgz#5f0835663bb774d5eecb5b283b390f9910ec4cfc" + integrity sha512-qgkDetwB9bz+ZA7mNCQGm6zLJOMT4yBkTZ7f16M9iS0GcI/bOeOeFkLkIaJddTtPca7MOiaUM1imMjFqUfQgSA== dependencies: - conf "^4.1.0" - type-fest "^0.3.1" + conf "^5.0.0" + type-fest "^0.5.2" electron-to-chromium@^1.3.150, electron-to-chromium@^1.3.47: version "1.3.166" resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.166.tgz#99d267514f4b92339788172400bc527545deb75b" integrity sha512-7XwtJz81H/PBnkmQ/07oVPOGTkBZs6ibZN8OqXNUrxjRPzR0Xj+MFcMmRZEXGilEg1Pm+97V8BZVI63qnBX1hQ== -electron-updater@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.0.6.tgz#9c4f495ae0e80bf4425e3e1b801c5ed2ab933c2d" - integrity sha512-JPGLME6fxJcHG8hX7HWFl6Aew6iVm0DkcrENreKa5SUJCHG+uUaAhxDGDt+YGcNkyx1uJ6eBGMvFxDTLUv67pg== +electron-updater@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.1.2.tgz#46a6e62cc8d0c7d935db7aff83207da2a21ff788" + integrity sha512-4Sk8IW0LfOilDz+WAB/gEDmX7+FUFRbKHGN1zGjehPilnd6H9cmjgBHK6Xzq/FLq/uOHGJ6GX/9tsF+jr7CvnA== dependencies: - bluebird-lst "^1.0.6" - builder-util-runtime "~8.1.0" - fs-extra-p "^7.0.0" - js-yaml "^3.12.0" - lazy-val "^1.0.3" + "@types/semver" "^6.0.1" + builder-util-runtime "8.3.0" + fs-extra "^8.1.0" + js-yaml "^3.13.1" + lazy-val "^1.0.4" lodash.isequal "^4.5.0" - pako "^1.0.7" - semver "^5.6.0" - source-map-support "^0.5.9" + pako "^1.0.10" + semver "^6.2.0" electron-window-state@^5.0.3: version "5.0.3" @@ -4146,10 +4212,10 @@ electron-window-state@^5.0.3: jsonfile "^4.0.0" mkdirp "^0.5.1" -electron@^5.0.4: - version "5.0.4" - resolved "https://registry.npmjs.org/electron/-/electron-5.0.4.tgz#2e0d09055363e983f4a73317cde4821c39617b02" - integrity sha512-7QaKorvANvP+azMT7wElx33oLlqw8QxmLs7/outfH7LC5amErk4EUtWDesQ6Zgr+s5pYFbykl8ZtJ4ZGXER05g== +electron@^5.0.7: + version "5.0.7" + resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.7.tgz#a48fcbd13d30f16f7d7887908b68e52156e90259" + integrity sha512-OMMz8DhatxLuBFbnW7KYcAUjflGYFn0IQEtKR0iZhMAm89FgNOd9SVbxXWAGNxvRR6C0gORXwhTh6BCqqqcR6Q== dependencies: "@types/node" "^10.12.18" electron-download "^4.1.0" @@ -4162,10 +4228,10 @@ element-resize-detector@^1.2.0: dependencies: batch-processor "1.0.0" -element-ui@^2.9.1: - version "2.9.1" - resolved "https://registry.npmjs.org/element-ui/-/element-ui-2.9.1.tgz#a05f2e76023d529ba0dfa2d03ae16e5134b20c4e" - integrity sha512-w8vrCW5Q+2gfDzs19MUrFdnCy5IjF98rs7DBsKnJQKFfZJZiZ2O+YAsSp/EuPrCm3P/2o/N3MtvZ34VANel13g== +element-ui@^2.10.1: + version "2.10.1" + resolved "https://registry.yarnpkg.com/element-ui/-/element-ui-2.10.1.tgz#1011016e50e76f5dae6fbf9c86e53b6e53fcb9eb" + integrity sha512-V3WMDoVd1rOT+UI4xasvS8hmUkmc0ezXRuLzlTznBD0bN6jXAiGOeCtmYjj8GFN3lpGNeKyQ/8LCAFuAbxaEww== dependencies: async-validator "~1.8.1" babel-helper-vue-jsx-merge-props "^2.0.0" @@ -4249,7 +4315,7 @@ engine.io@~3.2.0: engine.io-parser "~2.1.0" ws "~3.3.1" -enhanced-resolve@^4.1.0: +enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f" integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng== @@ -4386,10 +4452,10 @@ escodegen@^1.9.1: optionalDependencies: source-map "~0.6.1" -eslint-config-standard@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz#638b4c65db0bd5a41319f96bba1f15ddad2107d9" - integrity sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ== +eslint-config-standard@^13.0.1: + version "13.0.1" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-13.0.1.tgz#c9c6ffe0cfb8a51535bc5c7ec9f70eafb8c6b2c0" + integrity sha512-zLKp4QOgq6JFgRm1dDCVv1Iu0P5uZ4v5Wa4DTOkg2RFMxdCX/9Qf7lz9ezRj2dBRa955cWQF/O/LWEiYWAHbTw== eslint-friendly-formatter@^4.0.1: version "4.0.1" @@ -4416,10 +4482,10 @@ eslint-import-resolver-node@^0.3.2: debug "^2.6.9" resolve "^1.5.0" -eslint-loader@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.1.2.tgz#453542a1230d6ffac90e4e7cb9cadba9d851be68" - integrity sha512-rA9XiXEOilLYPOIInvVH5S/hYfyTPyxag6DZhoQOduM+3TkghAEQ3VcFO8VnX4J4qg/UIBzp72aOf/xvYmpmsg== +eslint-loader@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.1.tgz#28b9c12da54057af0845e2a6112701a2f6bf8337" + integrity sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg== dependencies: loader-fs-cache "^1.0.0" loader-utils "^1.0.2" @@ -4443,17 +4509,17 @@ eslint-plugin-es@^1.4.0: eslint-utils "^1.3.0" regexpp "^2.0.1" -eslint-plugin-html@^5.0.4: - version "5.0.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-5.0.5.tgz#e2388f813f75b2287cde884811eab287de8e0f56" - integrity sha512-v/33i3OD0fuXcRXexVyXXBOe4mLBLBQoF1UO1Uy9D+XLq4MC8K45GcQKfqjC/FnHAHp3pYUjpHHktYNCtShGmg== +eslint-plugin-html@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-6.0.0.tgz#28e5c3e71e6f612e07e73d7c215e469766628c13" + integrity sha512-PQcGippOHS+HTbQCStmH5MY1BF2MaU8qW/+Mvo/8xTa/ioeMXdSP+IiaBw2+nh0KEMfYQKuTz1Zo+vHynjwhbg== dependencies: - htmlparser2 "^3.10.0" + htmlparser2 "^3.10.1" -eslint-plugin-import@^2.17.2: - version "2.17.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.2.tgz#d227d5c6dc67eca71eb590d2bb62fb38d86e9fcb" - integrity sha512-m+cSVxM7oLsIpmwNn2WXTJoReOF9f/CtLMo7qOVmKd1KntBy0hEcuNZ3erTmWjx+DxRO0Zcrm5KwAvI9wHcV5g== +eslint-plugin-import@^2.18.2: + version "2.18.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6" + integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ== dependencies: array-includes "^3.0.3" contains-path "^0.1.0" @@ -4462,37 +4528,37 @@ eslint-plugin-import@^2.17.2: eslint-import-resolver-node "^0.3.2" eslint-module-utils "^2.4.0" has "^1.0.3" - lodash "^4.17.11" minimatch "^3.0.4" + object.values "^1.1.0" read-pkg-up "^2.0.0" - resolve "^1.10.0" + resolve "^1.11.0" -eslint-plugin-node@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-9.0.1.tgz#93e44626fa62bcb6efea528cee9687663dc03b62" - integrity sha512-fljT5Uyy3lkJzuqhxrYanLSsvaILs9I7CmQ31atTtZ0DoIzRbbvInBh4cQ1CrthFHInHYBQxfPmPt6KLHXNXdw== +eslint-plugin-node@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-9.1.0.tgz#f2fd88509a31ec69db6e9606d76dabc5adc1b91a" + integrity sha512-ZwQYGm6EoV2cfLpE1wxJWsfnKUIXfM/KM09/TlorkukgCAwmkgajEJnPCmyzoFPQQkmvo5DrW/nyKutNIw36Mw== dependencies: eslint-plugin-es "^1.4.0" eslint-utils "^1.3.1" ignore "^5.1.1" minimatch "^3.0.4" resolve "^1.10.1" - semver "^6.0.0" + semver "^6.1.0" -eslint-plugin-promise@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.1.1.tgz#1e08cb68b5b2cd8839f8d5864c796f56d82746db" - integrity sha512-faAHw7uzlNPy7b45J1guyjazw28M+7gJokKUjC5JSFoYfUEyy6Gw/i7YQvmv2Yk00sUjWcmzXQLpU1Ki/C2IZQ== +eslint-plugin-promise@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a" + integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== eslint-plugin-standard@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.0.tgz#f845b45109c99cd90e77796940a344546c8f6b5c" integrity sha512-OwxJkR6TQiYMmt1EsNRMe5qG3GsbjlcOhbGUBY4LtavF9DsLaTcoR+j2Tdjqi23oUwKNUqX7qcn5fPStafMdlA== -eslint-plugin-vue@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.2.tgz#86601823b7721b70bc92d54f1728cfc03b36283c" - integrity sha512-CtGWH7IB0DA6BZOwcV9w9q3Ri6Yuo8qMjx05SmOGJ6X6E0Yo3y9E/gQ5tuNxg2dEt30tRnBoFTbvtmW9iEoyHA== +eslint-plugin-vue@^5.2.3: + version "5.2.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz#3ee7597d823b5478804b2feba9863b1b74273961" + integrity sha512-mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw== dependencies: vue-eslint-parser "^5.0.0" @@ -4504,7 +4570,7 @@ eslint-scope@3.7.1: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^4.0.0, eslint-scope@^4.0.3: +eslint-scope@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== @@ -4512,6 +4578,14 @@ eslint-scope@^4.0.0, eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-scope@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9" + integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw== + dependencies: + esrecurse "^4.1.0" + estraverse "^4.1.1" + eslint-utils@^1.3.0, eslint-utils@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512" @@ -4522,52 +4596,53 @@ eslint-visitor-keys@^1.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ== -eslint@^5.16.0: - version "5.16.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea" - integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg== +eslint@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.1.0.tgz#06438a4a278b1d84fb107d24eaaa35471986e646" + integrity sha512-QhrbdRD7ofuV09IuE2ySWBz0FyXCq0rriLTZXZqaWSI79CVtHVRdkFuFTViiqzZhkCgfOh9USpriuGN2gIpZDQ== dependencies: "@babel/code-frame" "^7.0.0" - ajv "^6.9.1" + ajv "^6.10.0" chalk "^2.1.0" cross-spawn "^6.0.5" debug "^4.0.1" doctrine "^3.0.0" - eslint-scope "^4.0.3" + eslint-scope "^5.0.0" eslint-utils "^1.3.1" eslint-visitor-keys "^1.0.0" - espree "^5.0.1" + espree "^6.0.0" esquery "^1.0.1" esutils "^2.0.2" file-entry-cache "^5.0.1" functional-red-black-tree "^1.0.1" - glob "^7.1.2" + glob-parent "^5.0.0" globals "^11.7.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" - inquirer "^6.2.2" - js-yaml "^3.13.0" + inquirer "^6.4.1" + is-glob "^4.0.0" + js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.3.0" - lodash "^4.17.11" + lodash "^4.17.14" minimatch "^3.0.4" mkdirp "^0.5.1" natural-compare "^1.4.0" optionator "^0.8.2" - path-is-inside "^1.0.2" progress "^2.0.0" regexpp "^2.0.1" - semver "^5.5.1" - strip-ansi "^4.0.0" - strip-json-comments "^2.0.1" + semver "^6.1.2" + strip-ansi "^5.2.0" + strip-json-comments "^3.0.1" table "^5.2.3" text-table "^0.2.0" + v8-compile-cache "^2.0.3" -esm@^3.2.22: - version "3.2.22" - resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.22.tgz#5062c2e22fee3ccfee4e8f20da768330da90d6e3" - integrity sha512-z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA== +esm@^3.2.25: + version "3.2.25" + resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10" + integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA== espree@^4.1.0: version "4.1.0" @@ -4578,10 +4653,10 @@ espree@^4.1.0: acorn-jsx "^5.0.0" eslint-visitor-keys "^1.0.0" -espree@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a" - integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A== +espree@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-6.0.0.tgz#716fc1f5a245ef5b9a7fdb1d7b0d3f02322e75f6" + integrity sha512-lJvCS6YbCn3ImT3yKkPe0+tJ+mH6ljhGNjHQH9mRtiO6gjhVAOhVXW1yjnwqGwTkK3bGbye+hb00nFNmu0l/1Q== dependencies: acorn "^6.0.7" acorn-jsx "^5.0.0" @@ -4851,7 +4926,7 @@ extglob@^2.0.2, extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-zip@^1.0.3, extract-zip@^1.6.5: +extract-zip@^1.0.3, extract-zip@^1.6.7: version "1.6.7" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9" integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k= @@ -4944,13 +5019,13 @@ file-icons-js@^1.0.3: resolved "https://registry.yarnpkg.com/file-icons-js/-/file-icons-js-1.0.3.tgz#d0765dc1d86aba4b2d7664a39e4ef7af9f12c5af" integrity sha512-n4zoKEpMaAxBTUB7wtgrFBa4dM3b7mBLLA1VI/Q5Cdk/k2UA8S8oaxvnECp3QOzg0Dn+KKRzfIHF7qSdRkA65Q== -file-loader@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa" - integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw== +file-loader@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.1.0.tgz#3a763391bc9502da7c59612fe348e38fc1980336" + integrity sha512-ajDk1nlByoalZAGR4b0H6oD+EGlWnyW1qbSxzaUc7RFiqmn+RbXQQRbTc72jsiUIlVusJ4Et58ltds8ZwTfnAw== dependencies: - loader-utils "^1.0.2" - schema-utils "^1.0.0" + loader-utils "^1.2.3" + schema-utils "^2.0.0" filesize@^3.6.1: version "3.6.1" @@ -5062,13 +5137,13 @@ find-up@^2.0.0, find-up@^2.1.0: dependencies: locate-path "^2.0.0" -findup-sync@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" - integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw= +findup-sync@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" + integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg== dependencies: detect-file "^1.0.0" - is-glob "^3.1.0" + is-glob "^4.0.0" micromatch "^3.0.4" resolve-dir "^1.0.1" @@ -5098,10 +5173,10 @@ flatten@^1.0.2: resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I= -flowchart.js@^1.12.0: - version "1.12.0" - resolved "https://registry.npmjs.org/flowchart.js/-/flowchart.js-1.12.0.tgz#ff5b4cf350b4e067a4232dc1b4dfdd87524acf5a" - integrity sha512-82mj9315e3+U87D147dbPu/MKBqAtngQu3JY1GFG0+3HmsT6yN/PbpI/tmjdchWEU3gAAKuVXxSGT9u3dNvYow== +flowchart.js@^1.12.1: + version "1.12.1" + resolved "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.12.1.tgz#00eef6796b4d5d16426433457b774aecfd3ba6cb" + integrity sha512-SbNj/8zSFFL1CjCi1fjunZear9JuZy5fBCvG1xizZOpmz8KYnGNR909xP6894+B/tavl+tonjHSNyKNnAagFEA== dependencies: raphael "2.2.7" @@ -5176,14 +5251,6 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra-p@^7.0.0, fs-extra-p@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-7.0.1.tgz#4eec0b6dfa150fa90f6ddd773b4fb1d55cad54e3" - integrity sha512-yhd2OV0HnHt2oitlp+X9hl2ReX4X/7kQeL7/72qzPHTZj5eUPGzAKOvEglU02Fa1OeG2rSy/aKB4WGVaLiF8tw== - dependencies: - bluebird-lst "^1.0.7" - fs-extra "^7.0.1" - fs-extra@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" @@ -5202,12 +5269,12 @@ fs-extra@^7.0.0, fs-extra@^7.0.1: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.0.1.tgz#90294081f978b1f182f347a440a209154344285b" - integrity sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A== +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== dependencies: - graceful-fs "^4.1.2" + graceful-fs "^4.2.0" jsonfile "^4.0.0" universalify "^0.1.0" @@ -5246,16 +5313,6 @@ fsevents@^2.0.6: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.6.tgz#87b19df0bfb4a1a51d7ddb51b01b5f3bedb40c33" integrity sha512-vfmKZp3XPM36DNF0qhW+Cdxk7xm7gTEHY1clv1Xq1arwRQuKZgAhw+NZNWbJBtuaNxzNXwhfdPYRrvIbjfS33A== -fstream@^1.0.0, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" - integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE= - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -5317,13 +5374,20 @@ get-stream@^3.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= -get-stream@^4.0.0: +get-stream@^4.0.0, get-stream@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== dependencies: pump "^3.0.0" +get-stream@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9" + integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw== + dependencies: + pump "^3.0.0" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -5396,6 +5460,13 @@ global-dirs@^0.1.0: dependencies: ini "^1.3.4" +global-modules@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" + integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== + dependencies: + global-prefix "^3.0.0" + global-modules@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" @@ -5416,6 +5487,15 @@ global-prefix@^1.0.1: is-windows "^1.0.1" which "^1.2.14" +global-prefix@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== + dependencies: + ini "^1.3.5" + kind-of "^6.0.2" + which "^1.3.1" + globals@^11.1.0, globals@^11.7.0: version "11.11.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e" @@ -5465,28 +5545,33 @@ good-listener@^1.2.2: dependencies: delegate "^3.1.2" -got@^6.7.1: - version "6.7.1" - resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" - integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA= +got@^9.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" + integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== dependencies: - create-error-class "^3.0.0" + "@sindresorhus/is" "^0.14.0" + "@szmarczak/http-timer" "^1.1.2" + cacheable-request "^6.0.0" + decompress-response "^3.3.0" duplexer3 "^0.1.4" - get-stream "^3.0.0" - is-redirect "^1.0.0" - is-retry-allowed "^1.0.0" - is-stream "^1.0.0" - lowercase-keys "^1.0.0" - safe-buffer "^5.0.1" - timed-out "^4.0.0" - unzip-response "^2.0.1" - url-parse-lax "^1.0.0" + get-stream "^4.1.0" + lowercase-keys "^1.0.1" + mimic-response "^1.0.1" + p-cancelable "^1.0.0" + to-readable-stream "^1.0.0" + url-parse-lax "^3.0.0" graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6: version "4.1.15" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== +graceful-fs@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b" + integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg== + "graceful-readlink@>= 1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" @@ -5621,6 +5706,11 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" +has-yarn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" + integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== + has@^1.0.1, has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -5772,7 +5862,7 @@ html-webpack-plugin@^3.2.0: toposort "^1.0.0" util.promisify "1.0.0" -htmlparser2@^3.10.0, htmlparser2@^3.3.0, htmlparser2@^3.8.3, htmlparser2@^3.9.1: +htmlparser2@^3.10.1, htmlparser2@^3.3.0, htmlparser2@^3.8.3, htmlparser2@^3.9.1: version "3.10.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== @@ -5784,6 +5874,11 @@ htmlparser2@^3.10.0, htmlparser2@^3.3.0, htmlparser2@^3.8.3, htmlparser2@^3.9.1: inherits "^2.0.1" readable-stream "^3.1.1" +http-cache-semantics@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz#495704773277eeef6e43f9ab2c2c7d259dda25c5" + integrity sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew== + http-deceiver@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" @@ -5867,6 +5962,13 @@ iconv-lite@0.4.23: dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.0.tgz#59cdde0a2a297cc2aeb0c6445a195ee89f127550" + integrity sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw== + dependencies: + safer-buffer ">= 2.1.2 < 3" + icss-replace-symbols@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" @@ -5943,7 +6045,7 @@ import-lazy@^2.1.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= -import-local@^2.0.0: +import-local@2.0.0, import-local@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== @@ -5981,7 +6083,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= @@ -5991,7 +6093,7 @@ inherits@2.0.1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= -ini@^1.3.4, ini@~1.3.0: +ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -6010,10 +6112,10 @@ inline-source-map@~0.6.0: dependencies: source-map "~0.5.3" -inquirer@^6.2.2: - version "6.3.1" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7" - integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA== +inquirer@^6.4.1: + version "6.5.0" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42" + integrity sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA== dependencies: ansi-escapes "^3.2.0" chalk "^2.4.2" @@ -6021,7 +6123,7 @@ inquirer@^6.2.2: cli-width "^2.0.0" external-editor "^3.0.3" figures "^2.0.0" - lodash "^4.17.11" + lodash "^4.17.12" mute-stream "0.0.7" run-async "^2.2.0" rxjs "^6.4.0" @@ -6057,7 +6159,7 @@ internal-ip@^4.3.0: default-gateway "^4.2.0" ipaddr.js "^1.9.0" -interpret@^1.1.0: +interpret@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== @@ -6142,13 +6244,6 @@ is-callable@^1.1.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== -is-ci@^1.0.10: - version "1.2.1" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" - integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg== - dependencies: - ci-info "^1.5.0" - is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -6263,10 +6358,10 @@ is-lower-case@^1.1.0: dependencies: lower-case "^1.1.0" -is-npm@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" - integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ= +is-npm@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-3.0.0.tgz#ec9147bfb629c43f494cf67936a961edec7e8053" + integrity sha512-wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA== is-number@^3.0.0: version "3.0.0" @@ -6335,11 +6430,6 @@ is-promise@^2.1.0: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= -is-redirect@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" - integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ= - is-regex@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" @@ -6352,12 +6442,7 @@ is-regexp@^1.0.0: resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= -is-retry-allowed@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34" - integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ= - -is-stream@^1.0.0, is-stream@^1.1.0: +is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= @@ -6396,6 +6481,11 @@ is-wsl@^1.1.0: resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= +is-yarn-global@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== + isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -6411,17 +6501,17 @@ isarray@2.0.1: resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= -isbinaryfile@^3.0.0, isbinaryfile@^3.0.2: +isbinaryfile@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== dependencies: buffer-alloc "^1.2.0" -isbinaryfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.0.tgz#07d1061c21598b41292b0f5c68add5eab601ad8e" - integrity sha512-RBtmso6l2mCaEsUvXngMTIjg3oheXo0MgYzzfT6sk44RYggPnm9fT+cQJAmzRnJIxPHXg9FZglqDJGW28dvcqA== +isbinaryfile@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.2.tgz#bfc45642da645681c610cca831022e30af426488" + integrity sha512-C3FSxJdNrEr2F4z6uFtNzECDM5hXk+46fxaa+cwBe5/XrWSmzdG8DDgyjfX6/NRdBB21q2JXuRAzPCUs+fclnQ== iselement@^1.1.4: version "1.1.4" @@ -6513,7 +6603,7 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@3.13.1, js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.12.1, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.0: +js-yaml@3.13.1, js-yaml@3.x, js-yaml@^3.13.1, js-yaml@^3.9.0: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== @@ -6573,6 +6663,11 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= +json-buffer@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= + json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -6769,14 +6864,21 @@ keypress@0.1.x: resolved "https://registry.yarnpkg.com/keypress/-/keypress-0.1.0.tgz#4a3188d4291b66b4f65edb99f806aa9ae293592a" integrity sha1-SjGI1CkbZrT2XtuZ+AaqmuKTWSo= -keytar@^4.10.0: - version "4.10.0" - resolved "https://registry.npmjs.org/keytar/-/keytar-4.10.0.tgz#03897398b22d6e60dbd0b381c088b2495ff32ce5" - integrity sha512-oL6dF4FMX8G80zL5e1CPIUEKwZCe9XZw6JZI5YesNstamzJbyZduj7NMUEX2l72BLyWQibyZOvipmof0QbsbRQ== +keytar@^4.12.0: + version "4.12.0" + resolved "https://registry.yarnpkg.com/keytar/-/keytar-4.12.0.tgz#ea12f56b47fb2f719940385a4e7ea2ddfcb82191" + integrity sha512-V+MY1cD/QheiAY+FZcnEzp1f6vVjOZAZ5kqosZYfe5upROlmY0iDXtTMsLrYiGo1CD8KMujoivai7eB+pK2wew== dependencies: nan "2.14.0" prebuild-install "5.3.0" +keyv@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" + integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== + dependencies: + json-buffer "3.0.0" + killable@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" @@ -6813,19 +6915,19 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== -latest-version@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" - integrity sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU= +latest-version@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== dependencies: - package-json "^4.0.0" + package-json "^6.3.0" lazy-cache@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4= -lazy-val@^1.0.3, lazy-val@^1.0.4: +lazy-val@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65" integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q== @@ -6917,6 +7019,15 @@ loader-runner@^2.3.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== +loader-utils@1.2.3, loader-utils@^1.0.0, loader-utils@^1.0.2, loader-utils@^1.0.3, loader-utils@^1.1.0, loader-utils@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" + integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== + dependencies: + big.js "^5.2.2" + emojis-list "^2.0.0" + json5 "^1.0.1" + loader-utils@^0.2.16: version "0.2.17" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" @@ -6927,15 +7038,6 @@ loader-utils@^0.2.16: json5 "^0.5.0" object-assign "^4.0.1" -loader-utils@^1.0.0, loader-utils@^1.0.2, loader-utils@^1.0.3, loader-utils@^1.1.0, loader-utils@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" - integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== - dependencies: - big.js "^5.2.2" - emojis-list "^2.0.0" - json5 "^1.0.1" - locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -7175,6 +7277,11 @@ lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== +lodash@^4.17.12, lodash@^4.17.14: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + log-symbols@2.2.0, log-symbols@^2.1.0, log-symbols@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" @@ -7246,11 +7353,16 @@ lower-case@^1.1.0, lower-case@^1.1.1, lower-case@^1.1.2: resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= -lowercase-keys@^1.0.0: +lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== +lowercase-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== + lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.2: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" @@ -7322,10 +7434,10 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -marked@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a" - integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA== +marked@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-0.7.0.tgz#b64201f051d271b1edc10a04d1ae9b74bb8e5c0e" + integrity sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg== md5.js@^1.3.4: version "1.3.5" @@ -7336,6 +7448,11 @@ md5.js@^1.3.4: inherits "^2.0.1" safe-buffer "^5.1.2" +mdn-data@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" + integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== + mdn-data@~1.1.0: version "1.1.4" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01" @@ -7485,14 +7602,14 @@ mime@1.6.0: resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@^2.0.3, mime@^2.1.0, mime@^2.3.1, mime@^2.4.1: +mime@^2.0.3, mime@^2.1.0, mime@^2.3.1: version "2.4.2" resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.2.tgz#ce5229a5e99ffc313abac806b482c10e7ba6ac78" integrity sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg== -mime@^2.4.2: +mime@^2.4.2, mime@^2.4.4: version "2.4.4" - resolved "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== mimic-fn@^1.0.0: @@ -7505,18 +7622,18 @@ mimic-fn@^2.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mimic-response@^1.0.0: +mimic-response@^1.0.0, mimic-response@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== -mini-css-extract-plugin@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9" - integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw== +mini-css-extract-plugin@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz#81d41ec4fe58c713a96ad7c723cdb2d0bd4d70e1" + integrity sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw== dependencies: loader-utils "^1.1.0" - normalize-url "^2.0.1" + normalize-url "1.9.1" schema-utils "^1.0.0" webpack-sources "^1.1.0" @@ -7552,7 +7669,7 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= -minipass@^2.2.1, minipass@^2.3.4: +minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5: version "2.3.5" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA== @@ -7560,7 +7677,7 @@ minipass@^2.2.1, minipass@^2.3.4: safe-buffer "^5.1.2" yallist "^3.0.0" -minizlib@^1.1.1: +minizlib@^1.1.1, minizlib@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614" integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA== @@ -7603,17 +7720,17 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: +mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= dependencies: minimist "0.0.8" -mocha@^6.1.4: - version "6.1.4" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.1.4.tgz#e35fada242d5434a7e163d555c705f6875951640" - integrity sha512-PN8CIy4RXsIoxoFJzS4QNnCH4psUCPWc4/rPrst/ecSJJbLBkubMiyGCP2Kj/9YnWbotFqAoeXyXMucj7gwCFg== +mocha@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.0.tgz#f896b642843445d1bb8bca60eabd9206b8916e56" + integrity sha512-qwfFgY+7EKAAUAdv7VYMZQknI7YJSGesxHyhn6qD52DV8UcSZs5XwCifcZGMVIE4a5fbmhvbotxC0DLQ0oKohQ== dependencies: ansi-colors "3.2.3" browser-stdout "1.3.1" @@ -7788,6 +7905,13 @@ node-abi@^2.7.0: dependencies: semver "^5.4.1" +node-abi@^2.8.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.9.0.tgz#ae4075b298dab2d92dd1e22c48ccc7ffd7f06200" + integrity sha512-jmEOvv0eanWjhX8dX1pmjb7oJl1U1oR4FOh0b2GnvALwSYoOdU7sj+kLDSAyjo4pfC9aj/IxkloxdLJQhSSQBA== + dependencies: + semver "^5.4.1" + node-environment-flags@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.5.tgz#fa930275f5bf5dae188d6192b24b4c8bbac3d76a" @@ -7806,17 +7930,21 @@ node-fetch@^2.5.0: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.5.0.tgz#8028c49fc1191bba56a07adc6e2a954644a48501" integrity sha512-YuZKluhWGJwCcUu4RlZstdAxr8bFfOVHakc1mplwHkk8J+tqM1Y5yraYvIUpeX8aY7+crCwiELJq7Vl0o0LWXw== +node-fetch@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" + integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== + node-forge@0.7.5: version "0.7.5" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df" integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ== -node-gyp@^3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" - integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA== +node-gyp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-4.0.0.tgz#972654af4e5dd0cd2a19081b4b46fe0442ba6f45" + integrity sha512-2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA== dependencies: - fstream "^1.0.0" glob "^7.0.3" graceful-fs "^4.1.2" mkdirp "^0.5.0" @@ -7826,7 +7954,7 @@ node-gyp@^3.8.0: request "^2.87.0" rimraf "2" semver "~5.3.0" - tar "^2.0.0" + tar "^4.4.8" which "1" node-libs-browser@^2.0.0: @@ -7933,14 +8061,20 @@ normalize-range@^0.1.2: resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= -normalize-url@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6" - integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw== +normalize-url@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" + integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw= dependencies: - prepend-http "^2.0.0" - query-string "^5.0.1" - sort-keys "^2.0.0" + object-assign "^4.0.1" + prepend-http "^1.0.0" + query-string "^4.1.0" + sort-keys "^1.0.0" + +normalize-url@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.3.0.tgz#9c49e10fc1876aeb76dba88bf1b2b5d9fa57b2ee" + integrity sha512-0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ== normalize-wheel@^1.0.1: version "1.0.1" @@ -8171,7 +8305,7 @@ optionator@^0.8.1, optionator@^0.8.2: type-check "~0.3.2" wordwrap "~1.0.0" -ora@^3.0.0: +ora@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318" integrity sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg== @@ -8230,6 +8364,11 @@ osenv@0, osenv@^0.1.4: os-homedir "^1.0.0" os-tmpdir "^1.0.0" +p-cancelable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" + integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== + p-defer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" @@ -8295,17 +8434,17 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== -package-json@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" - integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0= +package-json@^6.3.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.4.0.tgz#4f626976604f4a9a41723ce1792b204a60b1b61e" + integrity sha512-bd1T8OBG7hcvMd9c/udgv6u5v9wISP3Oyl9Cm7Weop8EFwrtcQDnS2sb6zhwqus2WslSr5wSTIPiTTpxxmPm7Q== dependencies: - got "^6.7.1" - registry-auth-token "^3.0.1" - registry-url "^3.0.3" - semver "^5.1.0" + got "^9.6.0" + registry-auth-token "^3.4.0" + registry-url "^5.0.0" + semver "^6.1.1" -pako@^1.0.7, pako@~1.0.5: +pako@^1.0.10, pako@~1.0.5: version "1.0.10" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732" integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw== @@ -9064,7 +9203,7 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -prepend-http@^1.0.1: +prepend-http@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= @@ -9095,10 +9234,10 @@ pretty-error@^2.0.2: renderkid "^2.0.1" utila "~0.4" -prismjs@^1.16.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.16.0.tgz#406eb2c8aacb0f5f0f1167930cb83835d10a4308" - integrity sha512-OA4MKxjFZHSvZcisLGe14THYsug/nF6O1f0pAJc0KN0wTyAcLqmsbE+lTGKSpyh+9pEW57+k6pg2AfYR+coyHA== +prismjs@^1.17.1: + version "1.17.1" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.17.1.tgz#e669fcbd4cdd873c35102881c33b14d0d68519be" + integrity sha512-PrEDJAFdUGbOP6xK/UsfkC5ghJsPJviKgnQOoxaDbBjwc8op68Quupwt1DeAFoG8GImPhiKXAvvsH7wDSLsu1Q== optionalDependencies: clipboard "^2.0.0" @@ -9238,7 +9377,7 @@ qs@6.7.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== -query-string@^4.3.2: +query-string@^4.1.0, query-string@^4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s= @@ -9246,15 +9385,6 @@ query-string@^4.3.2: object-assign "^4.1.0" strict-uri-encode "^1.0.0" -query-string@^5.0.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" - integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw== - dependencies: - decode-uri-component "^0.2.0" - object-assign "^4.1.0" - strict-uri-encode "^1.0.0" - querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" @@ -9330,7 +9460,7 @@ raw-loader@^2.0.0: loader-utils "^1.1.0" schema-utils "^1.0.0" -rc@^1.0.1, rc@^1.1.6, rc@^1.2.1, rc@^1.2.7: +rc@^1.1.6, rc@^1.2.1, rc@^1.2.7, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -9340,18 +9470,29 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.1, rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -read-config-file@3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.2.2.tgz#57bbff7dd97caf237d0d625bd541c6d0efb4d067" - integrity sha512-PuFpMgZF01VB0ydH1dfitAxCP/fh+qnfbA9cYNIPoxPbz0SMngsrafCtaHDWfER7MwlDz4fmrNBhPkakxxFpTg== +read-config-file@4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-4.0.1.tgz#ece5f6b1a5e6a46d0d93fdd0339f2f60ab892776" + integrity sha512-5caED3uo2IAZMPcbh/9hx/O29s2430RLxtnFDdzxpH/epEpawOrQnGBHueotIXUrGPPIgdNQN+S/CIp2WmiSfw== dependencies: - ajv "^6.9.2" - ajv-keywords "^3.4.0" - bluebird-lst "^1.0.7" - dotenv "^6.2.0" - dotenv-expand "^4.2.0" - fs-extra-p "^7.0.1" - js-yaml "^3.12.1" + ajv "^6.10.1" + ajv-keywords "^3.4.1" + dotenv "^8.0.0" + dotenv-expand "^5.1.0" + fs-extra "^8.1.0" + js-yaml "^3.13.1" + json5 "^2.1.0" + lazy-val "^1.0.4" + +read-config-file@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-5.0.0.tgz#1487c983fae9c1b672d3acda5cac899a2d451f02" + integrity sha512-jIKUu+C84bfnKxyJ5j30CxCqgXWYjZLXuVE/NYlMEpeni+dhESgAeZOZd0JZbg1xTkMmnCdxksDoarkOyfEsOg== + dependencies: + dotenv "^8.0.0" + dotenv-expand "^5.1.0" + fs-extra "^8.1.0" + js-yaml "^3.13.1" json5 "^2.1.0" lazy-val "^1.0.4" @@ -9483,10 +9624,10 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" -readdirp@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.0.2.tgz#cba63348e9e42fc1bd334b1d2ef895b6a043cbd6" - integrity sha512-LbyJYv48eywrhOlScq16H/VkCiGKGPC2TpOdZCJ7QXnYEjn3NN/Oblh8QEU3vqfSRBB7OGvh5x45NKiVeNujIQ== +readdirp@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.1.tgz#b158123ac343c8b0f31d65680269cc0fc1025db1" + integrity sha512-XXdSXZrQuvqoETj50+JAitxz1UPdt5dupjT6T5nVB+WvjMv2XKYj+s7hPeAVCXvmJrL36O4YYyWlIC3an2ePiQ== dependencies: picomatch "^2.0.4" @@ -9549,7 +9690,7 @@ regexpu-core@^2.0.0: regjsgen "^0.2.0" regjsparser "^0.1.4" -registry-auth-token@^3.0.1: +registry-auth-token@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e" integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A== @@ -9557,12 +9698,12 @@ registry-auth-token@^3.0.1: rc "^1.1.6" safe-buffer "^5.0.1" -registry-url@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" - integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI= +registry-url@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== dependencies: - rc "^1.0.1" + rc "^1.2.8" regjsgen@^0.2.0: version "0.2.0" @@ -9733,6 +9874,20 @@ resolve@^1.10.0, resolve@^1.10.1, resolve@^1.5.0: dependencies: path-parse "^1.0.6" +resolve@^1.11.0: + version "1.11.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e" + integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw== + dependencies: + path-parse "^1.0.6" + +responselike@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= + dependencies: + lowercase-keys "^1.0.0" + restore-cursor@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" @@ -9867,6 +10022,14 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" +schema-utils@^2.0.0, schema-utils@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.0.1.tgz#1eec2e059556af841b7f3a83b61af13d7a3f9196" + integrity sha512-HJFKJ4JixDpRur06QHwi8uu2kZbng318ahWEKgBjc0ZklcE4FDvmm2wghb448q0IRaABxIESt8vqPFvwgMB80A== + dependencies: + ajv "^6.1.0" + ajv-keywords "^3.1.0" + scope-css@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/scope-css/-/scope-css-1.2.1.tgz#c35768bc900cad030a3e0d663a818c0f6a57f40e" @@ -9900,7 +10063,7 @@ semver-diff@^2.0.0: dependencies: semver "^5.0.3" -"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0: +"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0: version "5.7.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== @@ -9910,6 +10073,11 @@ semver@^6.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65" integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ== +semver@^6.1.0, semver@^6.1.2, semver@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db" + integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A== + semver@^6.1.1: version "6.1.1" resolved "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b" @@ -10235,10 +10403,10 @@ sockjs@0.3.19: faye-websocket "^0.10.0" uuid "^3.0.1" -sort-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128" - integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= +sort-keys@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" + integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0= dependencies: is-plain-obj "^1.0.0" @@ -10265,7 +10433,7 @@ source-map-support@^0.4.15: dependencies: source-map "^0.5.6" -source-map-support@^0.5.11, source-map-support@^0.5.12, source-map-support@^0.5.9, source-map-support@~0.5.10: +source-map-support@^0.5.12, source-map-support@~0.5.10: version "0.5.12" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ== @@ -10383,13 +10551,13 @@ spdy@^4.0.0: select-hose "^2.0.0" spdy-transport "^3.0.0" -spectron@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/spectron/-/spectron-5.0.0.tgz#602440da0c892f8d73471652ae68000b98d7769c" - integrity sha512-wJrFe8EZ7xvarYawBPd1pDegmSz81U1jG0rSCx+yXqD1TISUH9ASB21KysLXkPylAnc2vhbpGiWQxrqVFtsiJg== +spectron@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/spectron/-/spectron-7.0.0.tgz#2a16ea2b2fbe6149f5fa9fa1a2be601f5878e00c" + integrity sha512-l6EqXNJLLjbHFr4s2tky0hQU7Ql8UzNsAJm6CiDvX1eGOPiRVJBf2lqZWHGPayZQ7auxdhqAhnHceJJkokDiPQ== dependencies: dev-null "^0.1.1" - electron-chromedriver "~3.0.0" + electron-chromedriver "^5.0.1" request "^2.87.0" split "^1.0.0" webdriverio "^4.13.0" @@ -10623,11 +10791,16 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" -strip-json-comments@2.0.1, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: +strip-json-comments@2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= +strip-json-comments@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" + integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== + style-loader@^0.23.1: version "0.23.1" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925" @@ -10650,6 +10823,13 @@ supports-color@6.0.0: dependencies: has-flag "^3.0.0" +supports-color@6.1.0, supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== + dependencies: + has-flag "^3.0.0" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -10662,20 +10842,13 @@ supports-color@^3.1.0, supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -supports-color@^5.3.0, supports-color@^5.5.0: +supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== dependencies: has-flag "^3.0.0" -supports-color@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" - integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== - dependencies: - has-flag "^3.0.0" - supports-color@~5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.0.1.tgz#1c5331f22250c84202805b2f17adf16699f3a39a" @@ -10745,25 +10918,24 @@ svg-sprite-loader@^4.1.6: svg-baker-runtime "1.4.1" url-slug "2.0.0" -svgo-loader@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/svgo-loader/-/svgo-loader-2.2.0.tgz#f29eb43efc14c34a15c4023f56ba12775ccdbe5f" - integrity sha512-AtIy4kmUQc1zo+QK3ZFvRrULRZAhUC63cLJxdVo1cONZ9WeYAkySUlaB05uZKKcYpsTb/9tDsBSXMab3/0QWtw== +svgo-loader@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/svgo-loader/-/svgo-loader-2.2.1.tgz#ca1c9ad22e120bb45a5250233737da4d85521704" + integrity sha512-9dyz/h6ae04pAVRz7QY8bLXtMbwA19NPpCPfCixgW0qXNDCOlHbDRqvtT5/2gzRxfuibWCUP6ZBQmZWF9rjWhQ== dependencies: - js-yaml "^3.12.0" + js-yaml "^3.13.1" loader-utils "^1.0.3" -svgo@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.2.tgz#0253d34eccf2aed4ad4f283e11ee75198f9d7316" - integrity sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA== +svgo@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.0.tgz#bae51ba95ded9a33a36b7c46ce9c359ae9154313" + integrity sha512-MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ== dependencies: chalk "^2.4.1" coa "^2.0.2" css-select "^2.0.0" css-select-base-adapter "^0.1.1" - css-tree "1.0.0-alpha.28" - css-url-regex "^1.1.0" + css-tree "1.0.0-alpha.33" csso "^3.5.1" js-yaml "^3.13.1" mkdirp "~0.5.1" @@ -10824,15 +10996,6 @@ tar-stream@^1.1.2, tar-stream@^1.5.0: to-buffer "^1.1.1" xtend "^4.0.0" -tar@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE= - dependencies: - block-stream "*" - fstream "^1.0.2" - inherits "2" - tar@^4: version "4.4.8" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" @@ -10846,14 +11009,26 @@ tar@^4: safe-buffer "^5.1.2" yallist "^3.0.2" -temp-file@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.2.tgz#69b6daf1bbe23231d0a5d03844e3d96f3f531aaa" - integrity sha512-FGKccAW0Mux9hC/2bdUIe4bJRv4OyVo4RpVcuplFird1V/YoplIFbnPZjfzbJSf/qNvRZIRB9/4n/RkI0GziuQ== +tar@^4.4.8: + version "4.4.10" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1" + integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA== + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.3.5" + minizlib "^1.2.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.3" + +temp-file@^3.3.4: + version "3.3.4" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.4.tgz#73af868cd7cb7400a44e4bb03e653b2280ce2878" + integrity sha512-qSZ5W5q54iyGnP8cNl49RE0jTJc5CrzNocux5APD5yIxcgonoMuMSbsZfaZy8rTGCYo0Xz6ySVv3adagZ8gffg== dependencies: async-exit-hook "^2.0.1" - bluebird-lst "^1.0.6" - fs-extra-p "^7.0.0" + fs-extra "^8.1.0" term-size@^1.2.0: version "1.2.0" @@ -10941,11 +11116,6 @@ ticky@1.0.1: resolved "https://registry.yarnpkg.com/ticky/-/ticky-1.0.1.tgz#b7cfa71e768f1c9000c497b9151b30947c50e46d" integrity sha1-t8+nHnaPHJAAxJe5FRswlHxQ5G0= -timed-out@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" - integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= - timers-browserify@^2.0.4: version "2.0.10" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae" @@ -11005,6 +11175,11 @@ to-object-path@^0.3.0: dependencies: kind-of "^3.0.2" +to-readable-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== + to-regex-range@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" @@ -11155,11 +11330,16 @@ type-detect@^4.0.0, type-detect@^4.0.5: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== -type-fest@^0.3.1: +type-fest@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ== +type-fest@^0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz#d6ef42a0356c6cd45f49485c3b6281fc148e48a2" + integrity sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw== + type-func@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/type-func/-/type-func-1.0.3.tgz#ab184234ae80d8d50057cefeff3b2d97d08ae9b0" @@ -11267,13 +11447,20 @@ unique-string@^1.0.0: dependencies: crypto-random-string "^1.0.0" -universal-user-agent@^2.0.0, universal-user-agent@^2.1.0: +universal-user-agent@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-2.1.0.tgz#5abfbcc036a1ba490cb941f8fd68c46d3669e8e4" integrity sha512-8itiX7G05Tu3mGDTdNY2fB4KJ8MgZLS54RdG6PkkfwMAavrXu1mV/lls/GABx9O3Rw4PnTtasxrvbMQoBYY92Q== dependencies: os-name "^3.0.0" +universal-user-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-3.0.0.tgz#4cc88d68097bffd7ac42e3b7c903e7481424b4b9" + integrity sha512-T3siHThqoj5X0benA5H0qcDnrKGXzU8TKoX15x/tQHw1hQBvIEBHjxQ2klizYsqBOO/Q+WuxoQUihadeeqDnoA== + dependencies: + os-name "^3.0.0" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -11297,29 +11484,26 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" -unzip-response@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" - integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c= - upath@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068" integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q== -update-notifier@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6" - integrity sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw== +update-notifier@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-3.0.1.tgz#78ecb68b915e2fd1be9f767f6e298ce87b736250" + integrity sha512-grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ== dependencies: - boxen "^1.2.1" + boxen "^3.0.0" chalk "^2.0.1" - configstore "^3.0.0" + configstore "^4.0.0" + has-yarn "^2.1.0" import-lazy "^2.1.0" - is-ci "^1.0.10" + is-ci "^2.0.0" is-installed-globally "^0.1.0" - is-npm "^1.0.0" - latest-version "^3.0.0" + is-npm "^3.0.0" + is-yarn-global "^0.3.0" + latest-version "^5.0.0" semver-diff "^2.0.0" xdg-basedir "^3.0.0" @@ -11361,12 +11545,12 @@ url-loader@^1.1.2: mime "^2.0.3" schema-utils "^1.0.0" -url-parse-lax@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" - integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM= +url-parse-lax@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= dependencies: - prepend-http "^1.0.1" + prepend-http "^2.0.0" url-parse@^1.4.3: version "1.4.7" @@ -11466,10 +11650,10 @@ uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== -v8-compile-cache@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c" - integrity sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw== +v8-compile-cache@2.0.3, v8-compile-cache@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe" + integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w== validate-npm-package-license@^3.0.1: version "3.0.4" @@ -11506,14 +11690,14 @@ vega-dataflow@^5.1.0, vega-dataflow@^5.1.1, vega-dataflow@^5.2.1: vega-loader "^4.0.0" vega-util "^1.10.0" -vega-embed@^4.2.0: - version "4.2.0" - resolved "https://registry.npmjs.org/vega-embed/-/vega-embed-4.2.0.tgz#59e8478faa6e1e33d0eb601a5b98be9b79d4c4ad" - integrity sha512-+WaCaoESZBnF80OiA3UUTO/2qlruj5iTyK1mXYIqdfygEldFLQSZS1DSbLwy0m6BlTZz7mkEWMIe6cX4/P3ufw== +vega-embed@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-4.2.1.tgz#22f3521e5cdeeba76152d29cf03aed61d5d12edf" + integrity sha512-sCj/rYQ6lnAGmIz8ksYxCkbJK7ISmN1B1nCvZVOfsA3NOQhN0BwtEvePnf4FYachA1E7z60DabwihXutYD19pQ== dependencies: d3-selection "^1.4.0" json-stringify-pretty-compact "^2.0.0" - semver "^6.0.0" + semver "^6.1.2" vega-schema-url-parser "^1.1.0" vega-themes "^2.3.0" vega-tooltip "^0.17.0" @@ -11889,10 +12073,10 @@ vow@^0.4.17, vow@^0.4.19, vow@^0.4.7: resolved "https://registry.yarnpkg.com/vow/-/vow-0.4.19.tgz#cc5ef4d6bb6972d830830a7c9ecf8ad834a7c525" integrity sha512-S+0+CiQlbUhTNWMlJdqo/ARuXOttXdvw5ACGyh1W97NFHUdwt3Fzyaus03Kvdmo733dwnYS9AGJSDg0Zu8mNfA== -vscode-ripgrep@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.2.5.tgz#2093c8f36d52bd2dab9eb45b003dd02533c5499c" - integrity sha512-n5XBm9od5hahpljw9T8wbkuMnAY7LlAG1OyEEtcCZEX9aCHFuBKSP0IcvciGRTbtWRovNuT83A2iRjt6PL3bLg== +vscode-ripgrep@^1.5.5: + version "1.5.5" + resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.5.tgz#24c0e9cb356cf889c98e15ecb58f9cf654a1d961" + integrity sha512-OrPrAmcun4+uZAuNcQvE6CCPskh+5AsjANod/Q3zRcJcGNxgoOSGlQN9RPtatkUNmkN8Nn8mZBnS1jMylu/dKg== vscode-windows-registry@1.0.1: version "1.0.1" @@ -11934,21 +12118,21 @@ vue-html-loader@^1.2.4: loader-utils "^1.0.2" object-assign "^4.1.0" -vue-loader@^15.7.0: - version "15.7.0" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.0.tgz#27275aa5a3ef4958c5379c006dd1436ad04b25b3" - integrity sha512-x+NZ4RIthQOxcFclEcs8sXGEWqnZHodL2J9Vq+hUz+TDZzBaDIh1j3d9M2IUlTjtrHTZy4uMuRdTi8BGws7jLA== +vue-loader@^15.7.1: + version "15.7.1" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.1.tgz#6ccacd4122aa80f69baaac08ff295a62e3aefcfd" + integrity sha512-fwIKtA23Pl/rqfYP5TSGK7gkEuLhoTvRYW+TU7ER3q9GpNLt/PjG5NLv3XHRDiTg7OPM1JcckBgds+VnAc+HbA== dependencies: - "@vue/component-compiler-utils" "^2.5.1" + "@vue/component-compiler-utils" "^3.0.0" hash-sum "^1.0.2" loader-utils "^1.1.0" vue-hot-reload-api "^2.3.0" vue-style-loader "^4.1.0" -vue-router@^3.0.6: - version "3.0.6" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.6.tgz#2e4f0f9cbb0b96d0205ab2690cfe588935136ac3" - integrity sha512-Ox0ciFLswtSGRTHYhGvx2L44sVbTPNS+uD2kRISuo8B39Y79rOo0Kw0hzupTmiVtftQYCZl87mwldhh2L9Aquw== +vue-router@^3.0.7: + version "3.0.7" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.7.tgz#b36ca107b4acb8ff5bc4ff824584059c23fcb87b" + integrity sha512-utJ+QR3YlIC/6x6xq17UMXeAfxEvXA0VKD3PiSio7hBOZNusA1jXcbxZxVEfJunLp48oonjTepY8ORoIlRx/EQ== vue-style-loader@^4.1.0, vue-style-loader@^4.1.2: version "4.1.2" @@ -12068,22 +12252,22 @@ webpack-bundle-analyzer@^3.3.2: opener "^1.5.1" ws "^6.0.0" -webpack-cli@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.2.tgz#aed2437b0db0a7faa2ad28484e166a5360014a91" - integrity sha512-FLkobnaJJ+03j5eplxlI0TUxhGCOdfewspIGuvDVtpOlrAuKMFC57K42Ukxqs1tn8947/PM6tP95gQc0DCzRYA== +webpack-cli@^3.3.6: + version "3.3.6" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.6.tgz#2c8c399a2642133f8d736a359007a052e060032c" + integrity sha512-0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A== dependencies: - chalk "^2.4.1" - cross-spawn "^6.0.5" - enhanced-resolve "^4.1.0" - findup-sync "^2.0.0" - global-modules "^1.0.0" - import-local "^2.0.0" - interpret "^1.1.0" - loader-utils "^1.1.0" - supports-color "^5.5.0" - v8-compile-cache "^2.0.2" - yargs "^12.0.5" + chalk "2.4.2" + cross-spawn "6.0.5" + enhanced-resolve "4.1.0" + findup-sync "3.0.0" + global-modules "2.0.0" + import-local "2.0.0" + interpret "1.2.0" + loader-utils "1.2.3" + supports-color "6.1.0" + v8-compile-cache "2.0.3" + yargs "13.2.4" webpack-dev-middleware@^2.0.6: version "2.0.6" @@ -12188,17 +12372,16 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.31.0: - version "4.31.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.31.0.tgz#ae201d45f0571336e42d1c2b5c8ab56c4d3b0c63" - integrity sha512-n6RVO3X0LbbipoE62akME9K/JI7qYrwwufs20VvgNNpqUoH4860KkaxJTbGq5bgkVZF9FqyyTG/0WPLH3PVNJA== +webpack@^4.36.1: + version "4.36.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.36.1.tgz#f546fda7a403a76faeaaa7196c50d12370ed18a9" + integrity sha512-Ej01/N9W8DVyhEpeQnbUdGvOECw0L46FxS12cCOs8gSK7bhUlrbHRnWkjiXckGlHjUrmL89kDpTRIkUk6Y+fKg== dependencies: "@webassemblyjs/ast" "1.8.5" "@webassemblyjs/helper-module-context" "1.8.5" "@webassemblyjs/wasm-edit" "1.8.5" "@webassemblyjs/wasm-parser" "1.8.5" - acorn "^6.0.5" - acorn-dynamic-import "^4.0.0" + acorn "^6.2.0" ajv "^6.1.0" ajv-keywords "^3.1.0" chrome-trace-event "^1.0.0" @@ -12276,7 +12459,7 @@ which-pm-runs@^1.0.0: resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= -which@1, which@1.3.1, which@^1.1.1, which@^1.2.14, which@^1.2.9: +which@1, which@1.3.1, which@^1.1.1, which@^1.2.14, which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -12462,7 +12645,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.2: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== @@ -12491,6 +12674,14 @@ yargs-parser@^13.1.0: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^13.1.1: + version "13.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" + integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-unparser@1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.5.0.tgz#f2bb2a7e83cbc87bb95c8e572828a06c9add6e0d" @@ -12535,7 +12726,7 @@ yargs@13.2.2: y18n "^4.0.0" yargs-parser "^13.0.0" -yargs@^13.2.2, yargs@~13.2.4: +yargs@13.2.4, yargs@^13.2.2, yargs@~13.2.4: version "13.2.4" resolved "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83" integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg== @@ -12552,6 +12743,22 @@ yargs@^13.2.2, yargs@~13.2.4: y18n "^4.0.0" yargs-parser "^13.1.0" +yargs@^13.3.0: + version "13.3.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" + integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA== + dependencies: + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.1" + yargs@~3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"