feat: Merge pull request #1111 from pelias/drop-nodejs-4-add-8

Drop Node.js 4 support, add Node.js 8 support

.travis.yml

@@ -3,21 +3,17 @@ language: node_js
 notifications:
   email: false
 node_js:
-  - 4
   - 6
+  - 8
 matrix:
   fast_finish: true
-env:
-  global:
-    - BUILD_LEADER_ID=2
 script: npm run travis
 before_install:
-  - npm i -g npm@^3.0.0
+  - npm i -g npm
 before_script:
   - npm prune
 after_success:
-  - npm install -g npx
-  - npx -p node@8 npm run semantic-release
+  - npm run semantic-release
 branches:
   except:
     - /^v\d+\.\d+\.\d+$/

controller/markdownToHtml.js

@@ -1,4 +1,3 @@
-
 var markdown = require('markdown').markdown;
 var fs = require('fs');
 

controller/place.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 const retry = require('retry');
 

controller/search.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 
 const searchService = require('../service/search');

helper/debug.js

@@ -1,4 +1,3 @@
-'use strict';
 const _ = require('lodash');
 
 class Debug {

helper/fieldValue.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 
 function getStringValue(property) {

helper/geojsonify.js

@@ -1,4 +1,3 @@
-
 const GeoJSON = require('geojson');
 const extent = require('@mapbox/geojson-extent');
 const logger = require('pelias-logger').get('geojsonify');

helper/geojsonify_place_details.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 const field = require('./fieldValue');
 

helper/stackTraceLine.js

@@ -1,5 +1,3 @@
-'use strict';
-
 module.exports = () => {
   const stack = new Error().stack.split('\n');
   let targetLine;

middleware/404.js

@@ -1,4 +1,3 @@
-
 // handle not found errors
 function middleware(req, res) {
   res.header('Cache-Control','public');

middleware/access_log.js

@@ -2,8 +2,6 @@
  * Create a middleware that prints access logs via pelias-logger.
  */
 
-'use strict';
-
 var url = require( 'url' );
 
 var _ = require( 'lodash' );

middleware/changeLanguage.js

@@ -1,4 +1,3 @@
-
 var logger = require( 'pelias-logger' ).get( 'api' );
 const _ = require('lodash');
 

middleware/confidenceScoreFallback.js

@@ -1,5 +1,3 @@
-'use strict';
-
 /**
  *
  * Basic confidence score should be computed and returned for each item in the results.

middleware/cors.js

@@ -1,4 +1,3 @@
-
 function middleware(req, res, next){
   res.header('Access-Control-Allow-Origin', '*');
   res.header('Access-Control-Allow-Methods', 'GET, OPTIONS');

middleware/jsonp.js

@@ -1,4 +1,3 @@
-
 function middleware(req, res, next){
 
   // store old json function

middleware/normalizeParentIds.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const logger = require('pelias-logger').get('api');
 const Document = require('pelias-model').Document;
 const placeTypes = require('../helper/placeTypes');

middleware/options.js

@@ -1,4 +1,3 @@
-
 /**
   this functionality is required by CORS as the browser will send an
   HTTP OPTIONS request before performing the CORS request.

middleware/renamePlacenames.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 
 const PARENT_PROPS = require('../helper/placeTypes');

middleware/requestLanguage.js

@@ -1,4 +1,3 @@
-
 const _ = require('lodash');
 const logger = require( 'pelias-logger' ).get( 'api' );
 

package.json

@@ -35,7 +35,7 @@
     "url": "https://github.com/pelias/api/issues"
   },
   "engines": {
-    "node": ">=4.0.0"
+    "node": ">=6.0.0"
   },
   "dependencies": {
     "addressit": "1.5.0",

query/autocomplete.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const peliasQuery = require('pelias-query');
 const defaults = require('./autocomplete_defaults');
 const textParser = require('./text_parser_addressit');

query/autocomplete_defaults.js

@@ -1,4 +1,3 @@
-
 var peliasQuery = require('pelias-query');
 var _ = require('lodash');
 

query/reverse.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const peliasQuery = require('pelias-query');
 const defaults = require('./reverse_defaults');
 const check = require('check-types');

query/reverse_defaults.js

@@ -1,4 +1,3 @@
-
 var peliasQuery = require('pelias-query');
 var _ = require('lodash');
 

query/search.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const peliasQuery = require('pelias-query');
 const defaults = require('./search_defaults');
 const textParser = require('./text_parser');

query/search_defaults.js

@@ -1,4 +1,3 @@
-
 var peliasQuery = require('pelias-query');
 var _ = require('lodash');
 

query/search_original.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const peliasQuery = require('pelias-query');
 const defaults = require('./search_defaults');
 const textParser = require('./text_parser_addressit');

query/text_parser_addressit.js

@@ -1,4 +1,3 @@
-
 var logger = require('pelias-logger').get('api');
 var placeTypes = require('../helper/placeTypes');
 

query/view/boost_exact_matches.js

@@ -1,4 +1,3 @@
-
 var peliasQuery = require('pelias-query'),
     searchDefaults = require('../search_defaults');
 

query/view/focus_selected_layers.js

@@ -1,4 +1,3 @@
-
 var peliasQuery = require('pelias-query');
 
 /**

query/view/ngrams_last_token_only.js

@@ -1,4 +1,3 @@
-
 var peliasQuery = require('pelias-query'),
     ngrams_strict = require('./ngrams_strict');
 

query/view/ngrams_strict.js

@@ -1,4 +1,3 @@
-
 var peliasQuery = require('pelias-query');
 
 /**

query/view/phrase_first_tokens_only.js

@@ -1,4 +1,3 @@
-
 var peliasQuery = require('pelias-query');
 
 /**

query/view/pop_subquery.js

@@ -1,4 +1,3 @@
-
 var peliasQuery = require('pelias-query'),
     check = require('check-types');
 

sanitizer/_single_scalar_parameters.js

@@ -1,4 +1,3 @@
-
 var _ = require('lodash'),
     check = require('check-types');
 

sanitizer/_tokenizer.js

@@ -1,4 +1,3 @@
-
 var check = require('check-types');
 
 /**

sanitizer/place.js

@@ -1,4 +1,3 @@
-
 var sanitizeAll = require('../sanitizer/sanitizeAll'),
     sanitizers = {
       singleScalarParameters: require('../sanitizer/_single_scalar_parameters')(),

sanitizer/reverse.js

@@ -1,4 +1,3 @@
-
 var type_mapping = require('../helper/type_mapping');
 var sanitizeAll = require('../sanitizer/sanitizeAll'),
     sanitizers = {

sanitizer/sanitizeAll.js

@@ -1,4 +1,3 @@
-'use strict';
 function sanitize( req, sanitizers ){
   // init an object to store clean (sanitized) input parameters if not initialized
   req.clean = req.clean || {};

sanitizer/wrap.js

@@ -1,4 +1,3 @@
-
 /**
   normalize co-ordinates that lie outside of the normal ranges.
 

schema.js

@@ -1,4 +1,3 @@
-'use strict';
 
 const Joi = require('joi');
 

service/configurations/Interpolation.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const url = require('url');
 
 const _ = require('lodash');

service/configurations/Language.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const url = require('url');
 
 const _ = require('lodash');

service/configurations/Libpostal.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const url = require('url');
 
 const ServiceConfiguration = require('pelias-microservice-wrapper').ServiceConfiguration;

service/configurations/PlaceHolder.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const url = require('url');
 
 const _ = require('lodash');

service/configurations/PointInPolygon.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const url = require('url');
 
 const _ = require('lodash');

service/mget.js

@@ -1,4 +1,3 @@
-
 /**
 
   query must be an array of hashes, structured like so:

service/search.js

@@ -1,4 +1,3 @@
-
 /**
 
   cmd can be any valid ES query command

test/ciao_test_data.js

@@ -1,4 +1,3 @@
-
 /**
   Test data required by the ciao test suite.
 

test/unit/app.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const proxyquire = require('proxyquire').noCallThru();
 
 module.exports.tests = {};

test/unit/controller/coarse_reverse.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const setup = require('../../../controller/coarse_reverse');
 const proxyquire =  require('proxyquire').noCallThru();
 const _  = require('lodash');

test/unit/controller/index.js

@@ -1,4 +1,3 @@
-
 var setup = require('../../../controller/markdownToHtml');
 
 module.exports.tests = {};

test/unit/controller/libpostal.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const proxyquire =  require('proxyquire').noCallThru();
 const libpostal = require('../../../controller/libpostal');
 const _ = require('lodash');

test/unit/controller/place.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const setup = require('../../../controller/place');
 const proxyquire =  require('proxyquire').noCallThru();
 

test/unit/controller/placeholder.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const placeholder = require('../../../controller/placeholder');
 const proxyquire =  require('proxyquire').noCallThru();
 const mock_logger = require('pelias-mock-logger');

test/unit/controller/predicates/has_parsed_text_properties.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 const has_parsed_text_properties = require('../../../../controller/predicates/has_parsed_text_properties');
 

test/unit/controller/predicates/has_request_errors.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 const has_request_errors = require('../../../../controller/predicates/has_request_errors');
 

test/unit/controller/predicates/has_request_parameter.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 const has_request_parameter = require('../../../../controller/predicates/has_request_parameter');
 

test/unit/controller/predicates/has_response_data.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 const has_response_data = require('../../../../controller/predicates/has_response_data');
 

test/unit/controller/predicates/has_results_at_layers.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 const has_results_at_layers = require('../../../../controller/predicates/has_results_at_layers');
 

test/unit/controller/predicates/is_addressit_parse.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 const is_addressit_parse = require('../../../../controller/predicates/is_addressit_parse');
 

test/unit/controller/predicates/is_admin_only_analysis.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 const is_admin_only_analysis = require('../../../../controller/predicates/is_admin_only_analysis');
 

test/unit/controller/predicates/is_coarse_reverse.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 const is_coarse_reverse = require('../../../../controller/predicates/is_coarse_reverse');
 

test/unit/controller/predicates/is_only_non_admin_layers.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 const is_only_non_admin_layers = require('../../../../controller/predicates/is_only_non_admin_layers');
 

test/unit/controller/predicates/is_request_sources_only_whosonfirst.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 const is_request_sources_only_whosonfirst = require('../../../../controller/predicates/is_request_sources_only_whosonfirst');
 

test/unit/controller/search.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const setup = require('../../../controller/search');
 const proxyquire =  require('proxyquire').noCallThru();
 

test/unit/controller/search_with_ids.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const setup = require('../../../controller/search_with_ids');
 const proxyquire =  require('proxyquire').noCallThru();
 const mocklogger = require('pelias-mock-logger');

test/unit/controller/structured_libpostal.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const proxyquire =  require('proxyquire').noCallThru();
 const libpostal = require('../../../controller/structured_libpostal');
 const _ = require('lodash');

test/unit/fixture/autocomplete_boundary_country.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/autocomplete_linguistic_final_token.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/autocomplete_linguistic_focus.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/autocomplete_linguistic_focus_null_island.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/autocomplete_linguistic_multiple_tokens.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/autocomplete_linguistic_only.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/autocomplete_linguistic_with_admin.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/autocomplete_single_character_street.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/autocomplete_with_layer_filtering.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/autocomplete_with_source_filtering.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/search_boundary_country_original.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/search_linguistic_bbox_original.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/search_linguistic_focus_bbox_original.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/search_linguistic_focus_null_island_original.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/search_linguistic_focus_original.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/search_linguistic_only_original.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/fixture/search_partial_address_original.js

@@ -1,4 +1,3 @@
-
 var vs = require('../../../query/search_defaults');
 
 module.exports = {

test/unit/fixture/search_regions_address_original.js

@@ -1,4 +1,3 @@
-
 var vs = require('../../../query/search_defaults');
 
 module.exports = {

test/unit/fixture/search_with_source_filtering_original.js

@@ -1,4 +1,3 @@
-
 module.exports = {
   'query': {
     'bool': {

test/unit/middleware/changeLanguage.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const setup = require('../../../middleware/changeLanguage');
 const proxyquire =  require('proxyquire').noCallThru();
 const _  = require('lodash');

test/unit/middleware/interpolate.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const setup = require('../../../middleware/interpolate');
 const proxyquire =  require('proxyquire').noCallThru();
 const _  = require('lodash');

test/unit/middleware/localNamingConventions.js

@@ -1,4 +1,3 @@
-
 const proxyquire = require('proxyquire');
 
 var customConfig = {

test/unit/middleware/requestLanguage.js

@@ -1,4 +1,3 @@
-
 var middleware = require('../../../middleware/requestLanguage');
 module.exports.tests = {};
 

test/unit/query/MockQuery.js

@@ -1,5 +1,3 @@
-'use strict';
-
 module.exports = class MockQuery {
   constructor() {
     this._score_functions = [];

test/unit/query/autocomplete_defaults.js

@@ -1,4 +1,3 @@
-
 var defaults = require('../../../query/autocomplete_defaults');
 
 module.exports.tests = {};

test/unit/query/reverse_defaults.js

@@ -1,4 +1,3 @@
-
 var defaults = require('../../../query/reverse_defaults');
 
 module.exports.tests = {};

test/unit/query/search_defaults.js

@@ -1,4 +1,3 @@
-
 var defaults = require('../../../query/search_defaults');
 
 module.exports.tests = {};

test/unit/sanitizer/_geo_reverse.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const sanitizer = require('../../../sanitizer/_geo_reverse')();
 const defaults = require('../../../query/reverse_defaults');
 

test/unit/sanitizer/wrap.js

@@ -1,4 +1,3 @@
-
 var wrap = require('../../../sanitizer/wrap');
 
 module.exports.tests = {};

test/unit/schema.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const Joi = require('joi');
 const schema = require('../../schema');
 const _ = require('lodash');