Merge branch 'feature/pbs-25.04' into feat/8975-redirect-service

Author: futa-ikeda

.github/rules/All Branch Rules.json

@@ -2,9 +2,12 @@ name: Run Jest Tests
 
 on:
   pull_request:
-    branches: ['*'] # or change to match your default branch
   push:
-    branches: ['*']
+    branches:
+      - develop
+      - main
+      - 'release/*'
+      - 'hotfix/*'
   workflow_dispatch:
 
 jobs:
@@ -45,6 +48,10 @@ jobs:
 
       - name: Check coverage thresholds
         run: npm run test:check-coverage-thresholds
+      - name: Coveralls Report
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
   lint:
     runs-on: ubuntu-latest
 

.github/rules/Main_Develop Branch Rules.json

@@ -9,7 +9,7 @@ RUN npm install
 COPY . .
 
 RUN npm link @angular/cli
-RUN ng build --verbose
+RUN NG_BUILD_OPTIMIZE_CHUNKS=1 ng build --verbose
 
 # Dist
 FROM node:22-alpine AS dist

.github/workflows/review.yml

@@ -30,7 +30,9 @@
               "cedar-artifact-viewer",
               "markdown-it-video",
               "ace-builds/src-noconflict/ext-language_tools",
-              "@traptitech/markdown-it-katex"
+              "@traptitech/markdown-it-katex",
+              "@citation-js/core",
+              "@citation-js/plugin-csl"
             ],
             "assets": [
               "src/favicon.ico",
@@ -48,7 +50,6 @@
             "styles": [
               "src/styles/styles.scss",
               "node_modules/primeflex/primeflex.css",
-              "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
               "node_modules/ngx-markdown-editor/assets/highlight.js/agate.min.css"
             ],
             "stylePreprocessorOptions": {
@@ -74,7 +75,8 @@
                   "maximumError": "25kB"
                 }
               ],
-              "outputHashing": "all"
+              "outputHashing": "all",
+              "optimization": true
             },
             "analyze-bundle": {
               "sourceMap": true,
@@ -147,15 +149,15 @@
             },
             "development": {
               "buildTarget": "osf:build:development",
-              "hmr": false
+              "hmr": true
             },
             "docker": {
               "buildTarget": "osf:build:docker",
-              "hmr": false
+              "hmr": true
             },
             "staging": {
               "buildTarget": "osf:build:staging",
-              "hmr": false
+              "hmr": true
             },
             "test": {
               "buildTarget": "osf:build:test",

.github/workflows/test.yml

@@ -11,6 +11,8 @@ module.exports = {
     '^@styles/(.*)$': '<rootDir>/assets/styles/$1',
     '^@testing/(.*)$': '<rootDir>/src/testing/$1',
     '^src/environments/environment$': '<rootDir>/src/environments/environment.ts',
+    '^cedar-artifact-viewer$': '<rootDir>/src/testing/mocks/cedar-artifact-viewer.mock.ts',
+    '^cedar-embeddable-editor$': '<rootDir>/src/testing/mocks/cedar-embeddable-editor.mock.ts',
   },
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
@@ -50,10 +52,10 @@ module.exports = {
   extensionsToTreatAsEsm: ['.ts'],
   coverageThreshold: {
     global: {
-      branches: 24.1,
-      functions: 28.73,
-      lines: 56.52,
-      statements: 56.82,
+      branches: 28.0,
+      functions: 32.0,
+      lines: 60.28,
+      statements: 60.77,
     },
   },
   watchPathIgnorePatterns: [