Skip to content

Commit

Permalink
release: v1.0.0 alpha.3
Browse files Browse the repository at this point in the history
Merge pull request #140 from CartoDB/release/v1.0.0-alpha.3
  • Loading branch information
VictorVelarde authored Sep 2, 2020
2 parents ac84d20 + 30cb7b5 commit 79267eb
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 20 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

## [Unreleased]

## [1.0.0-alpha.3] 2020-09-02

### Added

- Add new `carto.viz.Legend` widget for layers, working for these styles: basic, colorBins, colorCategories, colorContinuous, sizeBins, sizeCategories and sizeContinuous (#100, #102, #104, #105, #106, #107, #109 and #113)
Expand Down Expand Up @@ -33,6 +35,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
- Fix interactivity styles for common geojson files, expecting cartodb_id to be always present on `carto.viz.source.GeoJSON` ([#125](https://github.com/CartoDB/web-sdk/pull/125/))
- Fix some `carto.viz.dataview` errors (with remote mode), due to map instance not ready yet ([#136](https://github.com/CartoDB/web-sdk/pull/136/))
- Fix multiple calls to remote dataviews API (precise mode) every time the map is dragged ([#138](https://github.com/CartoDB/web-sdk/pull/138/))
- Fix `carto.viz.dataview.Formula` not getting an updated source ([#139](https://github.com/CartoDB/web-sdk/pull/139/))


## [1.0.0-alpha.2] 2020-07-31
Expand Down
17 changes: 9 additions & 8 deletions DEVELOPERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,13 @@ Steps for a release:

1. create a new branch, either from `develop` (if it's a common release, eg. `release/v1.0.0`) or from `master` (if it is a hotfix, like `hotfix/legend-1`).
2. pass all the checks on it (build, test, lint, doc...).
3. update the `CHANGELOG`, adding the current date, expected version and its notes, and then a new _Unreleased_ section. Commit it to the branch.
4. set up the upstream branch (eg. `git push --set-upstream origin release/v1.0.0`).
5. create a PR, in draft mode, for some previous revision from your mates. Name the PR after the release, eg `release/v1.0.0`. Don't start the release process without that feedback.
6. launch the release process (which includes the version bump aand the npm & cdn publication) and specify the desired version, eg. `v1.0.0`. See section 2.3 to know more details about this step.
7. after a succesful release, merge the `release` to `develop` or the `hotfix` branch to `master`
8. merge `master` back to `develop` (or the other way around), because it always have to be updated with `master`.
3. apply small fixes if not blocking
4. update the `CHANGELOG`, adding the current date, expected version and its notes, and then a new _Unreleased_ section. Commit it to the branch.
5. set up the upstream branch (eg. `git push --set-upstream origin release/v1.0.0`).
6. create a PR, in draft mode, for some previous revision from your mates. Name the PR after the release, eg `release/v1.0.0`. Don't start the release process without that feedback.
7. launch the release process (which includes the version bump and the npm & cdn publication) and specify the desired version, eg. `v1.0.0`. See section 2.3 to know more details about this step.
8. after a succesful release, merge the `release` to `develop` or the `hotfix` branch to `master`
9. merge `master` back to `develop` (or the other way around), because it always have to be updated with `master`.

> Note: The next sections, about releases, are just for internal use at CARTO and they require the proper permissions (with a `secrets.json`).
Expand Down Expand Up @@ -112,7 +113,7 @@ If a release is, for example `v2.1.0`, it will be deployed to:

> Note, this triple deployment does not apply if using a pre-release (eg `4.2.0-alpha.0`). In that case it gets deployed to:
- `https://libs.cartocdn.com/web-sdk/4.2.0-alpha/index.min.js`
- `https://libs.cartocdn.com/web-sdk/4.2.0-alpha.0/index.min.js`
- `https://libs.cartocdn.com/web-sdk/v4.2.0-alpha/index.min.js`
- `https://libs.cartocdn.com/web-sdk/v4.2.0-alpha.0/index.min.js`

> After the publication, remember to manually merged the `release|fix` branch to `master`, and then `master` back to `develop`.
2 changes: 1 addition & 1 deletion docs/guides/04-dataviews-widgets.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ Finally, we are going to add an Histogram widget:
id="widgetHistogram"
heading="Countries by population"
description="Distribution of countries by population"
show-clear>
show-clear-button>
</as-histogram-widget>
```

Expand Down
7 changes: 4 additions & 3 deletions examples/_debug/demoBQ/bq-app.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
class="as-p--16"
heading="Average tip percent %"
description="currently onn screen"
show-clear
show-clear-button
>
</as-histogram-widget>
</section>
Expand Down Expand Up @@ -125,8 +125,9 @@
// bq source
// const tileJsonEndpoint = 'https://us-central1-bqtiler-staging.cloudfunctions.net/tilejson'; // for staging
const tileJsonEndpoint = 'https://bq1.cartocdn.com/tilejson'; // for PROD
const bq = new carto.viz.source.BQ('cartobq.maps.nyc_taxi_points_demo_id', { // for PROD
// const bq = new carto.viz.source.BQ('bqtiler-staging.maps.nyc_taxi_points_demo_id', { // for staging
const bq = new carto.viz.source.BQ('cartobq.maps.nyc_taxi_points_demo_id', {
// for PROD
// const bq = new carto.viz.source.BQ('bqtiler-staging.maps.nyc_taxi_points_demo_id', { // for staging
tileJsonEndpoint
});

Expand Down
2 changes: 1 addition & 1 deletion examples/_debug/mini-app/mini-app.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
id="widgetCommerceHistogram"
heading="GDP"
description="Distribution of GDP for countries"
show-clear>
show-clear-button>
</as-histogram-widget>
</section>
</div>
Expand Down
2 changes: 1 addition & 1 deletion examples/guides/dataviews-widgets/step-4.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
id="widgetHistogram"
heading="Countries by population"
description="Distribution of countries by population"
show-clear
show-clear-button
>
</as-histogram-widget>
</section>
Expand Down
4 changes: 2 additions & 2 deletions examples/interactivity/interactiveStyle.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<div class="as-panel__element as-p--16 as-body">
<h1 class="as-title">Interactive style</h1>
<h4 class="as-subheader as-mb--12">
Hover and clik the points, to see a style change due to the interaction,
with <em>hoverStylr</em> and <em>clickStyle</em> options
Hover and clik the points, to see a style change due to the interaction, with
<em>hoverStyle</em> and <em>clickStyle</em> options
</h4>
<div id="result"></div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions examples/widget/categoryWidget.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ <h4 class="as-subheader as-mb--12">
id="category-global"
heading="Countries per continent (global)"
description="All countries"
show-clear-button
>
</as-category-widget>
</section>
Expand All @@ -77,6 +78,7 @@ <h4 class="as-subheader as-mb--12">
id="category-viewport"
heading="Countries per continent (viewport)"
description="Countries on screen"
show-clear-button
>
</as-category-widget>
</section>
Expand Down
4 changes: 2 additions & 2 deletions examples/widget/histogramWidget.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ <h4 class="as-subheader as-mb--12">
id="histogram-global"
heading="Estimated Population (global)"
description="Distribution of estimated population in countries"
show-clear
show-clear-button
>
</as-histogram-widget>

Expand All @@ -77,7 +77,7 @@ <h4 class="as-subheader as-mb--12">
id="histogram-viewport"
heading="Estimated Population (viewport)"
description="Distribution of estimated population in countries"
show-clear
show-clear-button
>
</as-histogram-widget>
</section>
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carto/web-sdk",
"version": "1.0.0-alpha.2",
"version": "1.0.0-alpha.3",
"description": "CARTO Web SDK",
"repository": {
"type": "git",
Expand Down

1 comment on commit 79267eb

@vercel
Copy link

@vercel vercel bot commented on 79267eb Sep 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.