From 6b0ad899b3ced4932cf600a4f89b2609512c98be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Thu, 23 Feb 2017 12:19:04 +0100 Subject: [PATCH] [node] adhere to node module naming requirements https://nodejs.org/api/addons.html#addons_building specifies that "The module_name must match the filename of the final binary (excluding the .node suffix).". While the mismatch between `mapbox-gl-native` and `mapbox_gl_native` hasn't caused issues so far, we should play by the book. --- cmake/node.cmake | 2 +- platform/node/index.js | 2 +- platform/node/test/js/require.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/node.cmake b/cmake/node.cmake index 2dd4a66c3..b9a4f68ec 100644 --- a/cmake/node.cmake +++ b/cmake/node.cmake @@ -49,7 +49,7 @@ target_add_mason_package(mbgl-node PRIVATE geojson) add_custom_command( TARGET mbgl-node POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_SOURCE_DIR}/lib/mapbox-gl-native.node + COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_SOURCE_DIR}/lib/mapbox_gl_native.node ) mbgl_platform_node() diff --git a/platform/node/index.js b/platform/node/index.js index 8c5902384..54ba5c0dc 100644 --- a/platform/node/index.js +++ b/platform/node/index.js @@ -2,7 +2,7 @@ // Shim to wrap req.respond while preserving callback-passing API -var mbgl = require('../../lib/mapbox-gl-native.node'); +var mbgl = require('../../lib/mapbox_gl_native.node'); var constructor = mbgl.Map.prototype.constructor; var Map = function(options) { diff --git a/platform/node/test/js/require.js b/platform/node/test/js/require.js index 1528002c2..073ca742a 100644 --- a/platform/node/test/js/require.js +++ b/platform/node/test/js/require.js @@ -1 +1 @@ -var mbgl = require('../../../../lib/mapbox-gl-native'); +var mbgl = require('../../../../lib/mapbox_gl_native');