From 244f79aa95dac36d4ff220490127f761190b89bd Mon Sep 17 00:00:00 2001 From: pipisebastian Date: Mon, 18 Nov 2024 11:19:32 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20nanoid=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #143 --- pnpm-lock.yaml | 21 ++++++++------------- server/package.json | 2 +- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 40d65a3b..cbb062ee 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -61,9 +61,6 @@ importers: client: dependencies: - '@lottiefiles/react-lottie-player': - specifier: ^3.5.4 - version: 3.5.4(react@18.3.1) '@dnd-kit/core': specifier: ^6.1.0 version: 6.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -73,6 +70,9 @@ importers: '@dnd-kit/utilities': specifier: ^3.2.2 version: 3.2.2(react@18.3.1) + '@lottiefiles/react-lottie-player': + specifier: ^3.5.4 + version: 3.5.4(react@18.3.1) '@noctaCrdt': specifier: workspace:* version: link:../@noctaCrdt @@ -186,8 +186,8 @@ importers: specifier: ^8.8.0 version: 8.8.0(socks@2.8.3) nanoid: - specifier: ^5.0.8 - version: 5.0.8 + specifier: ^3.0.0 + version: 3.3.7 passport: specifier: ^0.7.0 version: 0.7.0 @@ -3600,9 +3600,10 @@ packages: loose-envify@1.4.0: resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} hasBin: true - + lottie-web@5.12.2: resolution: {integrity: sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg==} + lower-case@2.0.2: resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==} @@ -3852,11 +3853,6 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - nanoid@5.0.8: - resolution: {integrity: sha512-TcJPw+9RV9dibz1hHUzlLVy8N4X9TnwirAjrU08Juo6BNKggzVfP2ZJ/3ZUSq15Xl5i85i+Z89XBO90pB2PghQ==} - engines: {node: ^18 || >=20} - hasBin: true - natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} @@ -9228,6 +9224,7 @@ snapshots: js-tokens: 4.0.0 lottie-web@5.12.2: {} + lower-case@2.0.2: dependencies: tslib: 2.8.1 @@ -9496,8 +9493,6 @@ snapshots: nanoid@3.3.7: {} - nanoid@5.0.8: {} - natural-compare@1.4.0: {} negotiator@0.6.3: {} diff --git a/server/package.json b/server/package.json index dfd0f12a..d9c755ff 100644 --- a/server/package.json +++ b/server/package.json @@ -36,7 +36,7 @@ "bcrypt": "^5.1.1", "mongodb-memory-server": "^10.1.2", "mongoose": "^8.8.0", - "nanoid": "^5.0.8", + "nanoid": "^3.0.0", "passport": "^0.7.0", "passport-jwt": "^4.0.1", "reflect-metadata": "^0.2.0", From b6666417c3de6487c64addc38fefb11e2d43d5c2 Mon Sep 17 00:00:00 2001 From: minjungw00 Date: Mon, 18 Nov 2024 11:32:48 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=ED=8C=8C=EC=9D=BC=EB=AA=85=20?= =?UTF-8?q?=EC=95=9E=EC=9D=98=20=EA=B3=B5=EB=B0=B1=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/features/editor/components/IconBlock/IconBlock.style.ts | 0 client/src/features/editor/components/IconBlock/IconBlock.tsx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename "client/src/features/editor/components/IconBlock/\bIconBlock.style.ts" => client/src/features/editor/components/IconBlock/IconBlock.style.ts (100%) diff --git "a/client/src/features/editor/components/IconBlock/\bIconBlock.style.ts" b/client/src/features/editor/components/IconBlock/IconBlock.style.ts similarity index 100% rename from "client/src/features/editor/components/IconBlock/\bIconBlock.style.ts" rename to client/src/features/editor/components/IconBlock/IconBlock.style.ts diff --git a/client/src/features/editor/components/IconBlock/IconBlock.tsx b/client/src/features/editor/components/IconBlock/IconBlock.tsx index ab71b48b..f5670761 100644 --- a/client/src/features/editor/components/IconBlock/IconBlock.tsx +++ b/client/src/features/editor/components/IconBlock/IconBlock.tsx @@ -1,5 +1,5 @@ import { ElementType } from "@noctaCrdt/Interfaces"; -import { iconContainerStyle, iconStyle } from "./IconBlock.style"; +import { iconContainerStyle, iconStyle } from "./IconBlock.style"; interface IconBlockProps { type: ElementType;