Skip to content

Commit

Permalink
Merge branch 'master' into bulk-geocode-params
Browse files Browse the repository at this point in the history
  • Loading branch information
tomwayson authored Oct 24, 2019
2 parents 3b693ef + 0af0fdf commit 5870086
Show file tree
Hide file tree
Showing 35 changed files with 674 additions and 204 deletions.
16 changes: 11 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### [Unreleased][HEAD]

## [2.6.0] - October 22nd 2019

### @esri/arcgis-rest-portal

* New Features
* **arcgis-rest-portal**: add searchUsers function [`b91af15a`](https://github.com/Esri/arcgis-rest-js/commit/b91af15a0524ace69edfdaa5ccdea9da257746a9)

## [2.5.0] - October 15th 2019

### @esri/arcgis-rest-portal
Expand Down Expand Up @@ -1423,8 +1430,7 @@ Initial Public Release
[1.8.0]: https://github.com/Esri/arcgis-rest-js/compare/v1.7.1...v1.8.0 "v1.8.0"
[1.9.0]: https://github.com/Esri/arcgis-rest-js/compare/v1.8.0...v1.9.0 "v1.9.0"
[1.10.0]: https://github.com/Esri/arcgis-rest-js/compare/v1.9.0...v1.10.0 "v1.10.0"
[1.11.0]: https://github.com/Esri/arcgis-rest-js/compare/v1.10.0...v1.11.0 "v1.11.0"
[1.11.1]: https://github.com/Esri/arcgis-rest-js/compare/v1.11.0...v1.11.1 "v1.11.1"
[1.11.1]: https://github.com/Esri/arcgis-rest-js/compare/v1.10.0...v1.11.1 "v1.11.1"
[1.12.0]: https://github.com/Esri/arcgis-rest-js/compare/v1.11.1...v1.12.0 "v1.12.0"
[1.13.0]: https://github.com/Esri/arcgis-rest-js/compare/v1.12.0...v1.13.0 "v1.13.0"
[1.13.1]: https://github.com/Esri/arcgis-rest-js/compare/v1.13.0...v1.13.1 "v1.13.1"
Expand All @@ -1451,7 +1457,7 @@ Initial Public Release
[2.1.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.0.4...v2.1.0 "v2.1.0"
[2.1.1]: https://github.com/Esri/arcgis-rest-js/compare/v2.1.0...v2.1.1 "v2.1.1"
[2.2.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.1.1...v2.2.0 "v2.2.0"
[2.2.1]: https://github.com/Esri/arcgis-rest-js/compare/v2.2.0...v2.2.1 "v2.2.1"
[2.3.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.2.1...v2.3.0 "v2.3.0"
[2.3.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.2.0...v2.3.0 "v2.3.0"
[2.5.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.3.0...v2.5.0 "v2.5.0"
[HEAD]: https://github.com/Esri/arcgis-rest-js/compare/v2.5.0...HEAD "Unreleased Changes"
[2.6.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.5.0...v2.6.0 "v2.6.0"
[HEAD]: https://github.com/Esri/arcgis-rest-js/compare/v2.6.0...HEAD "Unreleased Changes"
8 changes: 4 additions & 4 deletions demos/ago-node-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "node-cli",
"version": "2.5.0",
"version": "2.6.0",
"description": "arcgis-rest-js node command-line item search example",
"main": "ago.js",
"scripts": {
Expand All @@ -18,9 +18,9 @@
"author": "Dave Bouwman <[email protected]>",
"license": "Apache-2.0",
"dependencies": {
"@esri/arcgis-rest-auth": "^2.5.0",
"@esri/arcgis-rest-portal": "^2.5.0",
"@esri/arcgis-rest-request": "^2.5.0",
"@esri/arcgis-rest-auth": "^2.6.0",
"@esri/arcgis-rest-portal": "^2.6.0",
"@esri/arcgis-rest-request": "^2.6.0",
"chalk": "^2.3.0",
"commander": "^2.12.2",
"cross-fetch": "^3.0.0",
Expand Down
6 changes: 3 additions & 3 deletions demos/attachments/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "attachments",
"version": "2.5.0",
"version": "2.6.0",
"private": true,
"description": "Vanilla JavaScript demo of attachment methods of @esri/arcgis-rest-feature-service",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"@esri/arcgis-rest-feature-layer": "^2.5.0",
"@esri/arcgis-rest-request": "^2.5.0"
"@esri/arcgis-rest-feature-layer": "^2.6.0",
"@esri/arcgis-rest-request": "^2.6.0"
},
"devDependencies": {
"http-server": "*"
Expand Down
9 changes: 4 additions & 5 deletions demos/batch-geocoder-node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "batch-geocoder",
"version": "2.5.0",
"version": "2.6.0",
"description": "arcgis-rest-js batch geocode sample",
"main": "batch-geocode.js",
"scripts": {
Expand All @@ -27,10 +27,9 @@
},
"homepage": "https://github.com/Esri/arcgis-rest-js#readme",
"dependencies": {
"@esri/arcgis-rest-auth": "^2.5.0",
"@esri/arcgis-rest-common": "^1.19.2",
"@esri/arcgis-rest-geocoding": "^2.5.0",
"@esri/arcgis-rest-request": "^2.5.0",
"@esri/arcgis-rest-auth": "^2.6.0",
"@esri/arcgis-rest-geocoding": "^2.6.0",
"@esri/arcgis-rest-request": "^2.6.0",
"cross-fetch": "^3.0.0",
"isomorphic-form-data": "^2.0.0",
"papaparse": "^4.6.0"
Expand Down
6 changes: 3 additions & 3 deletions demos/express/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@esri/arcgis-rest-demo-express",
"version": "2.5.0",
"version": "2.6.0",
"private": true,
"description": "Demo of @esri/arcgis-rest-* packages in an Express server",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"@esri/arcgis-rest-auth": "^2.5.0",
"@esri/arcgis-rest-request": "^2.5.0",
"@esri/arcgis-rest-auth": "^2.6.0",
"@esri/arcgis-rest-request": "^2.6.0",
"cross-fetch": "^3.0.0",
"express": "^4.16.3",
"isomorphic-form-data": "^2.0.0"
Expand Down
6 changes: 3 additions & 3 deletions demos/feature-service-browser/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "feature-service-browser",
"version": "2.5.0",
"version": "2.6.0",
"private": true,
"description": "Vanilla JavaScript demo of @esri/arcgis-rest-feature-service",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"@esri/arcgis-rest-feature-layer": "^2.5.0",
"@esri/arcgis-rest-request": "^2.5.0"
"@esri/arcgis-rest-feature-layer": "^2.6.0",
"@esri/arcgis-rest-request": "^2.6.0"
},
"devDependencies": {
"http-server": "*"
Expand Down
8 changes: 4 additions & 4 deletions demos/geocoder-browser/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "@esri/arcgis-rest-geocoder-vanilla",
"version": "2.5.0",
"version": "2.6.0",
"private": true,
"description": "Vanilla JavaScript demo of @esri/arcgis-rest-geocoder",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"@esri/arcgis-rest-auth": "^2.5.0",
"@esri/arcgis-rest-geocoding": "^2.5.0",
"@esri/arcgis-rest-request": "^2.5.0"
"@esri/arcgis-rest-auth": "^2.6.0",
"@esri/arcgis-rest-geocoding": "^2.6.0",
"@esri/arcgis-rest-request": "^2.6.0"
},
"devDependencies": {
"http-server": "0.11.1"
Expand Down
8 changes: 4 additions & 4 deletions demos/jsapi-integration/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "@esri/jsapi-integration",
"version": "2.5.0",
"version": "2.6.0",
"private": true,
"description": "to do",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"@esri/arcgis-rest-auth": "^2.5.0",
"@esri/arcgis-rest-portal": "^2.5.0",
"@esri/arcgis-rest-request": "^2.5.0"
"@esri/arcgis-rest-auth": "^2.6.0",
"@esri/arcgis-rest-portal": "^2.6.0",
"@esri/arcgis-rest-request": "^2.6.0"
},
"devDependencies": {
"http-server": "*"
Expand Down
8 changes: 4 additions & 4 deletions demos/node-cli-item-management/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cli-item-management",
"version": "2.5.0",
"version": "2.6.0",
"description": "Manage items in ArcGIS Online with a Node JS CLI and ArcGIS Rest JS",
"main": "index.js",
"scripts": {
Expand All @@ -16,9 +16,9 @@
"arcgis-rest-js"
],
"dependencies": {
"@esri/arcgis-rest-auth": "^2.5.0",
"@esri/arcgis-rest-portal": "^2.5.0",
"@esri/arcgis-rest-request": "^2.5.0",
"@esri/arcgis-rest-auth": "^2.6.0",
"@esri/arcgis-rest-portal": "^2.6.0",
"@esri/arcgis-rest-request": "^2.6.0",
"chalk": "^2.3.0",
"cross-fetch": "^3.0.0",
"isomorphic-form-data": "^1.0.0",
Expand Down
6 changes: 3 additions & 3 deletions demos/oauth2-browser/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@esri/arcgis-rest-demo-vanilla",
"version": "2.5.0",
"version": "2.6.0",
"private": true,
"description": "Vanilla JavaScript demo of @esri/arcgis-rest-* packages",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"@esri/arcgis-rest-auth": "^2.5.0",
"@esri/arcgis-rest-request": "^2.5.0"
"@esri/arcgis-rest-auth": "^2.6.0",
"@esri/arcgis-rest-request": "^2.6.0"
},
"devDependencies": {
"http-server": "*"
Expand Down
6 changes: 3 additions & 3 deletions demos/stream-response-to-file/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "stream-response-to-file",
"version": "2.5.0",
"version": "2.6.0",
"private": true,
"description": "stream response to file with arcgis-rest-request",
"main": "index.js",
Expand All @@ -25,8 +25,8 @@
},
"homepage": "https://github.com/Esri/arcgis-rest-js#readme",
"dependencies": {
"@esri/arcgis-rest-feature-layer": "^2.5.0",
"@esri/arcgis-rest-request": "^2.5.0",
"@esri/arcgis-rest-feature-layer": "^2.6.0",
"@esri/arcgis-rest-request": "^2.6.0",
"isomorphic-form-data": "^2.0.0",
"node-fetch": "^2.3.0"
}
Expand Down
6 changes: 3 additions & 3 deletions demos/tree-shaking-rollup/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/arcgis-rest-tree-shaking-rollup",
"version": "2.5.0",
"version": "2.6.0",
"private": true,
"description": "",
"scripts": {
Expand All @@ -19,7 +19,7 @@
"rollup-plugin-node-resolve": "^4.0.1"
},
"dependencies": {
"@esri/arcgis-rest-portal": "^2.5.0",
"@esri/arcgis-rest-request": "^2.5.0"
"@esri/arcgis-rest-portal": "^2.6.0",
"@esri/arcgis-rest-request": "^2.6.0"
}
}
6 changes: 3 additions & 3 deletions demos/tree-shaking-webpack/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/arcgis-rest-tree-shaking-webpack",
"version": "2.5.0",
"version": "2.6.0",
"private": true,
"description": "",
"scripts": {
Expand All @@ -18,7 +18,7 @@
"webpack-cli": "^3.3.0"
},
"dependencies": {
"@esri/arcgis-rest-portal": "^2.5.0",
"@esri/arcgis-rest-request": "^2.5.0"
"@esri/arcgis-rest-portal": "^2.6.0",
"@esri/arcgis-rest-request": "^2.6.0"
}
}
6 changes: 3 additions & 3 deletions demos/vue/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@esri/arcgis-rest-demo-vue-with-popup",
"description": "VueJS demo of @esri/arcgis-rest-* packages.",
"version": "2.5.0",
"version": "2.6.0",
"author": "",
"license": "Apache-2.0",
"private": true,
Expand All @@ -12,8 +12,8 @@
"start": "npm run serve"
},
"dependencies": {
"@esri/arcgis-rest-auth": "^2.5.0",
"@esri/arcgis-rest-request": "^2.5.0",
"@esri/arcgis-rest-auth": "^2.6.0",
"@esri/arcgis-rest-request": "^2.6.0",
"vue": "^2.5.17",
"vue-router": "^3.0.1",
"vuex": "^3.0.1"
Expand Down
8 changes: 4 additions & 4 deletions demos/webmap-checker-sapper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "sapper-webmap-checker",
"description": "this thing is cray cray",
"private": true,
"version": "2.5.0",
"version": "2.6.0",
"scripts": {
"dev": "sapper dev",
"build:legacy": "sapper build --legacy",
Expand All @@ -13,9 +13,9 @@
"test": "run-p --race dev cy:run"
},
"dependencies": {
"@esri/arcgis-rest-auth": "^2.5.0",
"@esri/arcgis-rest-portal": "^2.5.0",
"@esri/arcgis-rest-request": "^2.5.0",
"@esri/arcgis-rest-auth": "^2.6.0",
"@esri/arcgis-rest-portal": "^2.6.0",
"@esri/arcgis-rest-request": "^2.6.0",
"compression": "^1.7.1",
"cookies": "^0.7.3",
"cross-fetch": "^3.0.0",
Expand Down
16 changes: 8 additions & 8 deletions docs/src/srihashes.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"version": "2.5.0",
"version": "2.6.0",
"packages": {
"@esri/arcgis-rest-auth": "sha384-XMjPWs96DvTiMyofkTC5Z8EM1BrfvV6/ouYmUI74Hosocq1mzLON2KmWbQ5lQCm/",
"@esri/arcgis-rest-feature-layer": "sha384-bE0D8cK8V++EYiFwhJ+f7pKf9vy28mxZGIPIcZTPNcVzQbNx//UCsc5nPNaDneLx",
"@esri/arcgis-rest-geocoding": "sha384-WFpWwSKtF2smlOO/ot/fqdZo2MqiLbXpZ5TTty9DJkS4UTfEnRtynH7MQULCQZ+6",
"@esri/arcgis-rest-portal": "sha384-L42mmM4RU1DGbR16gRQuYQU0a36njQYwIpsR3PCp0Nbvodhe3hWUDlRYf4d97Ybr",
"@esri/arcgis-rest-request": "sha384-eE/fvikDoBjM6YBEekAOLfm6hJAiuzaYcovbeAOZzTH0PM8isl2DXWHX+ihpBDsD",
"@esri/arcgis-rest-routing": "sha384-oBeCuXRbatE7ygLTRhwnKNbXi6r9BSBWx+ddrKcR2O2zSV6NmAhuzC8JNt2x+ceo",
"@esri/arcgis-rest-service-admin": "sha384-GcB+Wrnog6F03Ks5Bc2D3EgRgfS/WLggutMAaf4xQWvS8K2/ciWc9t1c++3bhkdK"
"@esri/arcgis-rest-auth": "sha384-baCmhGPjywJvoVr8xpsdTUEMF1L6r/LRQoDhBUuI/Oh65vgPNr66uhmN8eN71h1U",
"@esri/arcgis-rest-feature-layer": "sha384-ynVh76V2CkyHS4H1NJ9/vh4rkCY0AAG9Q2t8CQ3m9tRtk/7bLLCPeaCBKqBSAGYt",
"@esri/arcgis-rest-geocoding": "sha384-W5Zn/mbqqgTR1Jpir6L2NrHXa6SIQKAv6c6PCl78qwTUz6lSFTx5Tu06Coq9ghjA",
"@esri/arcgis-rest-portal": "sha384-V7lYi9vd7IVpBVq6clajDRyJevMC5KGyZgFaF7e0pdiQWTXgMq593ra2ojbSb06o",
"@esri/arcgis-rest-request": "sha384-RKizAQ1zCobnrDnc6HXceaBz+H0cEwXqqQ5kAJygw80C7VYW6DxovAnbziI/ojMi",
"@esri/arcgis-rest-routing": "sha384-wH4i2p8SPj3bU0MmLNkV4z7jsGl7zdGwYF7wIR4v+MMrTZqQf7AO3YVBcvaplz6h",
"@esri/arcgis-rest-service-admin": "sha384-hAaeuF3NcS9XUM4YLPEOllID1ZIlRe0QxRWGnClpghBjaxcssFxuRdcmqeGoqKy+"
}
}
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"packages/*",
"demos/*"
],
"version": "2.5.0"
"version": "2.6.0"
}
8 changes: 6 additions & 2 deletions notes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ the command below bumps the version in each individual package.json file and par
npm run release:prepare
```

I don't know why, but sometimes lerna fails to increment a new version number for individual packages (like @esri/arcgis-rest-auth). When this happens, it is necessary to increment the version number in the package (and anything that depends on it) manually.

You should not increment peerDependency version numbers manually. they should remain as loose as possible. Unless you know that your new version of the package needs to use the updated peer dependency.

For some reason, in CHANGELOG.md, the unreleased section appears below this release. So please move it to the top.

afterwards, you can display a diff to give you a sense of what will be committed to master when you actually publish.

```bash
Expand All @@ -84,5 +90,3 @@ npm run release:publish
Basic utility libraries are going to be a problem. Most recommendation are to use something like `import defaults = require('lodash/defaults')` because you are importing a common JS module. However if you use this syntax you cannot have Typescript compile ES2015 modules which is goal for us. Not every library publishes itself as ES2015 modules.

We need to make a call on what we bundle into the library (`Promise`, `fetch`) ect... Do we ask people to bring their own polyfills or do we bundle them ourselves for simplicity. If we want to do both it will likely complicate the builds a great deal.


Loading

0 comments on commit 5870086

Please sign in to comment.