github/marktext
5
0
Fork 0
mirror of https://github.com/marktext/marktext.git synced 2025-05-02 07:31:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: electron and dayjs (#801)

Browse Source 
* update: electron and dayjs

* update useage of dayjs

* rm yarn-error.log
This commit is contained in:
Ran Luo 2019-03-25 12:03:45 +08:00 committed by GitHub
parent 347a1dfe45
commit 2389332e42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,6 +10,7 @@ coverage
node_modules/
npm-debug.log
npm-debug.log.*
yarn-error.log
thumbs.db
!.gitkeep
.idea

6
package.json
View File

@ -142,9 +142,9 @@
"@hfelix/electron-localshortcut": "^3.1.1",
"axios": "^0.18.0",
"chokidar": "^2.1.2",
"codemirror": "^5.44.0",
"codemirror": "^5.45.0",
"command-exists": "^1.2.8",
"dayjs": "^1.8.10",
"dayjs": "^1.8.11",
"dompurify": "^1.0.10",
"electron-is-accelerator": "^0.1.2",
"element-resize-detector": "^1.2.0",
@ -193,7 +193,7 @@
"css-loader": "^2.1.1",
"del": "^4.0.0",
"devtron": "^1.4.0",
"electron": "^4.0.8",
"electron": "^4.1.1",
"electron-builder": "^20.39.0",
"electron-debug": "^2.1.0",
"electron-devtools-installer": "^2.2.4",

5
src/renderer/util/day.js
View File

@ -1,8 +1,9 @@
import dayjs from 'dayjs/esm'
import relativeTime from 'dayjs/esm/plugin/relativeTime'
import 'dayjs/esm/locale/en' // load on demand
dayjs.locale('en') // use Spanish locale globally
// `en` is a built in locale. no need to import it.
// import 'dayjs/esm/locale/en' // load on demand
// dayjs.locale('en') // use en locale globally
dayjs.extend(relativeTime)

30
yarn.lock
View File

@ -143,9 +143,9 @@
integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ=
"@types/node@^10.12.18":
version "10.14.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.1.tgz#8701cd760acc20beba5ffe0b7a1b879f39cb8c41"
integrity sha512-Rymt08vh1GaW4vYB6QP61/5m/CFLGnFZP++bJpWbiNxceNa6RBipDmb413jvtSf/R1gg5a/jQVl2jY4XVRscEA==
version "10.14.3"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.3.tgz#170a81168620d931cc3b83460be253cadd3028f1"
integrity sha512-2lhc7S28vo8FwR3Jv3Ifyd77AxEsx+Nl9ajWiac6/eWuvZ84zPK4RE05pfqcn3acIzlZDpQj5F1rIKQZX3ptLQ==
"@types/q@^1.5.1":
version "1.5.2"
@ -2265,10 +2265,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.44.0:
version "5.44.0"
resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.44.0.tgz#80dc2a231eeb7aab25ec2405cdca37e693ccf9cc"
integrity sha512-3l42syTNakCdCQuYeZJXTyxina6Y9i4V0ighSJXNCQtRbaCN76smKKLu1ZHPHQon3rnzC7l4i/0r4gp809K1wg==
codemirror@^5.45.0:
version "5.45.0"
resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.45.0.tgz#db5ebbb3bf44028c684053f3954d011efcec27ad"
integrity sha512-c19j644usCE8gQaXa0jqn2B/HN9MnB2u6qPIrrhrMkB+QAP42y8G4QnTwuwbVSoUS1jEl7JU9HZMGhCDL0nsAw==
collection-visit@^1.0.0:
version "1.0.0"
@ -3168,10 +3168,10 @@ dateformat@^1.0.6:
get-stdin "^4.0.1"
meow "^3.3.0"
dayjs@^1.8.10:
version "1.8.10"
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.10.tgz#fc35a976ccac2a9c44b50485a06c4a5ecf5d1b37"
integrity sha512-U+7kBBkJzPWww0vNeMkaBeJwnkivTACoajm+bTfwparjFcPI6/5JSQN40WVnX6yCsm20oGf1SkMkIIp4m/boAw==
dayjs@^1.8.11:
version "1.8.11"
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.11.tgz#1e0e681c9f1b6668d92dfe71289500ae0990529d"
integrity sha512-eBvWmKn52ax/TBYg7f+tzzqARPl0D0/NUmf5QrZ0Pp+/vFoTP3Q7y4t6p438+5NPN+t8y8Sps3Ed34OV8sNFBQ==
de-indent@^1.0.2:
version "1.0.2"
@ -3762,10 +3762,10 @@ electron-window-state@^5.0.3:
jsonfile "^4.0.0"
mkdirp "^0.5.1"
electron@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/electron/-/electron-4.0.8.tgz#b7998b16543d2094f081757a0c5afdb8875ea510"
integrity sha512-FOBJIHkuv8wc15N+ZyqwDzPavYVu5CHMBEf14jHDWv7QW2vkEIpJjVK+PIT31kfZfvjsIP0j2wvA/FBsiqB7pw==
electron@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/electron/-/electron-4.1.1.tgz#dc9343ba829cabbf01364761e72796f766704184"
integrity sha512-ABIEXTw55eiCW30a6F8fWLHL0QeH+yK3JgZpvTZZWLnkO5/SmG38avMxRhKOUQstRpYb+EEpE8IAM2DVOaTvtw==
dependencies:
"@types/node" "^10.12.18"
electron-download "^4.1.0"