diff --git a/package.json b/package.json index 856c0eed69814..1f10ce645ce25 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@ngrx/effects": "~15.0.0", "@ngrx/router-store": "~15.0.0", "@ngrx/store": "~15.0.0", - "@nguniversal/builders": "~15.0.0", + "@nguniversal/builders": "~15.1.0", "@nrwl/cypress": "15.5.0-beta.1", "@nrwl/devkit": "15.5.0-beta.1", "@nrwl/eslint-plugin-nx": "15.5.0-beta.1", @@ -310,8 +310,7 @@ "resolutions": { "**/xmlhttprequest-ssl": "~1.6.2", "minimist": "^1.2.6", - "underscore": "^1.12.1", - "@nguniversal/builders/@angular-devkit/architect": "~0.1501.0" + "underscore": "^1.12.1" }, "nx": { "includedScripts": [ diff --git a/packages/angular/migrations.json b/packages/angular/migrations.json index cc60f30b6d634..94e247a0cfbd2 100644 --- a/packages/angular/migrations.json +++ b/packages/angular/migrations.json @@ -1757,6 +1757,19 @@ "alwaysAddToPackageJson": false } } + }, + "15.5.2": { + "version": "15.5.2-beta.0", + "packages": { + "@nguniversal/builders": { + "version": "~15.1.0", + "alwaysAddToPackageJson": false + }, + "@nguniversal/express-engine": { + "version": "~15.1.0", + "alwaysAddToPackageJson": false + } + } } } } diff --git a/packages/angular/package.json b/packages/angular/package.json index 4f09ea693ccae..dd6504a0410fd 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -61,7 +61,7 @@ "webpack-merge": "5.7.3" }, "peerDependencies": { - "@nguniversal/builders": "~15.0.0", + "@nguniversal/builders": "~15.1.0", "rxjs": "^6.5.3 || ^7.5.0" }, "peerDependenciesMeta": { diff --git a/packages/angular/src/utils/versions.ts b/packages/angular/src/utils/versions.ts index 7a66ba3c3c37c..70bf6a8a3a645 100644 --- a/packages/angular/src/utils/versions.ts +++ b/packages/angular/src/utils/versions.ts @@ -9,7 +9,7 @@ export const zoneJsVersion = '~0.11.4'; export const angularJsVersion = '1.7.9'; export const tsLibVersion = '^2.3.0'; -export const ngUniversalVersion = '~15.0.0'; +export const ngUniversalVersion = '~15.1.0'; export const corsVersion = '~2.8.5'; export const expressVersion = '~4.18.2'; export const moduleFederationNodeVersion = '~0.10.1'; diff --git a/yarn.lock b/yarn.lock index fe1a2dd7128d7..7e7d1830451fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -133,7 +133,7 @@ "@jridgewell/gen-mapping" "^0.1.0" "@jridgewell/trace-mapping" "^0.3.9" -"@angular-devkit/architect@0.1501.0", "@angular-devkit/architect@^0.1500.0-next.0", "@angular-devkit/architect@~0.1501.0": +"@angular-devkit/architect@0.1501.0", "@angular-devkit/architect@~0.1501.0": version "0.1501.0" resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1501.0.tgz#e0c80a1feb65db925a8c95f06034b2ef30e92b9c" integrity sha512-nbe830CwHm/HSMB8eZ4aFbgfNhc1eRYPCBmMFyRONc8HlXRAy0qWhpkY/NmQUaKUPOT9vJUzVk+AUNbqSR3l/w== @@ -227,7 +227,7 @@ rxjs "6.6.7" source-map "0.7.4" -"@angular-devkit/core@15.0.4", "@angular-devkit/core@^15.0.0-next.0": +"@angular-devkit/core@15.0.4": version "15.0.4" resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-15.0.4.tgz#257ba1d76cd106216d0150f480d0062e726af996" integrity sha512-4ITpRAevd652SxB+qNesIQ9qfbm7wT5UBU5kJOPPwGL77I21g8CQpkmV1n5VSacPvC9Zbz90feOWexf7w7JzcA== @@ -4325,14 +4325,14 @@ resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-15.1.0.tgz#ac6439810f8768a5f06e7d1a24b8faf31d415ab6" integrity sha512-7CyQk5eADg0fsi+EDa3DWIyR+CjymcyToWU0uBpuyrZCl5gUnzgeWZIQiQ0HyaMxWPfQ5cwwZ1YeAwkxMpKL2w== -"@nguniversal/builders@~15.0.0": - version "15.0.0" - resolved "https://registry.yarnpkg.com/@nguniversal/builders/-/builders-15.0.0.tgz#f765f7e98dc6e76d3e4c316035cadf0e2db49651" - integrity sha512-MEgKIhbbut933InHhogoNKSZXh7NigPIWHBFk7P7tSOfdu55nuO4WlR5lcTC7KbkqMmQOAtJP54XLdKS7hhFxg== +"@nguniversal/builders@~15.1.0": + version "15.1.0" + resolved "https://registry.yarnpkg.com/@nguniversal/builders/-/builders-15.1.0.tgz#430a1d9e3e21388ec84fdbff22978b1cf6a2bf04" + integrity sha512-AM+n6yAWXDKP3G4+LdvXLLJWAcSy76RuR7rswVoJ8SQdrqB3Vf/tUc/UVCohp/UZjuQBEGUE0kXWBQH4cdRmmQ== dependencies: - "@angular-devkit/architect" "^0.1500.0-next.0" - "@angular-devkit/core" "^15.0.0-next.0" - "@nguniversal/common" "15.0.0" + "@angular-devkit/architect" "~0.1501.0" + "@angular-devkit/core" "~15.1.0" + "@nguniversal/common" "15.1.0" browser-sync "^2.27.10" express "^4.18.2" guess-parser "^0.4.22" @@ -4342,13 +4342,13 @@ rxjs "^6.5.5" tree-kill "^1.2.2" -"@nguniversal/common@15.0.0": - version "15.0.0" - resolved "https://registry.yarnpkg.com/@nguniversal/common/-/common-15.0.0.tgz#c8d4ddbdbf1297a3c91cd83f38fdd24446e32194" - integrity sha512-RSlCSS5HejFoH/T6hpRIkTG1JzYEIxRgxsSxVyyPhGGRS4ouBzy4vEVkuIKwiYgVMBIGljJLelb38IsChTJsRg== +"@nguniversal/common@15.1.0": + version "15.1.0" + resolved "https://registry.yarnpkg.com/@nguniversal/common/-/common-15.1.0.tgz#3903c3e30a6530edf20ca3fa36092ccaa88c3711" + integrity sha512-NcZByxhO4VELZutuFL6/uvY0/dp7BJ7zu0AGUS1apNF4aAPmW6DjlbrVCPcqLOzrd1cPIOh0HJI3H1J2+dqRsA== dependencies: critters "0.0.16" - jsdom "20.0.2" + jsdom "21.0.0" tslib "^2.3.0" "@nodelib/fs.scandir@2.1.5": @@ -11569,7 +11569,7 @@ decimal.js@^10.2.1, decimal.js@^10.3.1: resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e" integrity sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA== -decimal.js@^10.4.1: +decimal.js@^10.4.2: version "10.4.3" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== @@ -16324,18 +16324,18 @@ jsdom@16.7.0, jsdom@^16.4.0: ws "^7.4.6" xml-name-validator "^3.0.0" -jsdom@20.0.2: - version "20.0.2" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.2.tgz#65ccbed81d5e877c433f353c58bb91ff374127db" - integrity sha512-AHWa+QO/cgRg4N+DsmHg1Y7xnz+8KU3EflM0LVDTdmrYOc1WWTSkOjtpUveQH+1Bqd5rtcVnb/DuxV/UjDO4rA== +jsdom@21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz#33e22f2fc44286e50ac853c7b7656c8864a4ea45" + integrity sha512-AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA== dependencies: abab "^2.0.6" - acorn "^8.8.0" + acorn "^8.8.1" acorn-globals "^7.0.0" cssom "^0.5.0" cssstyle "^2.3.0" data-urls "^3.0.2" - decimal.js "^10.4.1" + decimal.js "^10.4.2" domexception "^4.0.0" escodegen "^2.0.0" form-data "^4.0.0" @@ -16348,12 +16348,12 @@ jsdom@20.0.2: saxes "^6.0.0" symbol-tree "^3.2.4" tough-cookie "^4.1.2" - w3c-xmlserializer "^3.0.0" + w3c-xmlserializer "^4.0.0" webidl-conversions "^7.0.0" whatwg-encoding "^2.0.0" whatwg-mimetype "^3.0.0" whatwg-url "^11.0.0" - ws "^8.9.0" + ws "^8.11.0" xml-name-validator "^4.0.0" jsdom@^19.0.0: @@ -24432,6 +24432,13 @@ w3c-xmlserializer@^3.0.0: dependencies: xml-name-validator "^4.0.0" +w3c-xmlserializer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" + integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw== + dependencies: + xml-name-validator "^4.0.0" + walk-up-path@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e" @@ -25017,16 +25024,16 @@ ws@^7.4.6: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== +ws@^8.11.0: + version "8.12.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" + integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== + ws@^8.2.3, ws@^8.4.2: version "8.10.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz#00a28c09dfb76eae4eb45c3b565f771d6951aa51" integrity sha512-+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw== -ws@^8.9.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" - integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== - ws@~8.2.3: version "8.2.3" resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"