diff options
author | Dane Springmeyer <dane@mapbox.com> | 2019-10-02 17:29:03 -0700 |
---|---|---|
committer | Dane Springmeyer <dane@mapbox.com> | 2019-10-02 17:29:03 -0700 |
commit | 702d089e726e372040c06b4f56bc75de768e6501 (patch) | |
tree | cf8b6624fe8ba11966cebf04d89343fe9bf39c18 | |
parent | daf8e1289c3c8b437c97e1ec4250b521fa6edc52 (diff) | |
download | qtlocation-mapboxgl-702d089e726e372040c06b4f56bc75de768e6501.tar.gz |
node package improvements
-rw-r--r-- | .npmignore | 32 | ||||
-rw-r--r-- | cmake/node.cmake | 4 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | platform/node/DEVELOPING.md | 20 | ||||
-rw-r--r-- | platform/node/README.md | 6 |
5 files changed, 51 insertions, 13 deletions
diff --git a/.npmignore b/.npmignore new file mode 100644 index 0000000000..d2490da83f --- /dev/null +++ b/.npmignore @@ -0,0 +1,32 @@ +Makefile +CmakeLists.txt +*yml +build +cmake +misc +.* +*tgz +benchmark +expression-test +cloudformation +bin +vendor +include +mason_packages +mapbox-gl-js +test +lib +next +src +scripts +render-test +platform/android +platform/darwin +platform/default +platform/glfw +platform/ios +platform/linux +platform/macos +platform/qt +platform/node/symbol-list +platform/node/version-script
\ No newline at end of file diff --git a/cmake/node.cmake b/cmake/node.cmake index a791d99b42..edea4df71b 100644 --- a/cmake/node.cmake +++ b/cmake/node.cmake @@ -20,8 +20,8 @@ create_source_groups(mbgl-loop-node) add_node_module(mbgl-node INSTALL_PATH "lib/{node_abi}/mbgl.node" - NAN_VERSION "2.10.0" - + NAN_VERSION "2.14.0" + # Don't build for Node 4.x, 5.x, 7.x, 9.x, 11.x and 12.x # See https://nodejs.org/en/download/releases/ for mapping of Node version to ABI number. # Changes to this property should happen in tandem with updates to the version targets diff --git a/package.json b/package.json index 9b11a039cd..90ec89de71 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "node": ">=6" }, "scripts": { - "install": "node-pre-gyp install --fallback-to-build=false || make node", + "install": "node-pre-gyp install --fallback-to-build=false", "test": "tape platform/node/test/js/**/*.test.js", "test-memory": "node --expose-gc platform/node/test/memory.test.js", "test-expressions": "node -r esm platform/node/test/expression.test.js", diff --git a/platform/node/DEVELOPING.md b/platform/node/DEVELOPING.md index 3d07253ee3..f7067235f4 100644 --- a/platform/node/DEVELOPING.md +++ b/platform/node/DEVELOPING.md @@ -8,25 +8,31 @@ To develop these bindings, you’ll need to build them from source. Building req the [macOS](../macos/INSTALL.md#requirements) or [Linux](../linux/README.md#prerequisites) install documentation, depending on the target platform. -To compile the Node.js bindings and install module dependencies, from the repository root directory, run: +To compile the Node.js bindings and install module dependencies, from the repository root directory, first run: - npm install --build-from-source +``` +make distclean +``` + +If you are rebuilding after time has passed. -To recompile just the C++ code while developing, run `make node`. +Then do: -To create an Xcode project and use a GUI debugger in the case of a crash, run `make xnode`. +```bash +make node +``` ## Testing To test the Node.js bindings: -``` -npm test +```bash +make test-node ``` To run the visual render test suite: -``` +```bash npm run test-suite ``` diff --git a/platform/node/README.md b/platform/node/README.md index 7273c0813a..859172108b 100644 --- a/platform/node/README.md +++ b/platform/node/README.md @@ -9,7 +9,7 @@ Requires a modern C++ runtime that supports C++14. By default, installs binaries. On these platforms no additional dependencies are needed. - 64 bit macOS or 64 bit Linux -- Node.js v4.x _(note: v5+ is known to have issues)_ +- Node.js v10.x Run: @@ -168,9 +168,9 @@ var map = new mbgl.Map({ if (res.headers.modified) { response.modified = new Date(res.headers.modified); } if (res.headers.expires) { response.expires = new Date(res.headers.expires); } if (res.headers.etag) { response.etag = res.headers.etag; } - + response.data = body; - + callback(null, response); } else { callback(new Error(JSON.parse(body).message)); |