diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 84a90e3d34a65d3..f0d4da78faecee4 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -3,14 +3,12 @@ name: auto-merge on: pull_request_target: -# No GITHUB_TOKEN permissions, as we use AUTOMERGE_TOKEN instead. -permissions: {} +permissions: + contents: read jobs: auto-merge: - uses: mdn/workflows/.github/workflows/auto-merge.yml@main if: github.repository_owner == 'mdn' - with: - target-repo: ${{ github.repository }} + uses: mdn/workflows/.github/workflows/auto-merge.yml@main secrets: GH_TOKEN: ${{ secrets.AUTOMERGE_TOKEN }} diff --git a/files/en-us/mozilla/firefox/releases/149/index.md b/files/en-us/mozilla/firefox/releases/149/index.md index 9d20df4a34321fc..76f3c30a684bf0b 100644 --- a/files/en-us/mozilla/firefox/releases/149/index.md +++ b/files/en-us/mozilla/firefox/releases/149/index.md @@ -22,7 +22,7 @@ Firefox 149 was released on [March 24, 2026](https://whattrainisitnow.com/releas ### CSS -- The {{CSSXRef("shape-outside")}} CSS property now supports the [`xywh()`](/en-US/docs/Web/CSS/Reference/Values/basic-shape/xywh) function as a value. This allows you to define a shape for inline content to wrap around, using distances from the left (`x`) and top (`y`) edges of the containing block and a width (`w`) and height (`h`). ([Firefox bug 1983187](https://bugzil.la/1983187)). +- The {{CSSXRef("shape-outside")}} CSS property now supports the [`xywh()`](/en-US/docs/Web/CSS/Reference/Values/basic-shape/xywh) and [`rect()`](/en-US/docs/Web/CSS/Reference/Values/basic-shape/rect) functions as values. These functions were previously already implemented for the {{CSSXRef("clip-path")}} and {{CSSXRef("offset-path")}} properties, and are now also available for `shape-outside`. ([Firefox bug 1983187](https://bugzil.la/1983187)). - The {{CSSXRef("vertical-align")}} CSS property is now a shorthand property for {{CSSXRef("alignment-baseline")}}, {{CSSXRef("baseline-shift")}} and {{CSSXRef("baseline-source")}} properties. ([Firefox bug 1830771](https://bugzil.la/1830771)). diff --git a/package-lock.json b/package-lock.json index b78ddad508bdf3e..9b35e44505afbda 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7346,9 +7346,9 @@ } }, "node_modules/micromatch/node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", "dev": true, "license": "MIT", "engines": { @@ -8173,9 +8173,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", "engines": {