Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Bump to [email protected], [email protected] #9161

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

chore: Bump to [email protected], [email protected] #9161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ca5abc9
chore: Bump to @[email protected], @[email protected]
ibgreen Sep 18, 2024
fd9e6ea
test.yml
ibgreen Sep 18, 2024
18b0f12
updateModuleSettingsWebGL
ibgreen Sep 18, 2024
39c5393
Run brower tests first
ibgreen Sep 18, 2024
b409fb9
wip
ibgreen Sep 18, 2024
33015a5
beta.4
ibgreen Sep 20, 2024
c85dd8f
wip
ibgreen Sep 20, 2024
5d9fece
beta.6
ibgreen Sep 23, 2024
8c46d5a
deps
ibgreen Sep 23, 2024
24d8a1a
wip
ibgreen Sep 23, 2024
843ec06
Merge branch 'master' into luma91beta
ibgreen Sep 25, 2024
2572cc6
Merge branch 'master' into luma91beta
ibgreen Sep 25, 2024
b0656a4
Merge branch 'master' into luma91beta
ibgreen Sep 26, 2024
0cd2739
wip
ibgreen Sep 26, 2024
c61084b
wip
ibgreen Sep 26, 2024
aa96a57
binary-search
ibgreen Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,21 @@ jobs:
node-version: '18.x'

- name: Install dependencies
run: yarn

- name: Build
run: yarn bootstrap

- name: Run tests
run: yarn test-ci
- name: Run node tests
run: yarn test node

- name: Run browser tests and generate coverage
run: yarn cover

- name: Run lint and prettier
run: yarn lint

