diff --git a/changelog_unreleased/angular/18596.md b/changelog_unreleased/angular/18596.md index ebfe8843a..ced8302c3 100644 --- a/changelog_unreleased/angular/18596.md +++ b/changelog_unreleased/angular/18596.md @@ -1,4 +1,4 @@ -#### Support spread element in array and object literals (#18596 by @prettier) +#### Support spread element in array and object literals (#18596, #18636 by @prettier) ```html @@ -6,11 +6,12 @@ - + - + ``` diff --git a/package.json b/package.json index add44a5f7..ad06313e6 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "bin" ], "dependencies": { - "@angular/compiler": "21.1.0-rc.0", + "@angular/compiler": "21.1.0", "@babel/code-frame": "8.0.0-beta.3", "@babel/parser": "8.0.0-beta.3", "@babel/types": "8.0.0-beta.3", @@ -55,7 +55,7 @@ "@typescript-eslint/visitor-keys": "8.53.0", "acorn": "8.15.0", "acorn-jsx": "5.3.2", - "angular-estree-parser": "15.2.0", + "angular-estree-parser": "15.3.0", "angular-html-parser": "10.3.0", "camelcase": "9.0.0", "ci-info": "4.3.1", diff --git a/tests/format/angular/expression/__snapshots__/format.test.js.snap b/tests/format/angular/expression/__snapshots__/format.test.js.snap index 64d98c6f7..65b9a0f52 100644 --- a/tests/format/angular/expression/__snapshots__/format.test.js.snap +++ b/tests/format/angular/expression/__snapshots__/format.test.js.snap @@ -47,6 +47,9 @@ printWidth: 80
+{{ foo(a, +...b)}} + =====================================output===================================== {{ [...a] }} @@ -58,6 +61,8 @@ foo:1, ...bar }"> }" > +{{ foo(a, ...b) }} + ================================================================================ `; diff --git a/tests/format/angular/expression/spread-element.html b/tests/format/angular/expression/spread-element.html index 20cf7b962..b60dc4e95 100644 --- a/tests/format/angular/expression/spread-element.html +++ b/tests/format/angular/expression/spread-element.html @@ -5,3 +5,6 @@
+ +{{ foo(a, +...b)}} diff --git a/yarn.lock b/yarn.lock index 0996eeb5a..b7da0febf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,12 +5,12 @@ __metadata: version: 8 cacheKey: 10 -"@angular/compiler@npm:21.1.0-rc.0": - version: 21.1.0-rc.0 - resolution: "@angular/compiler@npm:21.1.0-rc.0" +"@angular/compiler@npm:21.1.0": + version: 21.1.0 + resolution: "@angular/compiler@npm:21.1.0" dependencies: tslib: "npm:^2.3.0" - checksum: 10/a4721142e932fe62b27a5e383b540ccb83cd2ca456e8ff3bdd62be1022f46b46d224213108b1186978de5f0d6e6916e7c074fb4270b16818f66b155f53531ac5 + checksum: 10/1f409c20eb36079719e004f9e683a41d9d9fd975d814132faa28f941a0d491ba392c7cca92061f8dbe540bd922cac905f76ccab48a87c82c764b3b7cdb6b28dd languageName: node linkType: hard @@ -2883,12 +2883,12 @@ __metadata: languageName: node linkType: hard -"angular-estree-parser@npm:15.2.0": - version: 15.2.0 - resolution: "angular-estree-parser@npm:15.2.0" +"angular-estree-parser@npm:15.3.0": + version: 15.3.0 + resolution: "angular-estree-parser@npm:15.3.0" peerDependencies: "@angular/compiler": ">=21.0.7 || >= 21.1.0-0" - checksum: 10/55aa6d98da1685c3c423d8c0db1766967ca60b7a888005e78f96484883edea46e27210b20c7cb1bb1f578f2fb4cf2835ced71b5acf13dc09c5a6d4bf4c75fa88 + checksum: 10/9266d6bf73fac7f2d96e6a7b306bef0a6b6563f4f11a36aa308d4ca2fda2868839c8831c2e95d5ea008636e061c1cdc0668c01fc9f9876eb1b5f6846217fc2ec languageName: node linkType: hard @@ -8359,7 +8359,7 @@ __metadata: version: 0.0.0-use.local resolution: "prettier@workspace:." dependencies: - "@angular/compiler": "npm:21.1.0-rc.0" + "@angular/compiler": "npm:21.1.0" "@babel/code-frame": "npm:8.0.0-beta.3" "@babel/generator": "npm:8.0.0-beta.3" "@babel/parser": "npm:8.0.0-beta.3" @@ -8378,7 +8378,7 @@ __metadata: "@typescript-eslint/visitor-keys": "npm:8.53.0" acorn: "npm:8.15.0" acorn-jsx: "npm:5.3.2" - angular-estree-parser: "npm:15.2.0" + angular-estree-parser: "npm:15.3.0" angular-html-parser: "npm:10.3.0" base64-arraybuffer-es6: "npm:3.1.0" browserslist: "npm:4.28.1"