feat(806): fix merge conflicts

newscorp-ghfb · May 19, 2023 · 49d001b · 49d001b
2 parents 48cb5c5 + 2642d60
commit 49d001b
Show file tree

Hide file tree

Showing 49 changed files with 39,145 additions and 1,158 deletions.
diff --git a/.storybook/preview.js b/.storybook/preview.js
@@ -50,7 +50,14 @@ export const parameters = {
   options: {
     storySort: {
       method: 'alphabetical',
-      order: ['Welcome', 'Components', 'Utilities', 'Deprecated', '*'],
+      order: [
+        'Welcome',
+        'Components',
+        'Utilities',
+        'Composed',
+        'Deprecated',
+        '*',
+      ],
     },
   },
   backgrounds: {
@@ -101,27 +108,6 @@ export const parameters = {
   viewMode: 'docs',
   percy: {
     ...(SKIP_GITHUB_CHECK ? {include: 'skip-percy-tests'} : {}),
-    include: [
-      // 'Components/Video Player: Overrides',
-      // 'Components/Video Player: Playlist',
-      // 'Components/Video Player: Default',
-      // 'Components/CardComposable: Default',
-      // 'Components/CardComposable: Card areas',
-      // 'Components/CardComposable: Variations',
-      // 'Components/CardComposable: Inset card',
-      // 'Components/CardComposable: Layout',
-      // 'Components/CardComposable: Span',
-      // 'Components/CardComposable: Order',
-      // 'Components/CardComposable: Responsive card',
-      // 'Components/CardComposable: Logical props',
-      // 'Components/CardComposable: Styling overrides',
-      // 'Components/CardComposable: Other story',
-      // 'Components/audio-player-composable: audio-player',
-      // 'Components/audio-player-composable: audio-player-sub-components',
-      // 'Components/audio-player-composable: audio-player-with-initial-props',
-      // 'Components/audio-player-composable: audio-player-overrides',
-      // 'Components/audio-player-composable: audio-player-loading-state',
-    ],
   },
 };
 

diff --git a/package.json b/package.json
@@ -245,6 +245,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "^7.20.13",
     "@capsizecss/core": "^3.0.0",
+    "@capsizecss/metrics": "^1.1.1",
     "@emotion-icons/emotion-icon": "4.1.0",
     "@emotion-icons/material": "3.9.0",
     "@emotion-icons/material-outlined": "3.8.0",
@@ -257,18 +258,25 @@
     "@newskit-themes/wall-street-journal": "^0.0.0",
     "@seznam/compose-react-refs": "^1.0.5",
     "@storybook/react": "^6.5.16",
+    "@types/blob-to-buffer": "^1.2.0",
+    "@types/fontkit": "2",
     "aria-hidden": "^1.1.3",
+    "blob-to-buffer": "^1.2.9",
+    "cross-fetch": "3.0.4",
     "date-fns": "^2.6.0",
     "debounce": "^1.2.0",
     "dequal": "^1.0.0",
+    "detect-font": "^0.1.5",
     "dotenv": "^16.0.3",
     "downshift": "^6.1.7",
     "file-saver": "^2.0.5",
+    "fontkit": "2.0.2",
     "glob": "^8.0.3",
     "globby": "^13.1.2",
     "googleapis": "^109.0.1",
     "isomorphic-dompurify": "^0.24.0",
     "jszip": "^3.7.1",
+    "match-sorter": "^4.2.1",
     "next-seo": "^4.28.1",
     "react-focus-lock": "^2.5.0",
     "react-hook-form": "^7.43.1",

diff --git a/scripts/build-package-json-support.js b/scripts/build-package-json-support.js
@@ -30,6 +30,14 @@ const dependenciesNotToBeIncluded = [
   'globby',
   '@newskit-themes/newskit-website',
   '@newskit-themes/the-sun',
+  '@capsizecss/metrics',
+  '@types/blob-to-buffer',
+  '@types/fontkit',
+  'blob-to-buffer',
+  'cross-fetch',
+  'detect-font',
+  'fontkit',
+  'match-sorter',
   '@newskit-themes/the-times',
   '@newskit-themes/dow-jones',
   '@newskit-themes/market-watch',