Skip to content

Commit c19af67

Browse files
committed
Merge remote-tracking branch 'upstream/main' into refactor-menu-resolvers-9.0
2 parents 4b3d7e8 + a01966a commit c19af67

3 files changed

Lines changed: 40 additions & 35 deletions

File tree

config/config.example.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ ui:
1919

2020
# Angular Server Side Rendering (SSR) settings
2121
ssr:
22-
# Enable request performance profiling data collection and printing the results in the server console.
23-
# Defaults to false. Enabling in production is NOT recommended
24-
enablePerformanceProfiler: false
2522
# Whether to tell Angular to inline "critical" styles into the server-side rendered HTML.
2623
# Determining which styles are critical is a relatively expensive operation; this option is
2724
# disabled (false) by default to boost server performance at the expense of loading smoothness.
@@ -48,6 +45,9 @@ ssr:
4845
# REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs.
4946
# Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues.
5047
replaceRestUrl: true
48+
# Enable request performance profiling data collection and printing the results in the server console.
49+
# Defaults to false. Enabling in production is NOT recommended
50+
#enablePerformanceProfiler: false
5151

5252
# The REST API server settings
5353
# NOTE: these settings define which (publicly available) REST API to use. They are usually

package-lock.json

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

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
"@angular/platform-server": "^17.3.12",
109109
"@angular/router": "^17.3.12",
110110
"@angular/ssr": "^17.3.11",
111-
"@babel/runtime": "7.26.0",
111+
"@babel/runtime": "7.26.7",
112112
"@kolkov/ngx-gallery": "^2.0.1",
113113
"@ng-bootstrap/ng-bootstrap": "^11.0.0",
114114
"@ng-dynamic-forms/core": "^16.0.0",
@@ -137,7 +137,7 @@
137137
"filesize": "^6.1.0",
138138
"http-proxy-middleware": "^2.0.7",
139139
"http-terminator": "^3.2.0",
140-
"isbot": "^5.1.21",
140+
"isbot": "^5.1.22",
141141
"js-cookie": "2.2.1",
142142
"js-yaml": "^4.1.0",
143143
"json5": "^2.2.3",
@@ -187,7 +187,7 @@
187187
"@types/grecaptcha": "^3.0.9",
188188
"@types/jasmine": "~3.6.0",
189189
"@types/js-cookie": "2.2.6",
190-
"@types/lodash": "^4.17.14",
190+
"@types/lodash": "^4.17.15",
191191
"@types/node": "^14.14.9",
192192
"@typescript-eslint/eslint-plugin": "^7.18.0",
193193
"@typescript-eslint/parser": "^7.18.0",
@@ -198,7 +198,7 @@
198198
"copy-webpack-plugin": "^6.4.1",
199199
"cross-env": "^7.0.3",
200200
"cypress": "^13.17.0",
201-
"cypress-axe": "^1.5.0",
201+
"cypress-axe": "^1.6.0",
202202
"deep-freeze": "0.0.1",
203203
"eslint": "^8.39.0",
204204
"eslint-plugin-deprecation": "^1.4.1",
@@ -207,7 +207,7 @@
207207
"eslint-plugin-import": "^2.31.0",
208208
"eslint-plugin-import-newlines": "^1.3.1",
209209
"eslint-plugin-jsdoc": "^45.0.0",
210-
"eslint-plugin-jsonc": "^2.18.2",
210+
"eslint-plugin-jsonc": "^2.19.1",
211211
"eslint-plugin-lodash": "^7.4.0",
212212
"eslint-plugin-rxjs": "^5.0.3",
213213
"eslint-plugin-simple-import-sort": "^10.0.0",
@@ -230,7 +230,7 @@
230230
"postcss-loader": "^4.0.3",
231231
"postcss-preset-env": "^7.4.2",
232232
"rimraf": "^3.0.2",
233-
"sass": "~1.83.4",
233+
"sass": "~1.84.0",
234234
"sass-loader": "^12.6.0",
235235
"sass-resources-loader": "^2.2.5",
236236
"ts-node": "^8.10.2",

0 commit comments

Comments
 (0)