mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-09-19 06:58:26 +03:00
Merge branch 'master' into pr/155
This commit is contained in:
commit
5369ffebc4
@ -37,7 +37,7 @@
|
|||||||
"autocomplete-atom-api": "https://codeload.github.com/atom/autocomplete-atom-api/legacy.tar.gz/refs/tags/v0.10.7",
|
"autocomplete-atom-api": "https://codeload.github.com/atom/autocomplete-atom-api/legacy.tar.gz/refs/tags/v0.10.7",
|
||||||
"autocomplete-css": "https://codeload.github.com/atom/autocomplete-css/legacy.tar.gz/refs/tags/v0.17.5",
|
"autocomplete-css": "https://codeload.github.com/atom/autocomplete-css/legacy.tar.gz/refs/tags/v0.17.5",
|
||||||
"autocomplete-html": "https://github.com/pulsar-edit/autocomplete-html.git#v0.8.9",
|
"autocomplete-html": "https://github.com/pulsar-edit/autocomplete-html.git#v0.8.9",
|
||||||
"autocomplete-plus": "https://github.com/pulsar-edit/autocomplete-plus.git#2.42.6",
|
"autocomplete-plus": "https://codeload.github.com/atom/autocomplete-plus/legacy.tar.gz/refs/tags/v2.42.4",
|
||||||
"autocomplete-snippets": "https://codeload.github.com/atom/autocomplete-snippets/legacy.tar.gz/refs/tags/v1.12.1",
|
"autocomplete-snippets": "https://codeload.github.com/atom/autocomplete-snippets/legacy.tar.gz/refs/tags/v1.12.1",
|
||||||
"autoflow": "file:packages/autoflow",
|
"autoflow": "file:packages/autoflow",
|
||||||
"autosave": "https://codeload.github.com/atom/autosave/legacy.tar.gz/refs/tags/v0.24.6",
|
"autosave": "https://codeload.github.com/atom/autosave/legacy.tar.gz/refs/tags/v0.24.6",
|
||||||
@ -196,7 +196,7 @@
|
|||||||
"autocomplete-atom-api": "0.10.7",
|
"autocomplete-atom-api": "0.10.7",
|
||||||
"autocomplete-css": "0.17.5",
|
"autocomplete-css": "0.17.5",
|
||||||
"autocomplete-html": "0.8.9",
|
"autocomplete-html": "0.8.9",
|
||||||
"autocomplete-plus": "2.42.6",
|
"autocomplete-plus": "2.42.4",
|
||||||
"autocomplete-snippets": "1.12.1",
|
"autocomplete-snippets": "1.12.1",
|
||||||
"autoflow": "file:./packages/autoflow",
|
"autoflow": "file:./packages/autoflow",
|
||||||
"autosave": "0.24.6",
|
"autosave": "0.24.6",
|
||||||
|
2
ppm
2
ppm
@ -1 +1 @@
|
|||||||
Subproject commit 25d418f4ae6db2504854c4fc0b2b22e8aef813f1
|
Subproject commit e09cc63b85616d19a95a10b02a632ecf48741056
|
17
yarn.lock
17
yarn.lock
@ -2278,16 +2278,16 @@ atom-slick@^2, atom-slick@^2.0.0:
|
|||||||
version "0.8.9"
|
version "0.8.9"
|
||||||
resolved "https://github.com/pulsar-edit/autocomplete-html.git#4d0c180bade12e90ec3fce944ba3759723e64ba4"
|
resolved "https://github.com/pulsar-edit/autocomplete-html.git#4d0c180bade12e90ec3fce944ba3759723e64ba4"
|
||||||
|
|
||||||
"autocomplete-plus@https://github.com/pulsar-edit/autocomplete-plus.git#2.42.6":
|
"autocomplete-plus@https://codeload.github.com/atom/autocomplete-plus/legacy.tar.gz/refs/tags/v2.42.4":
|
||||||
version "2.42.6"
|
version "2.42.4"
|
||||||
resolved "https://github.com/pulsar-edit/autocomplete-plus.git#e1845d77b2ed13cd2b988db816c77f49cd9a067d"
|
resolved "https://codeload.github.com/atom/autocomplete-plus/legacy.tar.gz/refs/tags/v2.42.4#dcfe8ea2b844d27f3d30c7cae4621638ca13e0a8"
|
||||||
dependencies:
|
dependencies:
|
||||||
atom-slick "^2.0.0"
|
atom-slick "^2.0.0"
|
||||||
dompurify "^2.2.6"
|
dompurify "^2.0.7"
|
||||||
fuzzaldrin "^2.1.0"
|
fuzzaldrin "^2.1.0"
|
||||||
fuzzaldrin-plus "^0.6.0"
|
fuzzaldrin-plus "^0.6.0"
|
||||||
grim "^2.0.1"
|
grim "^2.0.1"
|
||||||
marked "^4.0.10"
|
marked "^0.7.0"
|
||||||
minimatch "^3.0.3"
|
minimatch "^3.0.3"
|
||||||
selector-kit "^0.1"
|
selector-kit "^0.1"
|
||||||
stable "^0.1.5"
|
stable "^0.1.5"
|
||||||
@ -3674,7 +3674,7 @@ dompurify@^1.0.2, dompurify@^1.0.3:
|
|||||||
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-1.0.11.tgz#fe0f4a40d147f7cebbe31a50a1357539cfc1eb4d"
|
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-1.0.11.tgz#fe0f4a40d147f7cebbe31a50a1357539cfc1eb4d"
|
||||||
integrity sha512-XywCTXZtc/qCX3iprD1pIklRVk/uhl8BKpkTxr+ZyMVUzSUg7wkQXRBp/euJ5J5moa1QvfpvaPQVP71z1O59dQ==
|
integrity sha512-XywCTXZtc/qCX3iprD1pIklRVk/uhl8BKpkTxr+ZyMVUzSUg7wkQXRBp/euJ5J5moa1QvfpvaPQVP71z1O59dQ==
|
||||||
|
|
||||||
dompurify@^2.0.17, dompurify@^2.2.6:
|
dompurify@^2.0.17, dompurify@^2.0.7:
|
||||||
version "2.4.1"
|
version "2.4.1"
|
||||||
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.1.tgz#f9cb1a275fde9af6f2d0a2644ef648dd6847b631"
|
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.1.tgz#f9cb1a275fde9af6f2d0a2644ef648dd6847b631"
|
||||||
integrity sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA==
|
integrity sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA==
|
||||||
@ -6405,6 +6405,11 @@ marked@^0.6.2:
|
|||||||
resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.3.tgz#79babad78af638ba4d522a9e715cdfdd2429e946"
|
resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.3.tgz#79babad78af638ba4d522a9e715cdfdd2429e946"
|
||||||
integrity sha512-Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ==
|
integrity sha512-Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ==
|
||||||
|
|
||||||
|
marked@^0.7.0:
|
||||||
|
version "0.7.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/marked/-/marked-0.7.0.tgz#b64201f051d271b1edc10a04d1ae9b74bb8e5c0e"
|
||||||
|
integrity sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==
|
||||||
|
|
||||||
marked@^4.0.10:
|
marked@^4.0.10:
|
||||||
version "4.2.2"
|
version "4.2.2"
|
||||||
resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.2.tgz#1d2075ad6cdfe42e651ac221c32d949a26c0672a"
|
resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.2.tgz#1d2075ad6cdfe42e651ac221c32d949a26c0672a"
|
||||||
|
Loading…
Reference in New Issue
Block a user