Skip to content

Commit

Permalink
Merge pull request #934 from Shelf-nu/updating-hono-2
Browse files Browse the repository at this point in the history
removing some dependencies that were not used and not cleaned up in a…
  • Loading branch information
DonKoko authored Apr 26, 2024
2 parents 0f8ca20 + dd06cee commit 2815a7e
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 32 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: ⎔ Setup node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: 📥 Download deps
uses: bahmutov/npm-install@v1
Expand All @@ -69,7 +69,7 @@ jobs:
- name: ⎔ Setup node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: 📥 Download deps
uses: bahmutov/npm-install@v1
Expand All @@ -95,7 +95,7 @@ jobs:
- name: ⎔ Setup node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: 📥 Download deps
uses: bahmutov/npm-install@v1
Expand Down
2 changes: 1 addition & 1 deletion app/components/assets/actions-dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type { loader } from "~/routes/_layout+/assets.$assetId";
import { tw } from "~/utils/tw";
import { DeleteAsset } from "./delete-asset";
import { UpdateGpsCoordinatesForm } from "./update-gps-coordinates-form";
import Icon from "../icons/Icon";
import Icon from "../icons/icon";
import { Button } from "../shared/button";

const ConditionalActionsDropdown = () => {
Expand Down
3 changes: 1 addition & 2 deletions app/components/assets/update-gps-coordinates-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import { useFetcher, useParams } from "@remix-run/react";
import { useClientNotification } from "~/hooks/use-client-notification";
import type { action } from "~/routes/api+/asset.scan";
import { tw } from "~/utils/tw";
import Icon from "../icons/Icon";
import { GpsMarkerIcon } from "../icons/library";
import Icon from "../icons/icon";
import { Button } from "../shared/button";

interface Coordinates {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import IconHug from "./IconHug";
import IconHug from "./iconHug";
import type { IconType } from "../shared/icons-map";
import iconsMap from "../shared/icons-map";

Expand Down
File renamed without changes.
3 changes: 1 addition & 2 deletions app/components/layout/sidebar/menu-items.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import { NavLink, useLoaderData, useLocation } from "@remix-run/react";
import { motion } from "framer-motion";
import { useAtom } from "jotai";
import { switchingWorkspaceAtom } from "~/atoms/switching-workspace";
import Icon from "~/components/icons/Icon";
import { SwitchIcon } from "~/components/icons/library";
import Icon from "~/components/icons/icon";
import { ControlledActionButton } from "~/components/shared/controlled-action-button";
import { useMainMenuItems } from "~/hooks/use-main-menu-items";
import type { loader } from "~/routes/_layout+/_layout";
Expand Down
2 changes: 1 addition & 1 deletion app/components/shared/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import { Link } from "@remix-run/react";
import { tw } from "~/utils/tw";
import type { IconType } from "./icons-map";
import Icon from "../icons/Icon";
import Icon from "../icons/icon";
import type { ButtonVariant, ButtonWidth } from "../layout/header/types";

export interface ButtonProps {
Expand Down
12 changes: 1 addition & 11 deletions app/hooks/use-main-menu-items.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
import Icon from "~/components/icons/Icon";
import {
AssetsIcon,
CalendarIcon,
CategoriesIcon,
GraphIcon,
LocationMarkerIcon,
ScanQRIcon,
SettingsIcon,
TagsIcon,
} from "~/components/icons/library";
import Icon from "~/components/icons/icon";
// eslint-disable-next-line import/no-cycle
import { useUserIsSelfService } from "./user-user-is-self-service";

Expand Down
2 changes: 1 addition & 1 deletion app/routes/_layout+/assets.$assetId.duplicate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { z } from "zod";
import { AssetImage } from "~/components/assets/asset-image";
import { AssetStatusBadge } from "~/components/assets/asset-status-badge";
import Input from "~/components/forms/input";
import Icon from "~/components/icons/Icon";
import Icon from "~/components/icons/icon";
import Header from "~/components/layout/header";
import { Button } from "~/components/shared/button";
import { Spinner } from "~/components/shared/spinner";
Expand Down
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"precommit": "npm run db:generate-type && npm run lint:fix && npm run format && npm run typecheck"
},
"dependencies": {
"@hono/node-server": "^1.8.2",
"@hono/node-server": "1.10.1",
"@markdoc/markdoc": "^0.4.0",
"@paralleldrive/cuid2": "^2.2.2",
"@prisma/client": "^5.9.1",
Expand Down Expand Up @@ -72,7 +72,7 @@
"detectrtc": "^1.4.1",
"dom-to-image": "^2.6.0",
"framer-motion": "^11.0.5",
"hono": "^4.1.3",
"hono": "^4.2.7",
"iconv-lite": "^0.6.3",
"intl-parse-accept-language": "^1.0.0",
"isbot": "^4.4.0",
Expand Down

0 comments on commit 2815a7e

Please sign in to comment.