Skip to content

Commit

Permalink
Merge branch 'master' into chr/fix-mapbox-viewports
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pessimistress
Pessimistress committed Feb 21, 2022
2 parents 681d066 + d6c5619 commit 15d2af3
Show file tree
Hide file tree
Showing 55 changed files with 86 additions and 85 deletions.
3 changes: 2 additions & 1 deletion .nycrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"sourceMap": false,
"instrument": true,
"include": [
"modules/**/src/**/*.js"
"modules/**/src/**/*.js",
"modules/**/src/**/*.ts"
],
"exclude": [
"modules/test-utils/"
Expand Down
2 changes: 1 addition & 1 deletion examples/experimental/bezier/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"start": "webpack-dev-server --progress --hot --open"
},
"dependencies": {
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/experimental/h3-grid/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "webpack -p --output-path dist"
},
"dependencies": {
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-map-gl": "^5.1.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/experimental/interleaved-buffer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "webpack -p"
},
"dependencies": {
"@deck.gl/core": "^8.6.0-alpha.0",
"@deck.gl/layers": "^8.6.0-alpha.0"
"@deck.gl/core": "^8.7.0-beta.6",
"@deck.gl/layers": "^8.7.0-beta.6"
},
"devDependencies": {
"html-webpack-plugin": "^3.0.7",
Expand Down
6 changes: 3 additions & 3 deletions examples/get-started/pure-js/arcgis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
},
"dependencies": {
"@arcgis/core": "^4.21.0",
"@deck.gl/arcgis": "^8.6.0-alpha.0",
"@deck.gl/core": "^8.6.0-alpha.0",
"@deck.gl/layers": "^8.6.0-alpha.0"
"@deck.gl/arcgis": "^8.7.0-beta.6",
"@deck.gl/core": "^8.7.0-beta.6",
"@deck.gl/layers": "^8.7.0-beta.6"
},
"devDependencies": {
"webpack": "^4.20.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/get-started/pure-js/basic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "webpack -p"
},
"dependencies": {
"@deck.gl/core": "^8.6.0-alpha.0",
"@deck.gl/layers": "^8.6.0-alpha.0"
"@deck.gl/core": "^8.7.0-beta.6",
"@deck.gl/layers": "^8.7.0-beta.6"
},
"devDependencies": {
"html-webpack-plugin": "^3.0.7",
Expand Down
10 changes: 5 additions & 5 deletions examples/get-started/pure-js/carto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"build": "webpack -p"
},
"dependencies": {
"@deck.gl/core": "^8.7.0-alpha.2",
"@deck.gl/layers": "^8.7.0-alpha.2",
"@deck.gl/geo-layers": "^8.7.0-alpha.2",
"@deck.gl/mesh-layers": "^8.7.0-alpha.2",
"@deck.gl/carto": "^8.7.0-alpha.2",
"@deck.gl/core": "^8.7.0-beta.6",
"@deck.gl/layers": "^8.7.0-beta.6",
"@deck.gl/geo-layers": "^8.7.0-beta.6",
"@deck.gl/mesh-layers": "^8.7.0-beta.6",
"@deck.gl/carto": "^8.7.0-beta.6",
"mapbox-gl": "^1.12.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/get-started/pure-js/globe/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "webpack -p"
},
"dependencies": {
"@deck.gl/core": "^8.6.0-alpha.0",
"@deck.gl/layers": "^8.6.0-alpha.0"
"@deck.gl/core": "^8.7.0-beta.6",
"@deck.gl/layers": "^8.7.0-beta.6"
},
"devDependencies": {
"html-webpack-plugin": "^3.0.7",
Expand Down
6 changes: 3 additions & 3 deletions examples/get-started/pure-js/google-maps/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"build": "webpack -p"
},
"dependencies": {
"@deck.gl/core": "^8.6.0-alpha.0",
"@deck.gl/google-maps": "^8.6.0-alpha.0",
"@deck.gl/layers": "^8.6.0-alpha.0"
"@deck.gl/core": "^8.7.0-beta.6",
"@deck.gl/google-maps": "^8.7.0-beta.6",
"@deck.gl/layers": "^8.7.0-beta.6"
},
"devDependencies": {
"webpack": "^4.20.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/get-started/pure-js/harp.gl/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "webpack -p"
},
"dependencies": {
"@deck.gl/core": "^8.6.0-alpha.0",
"@deck.gl/layers": "^8.6.0-alpha.0",
"@deck.gl/core": "^8.7.0-beta.6",
"@deck.gl/layers": "^8.7.0-beta.6",
"@here/harp-datasource-protocol": "^0.14.0",
"@here/harp-geoutils": "^0.14.0",
"@here/harp-mapview": "^0.14.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/get-started/pure-js/leaflet/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "webpack -p"
},
"dependencies": {
"@deck.gl/core": "^8.6.0-alpha.0",
"@deck.gl/layers": "^8.6.0-alpha.0",
"@deck.gl/core": "^8.7.0-beta.6",
"@deck.gl/layers": "^8.7.0-beta.6",
"deck.gl-leaflet": "^1.1.1",
"leaflet": "^1.7.1"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/get-started/pure-js/mapbox/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "webpack -p"
},
"dependencies": {
"@deck.gl/core": "^8.6.0-alpha.0",
"@deck.gl/layers": "^8.6.0-alpha.0",
"@deck.gl/core": "^8.7.0-beta.6",
"@deck.gl/layers": "^8.7.0-beta.6",
"mapbox-gl": "^1.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/get-started/react/arcgis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@arcgis/core": "^4.21.0",
"@esri/react-arcgis": "^5.1.0",
"esri-loader": "^3.3.0",
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/get-started/react/basic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "webpack -p"
},
"dependencies": {
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/get-started/react/mapbox/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "webpack -p"
},
"dependencies": {
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-map-gl": "^5.3.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/get-started/scripting/arcgis/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<html>
<head>
<!-- deck.gl standalone bundle -->
<script src="https://unpkg.com/deck.gl@^8.6.0-alpha.0/dist.min.js"></script>
<script src="https://unpkg.com/@deck.gl/arcgis@^8.6.0-alpha.0/dist.min.js"></script>
<script src="https://unpkg.com/deck.gl@^8.7.0-beta.6/dist.min.js"></script>
<script src="https://unpkg.com/@deck.gl/arcgis@^8.7.0-beta.6/dist.min.js"></script>

<!-- ArcGIS dependencies -->
<link rel="stylesheet" href="https://js.arcgis.com/4.14/esri/themes/light/main.css"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/get-started/scripting/basic/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<!-- deck.gl standalone bundle -->
<script src="https://unpkg.com/deck.gl@^8.6.0-alpha.0/dist.min.js"></script>
<script src="https://unpkg.com/deck.gl@^8.7.0-beta.6/dist.min.js"></script>

<style type="text/css">
body {margin: 0; padding: 0;}
Expand Down
4 changes: 2 additions & 2 deletions examples/get-started/scripting/carto/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<html>
<head>
<!-- deck.gl standalone bundle -->
<script src="https://unpkg.com/deck.gl@^8.7.0-alpha.2/dist.min.js"></script>
<script src="https://unpkg.com/@deck.gl/carto@^8.7.0-alpha.2/dist.min.js"></script>
<script src="https://unpkg.com/deck.gl@^8.7.0-beta.6/dist.min.js"></script>
<script src="https://unpkg.com/@deck.gl/carto@^8.7.0-beta.6/dist.min.js"></script>
<!-- Mapbox dependencies -->
<script src="https://api.tiles.mapbox.com/mapbox-gl-js/v1.4.0/mapbox-gl.js"></script>
<link
Expand Down
2 changes: 1 addition & 1 deletion examples/get-started/scripting/globe/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<!-- deck.gl standalone bundle -->
<script src="https://unpkg.com/deck.gl@^8.6.0-alpha.0/dist.min.js"></script>
<script src="https://unpkg.com/deck.gl@^8.7.0-beta.6/dist.min.js"></script>

<style type="text/css">
body {background: #111; margin: 0; padding: 0;}
Expand Down
2 changes: 1 addition & 1 deletion examples/get-started/scripting/google-maps/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<!-- deck.gl standalone bundle -->
<script src="https://unpkg.com/deck.gl@^8.6.0-alpha.0/dist.min.js"></script>
<script src="https://unpkg.com/deck.gl@^8.7.0-beta.6/dist.min.js"></script>

<!-- Google Maps dependencies -->
<!-- Replace google_maps_api_key with your API key! -->
Expand Down
2 changes: 1 addition & 1 deletion examples/get-started/scripting/harp.gl/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<!-- deck.gl standalone bundle -->
<script src="https://unpkg.com/deck.gl@^8.6.0-alpha.0/dist.min.js"></script>
<script src="https://unpkg.com/deck.gl@^8.7.0-beta.6/dist.min.js"></script>

<!-- Mapbox dependencies -->
<script src="https://unpkg.com/three/build/three.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/get-started/scripting/leaflet/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css">

<!-- deck.gl standalone bundle -->
<script src="https://unpkg.com/deck.gl@^8.6.0-alpha.0/dist.min.js"></script>
<script src="https://unpkg.com/deck.gl@^8.7.0-beta.6/dist.min.js"></script>
<!-- deck.gl-leaflet -->
<script src="https://unpkg.com/deck.gl-leaflet@1.1.1/dist/deck.gl-leaflet.min.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/get-started/scripting/mapbox/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<!-- deck.gl standalone bundle -->
<script src="https://unpkg.com/deck.gl@^8.6.0-alpha.0/dist.min.js"></script>
<script src="https://unpkg.com/deck.gl@^8.7.0-beta.6/dist.min.js"></script>

<!-- Mapbox dependencies -->
<script src="https://api.tiles.mapbox.com/mapbox-gl-js/v1.12.0/mapbox-gl.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/website/360-video/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"start": "webpack-dev-server --progress --hot --open"
},
"dependencies": {
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/website/3d-heatmap/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"d3-request": "^1.0.5",
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-map-gl": "^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/3d-tiles/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"@loaders.gl/3d-tiles": "^3.1.5",
"react": "^16.8.0",
"react-dom": "^16.8.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/arc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"d3-scale": "^2.0.0",
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-map-gl": "^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/brushing/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"d3-scale": "^2.0.0",
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-map-gl": "^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/carto-sql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-map-gl": "^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/contour/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-map-gl": "^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/data-filter/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@material-ui/core": "^4.10.2",
"@material-ui/icons": "^4.9.1",
"d3-request": "^1.0.5",
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-map-gl": "^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/election/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"d3-scale": "^2.0.0",
"deck.gl": "^8.6.0-alpha.0"
"deck.gl": "^8.7.0-beta.6"
},
"devDependencies": {
"webpack": "^4.20.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/geojson/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"d3-scale": "^2.0.0",
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-map-gl": "^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/ghcn/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"d3-scale": "^2.0.0",
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/website/globe/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@loaders.gl/csv": "^3.1.5",
"@material-ui/core": "^4.10.2",
"@material-ui/icons": "^4.9.1",
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/website/google-3d/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"@turf/rhumb-bearing": "^6.5.0",
"@turf/rhumb-distance": "^6.5.0",
"deck.gl": "^8.6.0-alpha.4"
"deck.gl": "^8.7.0-beta.6"
},
"devDependencies": {
"webpack": "^4.20.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/heatmap/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-map-gl": "^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/highway/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"d3-request": "^1.0.5",
"d3-scale": "^2.0.0",
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-map-gl": "^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/i3s/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"@loaders.gl/i3s": "^3.1.5",
"deck.gl": "^8.6.0-alpha.0"
"deck.gl": "^8.7.0-beta.6"
},
"devDependencies": {
"webpack": "^4.20.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/icon/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"start": "webpack-dev-server --progress --hot --open"
},
"dependencies": {
"deck.gl": "^8.6.0-alpha.0",
"deck.gl": "^8.7.0-beta.6",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-map-gl": "^5.0.0",
Expand Down
Loading

0 comments on commit 15d2af3

Please sign in to comment.