Merge pull request #867 from CenterForOpenScience/feature/pbs-25-24

Merge Feature/pbs 25 24 into develop

Author: adlius

Dockerfile

@@ -18,6 +18,27 @@ WORKDIR /code
 
 COPY --from=build /app/dist /code/dist
 
+# SSR
+FROM node:22-alpine AS ssr
+
+WORKDIR /app
+
+COPY package*.json ./
+RUN npm install
+
+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
 

angular.json

@@ -29,8 +29,11 @@
               "cedar-embeddable-editor",
               "cedar-artifact-viewer",
               "markdown-it-video",
+              "markdown-it-anchor",
+              "markdown-it-toc-done-right",
               "ace-builds/src-noconflict/ext-language_tools",
               "@traptitech/markdown-it-katex",
+              "@centerforopenscience/markdown-it-atrules",
               "@citation-js/core",
               "@citation-js/plugin-csl"
             ],
@@ -60,10 +63,39 @@
               "node_modules/ngx-markdown-editor/assets/highlight.js/highlight.min.js",
               "node_modules/ngx-markdown-editor/assets/marked.min.js",
               "src/assets/js/ace/snippetsMarkdown.js"
-            ]
+            ],
+            "server": "src/main.server.ts",
+            "outputMode": "server",
+            "ssr": {
+              "entry": "src/server.ts"
+            }
           },
           "configurations": {
             "production": {
+              "outputMode": "static",
+              "server": false,
+              "ssr": false,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "9MB",
+                  "maximumError": "10MB"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "20KB",
+                  "maximumError": "25kB"
+                }
+              ],
+              "outputHashing": "all",
+              "optimization": true
+            },
+            "ssr": {
+              "outputMode": "server",
+              "server": "src/main.server.ts",
+              "ssr": {
+                "entry": "src/server.ts"
+              },
               "budgets": [
                 {
                   "type": "initial",
@@ -116,57 +148,33 @@
                   "with": "src/environments/environment.staging.ts"
                 }
               ]
-            },
-            "test": {
-              "optimization": true,
-              "extractLicenses": false,
-              "sourceMap": false,
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.test.ts"
-                }
-              ]
-            },
-            "test-osf": {
-              "optimization": true,
-              "extractLicenses": false,
-              "sourceMap": false,
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.test-osf.ts"
-                }
-              ]
             }
           },
           "defaultConfiguration": "production"
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "hmr": false
+          },
           "configurations": {
             "production": {
               "buildTarget": "osf:build:production"
             },
             "development": {
-              "buildTarget": "osf:build:development",
-              "hmr": true
+              "buildTarget": "osf:build:development"
             },
             "docker": {
-              "buildTarget": "osf:build:docker",
-              "hmr": true
+              "buildTarget": "osf:build:docker"
             },
             "staging": {
-              "buildTarget": "osf:build:staging",
-              "hmr": true
+              "buildTarget": "osf:build:staging"
             },
             "test": {
-              "buildTarget": "osf:build:test",
-              "hmr": false
+              "buildTarget": "osf:build:test"
             },
             "test-osf": {
-              "buildTarget": "osf:build:test-osf",
-              "hmr": false
+              "buildTarget": "osf:build:test-osf"
             }
           },
           "defaultConfiguration": "development"

jest.config.js

@@ -24,7 +24,9 @@ module.exports = {
       },
     ],
   },
-  transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$|@ngxs|@angular|@ngrx|parse5|entities|chart.js)'],
+  transformIgnorePatterns: [
+    'node_modules/(?!.*\\.mjs$|@ngxs|@angular|@ngrx|parse5|entities|chart.js|@mdit|@citation-js|@traptitech|@sentry|@primeng|@newrelic)',
+  ],
   testEnvironment: 'jsdom',
   moduleFileExtensions: ['ts', 'js', 'html', 'json', 'mjs'],
   coverageDirectory: 'coverage',
@@ -52,10 +54,10 @@ module.exports = {
   extensionsToTreatAsEsm: ['.ts'],
   coverageThreshold: {
     global: {
-      branches: 28.0,
-      functions: 32.0,
-      lines: 60.28,
-      statements: 60.77,
+      branches: 34.8,
+      functions: 38.0,
+      lines: 65.5,
+      statements: 66.0,
     },
   },
   watchPathIgnorePatterns: [
@@ -68,19 +70,9 @@ module.exports = {
   ],
   testPathIgnorePatterns: [
     '<rootDir>/src/environments',
-    '<rootDir>/src/app/app.config.ts',
     '<rootDir>/src/app/features/files/pages/file-detail',
     '<rootDir>/src/app/features/project/addons/',
-    '<rootDir>/src/app/features/project/registrations',
-    '<rootDir>/src/app/features/project/wiki',
-    '<rootDir>/src/app/features/registry/components',
-    '<rootDir>/src/app/features/registry/pages/registry-wiki/registry-wiki',
     '<rootDir>/src/app/features/settings/addons/',
     '<rootDir>/src/app/features/settings/tokens/store/',
-    '<rootDir>/src/app/shared/components/file-menu/',
-    '<rootDir>/src/app/shared/components/line-chart/',
-    '<rootDir>/src/app/shared/components/pie-chart/',
-    '<rootDir>/src/app/shared/components/reusable-filter/',
-    '<rootDir>/src/app/shared/components/wiki/edit-section/',
   ],
 };