From ab1047fc4588ae6157389060d29e0e6d540b5dba Mon Sep 17 00:00:00 2001 From: Will Date: Mon, 27 Feb 2023 20:35:27 -0500 Subject: [PATCH 1/7] Added remix demo --- apps/remix-demo | 1 + 1 file changed, 1 insertion(+) create mode 160000 apps/remix-demo diff --git a/apps/remix-demo b/apps/remix-demo new file mode 160000 index 0000000..bd49193 --- /dev/null +++ b/apps/remix-demo @@ -0,0 +1 @@ +Subproject commit bd49193ef6a6093fe2c8c8036f2bc845a0bc540c From b0d450611d8ba4e003759d4423b579d50ead806a Mon Sep 17 00:00:00 2001 From: Will Date: Mon, 27 Feb 2023 20:43:12 -0500 Subject: [PATCH 2/7] Clean up --- apps/docs/package.json | 2 +- apps/remix-demo | 1 - index.js | 6 ------ index.ts | 10 ---------- packages/components/CHANGELOG.md | 7 ++++++- 5 files changed, 7 insertions(+), 19 deletions(-) delete mode 160000 apps/remix-demo delete mode 100644 index.js delete mode 100644 index.ts diff --git a/apps/docs/package.json b/apps/docs/package.json index 2afaf5f..a067b03 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -7,7 +7,7 @@ "build": "next build", "start": "next start", "lint": "next lint", - "test": "cypress open" + "test": "cypress run" }, "dependencies": { "@chimera-ui/components": "workspace:*", diff --git a/apps/remix-demo b/apps/remix-demo deleted file mode 160000 index bd49193..0000000 --- a/apps/remix-demo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd49193ef6a6093fe2c8c8036f2bc845a0bc540c diff --git a/index.js b/index.js deleted file mode 100644 index ffeef71..0000000 --- a/index.js +++ /dev/null @@ -1,6 +0,0 @@ -"use strict"; -exports.__esModule = true; -var react_docgen_1 = require("react-docgen"); -var code = "\n/** My first component */\nexport default ({ name }: { name: string }) =>
{{name}}
;\n"; -var documentation = (0, react_docgen_1.parse)(code); -console.log(documentation); diff --git a/index.ts b/index.ts deleted file mode 100644 index e46b95e..0000000 --- a/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { parse } from "react-docgen"; - -const code = ` -/** My first component */ -export default ({ name }: { name: string }) =>
{{name}}
; -`; - -const documentation = parse(code); - -console.log(documentation); diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index f47bb8d..4732a69 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -5,4 +5,9 @@ ### Minor Changes - d9fa560: Initial publish -- efd2e64: Exposes default classes in intellisense + +## 0.2.0 + +### Minor Changes + +- Added default classes to intellisense for any subcomponents that have them. From 6ba340d322fec68ddf795a177c58d9c335753071 Mon Sep 17 00:00:00 2001 From: Will Date: Mon, 27 Feb 2023 20:43:36 -0500 Subject: [PATCH 3/7] FIX - Exports in package json causing issues with remix --- packages/components/package.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index edc602e..d9bb77b 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,16 +1,12 @@ { "name": "@chimera-ui/components", - "version": "0.1.0", + "version": "0.2.0", "main": "./dist/index.js", "module": "./dist/index.mjs", "types": "./dist/index.d.ts", "sideEffects": [ "**/*.css" ], - "exports": { - ".": "./dist", - "./styles.css": "./dist/index.css" - }, "license": "MIT", "files": [ "dist/**" From 1874a09bbff129bca72da3b32cd600649c104e0f Mon Sep 17 00:00:00 2001 From: Will Date: Mon, 27 Feb 2023 20:46:13 -0500 Subject: [PATCH 4/7] updated changeset --- .changeset/popular-turtles-worry.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/popular-turtles-worry.md diff --git a/.changeset/popular-turtles-worry.md b/.changeset/popular-turtles-worry.md new file mode 100644 index 0000000..607f29a --- /dev/null +++ b/.changeset/popular-turtles-worry.md @@ -0,0 +1,5 @@ +--- +"@chimera-ui/components": minor +--- + +Fixed issue with Remix where exports in package.json was breaking remix builds From 59688367e38a644a00b61b2cdf34864d5b562a3d Mon Sep 17 00:00:00 2001 From: Will Date: Mon, 27 Feb 2023 20:46:32 -0500 Subject: [PATCH 5/7] updated changeset --- .changeset/popular-turtles-worry.md | 5 ----- packages/components/CHANGELOG.md | 6 ++++++ packages/components/package.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 .changeset/popular-turtles-worry.md diff --git a/.changeset/popular-turtles-worry.md b/.changeset/popular-turtles-worry.md deleted file mode 100644 index 607f29a..0000000 --- a/.changeset/popular-turtles-worry.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@chimera-ui/components": minor ---- - -Fixed issue with Remix where exports in package.json was breaking remix builds diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index 4732a69..f30d294 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -1,5 +1,11 @@ # @chimera-ui/components +## 0.3.0 + +### Minor Changes + +- 1874a09: Fixed issue with Remix where exports in package.json was breaking remix builds + ## 0.1.0 ### Minor Changes diff --git a/packages/components/package.json b/packages/components/package.json index d9bb77b..03d744a 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@chimera-ui/components", - "version": "0.2.0", + "version": "0.3.0", "main": "./dist/index.js", "module": "./dist/index.mjs", "types": "./dist/index.d.ts", From 590dc6b73c965e63d3402e16e15ead7429b5e4e6 Mon Sep 17 00:00:00 2001 From: Will Date: Mon, 27 Feb 2023 20:54:37 -0500 Subject: [PATCH 6/7] Fixed cypress run issue --- .gitignore | 1 + apps/docs/cypress.config.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 69b9263..64dfc20 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ dist-ssr server/dist public/dist storybook-static/ +apps/docs/cypress/videos \ No newline at end of file diff --git a/apps/docs/cypress.config.ts b/apps/docs/cypress.config.ts index 59266b8..f515104 100644 --- a/apps/docs/cypress.config.ts +++ b/apps/docs/cypress.config.ts @@ -7,5 +7,6 @@ export default defineConfig({ }, experimentalStudio: true, baseUrl: "http://localhost:3000", + supportFile: false, }, }); From b7fa6006453b34a25d0f62a329bae585ae35a33a Mon Sep 17 00:00:00 2001 From: Will Date: Mon, 27 Feb 2023 20:58:24 -0500 Subject: [PATCH 7/7] Added remix installation documentation --- apps/docs/pages/docs/install.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/apps/docs/pages/docs/install.md b/apps/docs/pages/docs/install.md index 2615d6e..e9a4b4f 100644 --- a/apps/docs/pages/docs/install.md +++ b/apps/docs/pages/docs/install.md @@ -2,6 +2,8 @@ title: "Installation" --- +## General Installation + import { Callout } from 'nextra-theme-docs' import Link from 'next/link' @@ -152,3 +154,20 @@ html[data-theme="zookeper"] { ``` + +## Remix + +Installing with remix requires one additional step. + +In `remix.config.js` you need to add the `serverDependenciesToBundle` option. Read more [here](https://remix.run/docs/en/v1/pages/gotchas#importing-esm-packages). + +``` +/** @type {import('@remix-run/dev').AppConfig} */ +module.exports = { + future: { + unstable_tailwind: true, + }, + ignoredRouteFiles: ["**/.*"], + serverDependenciesToBundle: ["@chimera-ui/components"], +}; +```