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

Dependency updates #374

Merged
merged 73 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
4d24f00
fix(deps): bump vue-server-renderer from 2.6.14 to 2.7.14
dependabot[bot] Nov 10, 2022
6b62232
fix(deps): bump @nuxtjs/auth-next
dependabot[bot] Nov 10, 2022
5be84af
fix(deps): bump chart.js from 3.7.1 to 3.9.1
dependabot[bot] Nov 10, 2022
6e39e3b
fix(deps): bump actions/setup-node from 3.1.0 to 3.6.0
dependabot[bot] Jan 6, 2023
71db41a
fix(deps): bump vue and vue-template-compiler
dependabot[bot] Jan 16, 2023
a6b975a
fix(deps): bump docker/build-push-action from 1 to 4
dependabot[bot] Jan 31, 2023
0e86a52
fix(deps): bump actions/cache from 3.0.1 to 3.3.1
dependabot[bot] Mar 14, 2023
e1ef602
fix(deps): bump chartjs-plugin-annotation from 1.4.0 to 2.2.1
dependabot[bot] Mar 16, 2023
4a408cc
fix(deps): bump marked from 4.2.2 to 4.3.0
dependabot[bot] Mar 23, 2023
3f8a338
Merge pull request #301 from EOEPCA/dependabot/npm_and_yarn/vue-serve…
silvester-pari Nov 23, 2023
c5e0722
Merge pull request #302 from EOEPCA/dependabot/npm_and_yarn/nuxtjs/au…
silvester-pari Nov 23, 2023
d5717d3
Merge branch 'dependency-updates' into dependabot/npm_and_yarn/vue-an…
silvester-pari Nov 23, 2023
fd6d499
Merge pull request #305 from EOEPCA/dependabot/npm_and_yarn/vue-and-v…
silvester-pari Nov 23, 2023
abd6efa
Merge pull request #309 from EOEPCA/dependabot/npm_and_yarn/chart.js-…
silvester-pari Nov 23, 2023
d919766
Merge pull request #323 from EOEPCA/dependabot/github_actions/actions…
silvester-pari Nov 23, 2023
efe40d5
Merge pull request #337 from EOEPCA/dependabot/github_actions/docker/…
silvester-pari Nov 23, 2023
4d46c12
Merge pull request #348 from EOEPCA/dependabot/github_actions/actions…
silvester-pari Nov 23, 2023
6f50c50
Merge branch 'dependency-updates' into dependabot/npm_and_yarn/chartj…
silvester-pari Nov 23, 2023
be2bc3f
Merge pull request #351 from EOEPCA/dependabot/npm_and_yarn/chartjs-p…
silvester-pari Nov 23, 2023
286248a
Merge pull request #353 from EOEPCA/dependabot/npm_and_yarn/marked-4.3.0
silvester-pari Nov 23, 2023
ce44a80
fix(deps): bump actions/checkout from 2 to 4
dependabot[bot] Nov 24, 2023
0cecdf9
fix(deps): bump actions/cache from 3.0.1 to 3.3.2
dependabot[bot] Nov 24, 2023
7fa9078
fix(deps): bump actions/setup-node from 3.1.0 to 4.0.0
dependabot[bot] Nov 24, 2023
1297989
fix(deps): bump docker/build-push-action from 1 to 5
dependabot[bot] Nov 24, 2023
387e902
fix(deps): bump vue-server-renderer from 2.6.14 to 2.7.15
dependabot[bot] Nov 24, 2023
bfe404b
chore(deps-dev): bump @nuxt/typescript-build from 2.1.0 to 3.0.2
dependabot[bot] Nov 24, 2023
1cd1633
chore(deps-dev): bump @vue/test-utils from 1.3.3 to 1.3.6
dependabot[bot] Nov 24, 2023
5d4a0db
chore(deps-dev): bump babel-jest from 27.5.1 to 29.7.0
dependabot[bot] Nov 24, 2023
90469db
fix(deps): bump core-js from 3.26.0 to 3.33.3
dependabot[bot] Nov 24, 2023
47869d6
chore: update package lock
silvester-pari Nov 28, 2023
bcc5251
chore: update vuetify
silvester-pari Nov 28, 2023
8bfecfa
Merge branch 'dev' into dependency-updates
silvester-pari Nov 28, 2023
105e697
fix(deps): bump ol from 7.3.0 to 8.2.0
dependabot[bot] Nov 29, 2023
fccbea0
fix(deps): bump vue and vue-template-compiler
dependabot[bot] Dec 4, 2023
48e70a1
fix(deps): bump marked from 4.2.2 to 11.0.0
dependabot[bot] Dec 4, 2023
690dd19
chore: update package-lock.json
A-Behairi Dec 5, 2023
3ea375c
chore: transpile ol/renderer/webgl/PointsLayer
A-Behairi Dec 5, 2023
05440a7
Merge pull request #375 from EOEPCA/dependabot/github_actions/actions…
A-Behairi Dec 5, 2023
138e906
Merge branch 'dependency-updates' into dependabot/github_actions/acti…
A-Behairi Dec 5, 2023
5630fe6
chore: transpile 'ol'
A-Behairi Dec 5, 2023
916ee1d
Merge branch 'dependency-updates' into dependabot/npm_and_yarn/vue-se…
A-Behairi Dec 5, 2023
71931a9
chore: update package-lock.json
A-Behairi Dec 5, 2023
a546516
chore: format
A-Behairi Dec 5, 2023
f717ebc
Merge pull request #380 from EOEPCA/dependabot/npm_and_yarn/vue-serve…
A-Behairi Dec 5, 2023
e7e676d
Merge branch 'dependency-updates' into dependabot/npm_and_yarn/ol-8.2.0
A-Behairi Dec 5, 2023
535a565
chore: update package-lock.json
A-Behairi Dec 5, 2023
7e09318
Merge pull request #381 from EOEPCA/dependabot/npm_and_yarn/ol-8.2.0
A-Behairi Dec 5, 2023
e06c3f6
fix: transpiling ol files
A-Behairi Dec 6, 2023
63e095d
Merge branch 'dependency-updates' into dependabot/github_actions/acti…
A-Behairi Dec 6, 2023
d41a3b6
chore: format
A-Behairi Dec 6, 2023
8cf4a88
Merge pull request #376 from EOEPCA/dependabot/github_actions/actions…
A-Behairi Dec 6, 2023
f66490a
Merge branch 'dependency-updates' into dependabot/github_actions/acti…
A-Behairi Dec 6, 2023
dd2eba1
Merge pull request #377 from EOEPCA/dependabot/github_actions/actions…
A-Behairi Dec 6, 2023
3c4ce3c
Merge branch 'dependency-updates' into dependabot/github_actions/dock…
A-Behairi Dec 6, 2023
fa0619c
Merge pull request #378 from EOEPCA/dependabot/github_actions/docker/…
A-Behairi Dec 6, 2023
8c1e646
chore: update lint_test merge
A-Behairi Dec 6, 2023
ae7b3e8
Merge branch 'dependency-updates' into dependabot/npm_and_yarn/nuxt/t…
A-Behairi Dec 6, 2023
7e71a8f
Merge pull request #383 from EOEPCA/dependabot/npm_and_yarn/nuxt/type…
A-Behairi Dec 6, 2023
4c33507
Merge branch 'dependency-updates' into dependabot/npm_and_yarn/vue/te…
A-Behairi Dec 6, 2023
286015e
Merge pull request #384 from EOEPCA/dependabot/npm_and_yarn/vue/test-…
A-Behairi Dec 6, 2023
da07247
Merge branch 'dependency-updates' into dependabo..
A-Behairi Dec 6, 2023
fdc8e55
chore: update jest + ts-jest
A-Behairi Dec 6, 2023
944dee6
Merge branch 'dependency-updates' into dependabot/npm_and_yarn/babel-…
A-Behairi Dec 6, 2023
495cf1f
Merge pull request #386 from EOEPCA/dependabot/npm_and_yarn/babel-jes…
A-Behairi Dec 6, 2023
d2c9707
Merge branch 'dependency-updates' into dependabot/npm_and_yarn/core-j…
A-Behairi Dec 6, 2023
887619d
Merge pull request #387 from EOEPCA/dependabot/npm_and_yarn/core-js-3…
A-Behairi Dec 6, 2023
6bb0a19
Merge branch 'dependency-updates' into dependabot/npm_and_yarn/vue-an…
A-Behairi Dec 6, 2023
9addf53
Merge pull request #389 from EOEPCA/dependabot/npm_and_yarn/vue-and-v…
A-Behairi Dec 6, 2023
efb6e0e
Merge branch 'dependency-updates' into dependabot/npm_and_yarn/marked…
A-Behairi Dec 6, 2023
ff98038
chore: transpile marked
A-Behairi Dec 6, 2023
05562d4
Merge pull request #390 from EOEPCA/dependabot/npm_and_yarn/marked-11…
A-Behairi Dec 6, 2023
d8a5acd
chore: update bump_and_deploy merge
A-Behairi Dec 6, 2023
4f4f454
chore: update node to v20
A-Behairi Dec 7, 2023
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
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
Loading