Skip to content

Commit 850402e

Browse files
committed
sync with terriajs 8.12.5
1 parent c8697db commit 850402e

7 files changed

Lines changed: 474 additions & 2581 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
node-version: [22.x, 24.x, 25.x]
14+
node-version: [22.x, 24.x, 26.x]
1515

1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1818
- name: Use Node.js ${{ matrix.node-version }}
19-
uses: actions/setup-node@v1
19+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2020
with:
2121
node-version: ${{ matrix.node-version }}
2222
- run: rm -rf node_modules && yarn install --frozen-lockfile

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2222

2323
- name: Set up QEMU
2424
uses: docker/setup-qemu-action@v1

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
- Requires node version 22 or above
77
- Comes with a new version of proxy rewritten using undici instead of deprecated `request` package. This should improve the performance and reliability of the proxy. Please test your map with this new version of terriajs-server and report any issues you find.
88
- For full changelog see [terriajs-server CHANGES.md](https://github.com/TerriaJS/terriajs-server/blob/master/CHANGES.md#next-release---unreleased)
9+
- Upgraded `terriajs-cesium` to `26.0.0`. We are now using cesium 1.142.
910

1011
#### 0.4.6
1112

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# develop container
2-
FROM node:20 AS develop
2+
FROM node:24 AS develop
33

44
# build container
5-
FROM node:20 AS build
5+
FROM node:24 AS build
66
USER node
77

88
COPY --chown=node:node . /app
@@ -13,7 +13,7 @@ RUN yarn install --network-timeout 1000000
1313
RUN yarn gulp release
1414

1515
# deploy container
16-
FROM node:20-slim AS deploy
16+
FROM node:24-slim AS deploy
1717

1818
USER node
1919

deploy/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Docker image for the primary terria map application server
2-
FROM node:20
2+
FROM node:24
33

44
RUN mkdir -p /usr/src/app && mkdir -p /etc/config/client
55
WORKDIR /usr/src/app/component

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"private": true,
33
"workspaces": {
44
"packages": [
5-
"packages/terriajs/packages/terriajs",
65
"packages/terriajs-cesium/packages/engine",
76
"packages/terriajs-cesium/packages/widgets",
87
"packages/terriajs-server",
@@ -13,18 +12,18 @@
1312
]
1413
},
1514
"name": "terriajs-map",
16-
"version": "0.4.6",
15+
"version": "0.4.7",
1716
"description": "Geospatial catalog explorer based on TerriaJS.",
1817
"license": "Apache-2.0",
1918
"engines": {
20-
"node": ">= 20.0.0"
19+
"node": ">= 22"
2120
},
2221
"repository": {
2322
"type": "git",
2423
"url": "http://github.com/TerriaJS/TerriaMap"
2524
},
2625
"dependencies": {
27-
"terriajs-server": "5.0.0-alpha.2"
26+
"terriajs-server": "5.0.0-alpha.3"
2827
},
2928
"config": {
3029
"docker": {
@@ -67,8 +66,8 @@
6766
"sass-loader": "^16.0.7",
6867
"style-loader": "^4.0.0",
6968
"svg-sprite": "^2.0.4",
70-
"terriajs": "8.12.4",
71-
"terriajs-cesium": "23.0.2",
69+
"terriajs": "8.12.5",
70+
"terriajs-cesium": "26.0.0",
7271
"terriajs-plugin-api": "0.0.1-alpha.17",
7372
"terriajs-plugin-sample": "0.0.1-alpha.7",
7473
"typescript": "^5.9.2",

0 commit comments

Comments
 (0)