Merge branch 'v14' into cli-uplift-commander

seek-oss · Nov 28, 2024 · 4d34104 · 4d34104
2 parents a602cd0 + 6dab604
commit 4d34104
Show file tree

Hide file tree

Showing 14 changed files with 6,189 additions and 5,543 deletions.
diff --git a/fixtures/braid-design-system/package.json b/fixtures/braid-design-system/package.json
@@ -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"
   },

diff --git a/fixtures/braid-design-system/src/App.js b/fixtures/braid-design-system/src/App.js
@@ -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';
 

diff --git a/fixtures/braid-design-system/src/App.test.tsx b/fixtures/braid-design-system/src/App.test.tsx
@@ -8,15 +8,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>"
     `);
   });
 });
diff --git a/fixtures/sku-init/__snapshots__/sku-init.test.js.snap b/fixtures/sku-init/__snapshots__/sku-init.test.js.snap
@@ -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';
@@ -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.
@@ -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>
 
@@ -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>
 
@@ -282,6 +312,8 @@ export function NextSteps({ environment }: NextStepsProps) {
                 </Stack>
               </Stack>
 
+              <Divider weight="strong" />
+
               <Stack space="large">
                 <Heading level="2">📣 Announcements</Heading>
 

diff --git a/fixtures/sku-webpack-plugin/main.js b/fixtures/sku-webpack-plugin/main.js
@@ -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';
 

diff --git a/fixtures/sku-webpack-plugin/package.json b/fixtures/sku-webpack-plugin/package.json
@@ -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"
   },

diff --git a/fixtures/storybook-config/.storybook/preview.tsx b/fixtures/storybook-config/.storybook/preview.tsx
@@ -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';
 
@@ -16,7 +16,7 @@ export default {
       </div>
     ),
     (Story) => (
-      <BraidProvider theme={apac}>
+      <BraidProvider theme={seekJobs}>
         <Story />
       </BraidProvider>
     ),

diff --git a/fixtures/storybook-config/package.json b/fixtures/storybook-config/package.json
@@ -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"
   },

diff --git a/packages/sku/package.json b/packages/sku/package.json
@@ -161,7 +161,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",
     "lodash": "^4.17.21",
     "plop": "^4.0.1",

diff --git a/packages/sku/template/src/App/App.tsx b/packages/sku/template/src/App/App.tsx
@@ -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';
@@ -12,7 +12,7 @@ interface AppProps {
 
 export default ({ environment }: AppProps) => (
   <StrictMode>
-    <BraidProvider theme={apac}>
+    <BraidProvider theme={seekJobs}>
       <NextSteps environment={environment} />
     </BraidProvider>
   </StrictMode>

diff --git a/packages/sku/template/src/App/NextSteps.tsx b/packages/sku/template/src/App/NextSteps.tsx
@@ -7,6 +7,7 @@ import {
   TextLink,
   Stack,
   List,
+  Divider,
 } from 'braid-design-system';
 
 import * as styles from './NextSteps.css';
@@ -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.
@@ -74,10 +72,7 @@ export function NextSteps({ environment }: NextStepsProps) {
                     </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.
+                    and more.
                   </Text>
                 </Stack>
 
@@ -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>
 
@@ -150,6 +180,8 @@ export function NextSteps({ environment }: NextStepsProps) {
                 </Stack>
               </Stack>
 
+              <Divider weight="strong" />
+
               <Stack space="large">
                 <Heading level="2">📣 Announcements</Heading>