diff --git a/.vscode/settings.json b/.vscode/settings.json index a34f1046..e92ac443 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,6 +6,7 @@ "scheme": "file" } ], + "deno.disablePaths": ["packages/editor"], "cSpell.enableFiletypes": [ "mdx" ], diff --git a/packages/backend-embed/build.rs b/packages/backend-embed/build.rs index b64c43f8..acf646eb 100644 --- a/packages/backend-embed/build.rs +++ b/packages/backend-embed/build.rs @@ -31,11 +31,6 @@ async fn main() -> Result<()> { .arg("run") .arg("-A") .arg(&script_path) - // shhh font awesome can suck it, we'll fix this soon (tm) - .env( - "FONTAWESOME_PACKAGE_TOKEN", - "E7A94808-3467-4150-B90D-EABDAEB9E0B4", - ) .status()?; if !status.success() { panic!("build artifacts failed"); diff --git a/packages/editor/.env.example b/packages/editor/.env.example deleted file mode 100644 index 3dfbfef7..00000000 --- a/packages/editor/.env.example +++ /dev/null @@ -1 +0,0 @@ -FONTAWESOME_PACKAGE_TOKEN= \ No newline at end of file diff --git a/packages/editor/.yarnrc.yml b/packages/editor/.yarnrc.yml index 8ad42bf8..8b757b29 100644 --- a/packages/editor/.yarnrc.yml +++ b/packages/editor/.yarnrc.yml @@ -1,7 +1 @@ -nodeLinker: node-modules - -npmScopes: - fortawesome: - npmAlwaysAuth: true - npmRegistryServer: 'https://npm.fontawesome.com/' - npmAuthToken: ${FONTAWESOME_PACKAGE_TOKEN} \ No newline at end of file +nodeLinker: node-modules \ No newline at end of file diff --git a/packages/editor/package.json b/packages/editor/package.json index 1cf0d823..1d40c84a 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -11,9 +11,11 @@ }, "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.6.0", - "@fortawesome/pro-solid-svg-icons": "^6.6.0", + "@fortawesome/free-brands-svg-icons": "^6.6.0", + "@fortawesome/free-solid-svg-icons": "^6.6.0", "@fortawesome/react-fontawesome": "^0.2.2", - "@rivet-gg/components": "https://github.com/rivet-gg/hub#workspace=@rivet-gg/components&head=07-14-feat_opengb_web", + "@rivet-gg/components": "https://github.com/rivet-gg/hub#workspace=@rivet-gg/components&head=09-18-icons_pack", + "@rivet-gg/icons": "*", "@sentry/react": "^8.17.0", "@tanstack/query-broadcast-client-experimental": "^5.50.1", "@tanstack/query-sync-storage-persister": "^5.50.1", @@ -41,5 +43,8 @@ "typescript": "^5.2.2", "vite": "^5.2.0", "vite-plugin-favicons-inject": "^2.2.0" + }, + "resolutions": { + "@rivet-gg/icons": "https://github.com/rivet-gg/hub#workspace=@rivet-gg/icons&head=09-18-icons_pack" } } diff --git a/packages/editor/src/app.tsx b/packages/editor/src/app.tsx index d5dea713..27c3d491 100644 --- a/packages/editor/src/app.tsx +++ b/packages/editor/src/app.tsx @@ -1,5 +1,5 @@ import { library } from "@fortawesome/fontawesome-svg-core"; -import { fas } from "@fortawesome/pro-solid-svg-icons"; +import { iconPack } from "@rivet-gg/icons"; import { FullscreenLoading, Toaster, @@ -12,7 +12,8 @@ import { RouterProvider, createRouter } from "@tanstack/react-router"; import { Suspense } from "react"; import { queryClient } from "./queries/global"; import { routeTree } from "./routeTree.gen"; -library.add(fas); + +library.add(iconPack); declare module "@tanstack/react-router" { interface Register { diff --git a/packages/editor/src/components/message-banner.tsx b/packages/editor/src/components/message-banner.tsx index 140d5501..0e9b2380 100644 --- a/packages/editor/src/components/message-banner.tsx +++ b/packages/editor/src/components/message-banner.tsx @@ -1,4 +1,4 @@ -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { Icon } from "@rivet-gg/icons"; import { Button, Strong, WithTooltip } from "@rivet-gg/components"; import { useQuery } from "@tanstack/react-query"; import { type PropsWithChildren, useContext, useEffect } from "react"; @@ -66,7 +66,7 @@ function Content() { size="icon" variant="outline" > - + } diff --git a/packages/editor/src/components/module-card.tsx b/packages/editor/src/components/module-card.tsx index e110271b..7c37cb64 100644 --- a/packages/editor/src/components/module-card.tsx +++ b/packages/editor/src/components/module-card.tsx @@ -1,4 +1,4 @@ -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { Icon } from "@rivet-gg/icons"; import { Button, Card, @@ -78,7 +78,7 @@ function DeleteModuleButton({ setValue("modules", otherModules, { shouldDirty: true }); }} > - + } @@ -119,7 +119,7 @@ export function ModuleCard({ justify="between" >

- {module.config.icon ? : null} + {module.config.icon ? : null} {module.config.name}

@@ -139,7 +139,7 @@ export function ModuleCard({ target="_blank" rel="noreferrer" > - + } diff --git a/packages/editor/src/components/modules-select.tsx b/packages/editor/src/components/modules-select.tsx index 5e22330c..be0d7b99 100644 --- a/packages/editor/src/components/modules-select.tsx +++ b/packages/editor/src/components/modules-select.tsx @@ -1,4 +1,4 @@ -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { Icon } from "@rivet-gg/icons"; import { Badge, Combobox, type ComboboxProps, Flex } from "@rivet-gg/components"; import { useSuspenseQuery } from "@tanstack/react-query"; import { forwardRef } from "react"; @@ -79,7 +79,7 @@ function ModulesSelectOption({ - {module.icon ? : null} + {module.icon ? : null} {module.name ? ( diff --git a/packages/editor/src/routes/index.tsx b/packages/editor/src/routes/index.tsx index 4239abd8..2c6ba08b 100644 --- a/packages/editor/src/routes/index.tsx +++ b/packages/editor/src/routes/index.tsx @@ -1,5 +1,4 @@ -import { faPlus } from "@fortawesome/pro-solid-svg-icons"; -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { Icon,faPlus } from "@rivet-gg/icons"; import { Button, Card, @@ -31,7 +30,7 @@ function NewModuleButton() {