Skip to content

Commit 084f992

Browse files
committed
Updated frontend bundling
1 parent 2eecddf commit 084f992

File tree

10 files changed

+24
-47
lines changed

10 files changed

+24
-47
lines changed

frontend/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
## [2025-09-02]
2+
3+
- Upgrade the demo app to compile using Vite
4+
- Pull in environment variables at runtime.

frontend/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ COPY --from=builder /usr/src/app/packages/demo-app/dist /usr/share/caddy
4343

4444
WORKDIR /usr/share/caddy
4545

46-
# If CORELLE_API_URL is set in the environment, substitute it in...
46+
COPY docker-command.sh /run/docker-command.sh
4747

4848
EXPOSE 80
4949

50+
CMD ["/run/docker-command.sh"]
51+

frontend/docker-command.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/sh
2+
3+
# If CORELLE_API_URL is set in the environment, substitute it in index.html
4+
if [ -n "$CORELLE_API_URL" ]; then
5+
echo "Substituting CORELLE_API_URL in index.html"
6+
sed -i "s|window.corelleAPIBaseURL = null|window.corelleAPIBaseURL = '$CORELLE_API_URL'|g" index.html
7+
else
8+
echo "CORELLE_API_URL is not set, using default value."
9+
fi
10+
11+
# Start caddy
12+
caddy run --config /etc/caddy/Caddyfile --adapter caddyfile

frontend/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
],
1414
"packageManager": "[email protected]",
1515
"devDependencies": {
16-
"@parcel/packager-ts": "2.13.3",
17-
"@parcel/transformer-typescript-types": "2.13.3",
1816
"prettier": "^3.5.1",
1917
"typescript": "^5.7.3"
2018
}

frontend/packages/demo-app/src/app.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ function App(props) {
2929

3030
const setTime = useCallback(
3131
(time) => setState({ ...state, time }),
32-
[setState],
32+
[setState, state],
3333
);
3434
const setModel = useCallback(
3535
(model) => setState({ ...state, model }),
36-
[setState],
36+
[setState, state],
3737
);
3838

3939
const { baseURL } = useContext(APIContext);

frontend/packages/demo-app/src/control-panel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const ControlPanel = function (props: ControlPanelProps) {
101101
h(
102102
"h1",
103103
null,
104-
h("a", { href: "https://github.com/UW-Macrostrat/Corelle" }, "Corelle"),
104+
h("a", { href: "https://github.com/UW-Macrostrat/corelle" }, "Corelle"),
105105
),
106106
h("p", "Simple plate rotations."),
107107
]),

frontend/packages/demo-app/src/index.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//import "core-js/stable";
2-
//import "regenerator-runtime/runtime";
3-
41
import { FocusStyleManager } from "@blueprintjs/core";
52
import "@blueprintjs/core/lib/css/blueprint.css";
63

frontend/packages/svg-map-layers/src/feature.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ function usePathGenerator(plateId, context = null) {
2020
if (projection == null || geographyRotator == null) return null;
2121

2222
const rotate = geographyRotator(plateId);
23+
2324
if (rotate == null) return null;
2425

2526
return pathGenerator(projection, rotate, context);

frontend/packages/svg-map-layers/src/plate-polygons.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ function PlatePolygon(props) {
1515
const { feature, ...rest } = props;
1616
const { id, properties } = feature;
1717
const { old_lim, young_lim, plate_id } = properties;
18+
1819
return h(PlateFeature, {
1920
feature,
2021
oldLim: old_lim,

frontend/yarn.lock

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,15 +1195,6 @@ __metadata:
11951195
languageName: node
11961196
linkType: hard
11971197

1198-
"@parcel/packager-ts@npm:2.13.3":
1199-
version: 2.13.3
1200-
resolution: "@parcel/packager-ts@npm:2.13.3"
1201-
dependencies:
1202-
"@parcel/plugin": "npm:2.13.3"
1203-
checksum: 10c0/96d8d6c05d5d89e18b6f26b9f479f824c8c165a1582cc5a6ce8532233ca20960946b7825e34e46b51df40963fefd6314bc40409f6187b4469aa23e44d7d06ac1
1204-
languageName: node
1205-
linkType: hard
1206-
12071198
"@parcel/packager-wasm@npm:2.13.3":
12081199
version: 2.13.3
12091200
resolution: "@parcel/packager-wasm@npm:2.13.3"
@@ -1500,33 +1491,6 @@ __metadata:
15001491
languageName: node
15011492
linkType: hard
15021493

1503-
"@parcel/transformer-typescript-types@npm:2.13.3":
1504-
version: 2.13.3
1505-
resolution: "@parcel/transformer-typescript-types@npm:2.13.3"
1506-
dependencies:
1507-
"@parcel/diagnostic": "npm:2.13.3"
1508-
"@parcel/plugin": "npm:2.13.3"
1509-
"@parcel/source-map": "npm:^2.1.1"
1510-
"@parcel/ts-utils": "npm:2.13.3"
1511-
"@parcel/utils": "npm:2.13.3"
1512-
nullthrows: "npm:^1.1.1"
1513-
peerDependencies:
1514-
typescript: ">=3.0.0"
1515-
checksum: 10c0/dee381572ba3b70339ba3252d7fb2cd9da672f24f5ee0d21d0c002064877cd90260dee59a524c40e61f0942941ee14188943474c72a8b1e3a5c3ff9aa3ab1e48
1516-
languageName: node
1517-
linkType: hard
1518-
1519-
"@parcel/ts-utils@npm:2.13.3":
1520-
version: 2.13.3
1521-
resolution: "@parcel/ts-utils@npm:2.13.3"
1522-
dependencies:
1523-
nullthrows: "npm:^1.1.1"
1524-
peerDependencies:
1525-
typescript: ">=3.0.0"
1526-
checksum: 10c0/770935e24218d32ed5c9d5685d4e9a79fddf22e7480e0c9c7e5163d8ff70d2e8622bc9ff53ea1f965aa574d301044b9fbe2cd56729171817615233e33e2c5c71
1527-
languageName: node
1528-
linkType: hard
1529-
15301494
"@parcel/types-internal@npm:2.13.3":
15311495
version: 2.13.3
15321496
resolution: "@parcel/types-internal@npm:2.13.3"
@@ -4654,8 +4618,6 @@ __metadata:
46544618
version: 0.0.0-use.local
46554619
resolution: "root-workspace-0b6124@workspace:."
46564620
dependencies:
4657-
"@parcel/packager-ts": "npm:2.13.3"
4658-
"@parcel/transformer-typescript-types": "npm:2.13.3"
46594621
prettier: "npm:^3.5.1"
46604622
typescript: "npm:^5.7.3"
46614623
languageName: unknown

0 commit comments

Comments
 (0)