Skip to content

Commit

Permalink
Merge pull request #53 from neon-bindings/support-hybrid-crates
Browse files Browse the repository at this point in the history
fix(bug): support hybrid crates
  • Loading branch information
dherman authored May 16, 2024
2 parents b4dfafc + 824b6bd commit bc6fc5c
Show file tree
Hide file tree
Showing 9 changed files with 887 additions and 91 deletions.
5 changes: 1 addition & 4 deletions dist/cli/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -40397,11 +40397,8 @@ class Dist {
});
let file = null;
for await (const msg of reader) {
if (msg.isCompilerArtifact() && msg.crateName() === this._crateName) {
if (!file && msg.isCompilerArtifact() && msg.crateName() === this._crateName) {
file = msg.findFileByCrateType('cdylib');
if (!file) {
throw new Error(`No artifacts were generated for crate ${this._crateName}`);
}
}
}
if (!file) {
Expand Down
14 changes: 7 additions & 7 deletions dist/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
},
"homepage": "https://github.com/dherman/neon-rs#readme",
"optionalDependencies": {
"@cargo-messages/android-arm-eabi": "0.1.67",
"@cargo-messages/darwin-arm64": "0.1.67",
"@cargo-messages/darwin-x64": "0.1.67",
"@cargo-messages/linux-arm-gnueabihf": "0.1.67",
"@cargo-messages/linux-x64-gnu": "0.1.67",
"@cargo-messages/win32-arm64-msvc": "0.1.67",
"@cargo-messages/win32-x64-msvc": "0.1.67"
"@cargo-messages/android-arm-eabi": "0.1.68",
"@cargo-messages/darwin-arm64": "0.1.68",
"@cargo-messages/darwin-x64": "0.1.68",
"@cargo-messages/linux-arm-gnueabihf": "0.1.68",
"@cargo-messages/linux-x64-gnu": "0.1.68",
"@cargo-messages/win32-arm64-msvc": "0.1.68",
"@cargo-messages/win32-x64-msvc": "0.1.68"
}
}
56 changes: 28 additions & 28 deletions dist/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/cli/.mocharc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extension": ["ts"],
"spec": "dist/src/test/**/*.js",
"timeout": 5000
}

Loading

0 comments on commit bc6fc5c

Please sign in to comment.