diff --git a/.eslintignore b/.eslintignore index 3793e349d1..af488c8f8a 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,7 +1,3 @@ -src/vgl/** -src/version.js -src/sha.js -src/util/wigglemaps.js src/util/distanceGrid.js dist/** testing/** diff --git a/docs/conf.py b/docs/conf.py index b9343ab257..c2ab344f0c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -12,10 +12,10 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys +import json import os -import shutil import re +import sys from glob import glob # from subprocess import check_output @@ -73,7 +73,7 @@ # built documents. # # The short X.Y version. -version = '0.16.0' +version = json.load(open(os.path.join(toppath, 'package.json')))['version'] # The full version, including alpha/beta/rc tags. release = version diff --git a/docs/users.rst b/docs/users.rst index c5b4b47948..5e02f77bad 100644 --- a/docs/users.rst +++ b/docs/users.rst @@ -29,7 +29,7 @@ list of libraries used by GeoJS. +---------------------------+------------+---------------------------+ | `earcut`_ | 2.1 | GL polygon feature | +---------------------------+------------+---------------------------+ - | `jQuery`_ | 2.2 | Core | + | `jQuery`_ | 3.3 | Core | +---------------------------+------------+---------------------------+ .. table:: External GeoJS dependencies diff --git a/src/index.js b/src/index.js index 0521bb5f27..3c7825b77c 100644 --- a/src/index.js +++ b/src/index.js @@ -2,7 +2,7 @@ // License headers that will be preserved in distributed bundles. /** * GeoJS - * @copyright 2013-2017, Kitware, Inc. + * @copyright 2013-2018, Kitware, Inc. * @license Apache-2.0 * * Bundled with the following libraries: diff --git a/src/sha.js b/src/sha.js index 69abf4c005..7fba457db2 100644 --- a/src/sha.js +++ b/src/sha.js @@ -1 +1,10 @@ +/* global GEO_SHA */ + +/** + * The current geojs git SHA. + * + * @alias geo.sha + * @constant + * @type {string} + */ module.exports = GEO_SHA; diff --git a/src/version.js b/src/version.js index 21169a32d6..8188a99343 100644 --- a/src/version.js +++ b/src/version.js @@ -1 +1,10 @@ +/* global GEO_VERSION */ + +/** + * The current geojs version. + * + * @alias geo.version + * @constant + * @type {string} + */ module.exports = GEO_VERSION;