[chdefrene]

Component Development

Type

• Feature
• Fix
• Hotfix (should release ASAP)
• Maintenance (deps only)

Reference to assignment

Root cause: #3475 (commit ea5465f). Surfaced while rebasing #3438.

Description of assignment

#3475 ("build(deps-dev): bump @equinor/fusion-observable from 9.2.3 to 9.2.5") committed unresolved git merge-conflict markers into bun.lock in the storybook workspace devDependencies. Bun treats the lockfile as invalid, so any bun install re-resolves the whole dependency tree (~670 lines of unrelated upgrades). #3438 hit this during rebase.

Description of Proposed Changes

• Remove the conflict markers from bun.lock, keeping the incoming side, then run bun install so bun reconciles the entry with storybook/package.json (@babel/preset-typescript ^8.0.7, @equinor/fusion-observable ^9.2.5).
• Resulting diff: bun.lock | 5 ----- — markers and the stale duplicate lines removed; no re-resolution.
• git grep -nE '^(<<<<<<<|=======$|>>>>>>>)' found no other files with conflict markers on main.
• No changeset: lockfile-only change.

Validation

• bun install → passed, lockfile diff limited to the 5 lines above
• bun install --frozen-lockfile → passed (Checked 930 installs across 1026 packages (no changes))
• bun run build → passed (exit 0)

Checklist

Create User Story(DevOps) or Issue(Github)

• Describe functional requirements
• Design plan/suggestion (e.g. images, link to eds design or relevant figma links, mention of eds tokens to use)
• Communication with UX (evaluate if needed)

Development

• Describe the component
• Code funtional requirements
• Create stories
• Create snapshots (evaluate if needed)
• Remove unused imports and commented code
• Lint code with Biome (and follow best practises for code quality

Create Pull Request

• Assign relevant reviewers in Github and Cromatic
• Inform colleagues of pending reviews. We use Teams for this purpose, under fusion-frontend team please tag involved reviewers in the Code review channel

Review of Pull Request

• Follow up on comments from code review and implement necessary changes (evaluate if needed)
• Review approved in github (and chromatic)

Publish Code

• Increment version number
• Merge PR
• Consider letting fusion developers know this this shiny new thing exists

[Copilot]

Copilot wasn't able to review any files in this pull request. Check if the Files changed in this pull request are included in default exclusions.

[changeset-bot]

⚠️ No Changeset found

Latest commit: 7a5934d

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR