Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update fixtures Braid Version, Theme, and sku-init Template Enhancements #1092

Merged
merged 15 commits into from
Nov 25, 2024
Merged

Update fixtures Braid Version, Theme, and sku-init Template Enhancements #1092

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b969b37
update braid to v33 in fixtures and replace apac theme with seekJobs
adenj Nov 14, 2024
e05157e
update sku init template
adenj Nov 18, 2024
321bfa7
update snapshots
adenj Nov 21, 2024
224eb73
wip
adenj Nov 22, 2024
ef7095c
restore snapshot
adenj Nov 22, 2024
7c13a43
update NextSteps snapshot
adenj Nov 22, 2024
a4893b3
update snapshots
adenj Nov 22, 2024
553ff64
restore snapshot
adenj Nov 22, 2024
ea3b264
Update packages/sku/template/src/App/NextSteps.tsx
adenj Nov 22, 2024
b8fc496
remove reference to Storybook in init template
adenj Nov 25, 2024
6134569
Merge branch 'update-braid-fixtures' of github.com:seek-oss/sku into …
adenj Nov 25, 2024
87b8e66
remove reference to Storybook in init template
adenj Nov 25, 2024
745c197
merge master, update snapshots, fix conflicts
adenj Nov 25, 2024
b84fe14
update sku init snapshot
adenj Nov 25, 2024
2376ab4
fix double comma typo in template
adenj Nov 25, 2024
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
2 changes: 1 addition & 1 deletion fixtures/braid-design-system/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@sku-fixtures/braid-design-system",
"private": true,
"dependencies": {
"braid-design-system": "^32.0.0",
"braid-design-system": "^33.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion fixtures/braid-design-system/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
IconChevron,
Box,
} from 'braid-design-system';
import theme from 'braid-design-system/themes/apac';
import theme from 'braid-design-system/themes/seekJobs';

import { vanillaBox } from './App.css';

