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
6 changes: 6 additions & 0 deletions .changeset/bump-dompurify.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@frigade/react': patch
'@frigade/reactv1': patch
---

Bump dompurify to ^3.4.13 to resolve a security advisory.
5 changes: 5 additions & 0 deletions .changeset/bump-js-deps.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@frigade/js': patch
---

Dependency security updates.
2 changes: 1 addition & 1 deletion .github/workflows/storybook-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [19.x]
node-version: [22.x]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:

strategy:
matrix:
node-version: [19.x]
node-version: [22.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: yarn set version 4.1.1
Expand Down
11 changes: 11 additions & 0 deletions apps/smithy/.storybook/test-runner.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import type { TestRunnerConfig } from "@storybook/test-runner";

const config: TestRunnerConfig = {
tags: {
// Stories tagged "skip-test" are indexed and rendered in Storybook but
// their play functions are skipped by the test runner.
skip: ["skip-test"],
},
};

export default config;
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ const StoryMeta: Meta<typeof Collection> = {
export default StoryMeta;

export const InteractionTests: CollectionStory = {
// Skipped: depends on announcement flow_sXqeX8oN being in collection_84G6gzEL
// with URL targeting in the dev workspace, which is no longer the case.
tags: ["skip-test"],

args: {
announcementFlowId: "flow_sXqeX8oN",
bannerFlowId: "flow_ZacoWhZhzqbdHQ8k",
Expand Down
3 changes: 3 additions & 0 deletions apps/smithy/src/stories/Form/FormInteractionTests.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ const StoryMeta: Meta<typeof Form> = {
export default StoryMeta;

export const InteractionTests: FormStory = {
// Skipped: flaky against the live API (fails on a different assertion each run).
tags: ["skip-test"],

args: {
flowId: "flow_fpJlqkbl",
},
Expand Down
9 changes: 7 additions & 2 deletions apps/smithy/src/stories/Tour/TourInteractionTests.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export const AnchorFoundInteractionTests: TourStory = {
Tour = within(TourElement);

await userEvent.click(
Tour.getByRole("button", { name: "Scroll to the next step" })
Tour.getByRole("link", { name: "Scroll to the next step" })
);

await sleep(100);
Expand Down Expand Up @@ -188,7 +188,12 @@ export const AnchorNotFoundInteractionTests: TourStory = {
expect(args.flow).toBeDefined();
});

// Verify the flow is started
// Stories in this file share a user, so clear any state left behind by
// the previous story before asserting.
await args.flow?.restart();
await sleep(500);

// With no matching anchor on the page, the Tour must not auto-start
expect(args.flow?.isStarted).toBe(false);
});
},
Expand Down
20 changes: 19 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,25 @@
"serialize-javascript": "^7.0.5",
"ip-address": "^10.1.1",
"express/path-to-regexp": "0.1.13",
"minimatch@npm:9.0.3": "npm:9.0.7"
"minimatch@npm:9.0.3": "npm:9.0.7",
"js-yaml@^3.6.1": "3.15.2",
"js-yaml@^3.13.0": "3.15.2",
"js-yaml@^3.13.1": "3.15.2",
"js-yaml@^4.1.0": "4.3.2",
"nanoid": "^3.3.18",
"tmp": "^0.2.6",
"qs": "^6.16.0",
"brace-expansion@^1.1.7": "1.1.18",
"brace-expansion@^5.0.2": "5.0.9",
"browserslist": "^4.28.8",
"baseline-browser-mapping": "^2.11.21",
"joi": "^17.13.7",
"body-parser": "^1.20.6",
"cookie": "^0.7.2",
"on-headers": "^1.1.0",
"@tootallnate/once": "^2.0.1",
"yaml@2.3.1": "2.8.3",
"csv-parse": "^7.0.2"
},
"author": "Frigade Inc.",
"packageManager": "yarn@4.1.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@radix-ui/react-radio-group": "^1.1.3",
"@radix-ui/react-select": "^2.0.0",
"clsx": "^2.0.0",
"dompurify": "^3.4.0",
"dompurify": "^3.4.13",
"embla-carousel-react": "^8.1.3",
"jsdom": "^23.0.1",
"known-css-properties": "^0.29.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/reactv1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"homepage": "https://github.com/FrigadeHQ/javascript/tree/main/packages/react#readme",
"dependencies": {
"core-js-pure": "^3.32.0",
"dompurify": "^3.4.0",
"dompurify": "^3.4.13",
"react-portal": "^4.2.2",
"styled-components": "5.3.6",
"styled-system": "^5.1.5",
Expand Down
Loading
Loading