Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
maneetgoyal authored Apr 29, 2020
2 parents c63000f + 1d519ee commit c807192
Show file tree
Hide file tree
Showing 33 changed files with 379 additions and 134 deletions.
22 changes: 14 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased][head]


## [2.12.0] - April 27th 2020

### @esri/arcgis-rest-portal

* New Features
* **arcgis-rest-portal**: add getPortalSettings function [`e956dc56`](https://github.com/Esri/arcgis-rest-js/commit/e956dc56e2fb925478767d989e4cf42cb8ac1a1c)

## [2.11.0] - April 6th 2020

### @esri/arcgis-rest-auth
Expand Down Expand Up @@ -96,7 +104,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

- New Features

- **Add properties to IStatisticDefinition to support percentiles**: Added optional `statisticParameter` property to support new `"percentile_cont" | "percentile_disc"` types. [8edec3ff](https://github.com/Esri/arcgis-rest-js/pull/650/commits/8edec3ff7d91bc583dfd30db23067bee0e86887e)
- **Add properties to IStatisticDefinition to support percentiles**: Added optional `statisticParameter` property to support new `"percentile_cont" | "percentile_disc"` types. [8edec3ff](https://github.com/Esri/arcgis-rest-js/pull/650/commits/8edec3ff7d91bc583dfd30db23067bee0e86887e)

- **Export `IStatisticDefinition` interface**: [a6ac91b7](https://github.com/Esri/arcgis-rest-js/pull/651/commits/a6ac91b713510391e86819fa51595440cc1533ce)

Expand Down Expand Up @@ -1579,8 +1587,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 @@ -1607,10 +1614,8 @@ 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.4.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.3.0...v2.4.0 "v2.4.0"
[2.5.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.4.0...v2.5.0 "v2.5.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"
[2.6.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.5.0...v2.6.0 "v2.6.0"
[2.6.1]: https://github.com/Esri/arcgis-rest-js/compare/v2.6.0...v2.6.1 "v2.6.1"
[2.7.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.6.1...v2.7.0 "v2.7.0"
Expand All @@ -1624,4 +1629,5 @@ Initial Public Release
[2.10.1]: https://github.com/Esri/arcgis-rest-js/compare/v2.10.0...v2.10.1 "v2.10.1"
[2.10.2]: https://github.com/Esri/arcgis-rest-js/compare/v2.10.1...v2.10.2 "v2.10.2"
[2.11.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.10.2...v2.11.0 "v2.11.0"
[HEAD]: https://github.com/Esri/arcgis-rest-js/compare/v2.11.0...HEAD "Unreleased Changes"
[2.12.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.11.0...v2.12.0 "v2.12.0"
[HEAD]: https://github.com/Esri/arcgis-rest-js/compare/v2.12.0...HEAD "Unreleased Changes"
10 changes: 9 additions & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,22 @@ The command below bumps the version in each individual package.json file and par
npm run release:prepare
```

For some reason, in CHANGELOG.md, the unreleased section appears below this release. So please move it to the top.
Sometimes this step fails due to errors while parsing commit messages. See [these inline comments](https://github.com/Esri/arcgis-rest-js/blob/d8566a99dd1534e5eeae2ebfc5bfbffc679426d8/support/changelog.js#L78-L81) for how to modify the script and re-run the changelog generation script.

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

```bash
npm run release:review
```

**IMPORTANT**

Before publishing, you will likely need to make a few chages to `CHANGELOG.md` b/c the system to automates this is [far from perfect](https://github.com/Esri/arcgis-rest-js/issues/688). For example:
- It is very rare that anyone uses `npm run c`, so it is very likely that you will have to manually add changelog entries for whatever has changed since the last release
- Often the Unreleased section appears below the current release. So please move it to the top.

Once the changelog looks good, run `git add .` to stage it, and proceed.

The last command increments the version in the root package.json, pushes the new tag to GitHub and publishes a release of each individual package on npm.

```bash
Expand Down
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.11.0",
"version": "2.12.0",
"description": "arcgis-rest-js node command-line item search example",
"main": "ago.js",
"scripts": {
Expand All @@ -18,9 +18,9 @@
"author": "Dave Bouwman <dbouwman@esri.com>",
"license": "Apache-2.0",
"dependencies": {
"@esri/arcgis-rest-auth": "^2.11.0",
"@esri/arcgis-rest-portal": "^2.11.0",
"@esri/arcgis-rest-request": "^2.11.0",
"@esri/arcgis-rest-auth": "^2.12.0",
"@esri/arcgis-rest-portal": "^2.12.0",
"@esri/arcgis-rest-request": "^2.12.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.11.0",
"version": "2.12.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.11.0",
"@esri/arcgis-rest-request": "^2.11.0"
"@esri/arcgis-rest-feature-layer": "^2.12.0",
"@esri/arcgis-rest-request": "^2.12.0"
},
"devDependencies": {
"http-server": "*"
Expand Down
8 changes: 4 additions & 4 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.11.0",
"version": "2.12.0",
"description": "arcgis-rest-js batch geocode sample",
"main": "batch-geocode.js",
"scripts": {
Expand All @@ -27,9 +27,9 @@
},
"homepage": "https://github.com/Esri/arcgis-rest-js#readme",
"dependencies": {
"@esri/arcgis-rest-auth": "^2.11.0",
"@esri/arcgis-rest-geocoding": "^2.11.0",
"@esri/arcgis-rest-request": "^2.11.0",
"@esri/arcgis-rest-auth": "^2.12.0",
"@esri/arcgis-rest-geocoding": "^2.12.0",
"@esri/arcgis-rest-request": "^2.12.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.11.0",
"version": "2.12.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.11.0",
"@esri/arcgis-rest-request": "^2.11.0",
"@esri/arcgis-rest-auth": "^2.12.0",
"@esri/arcgis-rest-request": "^2.12.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.11.0",
"version": "2.12.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.11.0",
"@esri/arcgis-rest-request": "^2.11.0"
"@esri/arcgis-rest-feature-layer": "^2.12.0",
"@esri/arcgis-rest-request": "^2.12.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.11.0",
"version": "2.12.0",
"private": true,
"description": "Vanilla JavaScript demo of @esri/arcgis-rest-geocoder",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"@esri/arcgis-rest-auth": "^2.11.0",
"@esri/arcgis-rest-geocoding": "^2.11.0",
"@esri/arcgis-rest-request": "^2.11.0"
"@esri/arcgis-rest-auth": "^2.12.0",
"@esri/arcgis-rest-geocoding": "^2.12.0",
"@esri/arcgis-rest-request": "^2.12.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.11.0",
"version": "2.12.0",
"private": true,
"description": "to do",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"@esri/arcgis-rest-auth": "^2.11.0",
"@esri/arcgis-rest-portal": "^2.11.0",
"@esri/arcgis-rest-request": "^2.11.0"
"@esri/arcgis-rest-auth": "^2.12.0",
"@esri/arcgis-rest-portal": "^2.12.0",
"@esri/arcgis-rest-request": "^2.12.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.11.0",
"version": "2.12.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.11.0",
"@esri/arcgis-rest-portal": "^2.11.0",
"@esri/arcgis-rest-request": "^2.11.0",
"@esri/arcgis-rest-auth": "^2.12.0",
"@esri/arcgis-rest-portal": "^2.12.0",
"@esri/arcgis-rest-request": "^2.12.0",
"chalk": "^2.3.0",
"cross-fetch": "^3.0.0",
"isomorphic-form-data": "^1.0.0",
Expand Down
Loading

0 comments on commit c807192

Please sign in to comment.