Skip to content

Commit

Permalink
Change how git dependencies are expressed
Browse files Browse the repository at this point in the history
yarn has a bug (<yarnpkg/yarn#5235>)
where git dependencies are treated differently than github
deps
  • Loading branch information
gcampax committed Oct 5, 2018
1 parent c54c2a8 commit b138505
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"install": "make -C sandbox all || echo WARNING: failed to compile the sandbox"
},
"resolutions": {
"thingpedia-client": "github:Stanford-Mobisocial-IoT-Lab/thingpedia-client",
"thingtalk": "github:Stanford-Mobisocial-IoT-Lab/ThingTalk",
"thingengine-core": "github:Stanford-Mobisocial-IoT-Lab/thingengine-core"
"thingpedia-client": "git://github.com/Stanford-Mobisocial-IoT-Lab/thingpedia-client",
"thingtalk": "git://github.com/Stanford-Mobisocial-IoT-Lab/ThingTalk",
"thingengine-core": "git://github.com/Stanford-Mobisocial-IoT-Lab/thingengine-core"
},
"dependencies": {
"accept-language": "^2.0.17",
Expand Down Expand Up @@ -84,11 +84,11 @@
"serve-favicon": "~2.3.0",
"smtlib": "^0.1.1",
"sockaddr": "^1.0.0",
"thingengine-core": "github:Stanford-Mobisocial-IoT-Lab/thingengine-core",
"thingengine-core": "git://github.com/Stanford-Mobisocial-IoT-Lab/thingengine-core",
"thingpedia": "^2.2.2",
"thingpedia-client": "github:Stanford-Mobisocial-IoT-Lab/thingpedia-client",
"thingpedia-client": "git://github.com/Stanford-Mobisocial-IoT-Lab/thingpedia-client",
"thingpedia-discovery": "^1.0.0",
"thingtalk": "github:Stanford-Mobisocial-IoT-Lab/ThingTalk",
"thingtalk": "git://github.com/Stanford-Mobisocial-IoT-Lab/ThingTalk",
"tmp": "0.0.33",
"transparent-rpc": "^0.0.1",
"url": "~0.10.3",
Expand Down
13 changes: 6 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6669,9 +6669,9 @@ text-table@~0.2.0:
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=

"thingengine-core@github:Stanford-Mobisocial-IoT-Lab/thingengine-core":
"thingengine-core@git://github.com/Stanford-Mobisocial-IoT-Lab/thingengine-core":
version "1.1.2"
resolved "https://codeload.github.com/Stanford-Mobisocial-IoT-Lab/thingengine-core/tar.gz/2a7b57489ea8d92976d3504ccc808d132c219672"
resolved "git://github.com/Stanford-Mobisocial-IoT-Lab/thingengine-core#9d02c62d9d0e89d2e45f63b83b3240e95bf5ea12"
dependencies:
adt "^0.7.2"
consumer-queue "^1.0.1"
Expand All @@ -6688,9 +6688,9 @@ text-table@~0.2.0:
uuid "^3.1.0"
ws "^6.0.0"

"thingpedia-client@github:Stanford-Mobisocial-IoT-Lab/thingpedia-client":
"thingpedia-client@git://github.com/Stanford-Mobisocial-IoT-Lab/thingpedia-client", "thingpedia-client@github:Stanford-Mobisocial-IoT-Lab/thingpedia-client":
version "0.1.0"
resolved "https://codeload.github.com/Stanford-Mobisocial-IoT-Lab/thingpedia-client/tar.gz/27f6d51f7dfb2a08dee69b2bc5628680c7be5c45"
resolved "git://github.com/Stanford-Mobisocial-IoT-Lab/thingpedia-client#27f6d51f7dfb2a08dee69b2bc5628680c7be5c45"
dependencies:
thingpedia "^2.2.1"
tmp "0.0.33"
Expand All @@ -6715,10 +6715,9 @@ thingpedia@^2.2.0, thingpedia@^2.2.1, thingpedia@^2.2.2:
tmp "0.0.33"
xml2js "^0.4.17"

thingtalk@^1.0.0, thingtalk@^1.1.1, "thingtalk@github:Stanford-Mobisocial-IoT-Lab/ThingTalk":
thingtalk@^1.0.0, thingtalk@^1.1.1, "thingtalk@git://github.com/Stanford-Mobisocial-IoT-Lab/ThingTalk":
version "1.2.0"
uid b8c39280cb29528025da9f23b8e9fb6267c28258
resolved "https://codeload.github.com/Stanford-Mobisocial-IoT-Lab/ThingTalk/tar.gz/b8c39280cb29528025da9f23b8e9fb6267c28258"
resolved "git://github.com/Stanford-Mobisocial-IoT-Lab/ThingTalk#b8c39280cb29528025da9f23b8e9fb6267c28258"
dependencies:
adt "~0.7.2"
byline "^5.0.0"
Expand Down

0 comments on commit b138505

Please sign in to comment.