Skip to content

Commit

Permalink
Merge pull request #6673 from alkem-io/develop
Browse files Browse the repository at this point in the history
Release: Fixes
  • Loading branch information
valentinyanakiev authored Jul 25, 2024
2 parents 754dc5c + e91e04c commit 21d57a9
Show file tree
Hide file tree
Showing 169 changed files with 15,313 additions and 35,720 deletions.
4 changes: 2 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ module.exports = {
createDefaultProgram: true,
project: './tsconfig.json',
},
plugins: ['@typescript-eslint', 'react', 'jest'],
extends: ['react-app', 'react-app/jest', 'prettier', 'prettier/prettier'],
plugins: ['react'],
extends: ['react-app', 'prettier', 'prettier/prettier'],
env: {
browser: true,
es6: true,
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
dist: focal
language: node_js
node_js:
- v16.15.0
- v20.15.1
cache:
directories:
- node_modules
before_install:
- npm i -g npm@8.5.5
- npm i -g npm@10.7.0
install:
- npm install
script:
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.15.0-alpine as builder
FROM node:20.9.0-alpine as builder

# Create app directory
WORKDIR /app
Expand All @@ -25,7 +25,7 @@ ENV VITE_APP_SENTRY_AUTH_TOKEN=${ARG_SENTRY_AUTH_TOKEN}
# where available (npm@5+)
COPY package*.json ./

RUN npm i -g npm@8.5.5
RUN npm i -g npm@10.1.0
RUN npm install

# Everything for now
Expand Down
Loading

0 comments on commit 21d57a9

Please sign in to comment.