Expand Down
8 changes: 4 additions & 4 deletions fixtures/braid-design-system/src/App.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ describe('braid-design-system', () => {
test('components', () => {
expect(
renderToString(
<BraidTestProvider themeName="apac">
<BraidTestProvider themeName="seekJobs">
<Box paddingTop="large" className={vanillaBox} />
</BraidTestProvider>,
),
).toMatchInlineSnapshot(`
"<style type="text/css">
html,body{margin:0;padding:0;background:#F7F8FB}
html.sprinkles_darkMode__7n536nz,html.sprinkles_darkMode__7n536nz body{color-scheme:dark;background:#0E131B}
</style><div class="apacTheme_apac__1hqgmsr0 typography_lightModeTone_light__ndjjoi18 typography_darkModeTone_dark__ndjjoi1b"><div class="reset_base__14h31gj0 sprinkles_paddingTop_large_mobile__7n536n6y App_vanillaBox__inn18b0"></div></div>"
html,body{margin:0;padding:0;background:#fff}
html.sprinkles_darkMode__7n536n10,html.sprinkles_darkMode__7n536n10 body{color-scheme:dark;background:#1C2330}
</style><div class="seekJobs_seekJobs__1sh8lan0 typography_lightModeTone_light__ndjjoi18 typography_darkModeTone_dark__ndjjoi1b"><div class="reset_base__14h31gj0 sprinkles_paddingTop_large_mobile__7n536n83 App_vanillaBox__inn18b0"></div></div>"
`);
});
});
52 changes: 42 additions & 10 deletions fixtures/sku-init/__snapshots__/sku-init.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ exports[`sku init should create src/App/NextSteps.tsx 1`] = `
TextLink,
Stack,
List,
Divider,
} from 'braid-design-system';

import * as styles from './NextSteps.css';
Expand Down Expand Up @@ -180,12 +181,9 @@ export function NextSteps({ environment }: NextStepsProps) {
boxShadow="large"
padding={{ mobile: 'large', tablet: 'xlarge', desktop: 'xxlarge' }}
>
<Stack
space={{ mobile: 'xlarge', desktop: 'xxlarge' }}
dividers="strong"
>
<Stack space={{ mobile: 'xlarge', desktop: 'xxlarge' }}>
<Stack space="large">
<Heading level="2">🏃🏾‍♀️ Next steps</Heading>
<Heading level="2">🧰 Features and Tooling</Heading>
<Text>
The project comes pre-configured with a lot of standardised
tooling to make authoring web applications easier.
Expand All @@ -205,11 +203,8 @@ export function NextSteps({ environment }: NextStepsProps) {
TypeScript
</TextLink>
, <TextLink href="https://jestjs.io/">Jest</TextLink>,{' '}
<TextLink href="https://eslint.org/">ESLint</TextLink>,{' '}
<TextLink href="https://storybook.js.org/">
Storybook
</TextLink>{' '}
, and more.
<TextLink href="https://eslint.org/">ESLint</TextLink>, ,
and more.
</Text>
</Stack>

Expand Down Expand Up @@ -239,6 +234,41 @@ export function NextSteps({ environment }: NextStepsProps) {
</Stack>
</Stack>

<Divider weight="strong" />

<Stack space="large">
<Heading level="2">🏃‍♀️ Next steps</Heading>
<Text>
Ensure you’re fully set up with these additional
recommendations.
</Text>
<Stack space="gutter">
<Heading level="3">Brand resources</Heading>
<Text>
To align your project to SEEK's brand standards it is
recommended to install{' '}
<TextLink href="https://github.com/SEEK-Jobs/shared-web-assets">
Shared web assets
</TextLink>
.
</Text>
</Stack>

<Stack space="gutter">
<Heading level="3">Telemetry</Heading>
<Text>
To help us improve sku, please install our private{' '}
<TextLink href="https://github.com/SEEK-Jobs/sku-telemetry">
sku telemetry
</TextLink>{' '}
package that gives us insights on usage, errors and
performance.
</Text>
</Stack>
</Stack>

<Divider weight="strong" />

<Stack space="large">
<Heading level="2">🙋‍♂️ Support</Heading>

Expand Down Expand Up @@ -282,6 +312,8 @@ export function NextSteps({ environment }: NextStepsProps) {
</Stack>
</Stack>

<Divider weight="strong" />

<Stack space="large">
<Heading level="2">📣 Announcements</Heading>

Expand Down
2 changes: 1 addition & 1 deletion fixtures/sku-webpack-plugin/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'braid-design-system/reset';
import { createRoot } from 'react-dom/client';
import theme from 'braid-design-system/themes/apac';
import theme from 'braid-design-system/themes/seekJobs';

import { BraidProvider, Card, Text } from 'braid-design-system';

Expand Down
2 changes: 1 addition & 1 deletion fixtures/sku-webpack-plugin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"private": true,
"main": "./main.js",
"dependencies": {
"braid-design-system": "^32.0.0",
"braid-design-system": "^33.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion fixtures/ssr-hello-world/.eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.eslintrc
.prettierrc
coverage/
dist/
dist-build/
pnpm-lock.yaml
report/
tsconfig.json
Expand Down
2 changes: 1 addition & 1 deletion fixtures/ssr-hello-world/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.eslintrc
.prettierrc
coverage/
dist/
dist-build/
report/
tsconfig.json
# end managed by sku
2 changes: 1 addition & 1 deletion fixtures/ssr-hello-world/.prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.eslintrc
.prettierrc
coverage/
dist/
dist-build/
pnpm-lock.yaml
report/
tsconfig.json
Expand Down
4 changes: 2 additions & 2 deletions fixtures/storybook-config/.storybook/preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'braid-design-system/reset';

import { BraidProvider, Text } from 'braid-design-system';
import apac from 'braid-design-system/themes/apac';
import seekJobs from 'braid-design-system/themes/seekJobs';

import type { Preview } from '@storybook/react';

Expand All @@ -16,7 +16,7 @@ export default {
</div>
),
(Story) => (
<BraidProvider theme={apac}>
<BraidProvider theme={seekJobs}>
<Story />
</BraidProvider>
),
Expand Down
2 changes: 1 addition & 1 deletion fixtures/storybook-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@sku-fixtures/storybook-config",
"private": true,
"dependencies": {
"braid-design-system": "^32.0.0",
"braid-design-system": "^33.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion fixtures/translations/.eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.eslintrc
.prettierrc
coverage/
dist/
dist-ssr/
pnpm-lock.yaml
report/
tsconfig.json
Expand Down
2 changes: 1 addition & 1 deletion fixtures/translations/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.eslintrc
.prettierrc
coverage/
dist/
dist-ssr/
report/
tsconfig.json
# end managed by sku
2 changes: 1 addition & 1 deletion fixtures/translations/.prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ translations.ts
.eslintrc
.prettierrc
coverage/
dist/
dist-ssr/
pnpm-lock.yaml
report/
tsconfig.json
Expand Down
2 changes: 1 addition & 1 deletion packages/sku/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
"@types/wrap-ansi": "^3.0.0",
"@vanilla-extract/css": "^1.0.0",
"@vocab/react": "^1.1.11",
"braid-design-system": "^32.0.0",
"braid-design-system": "^33.1.0",
"fs-fixture": "^2.6.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/sku/template/src/App/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'braid-design-system/reset';

import { BraidProvider } from 'braid-design-system';
import apac from 'braid-design-system/themes/apac';
import seekJobs from 'braid-design-system/themes/seekJobs';
import { StrictMode } from 'react';

import { NextSteps } from './NextSteps';
Expand All @@ -12,7 +12,7 @@ interface AppProps {

export default ({ environment }: AppProps) => (
<StrictMode>
<BraidProvider theme={apac}>
<BraidProvider theme={seekJobs}>
<NextSteps environment={environment} />
</BraidProvider>
</StrictMode>
Expand Down
48 changes: 40 additions & 8 deletions packages/sku/template/src/App/NextSteps.tsx
View file
Open in desktop
adenj marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
TextLink,
Stack,
List,
Divider,
} from 'braid-design-system';

import * as styles from './NextSteps.css';
Expand Down Expand Up @@ -48,12 +49,9 @@ export function NextSteps({ environment }: NextStepsProps) {
boxShadow="large"
padding={{ mobile: 'large', tablet: 'xlarge', desktop: 'xxlarge' }}
>
<Stack
space={{ mobile: 'xlarge', desktop: 'xxlarge' }}
dividers="strong"
>
<Stack space={{ mobile: 'xlarge', desktop: 'xxlarge' }}>
<Stack space="large">
<Heading level="2">🏃🏾‍♀️ Next steps</Heading>
<Heading level="2">🧰 Features and Tooling</Heading>
<Text>
The project comes pre-configured with a lot of standardised
tooling to make authoring web applications easier.
Expand All @@ -74,9 +72,6 @@ export function NextSteps({ environment }: NextStepsProps) {
</TextLink>
, <TextLink href="https://jestjs.io/">Jest</TextLink>,{' '}
<TextLink href="https://eslint.org/">ESLint</TextLink>,{' '}
askoufis marked this conversation as resolved.
Show resolved Hide resolved
<TextLink href="https://storybook.js.org/">
Storybook
</TextLink>{' '}
, and more.
</Text>
</Stack>
Expand Down Expand Up @@ -107,6 +102,41 @@ export function NextSteps({ environment }: NextStepsProps) {
</Stack>
</Stack>

<Divider weight="strong" />

<Stack space="large">
<Heading level="2">🏃‍♀️ Next steps</Heading>
<Text>
Ensure you’re fully set up with these additional
recommendations.
</Text>
<Stack space="gutter">
<Heading level="3">Brand resources</Heading>
<Text>
To align your project to SEEK's brand standards it is
recommended to install{' '}
<TextLink href="https://github.com/SEEK-Jobs/shared-web-assets">
Shared web assets
</TextLink>
.
</Text>
</Stack>

<Stack space="gutter">
<Heading level="3">Telemetry</Heading>
<Text>
To help us improve sku, please install our private{' '}
<TextLink href="https://github.com/SEEK-Jobs/sku-telemetry">
sku telemetry
</TextLink>{' '}
package that gives us insights on usage, errors and
performance.
</Text>
</Stack>
</Stack>

<Divider weight="strong" />

<Stack space="large">
<Heading level="2">🙋‍♂️ Support</Heading>

Expand Down Expand Up @@ -150,6 +180,8 @@ export function NextSteps({ environment }: NextStepsProps) {
</Stack>
</Stack>

<Divider weight="strong" />

<Stack space="large">
<Heading level="2">📣 Announcements</Heading>

Expand Down
Loading