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.

Sign up for GitHub

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

update API devDependencies [MRXN23-485] #1546

Merged
merged 3 commits into from
Oct 16, 2023
Merged

update API devDependencies [MRXN23-485] #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
136fc57
update API devDependencies
hotzevzl Oct 12, 2023
2e6ebeb
use Yarn v3 for api, geoprocessing and webshot
hotzevzl Oct 12, 2023
5006e38
add yarnrc config files for Yarn v3
hotzevzl Oct 13, 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
1 change: 1 addition & 0 deletions api/.yarnrc.docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
3 changes: 3 additions & 0 deletions api/.yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.6.4.cjs
5 changes: 4 additions & 1 deletion api/api.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ LABEL maintainer="[email protected]"
ENV NAME marxan-api
ENV USER $NAME
ENV APP_HOME /opt/$NAME
ENV YARN_VERSION 3.6.4

RUN apk add --no-cache bash zip
RUN addgroup $USER && adduser -s /bin/bash -D -G $USER $USER
Expand All @@ -13,7 +14,9 @@ RUN chown $USER:$USER $APP_HOME
RUN mkdir /tmp/storage && chown $USER /tmp/storage

COPY --chown=$USER:$USER package.json yarn.lock ./
RUN yarn install --frozen-lockfile
COPY --chown=$USER:$USER .yarnrc.docker.yml .yarnrc.yml
RUN yarn policies set-version $YARN_VERSION
RUN yarn install --immutable

COPY --chown=$USER:$USER nodemon.json tsconfig.json tsconfig.build.json nest-cli.json ./
# @debt we should do this only for images used for tests
Expand Down
7 changes: 5 additions & 2 deletions api/geo.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ LABEL maintainer="[email protected]"
ENV NAME marxan-geoprocessing
ENV USER $NAME
ENV APP_HOME /opt/$NAME
ENV YARN_VERSION 3.6.4

RUN apk add --no-cache bash
RUN addgroup $USER && adduser -s /bin/bash -D -G $USER $USER
Expand All @@ -16,8 +17,10 @@ RUN chown -R $USER:$USER /opt/marxan-project-cloning

USER $USER

COPY package.json yarn.lock ./
RUN yarn install --frozen-lockfile
COPY package.json yarn.lock .yarnrc.docker.yml ./
COPY --chown=$USER:$USER .yarnrc.docker.yml .yarnrc.yml
RUN yarn policies set-version $YARN_VERSION
RUN yarn install --immutable

COPY --chown=$USER:$USER nodemon.json tsconfig.json tsconfig.build.json nest-cli.json ./
# @debt we should do this only for images used for tests
Expand Down
43 changes: 22 additions & 21 deletions api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"mapshaper": "^0.6.29",
"morgan": "^1.10.0",
"ms": "2.1.3",
"multer": "^1.4.2",
"multer": "^1.4.5-lts.1",
"multistream": "4.1.0",
"nestjs-base-service": "0.11.1",
"nestjs-console": "8.0.0",
Expand All @@ -112,9 +112,9 @@
},
"devDependencies": {
"@mapbox/vector-tile": "1.3.1",
"@nestjs/cli": "^10.1.11",
"@nestjs/schematics": "^10.0.1",
"@nestjs/testing": "^10.1.3",
"@nestjs/cli": "^10.1.18",
"@nestjs/schematics": "^10.0.2",
"@nestjs/testing": "^10.2.7",
"@types/archiver": "5.1.0",
"@types/bcrypt": "^3.0.0",
"@types/byline": "4.2.33",
Expand Down Expand Up @@ -145,31 +145,31 @@
"@types/supertest": "^2.0.10",
"@types/unzipper": "^0.10.3",
"@types/uuid": "8.3.0",
"@typescript-eslint/eslint-plugin": "^4.28.2",
"@typescript-eslint/parser": "^4.28.2",
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"axios-mock-adapter": "1.19.0",
"bunyan": "^1.8.14",
"eslint": "^7.30.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
"bunyan": "^1.8.15",
"eslint": "^8.51.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.1",
"fs-extra": "10.0.0",
"geojson2shp": "0.4.0",
"husky": "^4.3.0",
"jest": "^29.5.0",
"jest-jasmine2": "^29.5.0",
"lint-staged": "^10.5.2",
"nock": "13.1.0",
"nodemon": "^2.0.6",
"husky": "^8.0.3",
"jest": "^29.7.0",
"jest-jasmine2": "^29.7.0",
"lint-staged": "^14.0.1",
"nock": "13.3.4",
"nodemon": "^3.0.1",
"pbf": "^3.2.1",
"prettier": "^2.1.2",
"supertest": "^6.0.0",
"prettier": "^3.0.3",
"supertest": "^6.3.3",
"ts-jest": "^29.1.0",
"ts-loader": "^8.0.8",
"ts-loader": "^9.5.0",
"ts-node": "^10.9.1",
"tsconfig-paths": "^3.9.0",
"typed-emitter": "1.3.1",
"typescript": "4.7.4",
"typescript-coverage-report": "^0.7.0",
"typescript-coverage-report": "^0.8.0",
"utility-types": "^3.10.0",
"wait-for-expect": "^3.0.2"
},
Expand Down Expand Up @@ -278,5 +278,6 @@
},
"volta": {
"node": "18.14.2"
}
},
"packageManager": "[email protected]"
}
Loading