mirror of
https://github.com/webstudio-is/webstudio.git
synced 2026-11-07 12:33:36 +09:00
Update remix (#892)
## Description ```bash pnpm up -r -L '@remix-run/*' pnpm up -r -L 'react-router-dom' ``` `react-router-dom` removed. ## Steps for reproduction 1. click button 2. expect xyz ## Code Review - [ ] hi @kof, I need you to do - conceptual review (architecture, feature-correctness) - detailed review (read every line) - test it on preview ## Before requesting a review - [ ] made a self-review - [ ] added inline comments where things may be not obvious (the "why", not "what") ## Before merging - [ ] tested locally and on preview environment (preview dev login: 5de6) - [ ] updated [test cases](https://github.com/webstudio-is/webstudio-designer/blob/main/apps/designer/docs/test-cases.md) document - [ ] added tests - [ ] if any new env variables are added, added them to `.env.example` and the `designer/env-check.js` if mandatory
This commit is contained in:
1 parent
6c9ae8594f
commit
df580ce304
11 files changed
+2022
-410
No files matched your search
@@ -12,7 +12,7 @@ import {
|
||||
theme,
|
||||
Button,
|
||||
} from "@webstudio-is/design-system";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { useNavigate } from "@remix-run/react";
|
||||
import { logoutPath } from "~/shared/router-utils";
|
||||
import type { User } from "~/shared/db/user.server";
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ import type { DashboardProjectRouter } from "@webstudio-is/dashboard";
|
||||
import { Button, toast } from "@webstudio-is/design-system";
|
||||
import { PlusIcon } from "@webstudio-is/icons";
|
||||
import { useEffect } from "react";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { useNavigate } from "@remix-run/react";
|
||||
import { dashboardProjectPath, designerPath } from "~/shared/router-utils";
|
||||
import { createTrpcRemixProxy } from "~/shared/remix/trpc-remix-proxy";
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { useNavigate } from "@remix-run/react";
|
||||
import {
|
||||
theme,
|
||||
DeprecatedIconButton,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { useNavigate } from "@remix-run/react";
|
||||
import { isFeatureEnabled } from "@webstudio-is/feature-flags";
|
||||
import {
|
||||
DropdownMenu,
|
||||
@@ -161,7 +161,7 @@ export const Menu = ({ publish }: MenuProps) => {
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuSeparator />
|
||||
{/* https://github.com/webstudio-is/webstudio-designer/issues/499
|
||||
|
||||
|
||||
<DropdownMenuItem
|
||||
onSelect={() => {
|
||||
// TODO
|
||||
@@ -177,8 +177,8 @@ export const Menu = ({ publish }: MenuProps) => {
|
||||
>
|
||||
Paste
|
||||
<DropdownMenuItemRightSlot><ShortcutHint value={["cmd", "v"]} /></DropdownMenuItemRightSlot>
|
||||
</DropdownMenuItem>
|
||||
|
||||
</DropdownMenuItem>
|
||||
|
||||
*/}
|
||||
<DropdownMenuItem
|
||||
onSelect={() => {
|
||||
|
||||
@@ -19,7 +19,7 @@ export default function handleRequest(
|
||||
let handle = handleRequestDesigner;
|
||||
|
||||
if (
|
||||
remixContext.matches.some(
|
||||
remixContext.staticHandlerContext.matches.some(
|
||||
(match) =>
|
||||
match.route.id === "routes/$" || match.route.id === "routes/index"
|
||||
) &&
|
||||
|
||||
@@ -4,12 +4,14 @@ import { Outlet } from "@remix-run/react";
|
||||
import { setEnv } from "@webstudio-is/feature-flags";
|
||||
import { withSentryRouteTracing } from "@sentry/remix";
|
||||
import { ErrorBoundary } from "@sentry/remix";
|
||||
import { OutletProps } from "react-router-dom";
|
||||
import env from "./shared/env";
|
||||
import { PersistentFetcherProvider } from "./shared/fetcher";
|
||||
import type { ComponentProps } from "react";
|
||||
|
||||
setEnv(env.FEATURES as string);
|
||||
|
||||
type OutletProps = ComponentProps<typeof Outlet>;
|
||||
|
||||
const RootWithErrorBoundary = (props: OutletProps) => (
|
||||
<ErrorBoundary>
|
||||
<TooltipProvider>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { useSearchParams } from "react-router-dom";
|
||||
import { sentryMessage } from "../sentry";
|
||||
import { useSearchParams } from "@remix-run/react";
|
||||
|
||||
export const AUTH_PROVIDERS = {
|
||||
LOGIN_DEV: "login_dev",
|
||||
|
||||
@@ -28,10 +28,10 @@
|
||||
"@nanostores/react": "^0.4.1",
|
||||
"@radix-ui/react-select": "^1.0.0",
|
||||
"@radix-ui/react-tooltip": "^1.0.0",
|
||||
"@remix-run/node": "1.9.0",
|
||||
"@remix-run/react": "1.9.0",
|
||||
"@remix-run/serve": "1.9.0",
|
||||
"@remix-run/vercel": "1.9.0",
|
||||
"@remix-run/node": "1.11.1",
|
||||
"@remix-run/react": "1.11.1",
|
||||
"@remix-run/serve": "1.11.1",
|
||||
"@remix-run/vercel": "1.11.1",
|
||||
"@sentry/remix": "^7.5.0",
|
||||
"@sentry/types": "7.5.0",
|
||||
"@trpc/server": "^10.9.0",
|
||||
@@ -82,7 +82,6 @@
|
||||
"react-dom": "^17.0.2",
|
||||
"react-error-boundary": "^3.1.4",
|
||||
"react-hotkeys-hook": "^3.4.7",
|
||||
"react-router-dom": "^6.5.0",
|
||||
"react-use": "^17.3.2",
|
||||
"remix-auth": "^3.2.2",
|
||||
"remix-auth-form": "^1.1.2",
|
||||
@@ -100,7 +99,7 @@
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.20.2",
|
||||
"@jest/globals": "^29.3.1",
|
||||
"@remix-run/dev": "1.9.0",
|
||||
"@remix-run/dev": "1.11.1",
|
||||
"@storybook/addon-actions": "6.5.14",
|
||||
"@storybook/react": "^6.5.14",
|
||||
"@storybook/testing-library": "^0.0.13",
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-s3": "^3.131.0",
|
||||
"@aws-sdk/lib-storage": "^3.131.0",
|
||||
"@remix-run/node": "1.9.0",
|
||||
"@remix-run/node": "1.11.1",
|
||||
"@webstudio-is/fonts": "workspace:^",
|
||||
"@webstudio-is/prisma-client": "workspace:^",
|
||||
"app-root-path": "^3.0.0",
|
||||
|
||||
@@ -20,9 +20,9 @@
|
||||
"@babel/core": "^7.20.2",
|
||||
"@esbuild-kit/esm-loader": "^2.4.2",
|
||||
"@jest/globals": "^29.3.1",
|
||||
"@remix-run/node": "1.9.0",
|
||||
"@remix-run/react": "1.9.0",
|
||||
"@remix-run/server-runtime": "1.9.0",
|
||||
"@remix-run/node": "1.11.1",
|
||||
"@remix-run/react": "1.11.1",
|
||||
"@remix-run/server-runtime": "1.11.1",
|
||||
"@storybook/react": "^6.5.14",
|
||||
"@storybook/testing-library": "^0.0.11",
|
||||
"@types/node": "^18.11.18",
|
||||
|
||||
Generated
+2001
-390
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user