Skip to content

Commit

Permalink
Enable dependabot updates for WB/WS (and group them) (#1863)
Browse files Browse the repository at this point in the history
## Summary:

Juan and I were discussing keeping Perseus dependnecies up to date with webapp (especially WB and WS). This is a trial run to see if Dependabot will help us. It should open up a new PR any time WB or WS packages are released. And all WB or WS packages that received an update should be updated together in the same Perseus PR. 

Issue: "none"

## Test plan:

I suspect I'll need to land this and monitor it to test. Github action infra is notoriously difficult to test locally.

Author: jeremywiebe

Reviewers: jandrade, jeremywiebe, #perseus

Required Reviewers:

Approved By: jandrade

Checks: ✅ Publish npm snapshot (ubuntu-latest, 20.x), ✅ Cypress (ubuntu-latest, 20.x), ✅ Check builds for changes in size (ubuntu-latest, 20.x), ✅ Lint, Typecheck, Format, and Test (ubuntu-latest, 20.x), ✅ Check for .changeset entries for all changed files (ubuntu-latest, 20.x), ✅ Publish Storybook to Chromatic (ubuntu-latest, 20.x), ✅ gerald

Pull Request URL: #1863
  • Loading branch information
jeremywiebe authored Nov 27, 2024
1 parent 8ec06f4 commit 5841535
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .changeset/mighty-rules-talk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@khanacademy/perseus-editor": patch
---

Switch two corner usages of deprecated @khanacademy/wonder-blocks-spacing to @khanacademy/wonder-blocks-tokens
5 changes: 5 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@ module.exports = {
"no-invalid-this": "off",
"@typescript-eslint/no-this-alias": "off",
"no-unused-expressions": "off",
"no-restricted-imports": [
"error",
"@khanacademy/wonder-blocks-color",
"@khanacademy/wonder-blocks-spacing",
],
"object-curly-spacing": "off",
semi: "off",

Expand Down
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,15 @@ updates:
allow:
- dependency-name: "@khanacademy/eslint-config"
- dependency-name: "@khanacademy/eslint-plugin"
assignees:
- "@Khan/perseus"

# Grouped updates for Wonder Blocks and Wonder Stuff releases.
# This helps us to stay in sync with the latest releases of these packages.
groups:
wonder-stuff:
patterns:
- "@khanacademy/wonder-stuff-*"
wonder-blocks:
patterns:
- "@khanacademy/wonder-blocks-*"
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Spacing from "@khanacademy/wonder-blocks-spacing";
import {color} from "@khanacademy/wonder-blocks-tokens";
import {color, spacing} from "@khanacademy/wonder-blocks-tokens";

import DeviceFramer from "../device-framer";

Expand All @@ -21,7 +20,7 @@ const SampleContent = () => {
color: color.offWhite,
width: "90%",
height: "300px",
padding: Spacing.medium_16,
padding: spacing.medium_16,
}}
>
The DeviceFramer controls the size of the content inside the frame.
Expand Down
4 changes: 2 additions & 2 deletions packages/perseus-editor/src/components/widget-editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
} from "@khanacademy/perseus";
import {useUniqueIdWithMock} from "@khanacademy/wonder-blocks-core";
import {Strut} from "@khanacademy/wonder-blocks-layout";
import Spacing from "@khanacademy/wonder-blocks-spacing";
import Switch from "@khanacademy/wonder-blocks-switch";
import {spacing} from "@khanacademy/wonder-blocks-tokens";
import * as React from "react";
import _ from "underscore";

Expand Down Expand Up @@ -241,7 +241,7 @@ function LabeledSwitch(props: {
return (
<>
<label htmlFor={id}>{label}</label>
<Strut size={Spacing.xxSmall_6} />
<Strut size={spacing.xxSmall_6} />
<Switch id={id} {...switchProps} />
</>
);
Expand Down

0 comments on commit 5841535

Please sign in to comment.