Skip to content

Conversation

benjaminleonard
Copy link
Collaborator

Was converting the marketing site, noticed the component css exports needed fixing. Also removed the dist part on the import for neatness.

I guess technically it's breaking, but I shall not be shackled by semver.

@benjaminleonard benjaminleonard added the minor Increment the minor version when merged label Mar 17, 2025
@benjaminleonard benjaminleonard merged commit 8f8b8a6 into master Mar 17, 2025
5 checks passed
@benjaminleonard benjaminleonard deleted the new-dist-exports branch March 17, 2025 12:43
@benjaminleonard
Copy link
Collaborator Author

🚀 PR was released in v2.5.0 🚀

@steveklabnik
Copy link

steveklabnik commented Apr 8, 2025

I guess technically it's breaking, but I shall not be shackled by semver.

For anyone for whom this may have suddenly broke.... you fix this like this:

diff --git a/web/app/routes/ecos/show.tsx b/web/app/routes/ecos/show.tsx
index 97a99d400a..7861d23b82 100644
--- a/web/app/routes/ecos/show.tsx
+++ b/web/app/routes/ecos/show.tsx
@@ -7,7 +7,7 @@
 import { Table } from "~/components/Table";
 import { useState } from "react";
 import { requireAuth } from "~/cookies.server";
-import { buttonStyle } from "@oxide/design-system/components/dist";
+import { buttonStyle } from "@oxide/design-system";
 
 export async function loader({ params, request }: Route.LoaderArgs) {
   const api = await requireAuth(request);
diff --git a/web/app/routes/index.tsx b/web/app/routes/index.tsx
index a77ba7c2cd..63ad121f99 100644
--- a/web/app/routes/index.tsx
+++ b/web/app/routes/index.tsx
@@ -10,7 +10,7 @@
 import { Input } from "~/components/Input";
 import { PageTitle } from "~/components/PageTitle";
 import { requireAuth } from "~/cookies.server";
-import { buttonStyle } from "@oxide/design-system/components/dist";
+import { buttonStyle } from "@oxide/design-system";
 
 const schema = z.object({
   query: z.string({ required_error: "Query is required" }),
diff --git a/web/app/styles/index.css b/web/app/styles/index.css
index 34590c16e7..bc9b1e1d1d 100644
--- a/web/app/styles/index.css
+++ b/web/app/styles/index.css
@@ -9,8 +9,8 @@
 @import "tailwindcss/components";
 @import "tailwindcss/utilities";
 
-@import "@oxide/design-system/styles/dist/main.css";
-@import "@oxide/design-system/components/dist/button.css";
+@import "@oxide/design-system/styles/main.css";
+@import "@oxide/design-system/components/button.css";
 @import "table.css";
 @import "fonts.css";

😉

@benjaminleonard
Copy link
Collaborator Author

The person responsible has been fired.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

minor Increment the minor version when merged released

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants