Remove the custom node-capnp import logic.#3413
Open
zenhack wants to merge 4 commits intosandstorm-io:masterfrom
Open
Remove the custom node-capnp import logic.#3413zenhack wants to merge 4 commits intosandstorm-io:masterfrom
zenhack wants to merge 4 commits intosandstorm-io:masterfrom
Conversation
This removes the custom logic to import node-capnp, and instead installs deps/node-capnp as an npm dependency of the shell directly. To make this work, we also need to get the schema into meteor's node_modules, so we create a package for those too.
zenhack
added a commit
to zenhack/node-capnp
that referenced
this pull request
Aug 22, 2020
sandstorm-io/sandstorm#3413 removes the need for this (and I seriously doubt anyone else is using our ekam rule).
Collaborator
Author
|
Looks like on my system it was picking up the system capnp; will have to do a bit more fiddling to get it to use the in-tree one. Marking this as a draft for now. |
Member
|
Does this mean that the module gets built against the installed version of libcapnp, rather than the one built in-tree? |
Collaborator
Author
|
See my comment above: yes, but that was not my intent, which is why this is marked as a draft. |
Member
lol I can't read |
...rather than letting npm build it again (and possibly link against the wrong capnp).
zenhack
added a commit
to zenhack/node-capnp
that referenced
this pull request
Dec 7, 2020
...via an environment variable. I'm using this in:
sandstorm-io/sandstorm#3413
to avoid building the module twice.
zenhack
added a commit
to zenhack/node-capnp
that referenced
this pull request
Dec 7, 2020
With sandstorm-io/sandstorm#3413, this will no longer be needed.
Collaborator
Author
|
Alright, I've gotten it to use the in-tree capnp now (and only build capnp.node once). This required changes in node-capnp's repo, so capnproto/node-capnp#65 will have to be merged for this to work. |
Collaborator
|
I'll hold on the update to node-capnp being merged, and then I'll mark this ready for review. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This removes the custom logic to import node-capnp, and instead
installs deps/node-capnp as an npm dependency of the shell directly.
To make this work, we also need to get the schema into meteor's
node_modules, so we create a package for those too.
No functional change, just cleans up one of the gnarly bits of our build system.
I also have a local change to node-capnp that skips creating the extra node_modules directory. When this lands I'll send a PR for that too.