diff --git a/packages/components/package.json b/packages/components/package.json index f2ee5ff..7772f56 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,7 +1,7 @@ { - "name": "newspaperui-components", + "name": "newspaperui", "version": "0.1.0", - "description": "Production-grade newspaper layout React components", + "description": "Production-grade newspaper layout React components with built-in theme and utilities", "type": "module", "main": "./dist/index.cjs", "module": "./dist/index.js", @@ -11,7 +11,8 @@ "import": "./dist/index.js", "require": "./dist/index.cjs", "types": "./dist/index.d.ts" - } + }, + "./style.css": "./dist/style.css" }, "files": [ "dist" @@ -22,16 +23,13 @@ "test": "vitest run", "test:watch": "vitest", "lint": "tsc --noEmit", - "clean": "rm -rf dist" + "clean": "rm -rf dist", + "prepublishOnly": "pnpm build" }, "peerDependencies": { "react": "^18.3.1", "react-dom": "^18.3.1" }, - "dependencies": { - "newspaperui-theme": "workspace:*", - "newspaperui-utils": "workspace:*" - }, "devDependencies": { "@testing-library/react": "^16.1.0", "@testing-library/jest-dom": "^6.6.3", @@ -59,9 +57,16 @@ "layout", "typography", "css-grid", - "multi-column" + "multi-column", + "indesign", + "editorial" ], "publishConfig": { - "access": "public" + "access": "public", + "dependencies": {} + }, + "dependencies": { + "newspaperui-theme": "workspace:*", + "newspaperui-utils": "workspace:*" } } \ No newline at end of file diff --git a/packages/docs/app/(docs)/components/article/page.tsx b/packages/docs/app/(docs)/components/article/page.tsx index b287e6e..71d9aa2 100644 --- a/packages/docs/app/(docs)/components/article/page.tsx +++ b/packages/docs/app/(docs)/components/article/page.tsx @@ -7,7 +7,7 @@ import { Headline, Subhead, BodyText, -} from 'newspaperui-components'; +} from 'newspaperui'; import { Demo } from '@/components/Demo'; import { PropsTable } from '@/components/PropsTable'; diff --git a/packages/docs/app/(docs)/components/masthead/page.tsx b/packages/docs/app/(docs)/components/masthead/page.tsx index a710254..1ad56c0 100644 --- a/packages/docs/app/(docs)/components/masthead/page.tsx +++ b/packages/docs/app/(docs)/components/masthead/page.tsx @@ -7,7 +7,7 @@ import { Subhead, BodyText, Masthead, -} from 'newspaperui-components'; +} from 'newspaperui'; import { Demo } from '@/components/Demo'; import { PropsTable } from '@/components/PropsTable'; diff --git a/packages/docs/app/(docs)/components/media/page.tsx b/packages/docs/app/(docs)/components/media/page.tsx index c7d12a7..8d18839 100644 --- a/packages/docs/app/(docs)/components/media/page.tsx +++ b/packages/docs/app/(docs)/components/media/page.tsx @@ -8,7 +8,7 @@ import { BodyText, Figure, PullQuote, -} from 'newspaperui-components'; +} from 'newspaperui'; import { Demo } from '@/components/Demo'; import { PropsTable } from '@/components/PropsTable'; diff --git a/packages/docs/app/(docs)/components/rule/page.tsx b/packages/docs/app/(docs)/components/rule/page.tsx index 7d22081..a22e658 100644 --- a/packages/docs/app/(docs)/components/rule/page.tsx +++ b/packages/docs/app/(docs)/components/rule/page.tsx @@ -7,7 +7,7 @@ import { Subhead, BodyText, Rule, -} from 'newspaperui-components'; +} from 'newspaperui'; import { Demo } from '@/components/Demo'; import { PropsTable } from '@/components/PropsTable'; diff --git a/packages/docs/app/(docs)/examples/responsive/page.tsx b/packages/docs/app/(docs)/examples/responsive/page.tsx index cded3ac..b287519 100644 --- a/packages/docs/app/(docs)/examples/responsive/page.tsx +++ b/packages/docs/app/(docs)/examples/responsive/page.tsx @@ -7,7 +7,7 @@ import { Subhead, BodyText, Rule, -} from 'newspaperui-components'; +} from 'newspaperui'; import { CodeBlock } from '@/components/CodeBlock'; export default function ResponsivePage() { diff --git a/packages/docs/app/(docs)/examples/spanning/page.tsx b/packages/docs/app/(docs)/examples/spanning/page.tsx index 2fe07c3..e5b01d4 100644 --- a/packages/docs/app/(docs)/examples/spanning/page.tsx +++ b/packages/docs/app/(docs)/examples/spanning/page.tsx @@ -7,7 +7,7 @@ import { Subhead, BodyText, Rule, -} from 'newspaperui-components'; +} from 'newspaperui'; import { Demo } from '@/components/Demo'; export default function SpanningPage() { diff --git a/packages/docs/app/(docs)/grid-system/page.tsx b/packages/docs/app/(docs)/grid-system/page.tsx index 0ea14d2..b5664ef 100644 --- a/packages/docs/app/(docs)/grid-system/page.tsx +++ b/packages/docs/app/(docs)/grid-system/page.tsx @@ -6,7 +6,7 @@ import { Headline, Subhead, BodyText, -} from 'newspaperui-components'; +} from 'newspaperui'; import { Demo } from '@/components/Demo'; import { PropsTable } from '@/components/PropsTable'; diff --git a/packages/docs/app/(docs)/text/page.tsx b/packages/docs/app/(docs)/text/page.tsx index a77c5ce..6a9ae4a 100644 --- a/packages/docs/app/(docs)/text/page.tsx +++ b/packages/docs/app/(docs)/text/page.tsx @@ -11,7 +11,7 @@ import { Byline, Dateline, Caption, -} from 'newspaperui-components'; +} from 'newspaperui'; import { visualWeights, resolveFontSize } from 'newspaperui-theme'; import { Demo } from '@/components/Demo'; diff --git a/packages/docs/app/(docs)/theme/page.tsx b/packages/docs/app/(docs)/theme/page.tsx index e90eef6..60338a6 100644 --- a/packages/docs/app/(docs)/theme/page.tsx +++ b/packages/docs/app/(docs)/theme/page.tsx @@ -6,7 +6,7 @@ import { Headline, Subhead, BodyText, -} from 'newspaperui-components'; +} from 'newspaperui'; import { ThemeToggle } from '@/components/ThemeToggle'; interface Swatch { diff --git a/packages/docs/app/blocks/en-feature/page.tsx b/packages/docs/app/blocks/en-feature/page.tsx index eacc0ba..1a087ab 100644 --- a/packages/docs/app/blocks/en-feature/page.tsx +++ b/packages/docs/app/blocks/en-feature/page.tsx @@ -1,5 +1,5 @@ 'use client'; -import { Layout, Section, Article, Rule, Headline, Subhead, Kicker, BodyText, Byline, Dateline, Figure, PullQuote } from 'newspaperui-components'; +import { Layout, Section, Article, Rule, Headline, Subhead, Kicker, BodyText, Byline, Dateline, Figure, PullQuote } from 'newspaperui'; export default function EnFeature() { return ( diff --git a/packages/docs/app/blocks/jp-horizontal/page.tsx b/packages/docs/app/blocks/jp-horizontal/page.tsx index 42b5f5b..e2c4746 100644 --- a/packages/docs/app/blocks/jp-horizontal/page.tsx +++ b/packages/docs/app/blocks/jp-horizontal/page.tsx @@ -1,5 +1,5 @@ 'use client'; -import { Layout, Section, Article, Rule, BodyText, Figure } from 'newspaperui-components'; +import { Layout, Section, Article, Rule, BodyText, Figure } from 'newspaperui'; const jp = { fontFamily: 'var(--font-family-cjk-jp)' }; const jpAccent = { color: 'var(--nui-accent-ink-blue)' }; diff --git a/packages/docs/app/blocks/page.tsx b/packages/docs/app/blocks/page.tsx index 392701a..0340561 100644 --- a/packages/docs/app/blocks/page.tsx +++ b/packages/docs/app/blocks/page.tsx @@ -1,6 +1,6 @@ 'use client'; import Link from 'next/link'; -import { Layout, Section, Article, Headline, Subhead, Kicker } from 'newspaperui-components'; +import { Layout, Section, Article, Headline, Subhead, Kicker } from 'newspaperui'; const blocks = [ { diff --git a/packages/docs/app/blocks/zh-editorial/page.tsx b/packages/docs/app/blocks/zh-editorial/page.tsx index 1ea711e..491ecdb 100644 --- a/packages/docs/app/blocks/zh-editorial/page.tsx +++ b/packages/docs/app/blocks/zh-editorial/page.tsx @@ -1,5 +1,5 @@ 'use client'; -import { Layout, Section, Article, Rule, BodyText, Quote } from 'newspaperui-components'; +import { Layout, Section, Article, Rule, BodyText, Quote } from 'newspaperui'; const cn = { fontFamily: 'var(--font-family-cjk-serif)' }; const cnRed = { color: 'var(--nui-accent-cjk-red)' }; diff --git a/packages/docs/app/blocks/zh-feature/page.tsx b/packages/docs/app/blocks/zh-feature/page.tsx index 96c07fa..842647c 100644 --- a/packages/docs/app/blocks/zh-feature/page.tsx +++ b/packages/docs/app/blocks/zh-feature/page.tsx @@ -1,5 +1,5 @@ 'use client'; -import { Layout, Section, Article, BodyText, Quote, Figure, PullQuote } from 'newspaperui-components'; +import { Layout, Section, Article, BodyText, Quote, Figure, PullQuote } from 'newspaperui'; const cn = { fontFamily: 'var(--font-family-cjk-serif)' }; const cnRed = { color: 'var(--nui-accent-cjk-red)' }; diff --git a/packages/docs/app/blocks/zh-frontpage/page.tsx b/packages/docs/app/blocks/zh-frontpage/page.tsx index 7be1ac1..3abae08 100644 --- a/packages/docs/app/blocks/zh-frontpage/page.tsx +++ b/packages/docs/app/blocks/zh-frontpage/page.tsx @@ -1,5 +1,5 @@ 'use client'; -import { Layout, Section, Article, Rule, BodyText, Figure } from 'newspaperui-components'; +import { Layout, Section, Article, Rule, BodyText, Figure } from 'newspaperui'; const cn = { fontFamily: 'var(--font-family-cjk-serif)' }; const cnRed = { color: 'var(--nui-accent-cjk-red)' }; diff --git a/packages/docs/app/create/page.tsx b/packages/docs/app/create/page.tsx index 856eccc..8ea7cdd 100644 --- a/packages/docs/app/create/page.tsx +++ b/packages/docs/app/create/page.tsx @@ -4,7 +4,7 @@ import { Layout, Section, Article, Masthead, Rule, Headline, Subhead, Kicker, BodyText, Byline, Dateline, Caption, PullQuote, Footer, -} from 'newspaperui-components'; +} from 'newspaperui'; // ─── Presets ──────────────────────────────────────────────────────────────── diff --git a/packages/docs/app/examples/blackletter-frontpage/page.tsx b/packages/docs/app/examples/blackletter-frontpage/page.tsx index 2bcd710..1d7dd00 100644 --- a/packages/docs/app/examples/blackletter-frontpage/page.tsx +++ b/packages/docs/app/examples/blackletter-frontpage/page.tsx @@ -4,7 +4,7 @@ import { Layout, Section, Article, Masthead, Headline, Subhead, Kicker, BodyText, Byline, Dateline, Figure, PullQuote, -} from 'newspaperui-components'; +} from 'newspaperui'; export default function BlackletterFrontPage() { return ( diff --git a/packages/docs/app/examples/nyt-frontpage/page.tsx b/packages/docs/app/examples/nyt-frontpage/page.tsx index 7caf395..43096fb 100644 --- a/packages/docs/app/examples/nyt-frontpage/page.tsx +++ b/packages/docs/app/examples/nyt-frontpage/page.tsx @@ -4,7 +4,7 @@ import { Layout, Section, Article, Masthead, Rule, Headline, Subhead, Kicker, BodyText, Byline, Dateline, Figure, PullQuote, -} from 'newspaperui-components'; +} from 'newspaperui'; export default function FrontPage() { return ( diff --git a/packages/docs/app/page.tsx b/packages/docs/app/page.tsx index fba4b66..221668a 100644 --- a/packages/docs/app/page.tsx +++ b/packages/docs/app/page.tsx @@ -3,7 +3,7 @@ import { Layout, Section, Article, Masthead, Rule, Folio, IndexBox, Factbox, Headline, Subhead, Kicker, BodyText, Byline, Dateline, Figure, PullQuote, Footer, BreakingNewsBanner, -} from 'newspaperui-components'; +} from 'newspaperui'; import Link from 'next/link'; export default function LandingPage() { diff --git a/packages/docs/components/Sidebar.tsx b/packages/docs/components/Sidebar.tsx index 6d64c60..e3e35b4 100644 --- a/packages/docs/components/Sidebar.tsx +++ b/packages/docs/components/Sidebar.tsx @@ -1,7 +1,10 @@ 'use client'; import Link from 'next/link'; import { usePathname } from 'next/navigation'; -import { cx } from 'newspaperui-utils'; + +function cx(...args: (string | false | null | undefined)[]): string { + return args.filter(Boolean).join(' '); +} interface NavItem { label: string; diff --git a/packages/docs/next.config.mjs b/packages/docs/next.config.mjs index 493ec78..97f91ce 100644 --- a/packages/docs/next.config.mjs +++ b/packages/docs/next.config.mjs @@ -7,7 +7,7 @@ const nextConfig = { basePath: process.env.NEXT_PUBLIC_BASE_PATH || '', images: { unoptimized: true }, pageExtensions: ['js', 'jsx', 'md', 'mdx', 'ts', 'tsx'], - transpilePackages: ['newspaperui-components', 'newspaperui-theme', 'newspaperui-utils'], + transpilePackages: ['newspaperui'], }; const withMDX = createMDX({ diff --git a/packages/docs/package.json b/packages/docs/package.json index d3ead7e..ad0950e 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -20,9 +20,8 @@ "react-dom": "^18.3.1", "rehype-pretty-code": "^0.14.3", "shiki": "^4.1.0", - "newspaperui-components": "workspace:*", - "newspaperui-theme": "workspace:*", - "newspaperui-utils": "workspace:*" + "newspaperui": "workspace:*", + "newspaperui-theme": "workspace:*" }, "devDependencies": { "@types/node": "^22.10.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ba995ca..7bcd4c6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -96,15 +96,12 @@ importers: '@types/mdx': specifier: ^2.0.13 version: 2.0.13 - newspaperui-components: + newspaperui: specifier: workspace:* version: link:../components newspaperui-theme: specifier: workspace:* version: link:../theme - newspaperui-utils: - specifier: workspace:* - version: link:../utils next: specifier: ^15.1.6 version: 15.5.18(@babel/core@7.29.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)