- name: Coveralls
- name: Upload to Coveralls
uses: coverallsapp/github-action@09b709cf6a16e30b0808ba050c7a6e8a5ef13f8d # v1.2.5
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion examples/playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@loaders.gl/csv": "^4.2.0",
"@loaders.gl/draco": "^4.2.0",
"@loaders.gl/gltf": "^4.2.0",
"@luma.gl/constants": "^9.1.0-alpha.19",
"@luma.gl/constants": "^9.1.0-beta.7",
"brace": "^0.11.1",
"deck.gl": "^9.0.0",
"maplibre-gl": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/mesh/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"@loaders.gl/obj": "^4.2.0",
"@math.gl/core": "^4.1.0-alpha.3",
"@math.gl/core": "^4.1.0",
"deck.gl": "^9.0.0",
"react": "^18.0.0",
"react-dom": "^18.0.0"
Expand Down
12 changes: 6 additions & 6 deletions modules/aggregation-layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "^9.1.0-alpha.19",
"@luma.gl/shadertools": "^9.1.0-alpha.19",
"@math.gl/core": "^4.1.0-alpha.3",
"@math.gl/web-mercator": "^4.1.0-alpha.3",
"@luma.gl/constants": "^9.1.0-beta.7",
"@luma.gl/shadertools": "^9.1.0-beta.7",
"@math.gl/core": "^4.1.0",
"@math.gl/web-mercator": "^4.1.0",
"d3-hexbin": "^0.2.1"
},
"peerDependencies": {
"@deck.gl/core": "9.0.0-alpha.0",
"@deck.gl/layers": "9.0.0-alpha.0",
"@luma.gl/core": "^9.1.0-alpha.19",
"@luma.gl/engine": "^9.1.0-alpha.19"
"@luma.gl/core": "^9.1.0-beta.7",
"@luma.gl/engine": "^9.1.0-beta.7"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
6 changes: 3 additions & 3 deletions modules/arcgis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "^9.1.0-alpha.19",
"@luma.gl/constants": "^9.1.0-beta.7",
"esri-loader": "^3.7.0"
},
"peerDependencies": {
"@arcgis/core": "^4.0.0",
"@deck.gl/core": "9.0.0-alpha.0",
"@luma.gl/core": "^9.1.0-alpha.19",
"@luma.gl/engine": "^9.1.0-alpha.19"
"@luma.gl/core": "^9.1.0-beta.7",
"@luma.gl/engine": "^9.1.0-beta.7"
},
"devDependencies": {
"@arcgis/core": "^4.21.0"
Expand Down
8 changes: 4 additions & 4 deletions modules/carto/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
"@loaders.gl/mvt": "^4.2.0",
"@loaders.gl/schema": "^4.2.0",
"@loaders.gl/tiles": "^4.2.0",
"@luma.gl/core": "^9.1.0-alpha.19",
"@luma.gl/shadertools": "^9.1.0-alpha.19",
"@math.gl/web-mercator": "^4.1.0-alpha.3",
"@luma.gl/core": "^9.1.0-beta.7",
"@luma.gl/shadertools": "^9.1.0-beta.7",
"@math.gl/web-mercator": "^4.1.0",
"@types/d3-array": "^3.0.2",
"@types/d3-color": "^1.4.2",
"@types/d3-scale": "^3.0.0",
Expand All @@ -71,7 +71,7 @@
"@deck.gl/geo-layers": "9.0.0-alpha.0",
"@deck.gl/layers": "9.0.0-alpha.0",
"@loaders.gl/core": "^4.2.0",
"@luma.gl/core": "^9.1.0-alpha.19"
"@luma.gl/core": "^9.1.0-beta.7"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
18 changes: 9 additions & 9 deletions modules/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@
"dependencies": {
"@loaders.gl/core": "^4.2.0",
"@loaders.gl/images": "^4.2.0",
"@luma.gl/constants": "^9.1.0-alpha.19",
"@luma.gl/core": "^9.1.0-alpha.19",
"@luma.gl/engine": "^9.1.0-alpha.19",
"@luma.gl/shadertools": "^9.1.0-alpha.19",
"@luma.gl/webgl": "^9.1.0-alpha.19",
"@math.gl/core": "^4.1.0-alpha.3",
"@math.gl/sun": "^4.1.0-alpha.3",
"@math.gl/types": "^4.1.0-alpha.3",
"@math.gl/web-mercator": "^4.1.0-alpha.3",
"@luma.gl/constants": "^9.1.0-beta.7",
"@luma.gl/core": "^9.1.0-beta.7",
"@luma.gl/engine": "^9.1.0-beta.7",
"@luma.gl/shadertools": "^9.1.0-beta.7",
"@luma.gl/webgl": "^9.1.0-beta.7",
"@math.gl/core": "^4.1.0",
"@math.gl/sun": "^4.1.0",
"@math.gl/types": "^4.1.0",
"@math.gl/web-mercator": "^4.1.0",
"@probe.gl/env": "^4.0.9",
"@probe.gl/log": "^4.0.9",
"@probe.gl/stats": "^4.0.9",
Expand Down
1 change: 1 addition & 0 deletions modules/core/src/shaderlib/project/project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,5 @@ export default {
commonOrigin: 'vec3<f32>',
pseudoMeters: 'f32'
}
// @ts-ignore TODO v9.1
} as const satisfies ShaderModule<ProjectProps, ProjectUniforms, {}>;
10 changes: 5 additions & 5 deletions modules/extensions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "^9.1.0-alpha.19",
"@luma.gl/shadertools": "^9.1.0-alpha.19",
"@math.gl/core": "^4.1.0-alpha.3"
"@luma.gl/constants": "^9.1.0-beta.7",
"@luma.gl/shadertools": "^9.1.0-beta.7",
"@math.gl/core": "^4.1.0"
},
"peerDependencies": {
"@deck.gl/core": "9.0.0-alpha.0",
"@luma.gl/core": "^9.1.0-alpha.19",
"@luma.gl/engine": "^9.1.0-alpha.19"
"@luma.gl/core": "^9.1.0-beta.7",
"@luma.gl/engine": "^9.1.0-beta.7"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
14 changes: 7 additions & 7 deletions modules/geo-layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
"@loaders.gl/terrain": "^4.2.0",
"@loaders.gl/tiles": "^4.2.0",
"@loaders.gl/wms": "^4.2.0",
"@luma.gl/gltf": "^9.1.0-alpha.19",
"@luma.gl/shadertools": "^9.1.0-alpha.19",
"@math.gl/core": "^4.1.0-alpha.3",
"@math.gl/culling": "^4.1.0-alpha.3",
"@math.gl/web-mercator": "^4.1.0-alpha.3",
"@luma.gl/gltf": "^9.1.0-beta.7",
"@luma.gl/shadertools": "^9.1.0-beta.7",
"@math.gl/core": "^4.1.0",
"@math.gl/culling": "^4.1.0",
"@math.gl/web-mercator": "^4.1.0",
"@types/geojson": "^7946.0.8",
"h3-js": "^4.1.0",
"long": "^3.2.0"
Expand All @@ -61,8 +61,8 @@
"@deck.gl/layers": "9.0.0-alpha.0",
"@deck.gl/mesh-layers": "9.0.0-alpha.0",
"@loaders.gl/core": "^4.2.0",
"@luma.gl/core": "^9.1.0-alpha.19",
"@luma.gl/engine": "^9.1.0-alpha.19"
"@luma.gl/core": "^9.1.0-beta.7",
"@luma.gl/engine": "^9.1.0-beta.7"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
6 changes: 3 additions & 3 deletions modules/google-maps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "^9.1.0-alpha.19",
"@math.gl/core": "^4.1.0-alpha.3",
"@luma.gl/constants": "^9.1.0-beta.7",
"@math.gl/core": "^4.1.0",
"@types/google.maps": "^3.48.6"
},
"peerDependencies": {
"@deck.gl/core": "9.0.0-alpha.0",
"@luma.gl/core": "^9.1.0-alpha.19"
"@luma.gl/core": "^9.1.0-beta.7"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
2 changes: 1 addition & 1 deletion modules/jupyter-widget/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@loaders.gl/3d-tiles": "^4.2.0",
"@loaders.gl/core": "^4.2.0",
"@loaders.gl/csv": "^4.2.0",
"@luma.gl/core": "^9.1.0-alpha.19",
"@luma.gl/core": "^9.1.0-beta.7",
"d3-dsv": "^1.0.8",
"mapbox-gl": "^1.13.2"
},
Expand Down
10 changes: 5 additions & 5 deletions modules/layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@
"@loaders.gl/images": "^4.2.0",
"@loaders.gl/schema": "^4.2.0",
"@mapbox/tiny-sdf": "^2.0.5",
"@math.gl/core": "^4.1.0-alpha.3",
"@math.gl/polygon": "^4.1.0-alpha.3",
"@math.gl/web-mercator": "^4.1.0-alpha.3",
"@math.gl/core": "^4.1.0",
"@math.gl/polygon": "^4.1.0",
"@math.gl/web-mercator": "^4.1.0",
"earcut": "^2.2.4"
},
"peerDependencies": {
"@deck.gl/core": "9.0.0-alpha.0",
"@loaders.gl/core": "^4.2.0",
"@luma.gl/core": "^9.1.0-alpha.19",
"@luma.gl/engine": "^9.1.0-alpha.19"
"@luma.gl/core": "^9.1.0-beta.7",
"@luma.gl/engine": "^9.1.0-beta.7"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
4 changes: 2 additions & 2 deletions modules/main/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"@deck.gl/react": "9.1.0-alpha.0",
"@deck.gl/widgets": "9.1.0-alpha.0",
"@loaders.gl/core": "^4.2.0",
"@luma.gl/core": "^9.1.0-alpha.19",
"@luma.gl/engine": "^9.1.0-alpha.19"
"@luma.gl/core": "^9.1.0-beta.7",
"@luma.gl/engine": "^9.1.0-beta.7"
},
"peerDependencies": {
"@arcgis/core": "^4.0.0",
Expand Down
8 changes: 4 additions & 4 deletions modules/mapbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "^9.1.0-alpha.19",
"@math.gl/web-mercator": "^4.1.0-alpha.3"
"@luma.gl/constants": "^9.1.0-beta.7",
"@math.gl/web-mercator": "^4.1.0"
},
"peerDependencies": {
"@deck.gl/core": "^9.0.0-alpha",
"@luma.gl/core": "^9.1.0-alpha.19"
"@deck.gl/core": "^9.1.0-alpha",
"@luma.gl/core": "^9.1.0-beta.7"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
10 changes: 5 additions & 5 deletions modules/mesh-layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
},
"dependencies": {
"@loaders.gl/gltf": "^4.2.0",
"@luma.gl/gltf": "^9.1.0-alpha.19",
"@luma.gl/shadertools": "^9.1.0-alpha.19"
"@luma.gl/gltf": "^9.1.0-beta.7",
"@luma.gl/shadertools": "^9.1.0-beta.7"
},
"peerDependencies": {
"@deck.gl/core": "^9.0.0-alpha",
"@luma.gl/core": "^9.1.0-alpha.19",
"@luma.gl/engine": "^9.1.0-alpha.19"
"@deck.gl/core": "^9.1.0-alpha",
"@luma.gl/core": "^9.1.0-beta.7",
"@luma.gl/engine": "^9.1.0-beta.7"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
6 changes: 3 additions & 3 deletions modules/test-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
"src"
],
"dependencies": {
"@luma.gl/test-utils": "^9.1.0-alpha.19"
"@luma.gl/test-utils": "^9.1.0-beta.7"
},
"peerDependencies": {
"@deck.gl/core": "^9.1.0-alpha.0",
"@luma.gl/core": "^9.1.0-alpha.19",
"@luma.gl/engine": "^9.1.0-alpha.19",
"@luma.gl/core": "^9.1.0-beta.7",
"@luma.gl/engine": "^9.1.0-beta.7",
"@probe.gl/test-utils": "^4.0.0"
},
"scripts": {},
Expand Down
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@
"devDependencies": {
"@loaders.gl/csv": "^4.2.0",
"@loaders.gl/polyfills": "^4.2.0",
"@luma.gl/webgpu": "^9.1.0-alpha.19",
"@math.gl/proj4": "^4.1.0-alpha.3",
"@luma.gl/webgpu": "^9.1.0-beta.7",
"@luma.gl/effects": "^9.1.0-beta.7",
"@math.gl/proj4": "^4.1.0",
"@probe.gl/bench": "^4.0.9",
"jsdom": "^20.0.0",
"ocular-dev-tools": "2.0.0-alpha.33",
Expand Down
2 changes: 1 addition & 1 deletion test/apps/glsl-debugger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"start-local": "vite --config ../vite.config.local.mjs"
},
"dependencies": {
"@luma.gl/debug": "^9.1.0-alpha.17",
"@luma.gl/debug": "^9.1.0-beta.7",
"deck.gl": "^8.4.0",
"glsl-transpiler": "^1.8.5"
},
Expand Down
2 changes: 1 addition & 1 deletion test/apps/mask-first-person/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"dependencies": {
"deck.gl": "^8.4.0",
"@math.gl/core": "^4.1.0-alpha.3",
"@math.gl/core": "^4.1.0",
"@turf/circle": "6.5.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion test/apps/multi-viewport/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"dependencies": {
"deck.gl": "^8.4.0",
"@math.gl/core": "^4.1.0-alpha.3",
"@math.gl/core": "^4.1.0",
"maplibre-gl": "^3.0.0",
"react": "^18.0.0",
"react-dom": "^18.0.0",
Expand Down
26 changes: 13 additions & 13 deletions test/modules/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ import './imports-spec';
import './core';

// Layers and extensions
import './layers';
import './mesh-layers';
import './geo-layers';
import './aggregation-layers';
import './extensions';
// import './layers';
// import './mesh-layers';
// import './geo-layers';
// import './aggregation-layers';
// import './extensions';

// Integration
import './carto';
import './mapbox';
import './google-maps';
import './json';
import './jupyter-widget';
import './react';
import './main/bundle';
// // Integration
// import './carto';
// import './mapbox';
// import './google-maps';
// import './json';
// import './jupyter-widget';
// import './react';
// import './main/bundle';
2 changes: 1 addition & 1 deletion test/render/test-cases/effects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {PostProcessEffect, LightingEffect, AmbientLight, DirectionalLight} from '@deck.gl/core';
import {zoomBlur, vignette} from '@luma.gl/shadertools';
import {zoomBlur, vignette} from '@luma.gl/effects';
import {hexagons, points} from 'deck.gl-test/data';

import {ScatterplotLayer, SolidPolygonLayer, ColumnLayer} from '@deck.gl/layers';
Expand Down
Binary file added website/.yarn/install-state.gz
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions website/.yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
Loading
Loading