immutable-js · jdeniau · Jun 1, 2025 · Jun 1, 2025 · Jun 1, 2025
diff --git a/website/src/app/browser-extension/page.tsx b/website/src/app/browser-extension/page.tsx
@@ -1,6 +1,6 @@
 import { Metadata } from 'next';
 import { DocSearch } from '../../DocSearch';
-import { SideBar } from '../../Sidebar';
+import { Sidebar } from '../../sidebar';
 
 export async function generateMetadata(): Promise<Metadata> {
   return {
@@ -13,7 +13,7 @@ export default async function BrowserExtensionPage() {
 
   return (
     <>
-      <SideBar />
+      <Sidebar />
       <div key="Overview" className="docContents">
         <DocSearch />
 

diff --git a/website/src/Defs.tsx → website/src/app/docs/[version]/Defs.tsx b/website/src/Defs.tsx → website/src/app/docs/[version]/Defs.tsx
@@ -96,7 +96,7 @@ export function CallSigDef({
   );
 }
 
-export function TypeDef({ type, prefix }: { type: Type; prefix?: number }) {
+function TypeDef({ type, prefix }: { type: Type; prefix?: number }) {
   switch (type.k) {
     case TypeKind.Never:
       return wrap('primitive', 'never');

diff --git a/website/src/DocOverview.tsx → ...te/src/app/docs/[version]/DocOverview.tsx b/website/src/DocOverview.tsx → ...te/src/app/docs/[version]/DocOverview.tsx
@@ -1,8 +1,8 @@
 import Link from 'next/link';
-import { MarkdownContent } from './MarkdownContent';
+import { MarkdownContent } from '../../../MarkdownContent';
 import type { TypeDefs, TypeDoc } from './TypeDefs';
 
-export type OverviewData = {
+type OverviewData = {
   doc: TypeDoc | null;
   api: Array<APIMember>;
 };

diff --git a/website/src/MemberDoc.tsx → website/src/app/docs/[version]/MemberDoc.tsx b/website/src/MemberDoc.tsx → website/src/app/docs/[version]/MemberDoc.tsx
@@ -1,7 +1,7 @@
 import Link from 'next/link';
 import { Fragment } from 'react';
 import { CallSigDef, MemberDef } from './Defs';
-import { MarkdownContent } from './MarkdownContent';
+import { MarkdownContent } from '../../../MarkdownContent';
 import type { MemberDefinition } from './TypeDefs';
 
 export function MemberDoc({ member }: { member: MemberDefinition }) {

diff --git a/website/src/Sidebar.tsx → website/src/app/docs/[version]/SidebarV4.tsx b/website/src/Sidebar.tsx → website/src/app/docs/[version]/SidebarV4.tsx
@@ -4,10 +4,9 @@ import Link from 'next/link';
 import { Fragment, useEffect, useState } from 'react';
 import type { TypeDefinition } from './TypeDefs';
 import { collectMemberGroups } from './collectMemberGroups';
-import { ArrowDown } from './ArrowDown';
-import { SIDEBAR_LINKS } from './app/docs/currentVersion';
-
-export type SidebarLinks = Array<{ label: string; url: string }>;
+import { ArrowDown } from '../../../ArrowDown';
+import { SIDEBAR_LINKS } from '../currentVersion';
+import { SidebarLinks } from '../../../sidebar';
 
 function Links({
   links,
@@ -130,7 +129,7 @@ function Focus({
   );
 }
 
-export function SideBar({
+export function SideBarV4({
   links = SIDEBAR_LINKS,
   focus,
   toggleShowInherited,

diff --git a/website/src/TypeDefs.ts → website/src/app/docs/[version]/TypeDefs.ts b/website/src/TypeDefs.ts → website/src/app/docs/[version]/TypeDefs.ts
diff --git a/website/src/TypeDocumentation.tsx → ...cs/[version]/[type]/TypeDocumentation.tsx b/website/src/TypeDocumentation.tsx → ...cs/[version]/[type]/TypeDocumentation.tsx
@@ -2,13 +2,14 @@
 
 import { Fragment, useReducer } from 'react';
 
-import { InterfaceDef, CallSigDef } from './Defs';
-import { SideBar, SidebarLinks } from './Sidebar';
-import { MemberDoc } from './MemberDoc';
-import { MarkdownContent } from './MarkdownContent';
-import { collectMemberGroups } from './collectMemberGroups';
-import type { TypeDefinition, MemberDefinition } from './TypeDefs';
-import { DocSearch } from './DocSearch';
+import { InterfaceDef, CallSigDef } from '../Defs';
+import { SidebarLinks } from '../../../../sidebar';
+import { SideBarV4 } from '../SidebarV4';
+import { MemberDoc } from '../MemberDoc';
+import { MarkdownContent } from '../../../../MarkdownContent';
+import { collectMemberGroups } from '../collectMemberGroups';
+import type { TypeDefinition, MemberDefinition } from '../TypeDefs';
+import { DocSearch } from '../../../../DocSearch';
 
 const typeDefURL =
   'https://github.com/immutable-js/immutable-js/blob/main/type-definitions/immutable.d.ts';
@@ -46,7 +47,7 @@ export function TypeDocumentation({
 
   return (
     <>
-      <SideBar
+      <SideBarV4
         links={sidebarLinks}
         focus={def}
         toggleShowInherited={toggleShowInherited}

diff --git a/website/src/app/docs/[version]/[type]/page.tsx b/website/src/app/docs/[version]/[type]/page.tsx
@@ -1,8 +1,8 @@
-import { getSidebarLinks } from '../../../../getSidebarLinks';
-import { getTypeDefs } from '../../../../static/getTypeDefs';
+import { getSidebarLinks } from '../getSidebarLinks';
+import { getTypeDefs } from '../getTypeDefs';
 import { getVersionFromGitTag } from '../../../../static/getVersions';
-import { TypeDocumentation } from '../../../../TypeDocumentation';
-import { getVersionFromParams } from '../../../getVersionFromParams';
+import { TypeDocumentation } from './TypeDocumentation';
+import { getVersionFromParams } from '../getVersionFromParams';
 import { VERSION } from '../../currentVersion';
 
 export async function generateStaticParams() {

diff --git a/website/src/collectMemberGroups.ts → ...app/docs/[version]/collectMemberGroups.ts b/website/src/collectMemberGroups.ts → ...app/docs/[version]/collectMemberGroups.ts
diff --git a/website/src/getSidebarLinks.tsx → ...rc/app/docs/[version]/getSidebarLinks.tsx b/website/src/getSidebarLinks.tsx → ...rc/app/docs/[version]/getSidebarLinks.tsx
@@ -1,5 +1,5 @@
 import type { TypeDefs } from './TypeDefs';
-import { SidebarLinks } from './Sidebar';
+import { SidebarLinks } from '../../../sidebar';
 
 export function getSidebarLinks(defs: TypeDefs): SidebarLinks {
   return Object.values(defs.types).map(({ label, url }) => ({ label, url }));

diff --git a/website/src/static/getTypeDefs.ts → ...ite/src/app/docs/[version]/getTypeDefs.ts b/website/src/static/getTypeDefs.ts → ...ite/src/app/docs/[version]/getTypeDefs.ts
@@ -13,9 +13,9 @@ import {
   TypeDoc,
   TypeKind,
   MemberDefinition,
-} from '../TypeDefs';
-import { markdown, MarkdownContext } from './markdown';
-import { stripUndefineds } from './stripUndefineds';
+} from './TypeDefs';
+import { markdown, MarkdownContext } from '../../../static/markdown';
+import { stripUndefineds } from '../../../static/stripUndefineds';
 
 const generatedTypeDefs = new Map<string, TypeDefs>();
 export function getTypeDefs(version: string) {

diff --git a/website/src/app/getVersionFromParams.ts → ...pp/docs/[version]/getVersionFromParams.ts b/website/src/app/getVersionFromParams.ts → ...pp/docs/[version]/getVersionFromParams.ts
diff --git a/website/src/app/docs/[version]/layout.tsx b/website/src/app/docs/[version]/layout.tsx
@@ -1,7 +1,7 @@
 import { DocHeader } from '../../../DocHeader';
 import { ImmutableConsole } from '../../../ImmutableConsole';
 import { getVersions } from '../../../static/getVersions';
-import { getVersionFromParams } from '../../getVersionFromParams';
+import { getVersionFromParams } from './getVersionFromParams';
 
 export default async function VersionLayout(props: {
   children: React.ReactNode;

diff --git a/website/src/app/docs/[version]/page.tsx b/website/src/app/docs/[version]/page.tsx
@@ -1,11 +1,11 @@
 import { Metadata } from 'next';
 import { getVersionFromGitTag } from '../../../static/getVersions';
-import { getTypeDefs } from '../../../static/getTypeDefs';
-import { DocOverview, getOverviewData } from '../../../DocOverview';
+import { getTypeDefs } from './getTypeDefs';
+import { DocOverview, getOverviewData } from './DocOverview';
 import { DocSearch } from '../../../DocSearch';
-import { SideBar } from '../../../Sidebar';
-import { getSidebarLinks } from '../../../getSidebarLinks';
-import { getVersionFromParams } from '../../getVersionFromParams';
+import { SideBarV4 } from './SidebarV4';
+import { getSidebarLinks } from './getSidebarLinks';
+import { getVersionFromParams } from './getVersionFromParams';
 import { VERSION } from '../currentVersion';
 
 export async function generateStaticParams() {
@@ -45,7 +45,7 @@ export default async function OverviewDocPage(props: Props) {
 
   return (
     <>
-      <SideBar links={sidebarLinks} />
+      <SideBarV4 links={sidebarLinks} />
       <div key="Overview" className="docContents">
         <DocSearch />
         <h1 className="mainTitle">Immutable.js ({version})</h1>