Skip to content

Commit

Permalink
Update SDK and Web (#129)
Browse files Browse the repository at this point in the history
- Updated the SDK and Web packages.
- Fixed an issue where the third party library sample wouldn't build. As a bonus it no longer loads libraries for VR and 2d that it does not use.
- Added style-loader css-loader and postcss-loader packages to root as webpack+yarn now requires these to be explicit dependencies if they are used.
  • Loading branch information
yonabystedt authored Sep 11, 2024
1 parent e1760f4 commit 8ed8725
Show file tree
Hide file tree
Showing 17 changed files with 1,174 additions and 1,670 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- run: yarn test

- name: Save Cypress videos
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-videos
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/third-party-library.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe(sampleName, () => {

// Identify again in an area that shouldn't have any results.
cy.getViewer().contains("button", "Identify").click();
performExtentIdentify(10, 10, 20, 20);
performExtentIdentify(10, 100, 15, 105);

// Graph should be visible and have no nodes rendered.
cy.getViewer()
Expand Down
4 changes: 2 additions & 2 deletions samples/arcgis-widget/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"start-in-sandbox": "SOCK_PORT=443 vertigis-web-sdk start"
},
"devDependencies": {
"@vertigis/web": "^5.30.0",
"@vertigis/web-sdk": "^1.10.0",
"@vertigis/web": "^5.31.0",
"@vertigis/web-sdk": "^1.11.0",
"typescript": "~5.3.3"
}
}
4 changes: 2 additions & 2 deletions samples/basic-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"start-in-sandbox": "SOCK_PORT=443 vertigis-web-sdk start"
},
"devDependencies": {
"@vertigis/web": "^5.30.0",
"@vertigis/web-sdk": "^1.10.0",
"@vertigis/web": "^5.31.0",
"@vertigis/web-sdk": "^1.11.0",
"typescript": "~5.3.3"
}
}
4 changes: 2 additions & 2 deletions samples/basic-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"start-in-sandbox": "SOCK_PORT=443 vertigis-web-sdk start"
},
"devDependencies": {
"@vertigis/web": "^5.30.0",
"@vertigis/web-sdk": "^1.10.0",
"@vertigis/web": "^5.31.0",
"@vertigis/web-sdk": "^1.11.0",
"typescript": "~5.3.3"
}
}
4 changes: 2 additions & 2 deletions samples/commands-and-operations/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"start-in-sandbox": "SOCK_PORT=443 vertigis-web-sdk start"
},
"devDependencies": {
"@vertigis/web": "^5.30.0",
"@vertigis/web-sdk": "^1.10.0",
"@vertigis/web": "^5.31.0",
"@vertigis/web-sdk": "^1.11.0",
"typescript": "~5.3.3"
}
}
4 changes: 2 additions & 2 deletions samples/embedded-map/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"mapillary-js": "^4.0.0"
},
"devDependencies": {
"@vertigis/web": "^5.30.0",
"@vertigis/web-sdk": "^1.10.0",
"@vertigis/web": "^5.31.0",
"@vertigis/web-sdk": "^1.11.0",
"typescript": "~5.3.3"
}
}
4 changes: 2 additions & 2 deletions samples/i18n/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"start-in-sandbox": "SOCK_PORT=443 vertigis-web-sdk start"
},
"devDependencies": {
"@vertigis/web": "^5.30.0",
"@vertigis/web-sdk": "^1.10.0",
"@vertigis/web": "^5.31.0",
"@vertigis/web-sdk": "^1.11.0",
"typescript": "~5.3.3"
}
}
4 changes: 2 additions & 2 deletions samples/icons-pack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"@svgr/core": "^6.5.1",
"@svgr/plugin-jsx": "^6.5.1",
"@svgr/plugin-svgo": "^6.5.1",
"@vertigis/web": "^5.30.0",
"@vertigis/web-sdk": "^1.10.0",
"@vertigis/web": "^5.31.0",
"@vertigis/web-sdk": "^1.11.0",
"tsx": "4.7.2",
"typescript": "~5.3.3"
}
Expand Down
4 changes: 2 additions & 2 deletions samples/iframe/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"start-in-sandbox": "SOCK_PORT=443 vertigis-web-sdk start"
},
"devDependencies": {
"@vertigis/web": "^5.30.0",
"@vertigis/web-sdk": "^1.10.0",
"@vertigis/web": "^5.31.0",
"@vertigis/web-sdk": "^1.11.0",
"cross-env": "^7.0.2",
"typescript": "~5.3.3"
}
Expand Down
4 changes: 2 additions & 2 deletions samples/library-viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
},
"devDependencies": {
"@types/xml2js": "^0.4.14",
"@vertigis/web": "^5.30.0",
"@vertigis/web-sdk": "^1.10.0",
"@vertigis/web": "^5.31.0",
"@vertigis/web-sdk": "^1.11.0",
"typescript": "~5.3.3"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions samples/tap-into-web-event/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"start-in-sandbox": "SOCK_PORT=443 vertigis-web-sdk start"
},
"devDependencies": {
"@vertigis/web": "^5.30.0",
"@vertigis/web-sdk": "^1.10.0",
"@vertigis/web": "^5.31.0",
"@vertigis/web-sdk": "^1.11.0",
"typescript": "~5.3.3"
}
}
6 changes: 3 additions & 3 deletions samples/third-party-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"start-in-sandbox": "SOCK_PORT=443 vertigis-web-sdk start"
},
"dependencies": {
"@vertigis/web": "^5.30.0",
"react-force-graph": "^1.44.4"
"@vertigis/web": "^5.31.0",
"react-force-graph-3d": "^1.24.3"
},
"devDependencies": {
"@vertigis/web-sdk": "^1.10.0",
"@vertigis/web-sdk": "^1.11.0",
"typescript": "~5.3.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import type { LayoutElementProperties } from "@vertigis/web/components";
import { LayoutElement } from "@vertigis/web/components";
import { useWatch, useWatchAndRerender } from "@vertigis/web/ui";
import { useRef } from "react";
import type { ComponentProps, ReactElement } from "react";
import { ForceGraph3D } from "react-force-graph";
import type { MutableRefObject, ReactElement } from "react";
import ForceGraph3D, { type ForceGraphMethods } from "react-force-graph-3d";

import type ThreeDimensionalGraphModel from "./ThreeDimensionalGraphModel";
import useDimensions from "./useDimensions";
Expand All @@ -14,7 +14,7 @@ export default function ThreeDimensionalGraph(
): ReactElement {
const { model } = props;
const [rootRef, rootDimensions] = useDimensions<HTMLDivElement>();
const graphRef: ComponentProps<typeof ForceGraph3D>["ref"] = useRef();
const graphRef: MutableRefObject<ForceGraphMethods> = useRef();

useWatchAndRerender(model, "graphData");
// Force the nodes/links to re-render when the selected survey changes. This
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import type {
GraphData as ForceGraphData,
LinkObject,
NodeObject as ForceNodeObject,
} from "force-graph";
} from "react-force-graph-3d";

import { toFeatureArray } from "./utils";

Expand Down
4 changes: 2 additions & 2 deletions samples/ui-library/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"start-in-sandbox": "SOCK_PORT=443 vertigis-web-sdk start"
},
"devDependencies": {
"@vertigis/web": "^5.30.0",
"@vertigis/web-sdk": "^1.10.0",
"@vertigis/web": "^5.31.0",
"@vertigis/web-sdk": "^1.11.0",
"typescript": "~5.3.3"
}
}
Loading

0 comments on commit 8ed8725

Please sign in to comment.