Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions .agents/skills/dependabot-rollup/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,24 @@ git branch -D "$ROLLUP_BRANCH"

### Step 6 - Validate the rollup

Run validation from the rollup branch through the repository's Nx workflow:
Deduplicate the lockfile after all approved PRs have been merged and before running immutable installation or Nx validation:

```bash
yarn dedupe
```

If `yarn.lock` changed, commit that change separately so the rollup history records the normalization:

```bash
if ! git diff --quiet -- yarn.lock; then
git add yarn.lock
git commit -m "chore(deps): dedupe lockfile"
fi

yarn dedupe --check
```

Stop if deduplication or the dedupe check fails. Then run validation from the rollup branch through the repository's Nx workflow:

```bash
yarn install --immutable
Expand All @@ -189,7 +206,7 @@ yarn nx affected \
--head=HEAD
```

If installation or validation fails, report the failing command and leave the rollup branch checked out for inspection. Do not push the branch, open a PR, or create a tracking issue.
If deduplication, installation, or validation fails, report the failing command and leave the rollup branch checked out for inspection. Do not push the branch, open a PR, or create a tracking issue.

### Step 7 - Publish only after validation

Expand Down Expand Up @@ -240,4 +257,4 @@ Report:
- Never change branches or files before approval, and never proceed when the root `yarn.lock` has local changes.
- Never resolve conflicts by blindly choosing an entire side. Resolve only reviewed dependency manifest and lockfile conflicts as described above.
- Never bypass failed validation.
- Never create failure-tracking issues or close source Dependabot PRs.
- Never create failure-tracking issues or close source Dependabot PRs directly.
19 changes: 12 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,23 @@ updates:
interval: 'weekly'
open-pull-requests-limit: 6
versioning-strategy: increase
allow:
- dependency-type: 'development'
update-types:
- 'version-update:semver-minor'
- 'version-update:semver-patch'
# Production dependencies must stay in `allow` so security updates still apply;
# `allow.update-types` is ignored for security updates. Allowing only major version
# updates here, combined with the major version `ignore` rule below, disables all
# routine version updates for production dependencies.
- dependency-type: 'production'
update-types:
- 'version-update:semver-major'
ignore:
# Ignore major version bumps for scheduled npm version updates
- dependency-name: '*'
update-types: ['version-update:semver-major']
groups:
production-dependencies:
dependency-type: 'production'
patterns:
- '*'
update-types:
- 'minor'
- 'patch'
development-dependencies:
dependency-type: 'development'
patterns:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ This instruction guide explains how Dependabot automation works for security fix
Dependabot is configured to automatically create pull requests for:

1. **Security updates** - Advisory-driven minor and patch updates grouped by ecosystem
2. **npm dependencies** - Weekly minor and patch updates grouped by production or development dependency type
2. **npm dependencies** - Weekly minor and patch updates grouped for development dependencies; routine production version updates are disabled
3. **GitHub Actions** - Weekly minor and patch version and security update groups

## Configuration

The Dependabot configuration is defined in `.github/dependabot.yml`:

- **npm dependencies**: Weekly minor and patch version updates grouped into production and development pull requests
- **npm dependencies**: Weekly minor and patch version updates grouped for development dependencies; production dependencies are updated only for security advisories
- **GitHub Actions**: Weekly minor and patch version updates grouped separately from security updates
- **Security updates**: Minor and patch updates are grouped; major remediations are excluded from groups for isolated review
- **Manual rollups**: Maintainers can use `/dependabot-rollup` as a fallback to combine at most 11 eligible non-major updates
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import { ArrowLeftRegular, ArrowRightRegular, DismissCircleRegular } from '@flue
import type { CalendarProps } from '@fluentui/react-calendar-compat';
import { getStoryVariant, RTL, TestWrapperDecorator } from '../utilities';

const Calendar = (props: CalendarProps) => {
const today = new Date('3/15/2023');
const referenceDate = new Date(2023, 2, 15);

return <CalendarBase today={today} {...props} />;
const Calendar = (props: CalendarProps) => {
return <CalendarBase today={referenceDate} value={referenceDate} {...props} />;
};

export default {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
import * as React from 'react';
import { Calendar } from '@fluentui/react-calendar-compat';

const referenceDate = new Date('2023-03-15T12:00:00.000Z');

export const SampleCalendarCompatMultiDayView = ({ daysToSelectInDayView }: { daysToSelectInDayView: number }) => {
return <Calendar highlightSelectedMonth showGoToToday calendarDayProps={{ daysToSelectInDayView }} />;
return (
<Calendar
highlightSelectedMonth
showGoToToday
today={referenceDate}
value={referenceDate}
calendarDayProps={{ daysToSelectInDayView }}
/>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import type { StoryParameters } from 'storywright';
import { DatePicker } from '@fluentui/react-datepicker-compat';
import { DARK_MODE, getStoryVariant, HIGH_CONTRAST, TestWrapperDecorator } from '../../utilities';

const referenceDate = new Date(2023, 2, 15);

export default {
title: 'DatePicker Compat',
component: DatePicker,
Expand All @@ -22,7 +24,7 @@ export default {

export const Default = () => (
<div style={{ padding: '10px' }}>
<DatePicker input={{ className: 'datepicker-input' }} />
<DatePicker input={{ className: 'datepicker-input' }} today={referenceDate} value={referenceDate} />
</div>
);
Default.storyName = 'default';
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "HorizontalBarChart bug fixes",
"packageName": "@fluentui/react-charts",
"email": "132879294+v-baambati@users.noreply.github.com",
"dependentChangeType": "patch"
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"devDependencies": {
"@actions/core": "1.9.1",
"@actions/github": "5.0.3",
"@babel/core": "7.29.0",
"@babel/core": "7.29.6",
"@babel/generator": "7.29.1",
"@babel/parser": "7.29.3",
"@babel/plugin-proposal-class-properties": "7.18.6",
Expand Down Expand Up @@ -265,7 +265,7 @@
"playwright": "1.56.1",
"plop": "2.6.0",
"portfinder": "1.0.28",
"postcss": "8.5.10",
"postcss": "8.5.18",
"postcss-loader": "4.1.0",
"postcss-modules": "4.1.3",
"prettier": "2.8.8",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ export const HorizontalBarChartWithAxis: React.FunctionComponent<HorizontalBarCh
const showLabel = shouldShowLabel(isPositiveBar, currPositiveCounter, currNegativeCounter);

return (
<React.Fragment key={`${index}_${point.x}`}>
<React.Fragment key={`${index}_${point.x}_${point.y}`}>
<rect
key={point.y}
x={xStart}
Expand Down Expand Up @@ -644,7 +644,7 @@ export const HorizontalBarChartWithAxis: React.FunctionComponent<HorizontalBarCh
const showLabel = shouldShowLabel(isPositiveBar, currPositiveCounter, currNegativeCounter);

return (
<React.Fragment key={`${index}_${point.x}`}>
<React.Fragment key={`${index}_${point.x}_${point.y}`}>
<rect
transform={`translate(0,${0.5 * (yBarScale.bandwidth() - _barHeight)})`}
key={point.x}
Expand Down
Loading
Loading