Skip to content

Commit

Permalink
Merge pull request #374 from EOEPCA/dependency-updates
Browse files Browse the repository at this point in the history
Dependency updates
  • Loading branch information
silvester-pari authored Dec 7, 2023
2 parents 7d0f0fc + 4f4f454 commit 7718210
Show file tree
Hide file tree
Showing 9 changed files with 17,027 additions and 32,232 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "Node.js",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/javascript-node:0-16"
"image": "mcr.microsoft.com/devcontainers/javascript-node:0-20"

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_and_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:

steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: get-npm-version
id: package-version
uses: martinbeentjes/npm-get-version-action@main
- name: Push to Docker Hub
uses: docker/build-push-action@v1
uses: docker/build-push-action@v5
with:
path: ./
username: ${{ secrets.DOCKER_USERNAME }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_and_push_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:

steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: get-npm-version
id: package-version
uses: martinbeentjes/npm-get-version-action@main
- name: Push to Docker Hub
uses: docker/build-push-action@v1
uses: docker/build-push-action@v5
with:
path: ./
username: ${{ secrets.DOCKER_USERNAME }}
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/bump_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,23 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [16]
node: [20]

steps:
- name: Checkout 🛎
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Setup node env 🏗
uses: actions/[email protected]
uses: actions/[email protected]

with:
node-version: ${{ matrix.node }}
check-latest: true

- name: Cache node_modules 📦
uses: actions/cache@v3.0.1
uses: actions/cache@v3.3.2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/lint_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [16]
node: [20]

steps:
- name: Checkout 🛎
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node env 🏗
uses: actions/setup-node@v3.1.0
uses: actions/setup-node@v4.0.0
with:
node-version: ${{ matrix.node }}
check-latest: true

- name: Cache node_modules 📦
uses: actions/cache@v3.0.1
uses: actions/cache@v3.3.2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine3.14 as browser
FROM node:20-alpine3.18 as browser
RUN apk --no-cache add git

RUN git clone https://github.com/EOEPCA/open-science-catalog-stac-browser.git
Expand All @@ -9,7 +9,7 @@ npm i \



FROM node:16-alpine3.14
FROM node:20-alpine3.18
ENV NUXT_VERSION=2.15.8

WORKDIR /app
Expand Down
14 changes: 13 additions & 1 deletion nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,19 @@ export default {
},
}),
],
transpile: ["@eox/itemfilter", "@eox/map"],
transpile: [
"@eox/itemfilter",
"@eox/map",
"color-parse",
"ol/renderer/webgl/PointsLayer",
"ol/structs/LRUCache",
"ol/style/Style",
"ol/geom/LineString",
"ol/format/Feature",
"ol/expr/gpu",
"ol/style/RegularShape",
"marked/lib/marked",
],
},

auth: {
Expand Down
Loading

0 comments on commit 7718210

Please sign in to comment.