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

Upgrade [email protected] and [email protected] #299

Merged
merged 3 commits into from
Feb 5, 2025
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
11 changes: 4 additions & 7 deletions modules/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,16 @@
"build-bundle": "ocular-bundle ./bundle.ts"
},
"dependencies": {
"@loaders.gl/core": "^3.0.0",
"@loaders.gl/video": "^3.0.12",
"@loaders.gl/zip": "^3.0.12",
"@loaders.gl/core": "^4.3.3",
"@loaders.gl/video": "^4.3.3",
"@loaders.gl/zip": "^4.3.3",
"@math.gl/core": "^3.6.0",
"@math.gl/web-mercator": "^3.6.2",
"@probe.gl/log": "^4.1.0",
"downloadjs": "^1.4.7",
"popmotion": "9.3.1",
"probe.gl": "^3.4.0",
"webm-writer": "^1.0.0"
},
"resolutions": {
"@loaders.gl/video": "3.0.12"
},
"peerDependencies": {
"@deck.gl/core": ">=8.3",
"@luma.gl/core": ">=8.3",
Expand Down
2 changes: 1 addition & 1 deletion modules/core/src/utils/log.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: MIT
// Copyright (c) vis.gl contributors

import {Log} from 'probe.gl';
import {Log} from '@probe.gl/log';

const defaultLogger: Log = new Log({id: 'hubble'});

Expand Down
4 changes: 2 additions & 2 deletions modules/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
],
"sideEffects": false,
"dependencies": {
"@loaders.gl/zip": "^3.0.12",
"@loaders.gl/core": "^4.3.3",
"@loaders.gl/zip": "^4.3.3",
"@turf/helpers": "^5.1.5",
"@turf/transform-translate": "^5.1.5",
"classnames": "^2.2.6",
Expand All @@ -58,7 +59,6 @@
"@deck.gl/mapbox": ">=8.3",
"@deck.gl/react": ">=8.3",
"@hubble.gl/core": "^1.4.0",
"@loaders.gl/core": "^3.0.0",
"react": ">=18.2",
"react-dom": ">=18.2"
},
Expand Down
9 changes: 5 additions & 4 deletions modules/react/src/components/render-player.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ import {ZipLoader} from '@loaders.gl/zip';
import styled from 'styled-components';
import {type Encoders, GIF, JPEG, PNG, WEBM} from './encoders';

const parseImages = async (blob: Blob, encoder?: Encoders): Promise<{[name: string]: string}> => {
const parseImages = async (blob: Blob, encoder?: Encoders): Promise<Record<string, string>> => {
const images = await parse(blob, ZipLoader);
const imageBlobs: Record<string, string> = {};
for (const image in images) {
images[image] = URL.createObjectURL(
imageBlobs[image] = URL.createObjectURL(
new Blob([images[image]], {type: encoder === JPEG ? 'image/jpeg' : 'image/png'})
);
}
return images;
return imageBlobs;
};

const VideoPlayer = styled.video`
Expand Down Expand Up @@ -47,7 +48,7 @@ const Thumbnail = styled.img`

export default function RenderPlayer({encoder, blob}: {encoder: Encoders; blob?: Blob}) {
const [src, setSrc] = useState('');
const [gallery, setGallery] = useState<{[name: string]: string}>({});
const [gallery, setGallery] = useState<Record<string, string>>({});

useEffect(() => {
setSrc('');
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,16 @@
"video"
],
"devDependencies": {
"@loaders.gl/polyfills": "^4.2.0",
"@loaders.gl/polyfills": "^4.3.3",
"@luma.gl/experimental": "^8.5.0",
"@probe.gl/bench": "^3.5.0",
"@probe.gl/test-utils": "^3.5.0",
"@probe.gl/bench": "^4.1.0",
"@probe.gl/test-utils": "^4.1.0",
"coveralls": "^3.0.0",
"jsdom": "^20.0.0",
"ocular-dev-tools": "2.0.0-alpha.33",
"pre-commit": "^1.2.2",
"pre-push": "^0.1.1",
"puppeteer": "^22.4.0",
"tap-spec": "^5.0.0",
"tape-catch": "^1.0.6"
},
Expand All @@ -62,7 +63,6 @@
"@luma.gl/experimental: must include in devDeps for local dev examples"
],
"resolutions": {
"@loaders.gl/video": "3.0.12",
"@luma.gl/experimental": "8.5.21"
},
"volta": {
Expand Down
Loading
Loading