Merge pull request #926 from Ostap-Zherebetskyi/feature/merge_develop

[ENG-10644] Merge latest `develop` into feature branch

Author: cslzchen

CHANGELOG

@@ -2,6 +2,41 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+26.6.1 (2026-03-26)
+===================
+
+* Hotfix to prevent redirect on 403 error
+
+26.6.0 (2026-03-26)
+===================
+
+* Misc. improvements and bug fixes
+
+26.5.1 (2026-03-18)
+===================
+
+* Hotfix for Angular SSR
+
+26.5.0 (2026-02-26)
+===================
+
+* Config updates to enable Angular SSR
+
+26.4.0 (2026-02-26)
+===================
+
+* Search and fetch funder ids from ROR instead of CrossRef
+
+26.3.1 (2026-02-25)
+===================
+
+* Hotfix to prevent 403 error when fetching metadata from causing a redirect
+
+26.3.0 (2026-02-24)
+===================
+
+* FAIR Signposting
+
 26.2.1 (2026-02-03)
 ===================
 

Dockerfile

@@ -1,59 +1,37 @@
-# Build
-FROM node:22-alpine AS build
-
+# Dependencies stage
+FROM node:22-alpine AS deps
 WORKDIR /app
-
 COPY package*.json ./
-RUN npm install
+RUN npm ci --no-audit --no-fund
 
+# Build stage (SSR build output)
+FROM deps AS build
 COPY . .
+RUN NG_BUILD_OPTIMIZE_CHUNKS=1 npx ng build --configuration=ssr --verbose
 
-RUN npm link @angular/cli
-RUN NG_BUILD_OPTIMIZE_CHUNKS=1 ng build --verbose
+# SSR runtime stage
+FROM build AS ssr
+WORKDIR /app
+RUN npm prune --omit=dev --no-audit --no-fund
+EXPOSE 4000
+ENV PORT=4000
+CMD ["node", "--enable-source-maps", "dist/osf/server/server.mjs"]
 
-# Dist
+# Static dist artifact stage
 FROM node:22-alpine AS dist
-
 WORKDIR /code
-
 COPY --from=build /app/dist /code/dist
 
-# SSR
-FROM node:22-alpine AS ssr
-
-WORKDIR /app
-
-COPY package*.json ./
-RUN npm install
-
+# Dev server stage
+FROM deps AS dev
 COPY . .
-
-RUN npm link @angular/cli
-RUN NG_BUILD_OPTIMIZE_CHUNKS=1 ng build --configuration=ssr --verbose
-
-RUN npm ci --omit=dev --ignore-scripts --no-audit --no-fund
-
-EXPOSE 4000
-
-ENV PORT=4000
-
-CMD ["node", "dist/osf/server/server.mjs"]
-
-# Dev - run only
-FROM build AS dev
-
 EXPOSE 4200
+CMD ["npx", "ng", "serve", "--host", "0.0.0.0"]
 
-CMD ["ng", "serve"]
-
-# Local Development - coding
+# Local development stage
 FROM node:22-alpine AS local-dev
 WORKDIR /app
-
-# Install deps in the image (kept in container)
 COPY package*.json ./
-# COPY package-lock.docker.json ./package-lock.json
 RUN npm ci --no-audit --no-fund
-
-# Expose Angular dev server
 EXPOSE 4200
+CMD ["npx", "ng", "serve", "--host", "0.0.0.0"]

angular.json

@@ -96,6 +96,7 @@
               "ssr": {
                 "entry": "src/server.ts"
               },
+              "sourceMap": true,
               "budgets": [
                 {
                   "type": "initial",
@@ -117,6 +118,20 @@
               "namedChunks": true
             },
             "development": {
+              "outputMode": "static",
+              "server": false,
+              "ssr": false,
+              "optimization": false,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.development.ts"
+                }
+              ]
+            },
+            "dev-ssr": {
               "optimization": false,
               "extractLicenses": false,
               "sourceMap": true,
@@ -164,6 +179,9 @@
             "development": {
               "buildTarget": "osf:build:development"
             },
+            "dev-ssr": {
+              "buildTarget": "osf:build:dev-ssr"
+            },
             "docker": {
               "buildTarget": "osf:build:docker"
             },

docs/ngxs.md

@@ -46,7 +46,7 @@ Typical NGXS-related files are organized as follows:
 src/app/shared/stores/
   └── addons/
       ├── addons.actions.ts       # All action definitions
-      ├── addons.models.ts        # Interfaces & data models
+      ├── addons.model.ts        # Interfaces & data model
       ├── addons.state.ts         # State implementation
       ├── addons.selectors.ts     # Reusable selectors
 ```