Skip to content

Commit 336bf32

Browse files
committed
Merge branch 'release/25.2.0'
2 parents f4f6f86 + 24e64bc commit 336bf32

File tree

278 files changed

+5098
-1363
lines changed

Some content is hidden

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

278 files changed

+5098
-1363
lines changed

.github/rules/All Branch Rules.json

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/rules/Main_Develop Branch Rules.json

Lines changed: 0 additions & 52 deletions
This file was deleted.

.github/workflows/review.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

.github/workflows/test.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ name: Run Jest Tests
22

33
on:
44
pull_request:
5-
branches: ['*'] # or change to match your default branch
65
push:
7-
branches: ['*']
6+
branches:
7+
- develop
8+
- main
9+
- 'release/*'
10+
- 'hotfix/*'
811
workflow_dispatch:
912

1013
jobs:
@@ -45,6 +48,10 @@ jobs:
4548

4649
- name: Check coverage thresholds
4750
run: npm run test:check-coverage-thresholds
51+
- name: Coveralls Report
52+
uses: coverallsapp/github-action@v2
53+
with:
54+
github-token: ${{ secrets.GITHUB_TOKEN }}
4855
lint:
4956
runs-on: ubuntu-latest
5057

.husky/pre-push

Lines changed: 0 additions & 20 deletions
This file was deleted.

angular.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
"styles": [
4949
"src/styles/styles.scss",
5050
"node_modules/primeflex/primeflex.css",
51-
"node_modules/@fortawesome/fontawesome-free/css/all.min.css",
5251
"node_modules/ngx-markdown-editor/assets/highlight.js/agate.min.css"
5352
],
5453
"stylePreprocessorOptions": {
@@ -74,7 +73,8 @@
7473
"maximumError": "25kB"
7574
}
7675
],
77-
"outputHashing": "all"
76+
"outputHashing": "all",
77+
"optimization": true
7878
},
7979
"analyze-bundle": {
8080
"sourceMap": true,
@@ -147,15 +147,15 @@
147147
},
148148
"development": {
149149
"buildTarget": "osf:build:development",
150-
"hmr": false
150+
"hmr": true
151151
},
152152
"docker": {
153153
"buildTarget": "osf:build:docker",
154-
"hmr": false
154+
"hmr": true
155155
},
156156
"staging": {
157157
"buildTarget": "osf:build:staging",
158-
"hmr": false
158+
"hmr": true
159159
},
160160
"test": {
161161
"buildTarget": "osf:build:test",

jest.config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ module.exports = {
5050
extensionsToTreatAsEsm: ['.ts'],
5151
coverageThreshold: {
5252
global: {
53-
branches: 24.1,
54-
functions: 28.73,
55-
lines: 56.52,
56-
statements: 56.82,
53+
branches: 28.0,
54+
functions: 32.0,
55+
lines: 60.28,
56+
statements: 60.77,
5757
},
5858
},
5959
watchPathIgnorePatterns: [

package-lock.json

Lines changed: 0 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "osf",
3-
"version": "0.0.0",
3+
"version": "25.2.0",
44
"scripts": {
55
"ng": "ng",
66
"analyze-bundle": "ng build --configuration=analyze-bundle && source-map-explorer dist/**/*.js --no-border-checks",
@@ -47,8 +47,6 @@
4747
"@newrelic/browser-agent": "^1.301.0",
4848
"@ngx-translate/core": "^16.0.4",
4949
"@ngx-translate/http-loader": "^16.0.1",
50-
"@ngxs/devtools-plugin": "^19.0.0",
51-
"@ngxs/logger-plugin": "^19.0.0",
5250
"@ngxs/store": "^19.0.0",
5351
"@primeng/themes": "^19.0.9",
5452
"@sentry/angular": "^10.10.0",

setup-jest.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,16 @@ class ResizeObserver {
3131
// eslint-disable-next-line @typescript-eslint/no-empty-function
3232
disconnect() {}
3333
}
34+
3435
Object.defineProperty(window, 'ResizeObserver', {
3536
writable: true,
3637
configurable: true,
3738
value: ResizeObserver,
3839
});
40+
41+
jest.mock('@newrelic/browser-agent/loaders/browser-agent', () => ({
42+
BrowserAgent: jest.fn().mockImplementation(() => ({
43+
start: jest.fn(),
44+
stop: jest.fn(),
45+
})),
46+
}));

0 commit comments

Comments
 (0)