habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #409 from elastic/12.0.0-rc2

Browse Source 
12.0.0 rc2
This commit is contained in:
Spencer
2016-05-20 11:56:34 -07:00
parent f2c9103675 ecbc4ec22b
commit 1abf5b0a80
6 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
# elasticsearch.js 11.0.1 # elasticsearch.js 12.0.0-rc2
The official low-level Elasticsearch client for Node.js and the browser. The official low-level Elasticsearch client for Node.js and the browser.

2
docs/browser_builds.asciidoc
View File

@ -14,7 +14,7 @@ bower install elasticsearch
--------- ---------
=== Download === Download
* v11.0.1: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-11.0.1.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-11.0.1.tar.gz[tar.gz] * v12.0.0-rc2: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-12.0.0-rc2.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-12.0.0-rc2.tar.gz[tar.gz]
NOTE: Here's an example that integrates elasticsearch.js with React https://github.com/scotchfield/elasticsearch-react-example/[on GitHub] NOTE: Here's an example that integrates elasticsearch.js with React https://github.com/scotchfield/elasticsearch-react-example/[on GitHub]

9
grunt/browser_clients.js
View File

@ -17,11 +17,12 @@ module.exports = function (grunt) {
grunt.task.run([ grunt.task.run([
'clean:dist', 'clean:dist',
'webpack:browser_client', 'webpack:browser_clients',
'webpack:angular_client',
'webpack:jquery_client',
'uglify:dist', 'uglify:dist',
'concat:dist_banners' 'concat:dist_banners',
'copy:dist_to_named_dir',
'compress:release_zip',
'compress:release_tarball',
]); ]);
}); });

8
grunt/config/webpack.js
View File

@ -1,5 +1,7 @@
module.exports = { module.exports = {
browser_client: require('../../webpack_config/browser'), browser_clients: [
angular_client: require('../../webpack_config/angular'), require('../../webpack_config/browser'),
jquery_client: require('../../webpack_config/jquery'), require('../../webpack_config/angular'),
require('../../webpack_config/jquery'),
]
} }

42
package.json
View File

