mirror of
https://github.com/marktext/marktext.git
synced 2025-05-02 19:41:39 +08:00
Update dependencies (minor only) (#2402)
This commit is contained in:
Felix Häusler
GitHub
parent
e1498c6e8a
commit
dd672d75f1
@ -6,6 +6,7 @@ const path = require('path')
|
||||
const { say } = require('cfonts')
|
||||
const { spawn } = require('child_process')
|
||||
const webpack = require('webpack')
|
||||
const HtmlWebpackPlugin = require('html-webpack-plugin')
|
||||
const WebpackDevServer = require('webpack-dev-server')
|
||||
const webpackHotMiddleware = require('webpack-hot-middleware')
|
||||
|
||||
@ -48,14 +49,18 @@ function startRenderer () {
|
||||
heartbeat: 2500
|
||||
})
|
||||
|
||||
compiler.plugin('compilation', compilation => {
|
||||
compilation.plugin('html-webpack-plugin-after-emit', (data, cb) => {
|
||||
compiler.hooks.compilation.tap('HtmlWebpackPluginAfterEmit', compilation => {
|
||||
HtmlWebpackPlugin.getHooks(compilation).afterEmit.tapAsync(
|
||||
'AfterPlugin', // <-- Set a meaningful name here for stacktraces
|
||||
(data, cb) => {
|
||||
hotMiddleware.publish({ action: 'reload' })
|
||||
cb && cb()
|
||||
})
|
||||
// Tell webpack to move on
|
||||
cb(null, data)
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
compiler.plugin('done', stats => {
|
||||
compiler.hooks.done.tap('AfterCompiler', stats => {
|
||||
logStats('Renderer', stats)
|
||||
})
|
||||
|
||||
@ -83,7 +88,7 @@ function startMain () {
|
||||
|
||||
const compiler = webpack(mainConfig)
|
||||
|
||||
compiler.plugin('watch-run', (compilation, done) => {
|
||||
compiler.hooks.watchRun.tapAsync('Compiling', (_, done) => {
|
||||
logStats('Main', chalk.white.bold('compiling...'))
|
||||
hotMiddleware.publish({ action: 'compiling' })
|
||||
done()
|
||||
|
||||
138
package.json
138
package.json
@ -35,137 +35,137 @@
|
||||
"dependencies": {
|
||||
"@hfelix/electron-localshortcut": "^3.1.1",
|
||||
"@hfelix/electron-spellchecker": "1.0.0-rc.5",
|
||||
"@octokit/rest": "^16.43.1",
|
||||
"@octokit/rest": "^16.43.2",
|
||||
"arg": "^4.1.3",
|
||||
"axios": "^0.19.2",
|
||||
"axios": "^0.21.0",
|
||||
"ced": "^1.0.0",
|
||||
"chokidar": "^3.4.0",
|
||||
"codemirror": "^5.54.0",
|
||||
"chokidar": "^3.4.3",
|
||||
"codemirror": "^5.58.3",
|
||||
"command-exists": "^1.2.9",
|
||||
"dayjs": "^1.8.28",
|
||||
"dayjs": "^1.9.6",
|
||||
"dom-autoscroller": "^2.3.4",
|
||||
"dompurify": "^2.0.11",
|
||||
"dragula": "^3.7.2",
|
||||
"dompurify": "^2.2.2",
|
||||
"dragula": "^3.7.3",
|
||||
"electron-is-accelerator": "^0.2.0",
|
||||
"electron-log": "^4.2.2",
|
||||
"electron-store": "^5.2.0",
|
||||
"electron-log": "^4.3.0",
|
||||
"electron-store": "^6.0.1",
|
||||
"electron-window-state": "^5.0.3",
|
||||
"element-resize-detector": "^1.2.1",
|
||||
"element-ui": "^2.13.2",
|
||||
"element-ui": "^2.14.1",
|
||||
"execall": "^2.0.0",
|
||||
"file-icons-js": "^1.0.3",
|
||||
"flowchart.js": "^1.13.0",
|
||||
"file-icons-js": "1.0.3",
|
||||
"flowchart.js": "^1.15.0",
|
||||
"fontmanager-redux": "^0.4.0",
|
||||
"fs-extra": "^9.0.1",
|
||||
"fuzzaldrin": "^2.1.0",
|
||||
"github-markdown-css": "^3.0.1",
|
||||
"html-tags": "^3.1.0",
|
||||
"iconv-lite": "^0.6.0",
|
||||
"iso-639-1": "^2.1.3",
|
||||
"iconv-lite": "^0.6.2",
|
||||
"iso-639-1": "^2.1.4",
|
||||
"joplin-turndown-plugin-gfm": "^1.0.12",
|
||||
"katex": "^0.11.1",
|
||||
"keyboard-layout": "^2.0.16",
|
||||
"katex": "^0.12.0",
|
||||
"keyboard-layout": "^2.0.17",
|
||||
"keytar": "^6.0.1",
|
||||
"mermaid": "^8.5.2",
|
||||
"mermaid": "^8.8.3",
|
||||
"plist": "^3.0.1",
|
||||
"popper.js": "^1.16.1",
|
||||
"prismjs": "^1.20.0",
|
||||
"prismjs": "^1.22.0",
|
||||
"snabbdom": "^0.7.4",
|
||||
"snabbdom-to-html": "^6.0.0",
|
||||
"source-map-support": "^0.5.19",
|
||||
"turndown": "^6.0.0",
|
||||
"underscore": "^1.10.2",
|
||||
"unsplash-js": "^6.0.0",
|
||||
"vega": "^5.13.0",
|
||||
"vega-embed": "^6.9.0",
|
||||
"vega-lite": "^4.13.1",
|
||||
"vscode-ripgrep": "^1.6.2",
|
||||
"vue": "^2.6.11",
|
||||
"turndown": "^7.0.0",
|
||||
"underscore": "^1.12.0",
|
||||
"unsplash-js": "^6.3.0",
|
||||
"vega": "^5.17.0",
|
||||
"vega-embed": "^6.13.0",
|
||||
"vega-lite": "^4.17.0",
|
||||
"vscode-ripgrep": "^1.11.1",
|
||||
"vue": "^2.6.12",
|
||||
"vue-electron": "^1.0.6",
|
||||
"vue-router": "^3.3.4",
|
||||
"vuex": "^3.4.0",
|
||||
"vue-router": "^3.4.9",
|
||||
"vuex": "^3.6.0",
|
||||
"webfontloader": "^1.6.28"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.10.2",
|
||||
"@babel/plugin-proposal-class-properties": "^7.10.1",
|
||||
"@babel/plugin-proposal-export-default-from": "^7.10.1",
|
||||
"@babel/plugin-proposal-function-bind": "^7.10.1",
|
||||
"@babel/plugin-syntax-class-properties": "^7.10.1",
|
||||
"@babel/core": "^7.12.9",
|
||||
"@babel/plugin-proposal-class-properties": "^7.12.1",
|
||||
"@babel/plugin-proposal-export-default-from": "^7.12.1",
|
||||
"@babel/plugin-proposal-function-bind": "^7.12.1",
|
||||
"@babel/plugin-syntax-class-properties": "^7.12.1",
|
||||
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
||||
"@babel/plugin-transform-runtime": "^7.10.1",
|
||||
"@babel/preset-env": "^7.10.2",
|
||||
"@babel/register": "^7.10.1",
|
||||
"@babel/runtime": "^7.10.2",
|
||||
"@markedjs/html-differ": "^3.0.2",
|
||||
"@babel/plugin-transform-runtime": "^7.12.1",
|
||||
"@babel/preset-env": "^7.12.7",
|
||||
"@babel/register": "^7.12.1",
|
||||
"@babel/runtime": "^7.12.5",
|
||||
"@markedjs/html-differ": "^3.0.4",
|
||||
"babel-eslint": "^10.1.0",
|
||||
"babel-loader": "^8.1.0",
|
||||
"babel-loader": "^8.2.1",
|
||||
"babel-plugin-component": "^1.1.1",
|
||||
"babel-plugin-istanbul": "^6.0.0",
|
||||
"cfonts": "^2.8.2",
|
||||
"cfonts": "^2.8.6",
|
||||
"chai": "^4.2.0",
|
||||
"chalk": "^4.0.0",
|
||||
"chalk": "^4.1.0",
|
||||
"cheerio": "^1.0.0-rc.3",
|
||||
"copy-webpack-plugin": "^5.1.1",
|
||||
"copy-webpack-plugin": "^5.1.2",
|
||||
"cross-env": "^7.0.2",
|
||||
"css-loader": "^3.5.3",
|
||||
"css-loader": "^3.6.0",
|
||||
"del": "^5.1.0",
|
||||
"devtron": "^1.4.0",
|
||||
"dotenv": "^8.2.0",
|
||||
"electron": "^8.3.2",
|
||||
"electron-builder": "^22.7.0",
|
||||
"electron-devtools-installer": "^3.0.0",
|
||||
"electron-rebuild": "^1.11.0",
|
||||
"electron-updater": "^4.3.3",
|
||||
"eslint": "^7.2.0",
|
||||
"electron": "^8.5.5",
|
||||
"electron-builder": "^22.9.1",
|
||||
"electron-devtools-installer": "^3.1.1",
|
||||
"electron-rebuild": "^2.3.2",
|
||||
"electron-updater": "^4.3.5",
|
||||
"eslint": "^7.14.0",
|
||||
"eslint-config-standard": "^14.1.1",
|
||||
"eslint-friendly-formatter": "^4.0.1",
|
||||
"eslint-import-resolver-alias": "^1.1.2",
|
||||
"eslint-loader": "^4.0.2",
|
||||
"eslint-plugin-html": "^6.0.2",
|
||||
"eslint-plugin-import": "^2.20.2",
|
||||
"eslint-plugin-html": "^6.1.1",
|
||||
"eslint-plugin-import": "^2.22.1",
|
||||
"eslint-plugin-node": "^11.1.0",
|
||||
"eslint-plugin-promise": "^4.2.1",
|
||||
"eslint-plugin-standard": "^4.0.1",
|
||||
"eslint-plugin-standard": "^4.1.0",
|
||||
"eslint-plugin-vue": "^6.2.2",
|
||||
"esm": "^3.2.25",
|
||||
"file-loader": "^6.0.0",
|
||||
"file-loader": "^6.2.0",
|
||||
"git-revision-webpack-plugin": "^3.0.6",
|
||||
"html-webpack-plugin": "^3.2.0",
|
||||
"html-webpack-plugin": "^4.4.1",
|
||||
"imports-loader": "^0.8.0",
|
||||
"karma": "^5.0.9",
|
||||
"karma": "^5.2.3",
|
||||
"karma-chai": "^0.1.0",
|
||||
"karma-coverage": "^2.0.2",
|
||||
"karma-electron": "6.3.0",
|
||||
"karma-coverage": "^2.0.3",
|
||||
"karma-electron": "6.3.1",
|
||||
"karma-mocha": "^2.0.1",
|
||||
"karma-sourcemap-loader": "^0.3.7",
|
||||
"karma-sourcemap-loader": "^0.3.8",
|
||||
"karma-spec-reporter": "0.0.32",
|
||||
"karma-webpack": "^4.0.2",
|
||||
"license-checker": "^25.0.1",
|
||||
"marked": "^0.8.2",
|
||||
"mini-css-extract-plugin": "^0.9.0",
|
||||
"marked": "^1.2.5",
|
||||
"mini-css-extract-plugin": "^0.12.0",
|
||||
"mocha": "^7.2.0",
|
||||
"multispinner": "^0.2.1",
|
||||
"node-fetch": "^2.6.0",
|
||||
"node-fetch": "^2.6.1",
|
||||
"node-loader": "^0.6.0",
|
||||
"postcss-loader": "^3.0.0",
|
||||
"postcss-preset-env": "^6.7.0",
|
||||
"raw-loader": "^4.0.1",
|
||||
"raw-loader": "^4.0.2",
|
||||
"require-dir": "^1.2.0",
|
||||
"spectron": "^10.0.1",
|
||||
"style-loader": "^1.2.1",
|
||||
"style-loader": "^1.3.0",
|
||||
"svg-sprite-loader": "^4.3.0",
|
||||
"svgo": "^1.3.2",
|
||||
"svgo-loader": "^2.2.1",
|
||||
"to-string-loader": "^1.1.6",
|
||||
"url-loader": "^4.1.0",
|
||||
"url-loader": "^4.1.1",
|
||||
"vue-html-loader": "^1.2.4",
|
||||
"vue-loader": "^15.9.2",
|
||||
"vue-loader": "^15.9.5",
|
||||
"vue-style-loader": "^4.1.2",
|
||||
"vue-template-compiler": "^2.6.11",
|
||||
"webpack": "^4.43.0",
|
||||
"webpack-bundle-analyzer": "^3.8.0",
|
||||
"webpack-cli": "^3.3.11",
|
||||
"vue-template-compiler": "^2.6.12",
|
||||
"webpack": "^4.44.2",
|
||||
"webpack-bundle-analyzer": "^3.9.0",
|
||||
"webpack-cli": "^3.3.12",
|
||||
"webpack-dev-server": "^3.11.0",
|
||||
"webpack-hot-middleware": "^2.25.0",
|
||||
"webpack-merge": "^4.2.2"
|
||||
|
||||
@ -6,6 +6,7 @@ export const editorWinOptions = Object.freeze({
|
||||
minWidth: 550,
|
||||
minHeight: 350,
|
||||
webPreferences: {
|
||||
enableRemoteModule: true,
|
||||
nodeIntegration: true,
|
||||
webSecurity: false
|
||||
},
|
||||
@ -20,6 +21,7 @@ export const preferencesWinOptions = Object.freeze({
|
||||
width: 950,
|
||||
height: 650,
|
||||
webPreferences: {
|
||||
enableRemoteModule: true,
|
||||
nodeIntegration: true,
|
||||
webSecurity: false
|
||||
},
|
||||
|
||||
@ -9,6 +9,8 @@ import Accessor from './app/accessor'
|
||||
import setupEnvironment from './app/env'
|
||||
import { getLogLevel } from './utils'
|
||||
|
||||
app.allowRendererProcessReuse = false
|
||||
|
||||
const initializeLogger = appEnvironment => {
|
||||
log.transports.console.level = process.env.NODE_ENV === 'development' ? true : 'error'
|
||||
log.transports.rendererConsole = null
|
||||
|
||||
@ -17,6 +17,10 @@ class EmojiPicker extends BaseScrollFloat {
|
||||
this.listen()
|
||||
}
|
||||
|
||||
get renderObj () {
|
||||
return this._renderObj
|
||||
}
|
||||
|
||||
set renderObj (obj) {
|
||||
this._renderObj = obj
|
||||
const renderArray = []
|
||||
|
||||
@ -22,6 +22,10 @@ class QuickInsert extends BaseScrollFloat {
|
||||
this.listen()
|
||||
}
|
||||
|
||||
get renderObj () {
|
||||
return this._renderObj
|
||||
}
|
||||
|
||||
set renderObj (obj) {
|
||||
this._renderObj = obj
|
||||
const renderArray = []
|
||||
|
||||
@ -4,7 +4,6 @@ process.env.BABEL_ENV = 'renderer'
|
||||
|
||||
const path = require('path')
|
||||
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
|
||||
const postcssPresetEnv = require('postcss-preset-env')
|
||||
|
||||
module.exports = {
|
||||
mode: 'development',
|
||||
@ -22,14 +21,16 @@ module.exports = {
|
||||
{
|
||||
loader: 'postcss-loader',
|
||||
options: {
|
||||
ident: 'postcss',
|
||||
plugins: () => [
|
||||
postcssPresetEnv({
|
||||
postcssOptions: {
|
||||
plugins: [
|
||||
['postcss-preset-env',
|
||||
{
|
||||
stage: 0
|
||||
})
|
||||
}]
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
@ -35,6 +35,7 @@ module.exports = config => {
|
||||
base: 'Electron',
|
||||
browserWindowOptions: {
|
||||
webPreferences: {
|
||||
enableRemoteModule: true,
|
||||
nodeIntegration: true
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user