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.

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

fix: update iot-app-kit to provide workaround for draco compression #321

Merged
merged 1 commit into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 1.18.2

- Upgrade IotAppKit dependency from [10.11.0 to 10.13.1](https://github.com/awslabs/iot-app-kit/compare/ts-config-v10.11.0...ts-config-v10.13.1)
- Adding basis universal transcoder to support DRACO compressed tiles [#321](https://github.com/grafana/grafana-iot-twinmaker-app/pull/321)
- Remove unused alarm panel [#307](https://github.com/grafana/grafana-iot-twinmaker-app/pull/307)
- Remove unused merge dashboard flow [#306](https://github.com/grafana/grafana-iot-twinmaker-app/pull/306)

corteggiano marked this conversation as resolved.
Show resolved Hide resolved
## 1.18.1

- Bump fast-xml-parser dependency from [4.2.5 to 4.5.0](https://github.com/NaturalIntelligence/fast-xml-parser/compare/v4.2.5...v4.5.0)
Expand Down
1 change: 1 addition & 0 deletions cspell.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"awserr",
"awsui",
"cacheable",
"basisu",
"Datalink",
"Datamodule",
"datasource",
Expand Down
2 changes: 2 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ const esModules = [
'react-dnd-html5-backend',
'echarts',
'zrender',
'nanoid',
'@iot-app-kit/react-components',
];

module.exports = {
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "grafana-iot-twinmaker-app",
"version": "1.18.1",
"version": "1.18.2",
"description": "Grafana IoT TwinMaker App Plugin",
"scripts": {
"build": "NODE_OPTIONS='--max-old-space-size=4096' webpack -c webpack.config.ts --env production",
Expand Down Expand Up @@ -85,10 +85,10 @@
"@grafana/runtime": "^10.4.5",
"@grafana/schema": "^10.4.5",
"@grafana/ui": "^10.4.5",
"@iot-app-kit/core": "10.11.0",
"@iot-app-kit/react-components": "10.11.0",
"@iot-app-kit/scene-composer": "10.11.0",
"@iot-app-kit/source-iottwinmaker": "10.11.0",
"@iot-app-kit/core": "10.13.1",
"@iot-app-kit/react-components": "10.13.1",
"@iot-app-kit/scene-composer": "10.13.1",
"@iot-app-kit/source-iottwinmaker": "10.13.1",
"aws-iot-twinmaker-grafana-utils": "file:libs/aws-iot-twinmaker-grafana-utils-2.1.0.tgz",
"aws-sdk": "^2.978.0",
"cytoscape": "^3.26.0",
Expand Down
4 changes: 4 additions & 0 deletions src/panels/scene-viewer/SceneViewer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,10 @@ export const SceneViewer = (props: SceneViewerPropsFromParent) => {
enable: true,
path: `${window.location.origin}/${staticPluginPath}/static/draco/`,
},
basisuDecoder: {
enable: true,
path: `${window.location.origin}/${staticPluginPath}/static/basisu/`,
},
featureConfig: {
AutoQuery: true,
DynamicScene: true,
Expand Down
19 changes: 19 additions & 0 deletions src/static/basisu/basis_transcoder.js

Large diffs are not rendered by default.

Binary file added src/static/basisu/basis_transcoder.wasm
Binary file not shown.
763 changes: 126 additions & 637 deletions yarn.lock

Large diffs are not rendered by default.

Loading