Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Upgrade to N-API and Electron 11 #2422

Merged
merged 3 commits into from Dec 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion .eslintrc.js
Expand Up @@ -47,7 +47,10 @@ module.exports = {
'no-mixed-operators': "off",
'no-prototype-builtins': "off",
'no-return-await': "off",
'accessor-pairs': "off"
'accessor-pairs': "off",
// Workaround #2422.
'template-curly-spacing': "off",
'indent' : "off"
},
settings: {
'import/resolver': {
Expand Down
2 changes: 1 addition & 1 deletion docs/dev/BUILD.md
Expand Up @@ -10,7 +10,7 @@ git clone https://github.com/marktext/marktext.git

Before you can get started developing, you need set up your build environment:

- Node.js `>=v12.0.0` and yarn
- Node.js `>=v12.17` and yarn
- Python `v2.7` or `>=v3.5` for node-gyp
- C++ compiler and development tools
- Build is supported on Linux, macOS and Windows
Expand Down
50 changes: 25 additions & 25 deletions package.json
Expand Up @@ -34,28 +34,28 @@
},
"dependencies": {
"@hfelix/electron-localshortcut": "^3.1.1",
"@hfelix/electron-spellchecker": "1.0.0-rc.5",
"@hfelix/electron-spellchecker": "^2.0.0",
"@octokit/rest": "^16.43.2",
"arg": "^4.1.3",
"arg": "^5.0.0",
"axios": "^0.21.0",
"ced": "^1.0.0",
"chokidar": "^3.4.3",
"codemirror": "^5.58.3",
"command-exists": "^1.2.9",
"dayjs": "^1.9.6",
"dayjs": "^1.9.7",
"dom-autoscroller": "^2.3.4",
"dompurify": "^2.2.2",
"dompurify": "^2.2.4",
"dragula": "^3.7.3",
"electron-is-accelerator": "^0.2.0",
"electron-log": "^4.3.0",
"electron-log": "^4.3.1",
"electron-store": "^6.0.1",
"electron-window-state": "^5.0.3",
"element-resize-detector": "^1.2.1",
"element-ui": "^2.14.1",
"execall": "^2.0.0",
"file-icons-js": "1.0.3",
"flowchart.js": "^1.15.0",
"fontmanager-redux": "^0.4.0",
"fontmanager-redux": "^1.0.0",
"fs-extra": "^9.0.1",
"fuzzaldrin": "^2.1.0",
"github-markdown-css": "^3.0.1",
Expand All @@ -65,8 +65,8 @@
"joplin-turndown-plugin-gfm": "^1.0.12",
"katex": "^0.12.0",
"keyboard-layout": "^2.0.17",
"keytar": "^6.0.1",
"mermaid": "^8.8.3",
"keytar": "^7.3.0",
"mermaid": "^8.8.4",
"plist": "^3.0.1",
"popper.js": "^1.16.1",
"prismjs": "^1.22.0",
Expand All @@ -77,7 +77,7 @@
"underscore": "^1.12.0",
"unsplash-js": "^6.3.0",
"vega": "^5.17.0",
"vega-embed": "^6.13.0",
"vega-embed": "^6.14.2",
"vega-lite": "^4.17.0",
"vscode-ripgrep": "^1.11.1",
"vue": "^2.6.12",
Expand All @@ -87,37 +87,37 @@
"webfontloader": "^1.6.28"
},
"devDependencies": {
"@babel/core": "^7.12.9",
"@babel/core": "^7.12.10",
"@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.12.1",
"@babel/preset-env": "^7.12.7",
"@babel/register": "^7.12.1",
"@babel/plugin-transform-runtime": "^7.12.10",
"@babel/preset-env": "^7.12.11",
"@babel/register": "^7.12.10",
"@babel/runtime": "^7.12.5",
"@markedjs/html-differ": "^3.0.4",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.2.1",
"babel-loader": "^8.2.2",
"babel-plugin-component": "^1.1.1",
"babel-plugin-istanbul": "^6.0.0",
"cfonts": "^2.8.6",
"cfonts": "^2.9.0",
"chai": "^4.2.0",
"chalk": "^4.1.0",
"cheerio": "^1.0.0-rc.3",
"copy-webpack-plugin": "^5.1.2",
"cross-env": "^7.0.2",
"cross-env": "^7.0.3",
"css-loader": "^3.6.0",
"del": "^5.1.0",
"devtron": "^1.4.0",
"dotenv": "^8.2.0",
"electron": "^8.5.5",
"electron-builder": "^22.9.1",
"electron": "^11.1.0",
"electron-builder": "^22.10.3",
"electron-devtools-installer": "^3.1.1",
"electron-rebuild": "^2.3.2",
"electron-updater": "^4.3.5",
"eslint": "^7.14.0",
"electron-rebuild": "^2.3.4",
"electron-updater": "^4.3.7",
"eslint": "^7.15.0",
"eslint-config-standard": "^14.1.1",
"eslint-friendly-formatter": "^4.0.1",
"eslint-import-resolver-alias": "^1.1.2",
Expand All @@ -131,7 +131,7 @@
"esm": "^3.2.25",
"file-loader": "^6.2.0",
"git-revision-webpack-plugin": "^3.0.6",
"html-webpack-plugin": "^4.4.1",
"html-webpack-plugin": "^4.5.0",
"imports-loader": "^0.8.0",
"karma": "^5.2.3",
"karma-chai": "^0.1.0",
Expand All @@ -142,7 +142,7 @@
"karma-spec-reporter": "0.0.32",
"karma-webpack": "^4.0.2",
"license-checker": "^25.0.1",
"marked": "^1.2.5",
"marked": "^1.2.7",
"mini-css-extract-plugin": "^0.12.0",
"mocha": "^7.2.0",
"multispinner": "^0.2.1",
Expand All @@ -152,15 +152,15 @@
"postcss-preset-env": "^6.7.0",
"raw-loader": "^4.0.2",
"require-dir": "^1.2.0",
"spectron": "^10.0.1",
"spectron": "^13.0.0",
"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.1",
"vue-html-loader": "^1.2.4",
"vue-loader": "^15.9.5",
"vue-loader": "^15.9.6",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.6.12",
"webpack": "^4.44.2",
Expand Down