pulsar-edit/pulsar
1
1
Fork 0
mirror of https://github.com/pulsar-edit/pulsar.git synced 2024-09-20 07:28:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'atom:master' into master

Browse Source
This commit is contained in:
Andy Lin 2021-05-10 14:23:52 -04:00
commit 9bb639137b
5 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package-lock.json generated
View File

@ -3476,8 +3476,8 @@
}
},
"find-and-replace": {
"version": "https://www.atom.io/api/packages/find-and-replace/versions/0.219.7/tarball",
"integrity": "sha512-I3TdBhpUr+Qk5JqtmO+lt1oRc6yRpu4lBxq1ZAow5uY/UEmg0D5NyLO5liuH6FEINDaO17MQN66wCqgOsVzYrQ==",
"version": "https://www.atom.io/api/packages/find-and-replace/versions/0.219.8/tarball",
"integrity": "sha512-5jb+LoQFijsADkyD2t4vZl2vgSKN+4d157NMRZYwwEAytVNEvpDsq2QBZapbcTVISRIvOoznT5tu1RrqkWl+zw==",
"requires": {
"binary-search": "^1.3.3",
"etch": "0.9.3",
@ -6260,9 +6260,9 @@
"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
},
"pathwatcher": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.1.0.tgz",
"integrity": "sha512-CF6M8W3kR4sEF2wzwRLAN/J+MfstclhRhfd0+SP83vQyrIsuKDSxd6r2TVG16sXpKCzo/ieAQ+GD0yYZ1380Nw==",
"version": "8.1.1",
"resolved": "https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.1.1.tgz",
"integrity": "sha512-ObyoLNLIFaK0pKqrlgSHSbsRcahsngay4u2Vzs8k89BMBZaQZbyrOKLJccX4NROUyEe5LNPu/UYvpp5Lg7EosQ==",
"requires": {
"async": "~0.2.10",
"emissary": "^1.3.2",
@ -6278,14 +6278,6 @@
"version": "0.2.10",
"resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
"integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E="
},
"grim": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/grim/-/grim-2.0.2.tgz",
"integrity": "sha512-Qj7hTJRfd87E/gUgfvM0YIH/g2UA2SV6niv6BYXk1o6w4mhgv+QyYM1EjOJQljvzgEj4SqSsRWldXIeKHz3e3Q==",
"requires": {
"event-kit": "^2.0.0"
}
}
}
},

8
package.json
View File

@ -1,7 +1,7 @@
{
"name": "atom",
"productName": "Atom",
"version": "1.58.0-dev",
"version": "1.59.0-dev",
"description": "A hackable text editor for the 21st Century.",
"main": "./src/main-process/main.js",
"repository": {
@ -57,7 +57,7 @@
"etch": "0.14.1",
"event-kit": "^2.5.3",
"exception-reporting": "file:packages/exception-reporting",
"find-and-replace": "https://www.atom.io/api/packages/find-and-replace/versions/0.219.7/tarball",
"find-and-replace": "https://www.atom.io/api/packages/find-and-replace/versions/0.219.8/tarball",
"find-parent-dir": "^0.3.0",
"first-mate": "7.4.1",
"focus-trap": "6.3.0",
@ -135,7 +135,7 @@
"one-light-ui": "file:packages/one-light-ui",
"open-on-github": "https://www.atom.io/api/packages/open-on-github/versions/1.3.2/tarball",
"package-generator": "https://www.atom.io/api/packages/package-generator/versions/1.3.0/tarball",
"pathwatcher": "8.1.0",
"pathwatcher": "^8.1.1",
"postcss": "8.1.6",
"postcss-selector-parser": "6.0.4",
"prebuild-install": "6.0.0",
@ -203,7 +203,7 @@
"dev-live-reload": "file:./packages/dev-live-reload",
"encoding-selector": "0.23.9",
"exception-reporting": "file:./packages/exception-reporting",
"find-and-replace": "0.219.7",
"find-and-replace": "0.219.8",
"fuzzy-finder": "1.14.3",
"github": "0.36.9",
"git-diff": "file:./packages/git-diff",

12
packages/about/package-lock.json generated
View File

@ -814,9 +814,9 @@
"dev": true
},
"hosted-git-info": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
"version": "2.8.9",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
"dev": true
},
"iconv-lite": {
@ -1058,9 +1058,9 @@
}
},
"lodash": {
"version": "4.17.20",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"dev": true
},
"loose-envify": {

6
script/vsts/package-lock.json generated
View File

@ -1373,9 +1373,9 @@
}
},
"hosted-git-info": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
"version": "2.8.9",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
},
"http-cache-semantics": {
"version": "3.8.1",

4
spec/text-editor-component-spec.js
View File

@ -605,8 +605,8 @@ describe('TextEditorComponent', () => {
it('blinks cursors when the editor is focused and the cursors are not moving', async () => {
assertDocumentFocused();
const { component, element, editor } = buildComponent();
component.props.cursorBlinkPeriod = 40;
component.props.cursorBlinkResumeDelay = 40;
component.props.cursorBlinkPeriod = 30;
component.props.cursorBlinkResumeDelay = 30;
editor.addCursorAtScreenPosition([1, 0]);
element.focus();