Skip to content

Commit bb6f5b3

Browse files
authored
Merge branch 'main' into docs/react-19
2 parents 048389e + 6c377c0 commit bb6f5b3

40 files changed

+3273
-6955
lines changed

.github/workflows/examples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
path:
2121
- nextjs-app
2222
- nextjs-pages
23-
- remix-ts
23+
- react-router-ts
2424
- vite-ts
2525
fail-fast: false
2626
steps:
Lines changed: 23 additions & 0 deletions
Loading

.storybook/images/logo-remix.svg

Lines changed: 0 additions & 45 deletions
This file was deleted.

docs/ProjectTemplates.mdx

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Footer, ProjectTemplate, TableOfContent, LabelWithWrapping } from '@sb/components';
2-
import { Meta } from '@storybook/blocks';
3-
import { Link, FlexBox, FlexBoxJustifyContent, FlexBoxWrap, Label } from '@ui5/webcomponents-react';
1+
import { Footer, LabelWithWrapping, ProjectTemplate, TableOfContent } from '@sb/components';
42
import NextLogo from '@sb/images/logo-nextjs.svg';
3+
import ReactRouterLogo from '@sb/images/logo-react-router.svg';
54
import ViteLogo from '@sb/images/logo-vitejs.svg';
6-
import RemixLogo from '@sb/images/logo-remix.svg';
5+
import { Meta } from '@storybook/blocks';
6+
import { FlexBox, FlexBoxJustifyContent, FlexBoxWrap, Label } from '@ui5/webcomponents-react';
77

88
<Meta title="Project Templates & Examples" />
99

@@ -98,33 +98,27 @@ A curated list of minimal project templates and examples to get started using UI
9898
>
9999
<ul>
100100
<li>
101-
<LabelWithWrapping>
102-
Routing and Data Fetching using the createBrowserRouter of React Router v7
103-
</LabelWithWrapping>
104-
</li>
105-
<li>
106-
<Label>Cypress Component Test setup</Label>
101+
<LabelWithWrapping>{`Routing and Data Fetching using the createBrowserRouter of React Router v7`}</LabelWithWrapping>
107102
</li>
108103
<li>
109-
<Label>Cypress E2E Test setup</Label>
104+
<Label>Cypress Component & E2E Test setup</Label>
110105
</li>
111106
<li>
112107
<Label>Theming</Label>
113108
</li>
114109
</ul>
115110
</ProjectTemplate>
116111
<ProjectTemplate
117-
title={'Remix'}
118-
logo={RemixLogo}
119-
logoAttribution={'Remix.run Logo. Original Source: https://remix.run'}
120-
href={'https://github.com/SAP/ui5-webcomponents-react/tree/main/examples/remix-ts'}
112+
title={'React Router v7'}
113+
subtitle={'Previously: Remix Template'}
114+
logo={ReactRouterLogo}
115+
logoAttribution={'React Router Logo. Original Source: https://reactrouter.com'}
116+
href={'https://github.com/SAP/ui5-webcomponents-react/tree/main/examples/react-router-ts'}
121117
isTypeScript
122118
>
123119
<ul>
124120
<li>
125-
<Label>
126-
Remix template using <code>remix-island</code>
127-
</Label>
121+
<Label>{`React Router v7 with server side rendering`}</Label>
128122
</li>
129123
<li>
130124
<Label>Theming</Label>

0 commit comments

Comments
 (0)