Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Node: update dependencies #354

Merged
merged 2 commits into from
Sep 21, 2021
Merged

Node: update dependencies #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddce4ee
Make it clear to node-gyp which action arguments are paths
jrose-signal Sep 21, 2021
b4aec0c
Node: update dependencies
jrose-signal Sep 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@
'action': [
'python3',
'node/build_node_bridge.py',
# Use separated arguments for paths, joined arguments for non-paths.
'--out-dir', '<(PRODUCT_DIR)/',
'--os-name', '<(NODE_OS_NAME)',
'--configuration', '<(CONFIGURATION_NAME)',
'--os-name=<(NODE_OS_NAME)',
'--configuration=<(CONFIGURATION_NAME)',
'--cargo-build-dir', '<(INTERMEDIATE_DIR)/rust',
'--cargo-target', '<(CARGO_ARCH)-<(CARGO_TARGET_SUFFIX)',
'--node-arch', '<(target_arch)'
'--cargo-target=<(CARGO_ARCH)-<(CARGO_TARGET_SUFFIX)',
'--node-arch=<(target_arch)'
],
'inputs': [],
'outputs': [
Expand Down
6 changes: 0 additions & 6 deletions node/build_node_bridge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,16 @@ def main(args=None):
if node_os_name is None:
print('ERROR: --os-name is required')
return 1
if node_os_name.startswith('..\\'):
node_os_name = node_os_name[3:]

cargo_target = options.cargo_target
if cargo_target is None:
print('ERROR: --cargo-target is required')
return 1
if cargo_target.startswith('..\\'):
cargo_target = cargo_target[3:]

node_arch = options.node_arch
if node_arch is None:
print('ERROR: --node_arch is required')
return 1
if node_arch.startswith('..\\'):
node_arch = node_arch[3:]

out_dir = options.out_dir.strip('"') or os.path.join('build', configuration_name)

Expand Down
24 changes: 12 additions & 12 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,29 @@
},
"devDependencies": {
"@types/bindings": "^1.3.0",
"@types/chai": "4.2.15",
"@types/chai": "^4.2.15",
"@types/chai-as-promised": "^7.1.3",
"@types/mocha": "5.2.7",
"@types/node": "13.1.8",
"@types/mocha": "^5.2.7",
"@types/node": "*",
"@types/uuid": "^8.3.0",
"@typescript-eslint/eslint-plugin": "^4.6.0",
"@typescript-eslint/parser": "^4.6.0",
"chai": "4.2.0",
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"cpy-cli": "^3.0.0",
"electron": "11.2.3",
"electron-mocha": "8.1.1",
"electron": "13.3.0",
"electron-mocha": "^10.0",
"eslint": "^7.12.1",
"eslint-config-prettier": "6.15.0",
"eslint-config-prettier": "^6.15.0",
"eslint-plugin-header": "^3.1.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-mocha": "^8.0.0",
"eslint-plugin-more": "^1.0.0",
"mocha": "7.1.1",
"node-gyp": "^7.1.2",
"prettier": "1.19.1",
"rimraf": "3.0.1",
"mocha": "*",
"node-gyp": "^8.2.0",
"prettier": "^1.19.1",
"rimraf": "^3.0.1",
"source-map-support": "^0.5.19",
"typescript": "3.7.4"
"typescript": "4.4.2"
}
}
4 changes: 2 additions & 2 deletions rust/bridge/node/futures/tests/node-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
},
"devDependencies": {
"benchmark": "^2.1.4",
"chai": "4.2.0",
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"microtime": "^3.0.0",
"mocha": "8.2.1"
"mocha": "^8.4"
}
}
Loading