Skip to content

Commit

Permalink
Beta.1 release. Brings in luma and react-map-gl beta.1 (#752)
Browse files Browse the repository at this point in the history
* Upgrade to luma.gl beta.1
* Integrate luma and react-map-gl beta. ChANGELOG. package.json(s)
  • Loading branch information
ibgreen authored and Shaojing Li committed Jul 5, 2017
1 parent ea9bd01 commit d6afa25
Show file tree
Hide file tree
Showing 27 changed files with 276 additions and 229 deletions.
26 changes: 25 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,33 @@ Ref: http://keepachangelog.com/en/0.3.0/

## Beta Releases

[TBD]
### deck.gl v4.1.0-beta.1
- Import luma.gl v4.0.0-beta.1
- webpack configuration cleanup
- SEER integration upgrades
- EXAMPLES: Experimental TagMap Layer @zhan1486

- FIX: Use external buffers for layer attributes

### deck.gl v4.1.0-alpha.15

- Graph Layer example refactor
- Event Management Refactor
- queryVisibleObjects (renamed from queryObject)
- New luma state management API
- Example config files cleaned up
- WEBSITE: demo renamed to website


### deck.gl v4.1.0-alpha.14

- Lifecycle performance tuning
- SEER performance badges
- "Stateless" picking
- Custom "spy" class to fix test-browser
- FIX: Using external buffers for layer attributes


### deck.gl v4.1.0-alpha.13
- FIX external buffers for layer attributes
- Event Manager API Audit fixes
Expand Down
7 changes: 3 additions & 4 deletions examples/3d-heatmap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
},
"dependencies": {
"d3-request": "^1.0.5",
"deck.gl": ">=4.1.0-alpha.14",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-map-gl": ">=3.0.0-alpha.13"
"react-map-gl": ">=3.0.0-beta.1"
},
"devDependencies": {
"buble-loader": "^0.4.0",
Expand Down
7 changes: 3 additions & 4 deletions examples/arc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
"dependencies": {
"d3-request": "^1.0.5",
"d3-scale": "^1.0.5",
"deck.gl": ">=4.1.0-alpha.14",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-map-gl": ">=3.0.0-alpha.13"
"react-map-gl": ">=3.0.0-beta.1"
},
"devDependencies": {
"buble-loader": "^0.4.0",
Expand Down
7 changes: 3 additions & 4 deletions examples/brushing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
"dependencies": {
"d3-request": "^1.0.5",
"d3-scale": "^1.0.5",
"deck.gl": ">=4.1.0-alpha.14",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-map-gl": ">=3.0.0-alpha.13"
"react-map-gl": ">=3.0.0-beta.1"
},
"devDependencies": {
"buble-loader": "^0.4.0",
Expand Down
7 changes: 3 additions & 4 deletions examples/geojson/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
},
"dependencies": {
"d3-request": "^1.0.5",
"deck.gl": ">=4.1.0-alpha.14",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-map-gl": ">=3.0.0-alpha.13"
"react-map-gl": ">=3.0.0-beta.1"
},
"devDependencies": {
"buble-loader": "^0.4.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/graph/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"d3-scale": "^1.0.5",
"deck.gl": "^4.0.0-rc.4",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-dom": "^15.4.1"
},
Expand Down
7 changes: 3 additions & 4 deletions examples/hello-world-browserify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
},
"dependencies": {
"babel-polyfill": "^6.16.0",
"deck.gl": ">=4.1.0-alpha.14",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-map-gl": ">=3.0.0-alpha.13"
"react-map-gl": ">=3.0.0-beta.1"
},
"devDependencies": {
"babel-preset-es2015": "^6.18.0",
Expand Down
7 changes: 3 additions & 4 deletions examples/hello-world-webpack2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
"start": "webpack-dev-server --progress --hot --port 3000 --open"
},
"dependencies": {
"deck.gl": ">=4.1.0-alpha.14",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-map-gl": ">=3.0.0-alpha.13"
"react-map-gl": ">=3.0.0-beta.1"
},
"devDependencies": {
"buble-loader": "^0.4.0",
Expand Down
7 changes: 3 additions & 4 deletions examples/icon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
},
"dependencies": {
"d3-request": "^1.0.5",
"deck.gl": ">=4.1.0-alpha.14",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"rbush": "^2.0.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-map-gl": ">=3.0.0-alpha.13"
"react-map-gl": ">=3.0.0-beta.1"
},
"devDependencies": {
"buble-loader": "^0.4.0",
Expand Down
7 changes: 3 additions & 4 deletions examples/jsx-layers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
"start": "webpack-dev-server --progress --hot --port 3000 --open"
},
"dependencies": {
"deck.gl": ">=4.1.0-alpha.14",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-map-gl": ">=3.0.0-alpha.13"
"react-map-gl": ">=3.0.0-beta.1"
},
"devDependencies": {
"buble-loader": "^0.4.0",
Expand Down
5 changes: 2 additions & 3 deletions examples/layer-browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
"build": "webpack app bundle.js --env.local --display-error-details"
},
"dependencies": {
"deck.gl": ">=4.1.0-alpha.14",
"deck.gl": ">=4.1.0-beta.1",
"colorbrewer": "^1.0.0",
"extrude-polyline": "^1.0.6",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-autobind": "^1.0.6",
"react-dom": "^15.4.1",
Expand Down
3 changes: 1 addition & 2 deletions examples/layer-browser/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,7 @@ class App extends PureComponent {
// const {mapViewState: {longitude, latitude}} = this.props;
// const modelMatrix = new Matrix4().fromTranslation([0, 0, 1000 * index * separation]);

const modelMatrix = new Matrix4()
.fromTranslation([0, 0, 1000 * index * separation]);
const modelMatrix = new Matrix4().translate([0, 0, 1000 * index * separation]);

// if (offsetMode) {
// modelMatrix.rotateZ(index * rotationZ * Math.PI);
Expand Down
7 changes: 3 additions & 4 deletions examples/line/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
},
"dependencies": {
"d3-request": "^1.0.5",
"deck.gl": ">=4.1.0-alpha.14",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-map-gl": ">=3.0.0-alpha.13"
"react-map-gl": ">=3.0.0-beta.1"
},
"devDependencies": {
"buble-loader": "^0.4.0",
Expand Down
5 changes: 2 additions & 3 deletions examples/plot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
},
"dependencies": {
"d3-scale": "^1.0.6",
"deck.gl": ">=4.1.0-alpha.14",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"prop-types": "^15.5.8",
"react": "^15.4.1",
"react-dom": "^15.4.1"
Expand Down
7 changes: 3 additions & 4 deletions examples/scatterplot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
},
"dependencies": {
"d3-request": "^1.0.5",
"deck.gl": ">=4.1.0-alpha.14",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-map-gl": ">=3.0.0-alpha.13"
"react-map-gl": ">=3.0.0-beta.1"
},
"devDependencies": {
"buble-loader": "^0.4.0",
Expand Down
7 changes: 3 additions & 4 deletions examples/screen-grid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
},
"dependencies": {
"d3-request": "^1.0.5",
"deck.gl": ">=4.1.0-alpha.14",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-map-gl": ">=3.0.0-alpha.13"
"react-map-gl": ">=3.0.0-beta.1"
},
"devDependencies": {
"buble-loader": "^0.4.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/svg-interoperability/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"deck.gl": ">=4.1.0-alpha.14",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-dom": "^15.4.1"
},
Expand Down
7 changes: 3 additions & 4 deletions examples/tagmap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@
"colorbrewer": "^1.0.0",
"d3-color": "^1.0.3",
"d3-scale": "^1.0.6",
"deck.gl": "4.1.0-alpha.13",
"immutable": "^3.8.1",
"luma.gl": "4.0.0-alpha.12",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"rbush": "^2.0.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-map-gl": ">=3.0.0-alpha.13"
"react-map-gl": ">=3.0.0-beta.1"
},
"devDependencies": {
"buble-loader": "^0.4.0",
Expand Down
7 changes: 3 additions & 4 deletions examples/tree-shaking/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
},
"dependencies": {
"babel-polyfill": "^6.16.0",
"deck.gl": ">=4.1.0-alpha.14",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-map-gl": ">=3.0.0-alpha.13"
"react-map-gl": ">=3.0.0-beta.1"
},
"devDependencies": {
"buble-loader": "^0.4.0",
Expand Down
7 changes: 3 additions & 4 deletions examples/trips/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
},
"dependencies": {
"d3-request": "^1.0.5",
"deck.gl": ">=4.1.0-alpha.14",
"immutable": "^3.8.1",
"luma.gl": ">=4.0.0-alpha.13",
"deck.gl": ">=4.1.0-beta.1",
"luma.gl": ">=4.0.0-beta.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-map-gl": ">=3.0.0-alpha.13"
"react-map-gl": ">=3.0.0-beta.1"
},
"devDependencies": {
"buble-loader": "^0.4.0",
Expand Down
1 change: 1 addition & 0 deletions examples/webpack.config.local.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const LOCAL_DEV_CONFIG = {
'deck.gl': SRC_DIR,
// Important: ensure shared dependencies come from the main node_modules dir
'luma.gl': resolve(LIB_DIR, './node_modules/luma.gl'),
seer: resolve(LIB_DIR, './node_modules/seer'),
react: resolve(LIB_DIR, './node_modules/react')
}
},
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "deck.gl",
"description": "A suite of 3D-enabled data visualization overlays, suitable for react-map-gl",
"license": "MIT",
"version": "4.1.0-alpha.15",
"version": "4.1.0-beta.1",
"keywords": [
"webgl",
"visualization",
Expand Down Expand Up @@ -37,9 +37,9 @@
"test-cover": "NODE_ENV=test tape -r babel-register test/node.js && nyc report",
"test-node": "node test/node.js",
"test-dist": "node test/node-dist.js",
"test-browser": "webpack-dev-server --config webpack.config.test-browser.js --progress --hot --open --port 3010",
"test-browser": "webpack-dev-server --env.test --progress --hot --open",
"bench": "node test/bench/node.js",
"bench-browser": "webpack-dev-server --config webpack.config.bench-browser.js --progress --hot --open --port 3011",
"bench-browser": "webpack-dev-server --env.bench --progress --hot --open",
"test-fp64": "(cd test/fp64-test && webpack-dev-server --config webpack.config.test-fp64.js --progress --hot --open)",
"test-rendering": "(cd test/rendering-test && webpack-dev-server --config webpack.config.test-rendering.js --progress --hot --open)"
},
Expand Down Expand Up @@ -74,7 +74,7 @@
"gl": "^4.0.3",
"immutable": "^3.8.1",
"jsdom": "^9.11.0",
"luma.gl": ">=4.0.0-alpha.13",
"luma.gl": ">=4.0.0-alpha.14",
"module-alias": "^2.0.0",
"nyc": "^10.2.0",
"path-exists-cli": "^1.0.0",
Expand All @@ -93,7 +93,7 @@
"webpack-dev-server": "^2.4.0"
},
"peerDependencies": {
"luma.gl": ">=4.0.0-alpha.13",
"luma.gl": ">=4.0.0-beta.1",
"react": "0.14.x - 15.x",
"react-dom": "0.14.x - 15.x"
},
Expand Down
12 changes: 0 additions & 12 deletions webpack.config.bench-browser.js

This file was deleted.

Loading

0 comments on commit d6afa25

Please sign in to comment.