@ -7,13 +7,12 @@
"description": "The official low-level Elasticsearch client for Node.js and the browser.", "description": "The official low-level Elasticsearch client for Node.js and the browser.",
"main": "src/elasticsearch.js", "main": "src/elasticsearch.js",
"homepage": "http://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html", "homepage": "http://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
"version": "11.0.1", "version": "12.0.0-rc2",
"browser": { "browser": {
"./src/lib/connectors/index.js": "./src/lib/connectors/browser_index.js", "./src/lib/connectors/index.js": "./src/lib/connectors/browser_index.js",
"./src/lib/loggers/index.js": "./src/lib/loggers/browser_index.js", "./src/lib/loggers/index.js": "./src/lib/loggers/browser_index.js",
"./src/lib/apis/index.js": "./src/lib/apis/browser_index.js", "./src/lib/apis/index.js": "./src/lib/apis/browser_index.js",
"./test/mocks/server.js": "./test/mocks/browser_server.js", "./test/mocks/server.js": "./test/mocks/browser_server.js"
"lodash": "lodash-compat"
}, },
"config": { "config": {
"blanket": { "blanket": {
@ -44,47 +43,47 @@
"@spalger/eslint-config-personal": "^0.4.0", "@spalger/eslint-config-personal": "^0.4.0",
"async": "~0.8.0", "async": "~0.8.0",
"babel-eslint": "^6.0.4", "babel-eslint": "^6.0.4",
"blanket": "~1.1.5", "blanket": "^1.2.3",
"bluebird": "^2.9.14", "bluebird": "^2.9.14",
"eslint": "^2.9.0", "eslint": "^2.9.0",
"eslint-config-airbnb": "^8.0.0", "eslint-config-airbnb": "^8.0.0",
"eslint-plugin-import": "^1.6.1", "eslint-plugin-import": "^1.6.1",
"eslint-plugin-jsx-a11y": "^1.0.4", "eslint-plugin-jsx-a11y": "^1.0.4",
"eslint-plugin-react": "^5.0.1", "eslint-plugin-react": "^5.0.1",
"expect.js": "~0.2.0", "expect.js": "^0.3.1",
"express": "~3.4.7", "express": "~3.4.7",
"find-root": "~0.1.1", "find-root": "~0.1.1",
"glob": "~3.2.7", "glob": "~3.2.7",
"grunt": "~0.4.1", "grunt": "^1.0.1",
"grunt-cli": "~0.1.13", "grunt-cli": "^1.2.0",
"grunt-contrib-clean": "~0.5.0", "grunt-contrib-clean": "^1.0.0",
"grunt-contrib-compress": "~0.5.3", "grunt-contrib-compress": "^1.2.0",
"grunt-contrib-concat": "~0.3.0", "grunt-contrib-concat": "^1.0.1",
"grunt-contrib-copy": "~0.4.1", "grunt-contrib-copy": "^1.0.0",
"grunt-contrib-uglify": "^1.0.1", "grunt-contrib-uglify": "^1.0.1",
"grunt-contrib-watch": "~0.5.3", "grunt-contrib-watch": "^1.0.0",
"grunt-esvm": "^3.2.0", "grunt-esvm": "^3.2.0",
"grunt-mocha-cov": "^0.4.0", "grunt-mocha-cov": "^0.4.0",
"grunt-open": "~0.2.2", "grunt-open": "~0.2.2",
"grunt-prompt": "~0.1.2", "grunt-prompt": "^1.3.3",
"grunt-run": "~0.2.2", "grunt-run": "^0.6.0",
"grunt-s3": "~0.2.0-alpha.3", "grunt-s3": "~0.2.0-alpha.3",
"grunt-saucelabs": "~8.2.0", "grunt-saucelabs": "^8.6.2",
"grunt-webpack": "^1.0.11", "grunt-webpack": "^1.0.11",
"jquery": "~2.1.1", "jquery": "^2.2.3",
"js-yaml": "^3.6.0", "js-yaml": "^3.6.0",
"load-grunt-config": "~0.7.0", "load-grunt-config": "^0.19.2",
"load-grunt-tasks": "~0.2.0", "load-grunt-tasks": "^3.5.0",
"mocha": "^2.2.5", "mocha": "^2.2.5",
"mocha-lcov-reporter": "0.0.1", "mocha-lcov-reporter": "0.0.1",
"mocha-screencast-reporter": "~0.1.4", "mocha-screencast-reporter": "~0.1.4",
"moment": "~2.4.0", "moment": "^2.13.0",
"nock": "~0.28.3", "nock": "~0.28.3",
"null-loader": "^0.1.1", "null-loader": "^0.1.1",
"open": "0.0.4", "open": "0.0.5",
"optimist": "~0.6.0", "optimist": "~0.6.0",
"semver": "^4.3.6", "semver": "^4.3.6",
"sinon": "~1.12.2", "sinon": "^1.17.4",
"split": "~0.3.2", "split": "~0.3.2",
"through2": "~0.6.3", "through2": "~0.6.3",
"through2-map": "~1.4.0", "through2-map": "~1.4.0",
@ -97,7 +96,6 @@
"chalk": "^1.0.0", "chalk": "^1.0.0",
"forever-agent": "^0.6.0", "forever-agent": "^0.6.0",
"lodash": "^4.12.0", "lodash": "^4.12.0",
"lodash-compat": "^3.0.0",
"promise": "^7.1.1" "promise": "^7.1.1"
}, },
"repository": { "repository": {

2
webpack_config/browser.js
View File

@ -7,6 +7,8 @@ module.exports = {
output: { output: {
filename: 'elasticsearch.js', filename: 'elasticsearch.js',
path: rel('dist'), path: rel('dist'),
library: 'elasticsearch',
libraryTarget: 'umd'
}, },
module: { module: {
loaders: [ loaders: [