Skip to content

Commit 58c0201

Browse files
authored
Merge pull request #1030 from legumeinfo/release-2.6.1
Release 2.6.1
2 parents 1e596eb + dfa614d commit 58c0201

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+15145
-14019
lines changed

.github/ISSUE_TEMPLATE/release-checklist.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ assignees: ''
99

1010
- [ ] Create a branch for the release.
1111
- [ ] Update the dependencies. The dependabot PR backlog is not comprehensive and doesn't include transitive dependencies, and merging them one at a time tends to break things, so the best way to do this is manually with `npm`.
12-
- [ ] Do a test build of the NPM package on your **local machine** so you know if something is going off the rails before the automated build action on GitHub.
12+
- [ ] Update Angular dependencies using the Angular CLI following the [Angular Update Guide](https://angular.dev/update-guide)
13+
- [ ] Update the dependencies in the microservices pseudo-package (`dep/legumeinfo-microservices`)
14+
- [ ] Make sure transitive dependencies are updated with `npm audit`
15+
- [ ] Update the base image version in the `Dockerfile` if necessary (only LTS versions should be used).
16+
- [ ] Do a test build and run of the Docker image on you local machine so you know if something is going to go off the rails before the automated build action on GitHub.
1317
- [ ] Bump the `"version"` number in `package.json` and reinstall the dependencies so the correct version number is in `package-lock.json`.
14-
- [ ] Update the base image version in the `Dockerfile` if necessary and do a test build and run of the **Docker** image on you local machine so you know if something is going to go off the rails before the automated build action on GitHub.
1518
- [ ] Open a PR that merges the release branch into main.
1619
- [ ] Merge the release PR after it passes testing and review.
1720
- [ ] Tag a corresponding release on GitHub. This will trigger an automated NPM package build on GitHub. If the package build succeeds it will be automatically published to NPM.

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# base stage installs the project dependencies
2-
FROM node:19-alpine3.16 as base
2+
FROM node:22.15.0-alpine3.21 as base
33

44
# install non-npm build dependencies
55
RUN apk add --no-cache \
@@ -44,7 +44,7 @@ RUN npx ng build --configuration production $ANGULAR_BUILD_OPTIONS
4444

4545

4646
# prod stage deploys the project with NGINX
47-
FROM nginx:1.23-alpine as prod
47+
FROM nginx:1.28-alpine as prod
4848

4949
# copy the nginx configuration template
5050
COPY nginx/templates/default.conf.template /etc/nginx/templates/

angular.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
"prefix": "app",
1616
"architect": {
1717
"build": {
18-
"builder": "@angular-devkit/build-angular:browser",
18+
"builder": "@angular-devkit/build-angular:application",
1919
"options": {
20-
"outputPath": "dist",
20+
"outputPath": {
21+
"base": "dist"
22+
},
2123
"index": "src/index.html",
22-
"main": "src/main.ts",
2324
"polyfills": [
2425
"zone.js"
2526
],
@@ -42,7 +43,8 @@
4243
"node_modules/@popperjs/core/dist/umd/popper.min.js",
4344
"node_modules/bootstrap/dist/js/bootstrap.min.js",
4445
"node_modules/golden-layout/dist/goldenlayout.min.js",
45-
]
46+
],
47+
"browser": "src/main.ts"
4648
},
4749
"configurations": {
4850
"production": {
@@ -55,9 +57,7 @@
5557
"outputHashing": "all"
5658
},
5759
"development": {
58-
"buildOptimizer": false,
5960
"optimization": false,
60-
"vendorChunk": true,
6161
"extractLicenses": false,
6262
"sourceMap": true,
6363
"namedChunks": true
@@ -69,18 +69,18 @@
6969
"builder": "@angular-devkit/build-angular:dev-server",
7070
"configurations": {
7171
"production": {
72-
"browserTarget": "gcv:build:production"
72+
"buildTarget": "gcv:build:production"
7373
},
7474
"development": {
75-
"browserTarget": "gcv:build:development"
75+
"buildTarget": "gcv:build:development"
7676
}
7777
},
7878
"defaultConfiguration": "development"
7979
},
8080
"extract-i18n": {
8181
"builder": "@angular-devkit/build-angular:extract-i18n",
8282
"options": {
83-
"browserTarget": "gcv:build"
83+
"buildTarget": "gcv:build"
8484
}
8585
},
8686
"test": {

0 commit comments

Comments
 (0)