Merge pull request #9 from vercel/update-types-2

vercel · Oct 27, 2023 · c39e67e · c39e67e
2 parents 6bf6eda + ee39a33
commit c39e67e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 35 deletions.
diff --git a/packages/next/.npmignore b/packages/next/.npmignore
@@ -1,2 +1,3 @@
 *
 !dist/**/*
+!font.d.ts
diff --git a/packages/next/dist/font.d.ts b/packages/next/dist/font.d.ts
@@ -1,34 +1 @@
-import { NextFontWithVariable } from "@next/font";
-
-declare module "geist/font" {
-  /**
-   * Geist Sans font, with `className` and `variable` properties,
-   * meant to be attached to DOM elements via `className`
-   *
-   * Included weights: 100, 200, 300, 400, 500, 600, 700, 800, 900
-   *
-   * * {@link https://www.npmjs.com/package/geist?activeTab=readme#app-router View App Router Example}
-   *
-   * * {@link https://www.npmjs.com/package/geist?activeTab=readme#with-tailwind-css View Tailwind Example}
-   *
-   * * {@link https://www.npmjs.com/package/geist?activeTab=readme#pages-router View Pages Router Example}
-   *
-   * * {@link https://github.com/vercel/geist-font/releases Download Font Files}
-   */
-  export const GeistSans: NextFontWithVariable;
-  /**
-   * Geist Mono font, with `className` and `variable` properties,
-   * meant to be attached to DOM elements via `className`
-   *
-   * Included weights: 100, 200, 300, 400, 500, 600, 700, 800, 900
-   *
-   * * {@link https://www.npmjs.com/package/geist?activeTab=readme#app-router View App Router Example}
-   *
-   * * {@link https://www.npmjs.com/package/geist?activeTab=readme#with-tailwind-css View Tailwind Example}
-   *
-   * * {@link https://www.npmjs.com/package/geist?activeTab=readme#pages-router View Pages Router Example}
-   *
-   * * {@link https://github.com/vercel/geist-font/releases Download Font Files}
-   */
-  export const GeistMono: NextFontWithVariable;
-}
+export * from "../font";
diff --git a/packages/next/font.d.ts b/packages/next/font.d.ts
@@ -0,0 +1,34 @@
+import { NextFontWithVariable } from "@next/font";
+
+declare module "geist/font" {
+  /**
+   * Geist Sans font, with `className` and `variable` properties,
+   * meant to be attached to DOM elements via `className`
+   *
+   * Included weights: 100, 200, 300, 400, 500, 600, 700, 800, 900
+   *
+   * * {@link https://www.npmjs.com/package/geist?activeTab=readme#app-router View App Router Example}
+   *
+   * * {@link https://www.npmjs.com/package/geist?activeTab=readme#with-tailwind-css View Tailwind Example}
+   *
+   * * {@link https://www.npmjs.com/package/geist?activeTab=readme#pages-router View Pages Router Example}
+   *
+   * * {@link https://github.com/vercel/geist-font/releases Download Font Files}
+   */
+  export const GeistSans: NextFontWithVariable;
+  /**
+   * Geist Mono font, with `className` and `variable` properties,
+   * meant to be attached to DOM elements via `className`
+   *
+   * Included weights: 100, 200, 300, 400, 500, 600, 700, 800, 900
+   *
+   * * {@link https://www.npmjs.com/package/geist?activeTab=readme#app-router View App Router Example}
+   *
+   * * {@link https://www.npmjs.com/package/geist?activeTab=readme#with-tailwind-css View Tailwind Example}
+   *
+   * * {@link https://www.npmjs.com/package/geist?activeTab=readme#pages-router View Pages Router Example}
+   *
+   * * {@link https://github.com/vercel/geist-font/releases Download Font Files}
+   */
+  export const GeistMono: NextFontWithVariable;
+}
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -3,6 +3,9 @@
   "version": "1.0.0",
   "description": "Geist is a new font family for Vercel, created by Vercel in collaboration with Basement Studio.",
   "main": "./dist/font.js",
+  "module": "./dist/font.js",
+  "typings": "font.d.ts",
+  "types": "font.d.ts",
   "scripts": {
     "prepare": "cp ../../LICENSE.TXT ."
   },
@@ -22,7 +25,11 @@
     "vercel font"
   ],
   "exports": {
-    "./font": "./dist/font.js"
+    "./font": {
+      "import": "./dist/font.js",
+      "require": "./dist/font.js",
+      "default": "./dist/index.d.ts"
+    }
   },
   "license": "SIL OPEN FONT LICENSE",
   "dependencies": {