fix: Update merge conflict

.github/workflows/canary.yml

@@ -34,6 +34,8 @@ jobs:
       ## Build for packaging.
       - name: Build
         run: yarn build
+        env:
+          TSP_SKIP_CACHE: true
 
       ## Publish prerelease to npm. Must be run after a build
       - name: Publish

.storybook/main.ts

@@ -1,4 +1,5 @@
 const path = require('node:path');
+const remarkGfm = require('remark-gfm').default;
 
 const modulesPath = path.resolve(__dirname, '../modules');
 const getSpecifications = require('../modules/docs/utils/get-specifications');
@@ -22,6 +23,16 @@ const config: StorybookConfig = {
     },
     './readme-panel/preset.js',
     '@storybook/addon-storysource',
+    {
+      name: '@storybook/addon-docs',
+      options: {
+        mdxPluginOptions: {
+          mdxCompileOptions: {
+            remarkPlugins: [remarkGfm],
+          },
+        },
+      },
+    },
   ],
   core: {
     builder: '@storybook/builder-webpack5',

.storybook/manager.js

@@ -1,6 +1,6 @@
-import {addons} from '@storybook/preview-api';
-import theme from './theme';
+import { addons } from '@storybook/manager-api';
+import canvasTheme from './theme';
 
 addons.setConfig({
-  theme,
+  theme: canvasTheme,
 });

.storybook/preview.js

@@ -1,4 +1,5 @@
-import {DocsPage, DocsContainer} from '@storybook/addon-docs';
+import React from 'react';
+import {DocsPage, DocsContainer, Unstyled} from '@storybook/addon-docs';
 import 'cypress-storybook/react';
 import routes from './routes';
 
@@ -12,6 +13,14 @@ import '@workday/canvas-tokens-web/css/system/_variables.css';
 // set routes on window for testing the validity of the routes
 window.__routes = routes;
 
+const UnstyledDocsContainer = ({children, ...props}) => {
+  return (
+    <DocsContainer {...props}>
+      <Unstyled>{children}</Unstyled>
+    </DocsContainer>
+  );
+};
+
 export const decorators = [CanvasProviderDecorator];
 
 export const parameters = {

.storybook/routes.js

@@ -19,7 +19,7 @@ const routes = {
   '/components/indicators/status-indicator/': 'preview-status-indicator--basic',
   '/components/inputs/checkbox/': 'components-inputs-checkbox--basic',
   '/components/inputs/color-input/': 'components-inputs-color-picker-color-input--basic',
-  '/components/inputs/form-field/': 'preview-inputs-form-field--basic',
+  '/components/inputs/form-field/': 'components-inputs-form-field--basic',
   '/components/inputs/radio/': 'components-inputs-radio--basic',
   '/components/inputs/select/': 'components-inputs-select--basic',
   '/components/inputs/switch/': 'components-inputs-switch--basic',
@@ -61,13 +61,15 @@ const routes = {
   '/tokens/space/': 'tokens--space',
   '/tokens/type/': 'tokens--type',
   '/utilities/testing/': 'hooks-and-utilities-testing--basic',
-  '/whats-new/upgrade-guides/canvas-kit-v4-upgrade-guide/': 'guides-upgrade-guides-v4-0--page',
-  '/whats-new/upgrade-guides/canvas-kit-v5-upgrade-guide/': 'guides-upgrade-guides-v5-0--page',
-  '/whats-new/upgrade-guides/canvas-kit-v6-upgrade-guide/': 'guides-upgrade-guides-v6-0--page',
-  '/whats-new/upgrade-guides/canvas-kit-v7-upgrade-guide/': 'guides-upgrade-guides-v7-0--page',
-  '/whats-new/upgrade-guides/canvas-kit-v8-upgrade-guide/': 'guides-upgrade-guides-v8-0--page',
-  '/whats-new/upgrade-guides/canvas-v9-upgrade-guide/': 'guides-upgrade-guides-v9-0--page',
-  '/whats-new/upgrade-guides/canvas-v10-upgrade-guide/': 'guides-upgrade-guides-v10-0--page',
+  '/whats-new/upgrade-guides/canvas-kit-v4-upgrade-guide/': 'guides-upgrade-guides-v4-0--docs',
+  '/whats-new/upgrade-guides/canvas-kit-v5-upgrade-guide/': 'guides-upgrade-guides-v5-0--docs',
+  '/whats-new/upgrade-guides/canvas-kit-v6-upgrade-guide/': 'guides-upgrade-guides-v6-0--docs',
+  '/whats-new/upgrade-guides/canvas-kit-v7-upgrade-guide/': 'guides-upgrade-guides-v7-0--docs',
+  '/whats-new/upgrade-guides/canvas-kit-v8-upgrade-guide/': 'guides-upgrade-guides-v8-0--docs',
+  '/whats-new/upgrade-guides/canvas-v9-upgrade-guide/': 'guides-upgrade-guides-v9-0--docs',
+  '/whats-new/upgrade-guides/canvas-v10-upgrade-guide/': 'guides-upgrade-guides-v10-0--docs',
+  '/whats-new/upgrade-guides/canvas-v11-upgrade-guide/': 'guides-upgrade-guides-v11-0--docs',
+  '/whats-new/upgrade-guides/canvas-v12-upgrade-guide/': 'guides-upgrade-guides-v12-0--docs',
 };
 
 module.exports = routes;