hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-04 17:11:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix yarn conflicts

Browse source 
It wasn't using our theme fork or the node-shell-quote fork
This commit is contained in:
Oliver Blanthorn 2019-06-05 16:43:00 +01:00
parent e53e35a6dc
commit 11a6c608ae
No known key found for this signature in database
GPG key ID: 2BB8C36BB504BFF3
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -13,6 +13,7 @@
"immer": "^3.1.2",
"mark.js": "^8.11.1",
"mithril": "^1.1.6",
"node-shell-quote": "git://github.com/dy/node-shell-quote",
"rss-parser": "^3.7.1",
"semver-compare": "^1.0.0"
},
@ -27,7 +28,6 @@
"jest": "^24.8.0",
"marked": "^0.6.2",
"nearley": "^2.16.0",
"node-shell-quote": "git://github.com/dy/node-shell-quote",
"prettier": "^1.17.1",
"selenium-webdriver": "^4.0.0-alpha.1",
"shared-git-hooks": "^1.2.1",

30
yarn.lock
View file

@ -4476,6 +4476,11 @@ jetpack-id@1.0.0:
resolved "https://registry.yarnpkg.com/jetpack-id/-/jetpack-id-1.0.0.tgz#2cf9fbae46d8074fc16b7de0071c8efebca473a6"
integrity sha1-LPn7rkbYB0/Ba33gBxyO/rykc6Y=
jquery@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
integrity sha1-LInWiJterFIqfuoywUUhVZxsvwI=
jquery@^3.3.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
@ -5377,8 +5382,7 @@ node-pre-gyp@^0.10.0:
semver "^5.3.0"
tar "^4"
"node-shell-quote@git://github.com/dy/node-shell-quote", shell-quote@1.6.1:
name node-shell-quote
"node-shell-quote@git://github.com/dy/node-shell-quote":
version "1.6.1"
resolved "git://github.com/dy/node-shell-quote.git#daa9d313adb29edd3e2354d409078c9bb283127e"
dependencies:
@ -6714,6 +6718,16 @@ shebang-regex@^1.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
shell-quote@1.6.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=
dependencies:
array-filter "~0.0.0"
array-map "~0.0.0"
array-reduce "~0.0.0"
jsonify "~0.0.0"
shelljs@0.7.7:
version "0.7.7"
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
@ -7579,7 +7593,17 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
typedoc-default-themes@^0.6.0-0, "typedoc-default-themes@git://github.com/tridactyl/typedoc-default-themes.git#fix_weird_member_names_bin":
typedoc-default-themes@^0.6.0-0:
version "0.6.0-0"
resolved "https://registry.yarnpkg.com/typedoc-default-themes/-/typedoc-default-themes-0.6.0-0.tgz#a4867eaf91fb7888efd01680f1328b72e8a33640"
integrity sha512-O7hBMS1yBCozvVUntIIdlBk04WiqM+f6NOEc9p+LimJSFKJMF66cgzejeiybuTk6mgbMJW+olg42BNYC8E9x9Q==
dependencies:
backbone "^1.1.2"
jquery "^2.2.4"
lunr "^2.3.6"
underscore "^1.9.1"
"typedoc-default-themes@git://github.com/tridactyl/typedoc-default-themes.git#fix_weird_member_names_bin":
version "0.6.0-0"
resolved "git://github.com/tridactyl/typedoc-default-themes.git#a28d333b26688511dae6d99d92abb082c5f23214"
dependencies: