Replace GlobalHeader by MarketingNavbar (#859)

* Replace `GlobalHeader` by `MarketingNavbar`

* Tweaks

Author: benface

package.json

@@ -22,13 +22,16 @@
     "eslint": "^8.57.1",
     "eslint-plugin-mdx": "^2.3.4",
     "prettier": "^3.4.2",
-    "prettier-plugin-tailwindcss": "^0.6.9",
+    "prettier-plugin-tailwindcss": "^0.6.11",
     "remark-frontmatter": "^5.0.0",
     "remark-lint-first-heading-level": "^3.1.2",
     "remark-lint-heading-increment": "^3.1.2",
     "remark-lint-no-heading-punctuation": "^3.1.2",
     "remark-lint-restrict-elements": "workspace:*",
     "turbo": "^1.13.4",
     "typescript": "^5.7.3"
+  },
+  "resolutions": {
+    "@babel/core": "7.26.7"
   }
 }

packages/nextra-theme/package.json

@@ -25,8 +25,8 @@
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@edgeandnode/gds": "^5",
-    "@edgeandnode/go": "^6",
+    "@edgeandnode/gds": "^6",
+    "@edgeandnode/go": "^8",
     "@emotion/react": "^11",
     "next": "^13",
     "next-seo": "^6",
@@ -35,16 +35,16 @@
     "theme-ui": "^0.16"
   },
   "dependencies": {
-    "@docsearch/react": "^3.8.2",
+    "@docsearch/react": "^3.8.3",
     "@radix-ui/react-collapsible": "^1.1.2",
     "@radix-ui/react-visually-hidden": "^1.1.1",
     "lodash": "^4.17.21",
-    "react-intersection-observer": "^9.14.1",
+    "react-intersection-observer": "^9.15.1",
     "react-use": "^17.6.0"
   },
   "devDependencies": {
-    "@edgeandnode/gds": "^5.41.0",
-    "@edgeandnode/go": "^6.79.0",
+    "@edgeandnode/gds": "^6.1.2",
+    "@edgeandnode/go": "^8.4.3",
     "@emotion/react": "^11.14.0",
     "@types/lodash": "^4.17.14",
     "@types/react": "^18.3.18",

packages/nextra-theme/src/components/DocSearch.tsx

@@ -64,11 +64,13 @@ export function DocSearch(props: DocSearchProps) {
         onClick={onOpen}
         innerFocusRing
         sx={{
-          borderRadius: [BorderRadius.FULL, null, null, BorderRadius.S],
-          '&:focus-visible': { outline: ['none', null, null, `${BorderWidth['4px']} solid ${theme.colors!.Purple16}`] },
+          borderRadius: [BorderRadius.FULL, null, null, null, BorderRadius.S],
+          '&:focus-visible': {
+            outline: ['none', null, null, null, `${BorderWidth['4px']} solid ${theme.colors.Purple16}`],
+          },
         }}
       >
-        <Responsive.Multiple as="span" cases={['mobile', null, null, 'desktop']}>
+        <Responsive.Multiple as="span" cases={['mobile', null, null, null, 'desktop']}>
           {(caseName) => {
             switch (caseName) {
               case 'mobile':
@@ -158,17 +160,17 @@ export function DocSearch(props: DocSearchProps) {
             styles={{
               html: {
                 '--docsearch-spacing': '0 !important',
-                '--docsearch-container-background': `${theme.colors!.Midnight88} !important`,
+                '--docsearch-container-background': `${theme.colors.Midnight88} !important`,
                 '--docsearch-modal-width': 'min(calc(100vw - 32px), 840px) !important',
-                '--docsearch-modal-background': `${theme.colors!.Tooltip} !important`,
+                '--docsearch-modal-background': `${theme.colors.Tooltip} !important`,
                 '--docsearch-modal-shadow': 'none !important',
                 '--docsearch-searchbox-height': ['64px !important', null, '96px !important'],
                 '--docsearch-searchbox-focus-background': 'transparent !important',
                 '--docsearch-searchbox-shadow': 'none !important',
                 '--docsearch-hit-background': 'transparent !important',
-                '--docsearch-hit-color': `${theme.colors!.White88} !important`,
-                '--docsearch-hit-active-color': `${theme.colors!.White} !important`,
-                '--docsearch-highlight-color': `${theme.colors!.Purple} !important`,
+                '--docsearch-hit-color': `${theme.colors.White88} !important`,
+                '--docsearch-hit-active-color': `${theme.colors.White} !important`,
+                '--docsearch-highlight-color': `${theme.colors.Purple} !important`,
               },
               '.DocSearch-Container': {
                 animation: `${animationFadeIn} 150ms ease-in-out`,

packages/nextra-theme/src/index.tsx

@@ -9,7 +9,6 @@ import { useSet } from 'react-use'
 import type { ThemeUICSSObject } from 'theme-ui'
 
 import { Divider, type DividerProps, Flex, Icon, Spacing, useI18n } from '@edgeandnode/gds'
-import { NPSForm } from '@edgeandnode/go'
 
 import {
   Callout,
@@ -245,30 +244,6 @@ export default function NextraLayout({ children, pageOpts, pageProps }: NextraTh
 
             <div sx={{ mt: Spacing['64px'] }}>
               <MDXLayoutPagination />
-              {/* TODO: Uncomment when we're ready to add the NPS form to the docs
-              <NPSForm
-                key={fsPath}
-                question="Was this page helpful?"
-                choices={[
-                  {
-                    label: 'No',
-                    commentsLabel: 'How can we improve this page?',
-                    icon: <Icon.ThumbsDown title="No" size="24px" />,
-                    hideLabel: true,
-                    score: -1,
-                  },
-                  {
-                    label: 'Yes',
-                    commentsLabel: 'In what way did this page help you?',
-                    icon: <Icon.ThumbsUp title="Yes" size="24px" />,
-                    hideLabel: true,
-                    score: 1,
-                  },
-                ]}
-                chipSize="xlarge"
-                sx={{ mb: Spacing['32px'] }}
-              />
-              */}
             </div>
           </div>
 

packages/og-image/package.json

@@ -16,12 +16,12 @@
     "yoga-wasm-web": "0.3.3"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250109.0",
+    "@cloudflare/workers-types": "^4.20250124.3",
     "@types/react": "^18.3.18",
     "jest-image-snapshot": "^6.4.0",
     "tsx": "^4.19.2",
     "typescript": "^5.7.3",
     "vitest": "^1.6.0",
-    "wrangler": "^3.101.0"
+    "wrangler": "^3.105.1"
   }
 }