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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to N-API and Electron 11 #2422

Merged
merged 3 commits into from Dec 18, 2020
Merged

Upgrade to N-API and Electron 11 #2422

merged 3 commits into from Dec 18, 2020

Conversation

fxha
Copy link
Contributor

@fxha fxha commented Dec 3, 2020 •
edited

Q A
License MIT

Description

Upgraded all native add-ons in renderer process to N-API and Electron to version 11. The minimum Node version to build Mark Text is now 12.17.

@Jocs Please test this PR in detail and also build and test the binary because there were a few issues.

Resolves #2128

Blocked by Electron v11.0.4 release due to issues with ASAR unpacking.

@fxha fxha requested a review from Jocs December 3, 2020 16:23
@fxha fxha added the 🛑 blocked This issue or PR is blocked by other issue label Dec 5, 2020
@fxha fxha removed the 🛑 blocked This issue or PR is blocked by other issue label Dec 10, 2020
@fxha
Copy link
Contributor Author

fxha commented Dec 10, 2020

@Jocs The PR is ready to review and test, so far everything is fine on Linux and Windows.

@Jocs
Copy link
Member

Jocs commented Dec 16, 2020

Hi @fxha it works well on macOS, only some eslint warning like bellow:

 WARNING in ./src/renderer/store/treeCtrl.js
  Module Warning (from ./node_modules/eslint-loader/dist/cjs.js):
  Cannot read property 'value' of null
  Occurred while linting /Users/ransixi/Documents/marktext/src/renderer/store/treeCtrl.js:39
   @ ./src/renderer/store/project.js 3:0-80 50:4-11 57:4-14 64:4-16 71:4-19
   @ ./src/renderer/store/index.js
   @ ./src/renderer/main.js
   @ multi ./.electron-vue/dev-client ./src/renderer/main.js

it maybe the issue in babel, you can refer these issues:

babel/babel#10904
babel/babel-eslint#681

It works well after I turn off these two eslint rules.

   'template-curly-spacing': "off",
   'indent' : "off",

@fxha
Copy link
Contributor Author

fxha commented Dec 17, 2020

@Jocs Strange error, just as our CI passed... Could you check again with the patch applied?

@fxha fxha added this to Review in 0.16.3 Dec 17, 2020
@fxha fxha mentioned this pull request Dec 17, 2020
Closed
@Jocs Jocs merged commit e4b3381 into develop Dec 18, 2020
@Jocs Jocs deleted the electron11-napi branch December 18, 2020 10:26
@Jocs
Copy link
Member

Jocs commented Dec 18, 2020

done. great!

@fxha fxha moved this from Review to Done in 0.16.3 Dec 18, 2020
Jocs added a commit that referenced this pull request Jul 16, 2021
@fxha @Jocs
@saymoon @shaunmbg @aimproxy @dandv @BeatLink @MrHeer @brainchild0 @Pajn @nyanpasu64 @Sbelletier @xinpingwang @endersonmenezes @sweetliquid @nickali @erentar @mnxn @vemonet @extern-c @antonfreeman @munckymagik @evan-cohen @zmen @bmvisoky @yelomelon @mzzx @kawarimidoll
Merge develop into master (#2456)
1790504 
* update readme (#2008)

* update readme

* remove unused codes

* Update third party

* remove unused codes

* fix: style error in editor setting

* Release v0.16.1 (#2011)

* Fix typo (#2118)

* Include Chocolatey package installation option (#2107)

* Update dependencies (#2133)

* Fix max width of editor tabs (#2097)

* Fix max width of editor tabs

* Update sponsor (#2141)

* update: sponsors

* update img width and height

* Add ability to paste images to Features (#2127)

* Fix empty shortcuts in shortcut validator (#2130)

* Fix Hunspell dictionary downloader on Windows (#2131)

* Add missing encoding entry (#2132)

* Improve heading font size scaling (#2135)

* Reduce dependency bundle size (#2136)

* Fix Hunspell spell checker initialization on Windows (#2137)

* Disable and hide unnecessary settings options (#2138)

* Increase indentation for sidebar treeview (#2161)

* Fix image export issues on Windows (#2129)

* Fix footnote renderer exception in markedjs (#2162)

* Add GitLab math block support (#2119)

* update: yarn.lock file (#2178)

* feat: switch tabs using alt-#num (#1975)

* Fix bad font when exporting document on macOS (#2190)

* 📝 update zh_cn.md (#2192)

* Improve English grammar in user-interface text. (#2075)

* Fix unnecessary character sanitation on clipboard output (#2197)

* Fix double used shortcut (#2198)

* Fix double used shortcut

* Update documentation

* Update dependencies (#2199)

* Support setting text direction via comand palette (#2194) (#2195)

* Update bug issue template (#2215)

* Fix inline html renderer (#2224)

* Fix sub- and superscript in HTML output

* Update dependencies

* Conform user-interface text to conventions for trailing punctuation (#2209)

* Release v0.16.2 (#2200)

Bump version to 0.16.2 and update documentation.

* Replace PRC emoji for zh_TW translation with Taiwan flag (#2278)

* Update FAQ.md (#2290)

Clarify what aidou is for non-chinese users

* Fix markdown syntax document mistake for table content align (#2282) (#2296)

* Update pt.md (#2350)

* Update pt.md

My annual contribution to Mark Text, with its documentation accessible to all Brazilians and Portuguese.

* Update pt.md

* Update pt.md

* Update pt.md

* Update pt.md

* Update pt.md

* Update pt.md

* Update pt.md

* Update pt.md

* Update regex of auto link to fix trailing slashes (#2354)

* Update FAQ.md - link to Portable (#2337)

Fixing link to portable page.

* updated turkish translation of readme.md (#2366)

* pass file.id to closeTab on middle click (#2272)

* Add codeblock highlight and coloration for the SPARQL and Turtle languages (#2365)

* fix image paths on readme tr.md (#2374)

* Fix issue with not being able to copy table cell (#2375)

* fixed issue#2383 (#2397)

* Fix quick open bug and freeze constants to avoid accidental mutation (#2323)

* fix: #2330 enable shift+tab for table navigation (#2331)

* fix: prism language missing while load dependent language (#1752) (#2335)

* Fix graphite light wordcount (#2392)

* Update dependencies (minor only) (#2402)

* fix: typewriter shake after press enter (#1852)

* Support negative zoom (#2412)

* Restrict export dialog file extensions (#2408)

* Allow BCP-47 language codes in spell checker (#2410)

* Fix footnote inline code font size (#2411)

* feat: add shortcut for toggle-toc (#1863) (#2326)

* Make global menu fields mutable (#2407)

* Replace text when only one table cell is selected (#2413)

* Allow to copy table cells text as plaintext (#2409)

* Fix font selection autocomplete (#2420)

* Updated korean translation of README.md (#2432)

I updated ko.md (korean translation of README.md) to match the latest version of README.md

* Rebase markedjs bug fixes (#2419)

* Add option to disable HTML rendering (#2414)

* Fix symbolic links and related path issues (#2416)

* Upgrade to N-API and Electron 11 (#2422)

* Upgrade to N-API and Electron 11

* Update Electron and remove workaround

* Fix ESLint error

* Disble MathML due to DOMPurify security issues (#2436)

* Update Simplified Chinese translation of README (#2445)

* Improve undo history (#2437)

* Add TOC generator to document exporter (#2391)

* Add support for relative image directory (#2439)

* Fix installation instructions in README.md (#2449)

* Update README.md

Calling brew cask install is disabled

* Update i18n files

* Release v0.16.3 (#2448)

Co-authored-by: Ran Luo <ransixi@gmail.com>
Co-authored-by: saymoon <saymoon@gmail.com>
Co-authored-by: shaunmbg <shaunmbg@users.noreply.github.com>
Co-authored-by: Micael Dias <diasmicaelandre@gmail.com>
Co-authored-by: Dan Dascalescu <ddascalescu+github@gmail.com>
Co-authored-by: BeatLink <47278150+BeatLink@users.noreply.github.com>
Co-authored-by: He Linming <hlm52pk@163.com>
Co-authored-by: Royce <royce2003@qq.com>
Co-authored-by: brainchild0 <34869175+brainchild0@users.noreply.github.com>
Co-authored-by: Rasmus Eneman <rasmus@eneman.eu>
Co-authored-by: nyanpasu64 <nyanpasu64@tuta.io>
Co-authored-by: Sbelletier <sbelletier@gmail.com>
Co-authored-by: 小新 <xinping.wang@hotmail.com>
Co-authored-by: Enderson Menezes <endersonster@gmail.com>
Co-authored-by: Sweet Liquid <himejisyana@hotmail.com>
Co-authored-by: Nick Ali <1514992+nickali@users.noreply.github.com>
Co-authored-by: erentar <erentar2002@gmail.com>
Co-authored-by: Max Lantas <mnxndev@outlook.com>
Co-authored-by: Vincent Emonet <vincent.emonet@gmail.com>
Co-authored-by: Amauri Bizerra <amauriairesfilho@gmail.com>
Co-authored-by: Anton Freeman <asfreeman12@gmail.com>
Co-authored-by: Dan Munckton <munckfish@gmail.com>
Co-authored-by: evan-cohen <evancohen97@gmail.com>
Co-authored-by: zmen <sandoverflow@gmail.com>
Co-authored-by: bmvisoky <49735648+bmvisoky@users.noreply.github.com>
Co-authored-by: YeloMelon <42390003+YeloMelon@users.noreply.github.com>
Co-authored-by: MingZZX <41257880+mzzx@users.noreply.github.com>
Co-authored-by: カワリミ人形 <kawarimidoll+git@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jocs Jocs Jocs approved these changes

Assignees
No one assigned
Labels
None yet
Projects
No open projects
0.16.3
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Electron 9
2 participants
@fxha @Jocs