Merge pull request #354 from signalapp/jrose/node-update-dependencies

Node: update dependencies
signalapp · Sep 21, 2021 · a7bf226 · a7bf226
2 parents 9aa79c0 + b4aec0c
commit a7bf226
Show file tree

Hide file tree

Showing 6 changed files with 1,554 additions and 1,439 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -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': [

diff --git a/node/build_node_bridge.py b/node/build_node_bridge.py
@@ -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)
 

diff --git a/package.json b/package.json
@@ -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"
   }
 }
diff --git a/rust/bridge/node/futures/tests/node-tests/package.json b/rust/bridge/node/futures/tests/node-tests/package.json
@@ -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"
   }
 }