Skip to content

Commit 5a0620c

Browse files
Coly010FrozenPandaz
authored andcommitted
feat(angular): upgrade nguniversal version (#14419)
(cherry picked from commit 2773f40)
1 parent 17d9ce8 commit 5a0620c

File tree

5 files changed

+51
-43
lines changed

5 files changed

+51
-43
lines changed

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"@ngrx/effects": "~15.0.0",
5454
"@ngrx/router-store": "~15.0.0",
5555
"@ngrx/store": "~15.0.0",
56-
"@nguniversal/builders": "~15.0.0",
56+
"@nguniversal/builders": "~15.1.0",
5757
"@nrwl/cypress": "15.5.0-beta.1",
5858
"@nrwl/devkit": "15.5.0-beta.1",
5959
"@nrwl/eslint-plugin-nx": "15.5.0-beta.1",
@@ -310,8 +310,7 @@
310310
"resolutions": {
311311
"**/xmlhttprequest-ssl": "~1.6.2",
312312
"minimist": "^1.2.6",
313-
"underscore": "^1.12.1",
314-
"@nguniversal/builders/@angular-devkit/architect": "~0.1501.0"
313+
"underscore": "^1.12.1"
315314
},
316315
"nx": {
317316
"includedScripts": [

packages/angular/migrations.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1757,6 +1757,19 @@
17571757
"alwaysAddToPackageJson": false
17581758
}
17591759
}
1760+
},
1761+
"15.5.2": {
1762+
"version": "15.5.2-beta.0",
1763+
"packages": {
1764+
"@nguniversal/builders": {
1765+
"version": "~15.1.0",
1766+
"alwaysAddToPackageJson": false
1767+
},
1768+
"@nguniversal/express-engine": {
1769+
"version": "~15.1.0",
1770+
"alwaysAddToPackageJson": false
1771+
}
1772+
}
17601773
}
17611774
}
17621775
}

packages/angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"webpack-merge": "5.7.3"
6262
},
6363
"peerDependencies": {
64-
"@nguniversal/builders": "~15.0.0",
64+
"@nguniversal/builders": "~15.1.0",
6565
"rxjs": "^6.5.3 || ^7.5.0"
6666
},
6767
"peerDependenciesMeta": {

packages/angular/src/utils/versions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const zoneJsVersion = '~0.11.4';
99
export const angularJsVersion = '1.7.9';
1010
export const tsLibVersion = '^2.3.0';
1111

12-
export const ngUniversalVersion = '~15.0.0';
12+
export const ngUniversalVersion = '~15.1.0';
1313
export const corsVersion = '~2.8.5';
1414
export const expressVersion = '~4.18.2';
1515
export const moduleFederationNodeVersion = '~0.10.1';

yarn.lock

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
"@jridgewell/gen-mapping" "^0.1.0"
134134
"@jridgewell/trace-mapping" "^0.3.9"
135135

136-
"@angular-devkit/architect@0.1501.0", "@angular-devkit/architect@^0.1500.0-next.0", "@angular-devkit/architect@~0.1501.0":
136+
"@angular-devkit/architect@0.1501.0", "@angular-devkit/architect@~0.1501.0":
137137
version "0.1501.0"
138138
resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1501.0.tgz#e0c80a1feb65db925a8c95f06034b2ef30e92b9c"
139139
integrity sha512-nbe830CwHm/HSMB8eZ4aFbgfNhc1eRYPCBmMFyRONc8HlXRAy0qWhpkY/NmQUaKUPOT9vJUzVk+AUNbqSR3l/w==
@@ -238,17 +238,6 @@
238238
rxjs "6.6.7"
239239
source-map "0.7.4"
240240

241-
"@angular-devkit/core@^15.0.0-next.0":
242-
version "15.0.4"
243-
resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-15.0.4.tgz#257ba1d76cd106216d0150f480d0062e726af996"
244-
integrity sha512-4ITpRAevd652SxB+qNesIQ9qfbm7wT5UBU5kJOPPwGL77I21g8CQpkmV1n5VSacPvC9Zbz90feOWexf7w7JzcA==
245-
dependencies:
246-
ajv "8.11.0"
247-
ajv-formats "2.1.1"
248-
jsonc-parser "3.2.0"
249-
rxjs "6.6.7"
250-
source-map "0.7.4"
251-
252241
"@angular-devkit/schematics@14.2.1":
253242
version "14.2.1"
254243
resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-14.2.1.tgz#9d66080e60ab32d1b44c854cabc8f5cbb421d877"
@@ -4279,14 +4268,14 @@
42794268
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-15.1.0.tgz#ac6439810f8768a5f06e7d1a24b8faf31d415ab6"
42804269
integrity sha512-7CyQk5eADg0fsi+EDa3DWIyR+CjymcyToWU0uBpuyrZCl5gUnzgeWZIQiQ0HyaMxWPfQ5cwwZ1YeAwkxMpKL2w==
42814270

4282-
"@nguniversal/builders@~15.0.0":
4283-
version "15.0.0"
4284-
resolved "https://registry.yarnpkg.com/@nguniversal/builders/-/builders-15.0.0.tgz#f765f7e98dc6e76d3e4c316035cadf0e2db49651"
4285-
integrity sha512-MEgKIhbbut933InHhogoNKSZXh7NigPIWHBFk7P7tSOfdu55nuO4WlR5lcTC7KbkqMmQOAtJP54XLdKS7hhFxg==
4271+
"@nguniversal/builders@~15.1.0":
4272+
version "15.1.0"
4273+
resolved "https://registry.yarnpkg.com/@nguniversal/builders/-/builders-15.1.0.tgz#430a1d9e3e21388ec84fdbff22978b1cf6a2bf04"
4274+
integrity sha512-AM+n6yAWXDKP3G4+LdvXLLJWAcSy76RuR7rswVoJ8SQdrqB3Vf/tUc/UVCohp/UZjuQBEGUE0kXWBQH4cdRmmQ==
42864275
dependencies:
4287-
"@angular-devkit/architect" "^0.1500.0-next.0"
4288-
"@angular-devkit/core" "^15.0.0-next.0"
4289-
"@nguniversal/common" "15.0.0"
4276+
"@angular-devkit/architect" "~0.1501.0"
4277+
"@angular-devkit/core" "~15.1.0"
4278+
"@nguniversal/common" "15.1.0"
42904279
browser-sync "^2.27.10"
42914280
express "^4.18.2"
42924281
guess-parser "^0.4.22"
@@ -4296,13 +4285,13 @@
42964285
rxjs "^6.5.5"
42974286
tree-kill "^1.2.2"
42984287

4299-
"@nguniversal/common@15.0.0":
4300-
version "15.0.0"
4301-
resolved "https://registry.yarnpkg.com/@nguniversal/common/-/common-15.0.0.tgz#c8d4ddbdbf1297a3c91cd83f38fdd24446e32194"
4302-
integrity sha512-RSlCSS5HejFoH/T6hpRIkTG1JzYEIxRgxsSxVyyPhGGRS4ouBzy4vEVkuIKwiYgVMBIGljJLelb38IsChTJsRg==
4288+
"@nguniversal/common@15.1.0":
4289+
version "15.1.0"
4290+
resolved "https://registry.yarnpkg.com/@nguniversal/common/-/common-15.1.0.tgz#3903c3e30a6530edf20ca3fa36092ccaa88c3711"
4291+
integrity sha512-NcZByxhO4VELZutuFL6/uvY0/dp7BJ7zu0AGUS1apNF4aAPmW6DjlbrVCPcqLOzrd1cPIOh0HJI3H1J2+dqRsA==
43034292
dependencies:
43044293
critters "0.0.16"
4305-
jsdom "20.0.2"
4294+
jsdom "21.0.0"
43064295
tslib "^2.3.0"
43074296

43084297
"@nodelib/fs.scandir@2.1.5":
@@ -11523,7 +11512,7 @@ decimal.js@^10.2.1, decimal.js@^10.3.1:
1152311512
resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e"
1152411513
integrity sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA==
1152511514

11526-
decimal.js@^10.4.1:
11515+
decimal.js@^10.4.2:
1152711516
version "10.4.3"
1152811517
resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
1152911518
integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
@@ -16236,18 +16225,18 @@ jsdom@16.7.0, jsdom@^16.4.0:
1623616225
ws "^7.4.6"
1623716226
xml-name-validator "^3.0.0"
1623816227

16239-
jsdom@20.0.2:
16240-
version "20.0.2"
16241-
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.2.tgz#65ccbed81d5e877c433f353c58bb91ff374127db"
16242-
integrity sha512-AHWa+QO/cgRg4N+DsmHg1Y7xnz+8KU3EflM0LVDTdmrYOc1WWTSkOjtpUveQH+1Bqd5rtcVnb/DuxV/UjDO4rA==
16228+
jsdom@21.0.0:
16229+
version "21.0.0"
16230+
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz#33e22f2fc44286e50ac853c7b7656c8864a4ea45"
16231+
integrity sha512-AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA==
1624316232
dependencies:
1624416233
abab "^2.0.6"
16245-
acorn "^8.8.0"
16234+
acorn "^8.8.1"
1624616235
acorn-globals "^7.0.0"
1624716236
cssom "^0.5.0"
1624816237
cssstyle "^2.3.0"
1624916238
data-urls "^3.0.2"
16250-
decimal.js "^10.4.1"
16239+
decimal.js "^10.4.2"
1625116240
domexception "^4.0.0"
1625216241
escodegen "^2.0.0"
1625316242
form-data "^4.0.0"
@@ -16260,12 +16249,12 @@ jsdom@20.0.2:
1626016249
saxes "^6.0.0"
1626116250
symbol-tree "^3.2.4"
1626216251
tough-cookie "^4.1.2"
16263-
w3c-xmlserializer "^3.0.0"
16252+
w3c-xmlserializer "^4.0.0"
1626416253
webidl-conversions "^7.0.0"
1626516254
whatwg-encoding "^2.0.0"
1626616255
whatwg-mimetype "^3.0.0"
1626716256
whatwg-url "^11.0.0"
16268-
ws "^8.9.0"
16257+
ws "^8.11.0"
1626916258
xml-name-validator "^4.0.0"
1627016259

1627116260
jsdom@^19.0.0:
@@ -24299,6 +24288,13 @@ w3c-xmlserializer@^3.0.0:
2429924288
dependencies:
2430024289
xml-name-validator "^4.0.0"
2430124290

24291+
w3c-xmlserializer@^4.0.0:
24292+
version "4.0.0"
24293+
resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
24294+
integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
24295+
dependencies:
24296+
xml-name-validator "^4.0.0"
24297+
2430224298
walk-up-path@^1.0.0:
2430324299
version "1.0.0"
2430424300
resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e"
@@ -24877,16 +24873,16 @@ ws@^7.4.6:
2487724873
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
2487824874
integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
2487924875

24876+
ws@^8.11.0:
24877+
version "8.12.0"
24878+
resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8"
24879+
integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==
24880+
2488024881
ws@^8.2.3, ws@^8.4.2:
2488124882
version "8.10.0"
2488224883
resolved "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz#00a28c09dfb76eae4eb45c3b565f771d6951aa51"
2488324884
integrity sha512-+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw==
2488424885

24885-
ws@^8.9.0:
24886-
version "8.11.0"
24887-
resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
24888-
integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
24889-
2489024886
ws@~8.2.3:
2489124887
version "8.2.3"
2489224888
resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"

0 commit comments

Comments
 (0)