Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

Replace bson-objectid with nanoid (#925)

Bogdan Chadkin370718f5a269
diff --git a/apps/designer/app/designer/features/breakpoints/breakpoints-editor.tsx b/apps/designer/app/designer/features/breakpoints/breakpoints-editor.tsx
index 2cc086fede..dacd243703 100644
--- a/apps/designer/app/designer/features/breakpoints/breakpoints-editor.tsx
+++ b/apps/designer/app/designer/features/breakpoints/breakpoints-editor.tsx
@@ -1,6 +1,6 @@
import { useState } from "react";
import { useDebouncedCallback } from "use-debounce";
-import ObjectId from "bson-objectid";
+import { nanoid } from "nanoid";
import store from "immerhin";
import type { Breakpoint } from "@webstudio-is/css-data";
import {
@@ -130,7 +130,7 @@ export const BreakpointsEditor = ({ onDelete }: BreakpointsEditorProps) => {
setAddedBreakpoints((prev) => [
...prev,
{
- id: ObjectId().toString(),
+ id: nanoid(),
label: "",
minWidth: 0,
},
diff --git a/apps/designer/app/designer/features/props-panel/use-props-logic.ts b/apps/designer/app/designer/features/props-panel/use-props-logic.ts
index 0f881f9620..39ace6c452 100644
--- a/apps/designer/app/designer/features/props-panel/use-props-logic.ts
+++ b/apps/designer/app/designer/features/props-panel/use-props-logic.ts
@@ -1,5 +1,5 @@
import { useMemo, useState } from "react";
-import ObjectId from "bson-objectid";
+import { nanoid } from "nanoid";
import warnOnce from "warn-once";
import type { Instance, PropsItem } from "@webstudio-is/project-build";
import type { MetaProps } from "@webstudio-is/react-sdk";
@@ -85,7 +85,7 @@ const getPropsItemFromMetaProps = (
return undefined;
}
return {
- id: ObjectId().toString(),
+ id: nanoid(),
instanceId,
name,
...getValueFromPropMeta(metaPropValue),
@@ -176,7 +176,7 @@ export const usePropsLogic = ({
setAddedProps((prev) => [
...prev,
{
- id: ObjectId().toString(),
+ id: nanoid(),
instanceId,
name: "",
type: "string",
diff --git a/apps/designer/app/designer/features/style-panel/shared/use-style-data.ts b/apps/designer/app/designer/features/style-panel/shared/use-style-data.ts
index 29dd69b47a..d65b0312bc 100644
--- a/apps/designer/app/designer/features/style-panel/shared/use-style-data.ts
+++ b/apps/designer/app/designer/features/style-panel/shared/use-style-data.ts
@@ -1,6 +1,6 @@
import { useCallback, useMemo } from "react";
import { useStore } from "@nanostores/react";
-import ObjectId from "bson-objectid";
+import { nanoid } from "nanoid";
import store from "immerhin";
import warnOnce from "warn-once";
import type { Instance, Tree } from "@webstudio-is/project-build";
@@ -104,7 +104,7 @@ export const useStyleData = ({
(styleSourceSelections, styleSources, styles) => {
const instanceId = selectedInstance.id;
const breakpointId = selectedBreakpoint.id;
- const styleSourceId = localStyleSource?.id ?? ObjectId().toString();
+ const styleSourceId = localStyleSource?.id ?? nanoid();
// crate style source and its selection on currently selected instance
if (localStyleSource === undefined) {
styleSources.push({
diff --git a/apps/designer/app/designer/features/style-panel/style-source/style-source-input.stories.tsx b/apps/designer/app/designer/features/style-panel/style-source/style-source-input.stories.tsx
index 536fee63cc..13e3bd74a9 100644
--- a/apps/designer/app/designer/features/style-panel/style-source/style-source-input.stories.tsx
+++ b/apps/designer/app/designer/features/style-panel/style-source/style-source-input.stories.tsx
@@ -1,4 +1,4 @@
-import { v4 as uuid } from "uuid";
+import { nanoid } from "nanoid";
import type { ComponentStory } from "@storybook/react";
import { useState } from "react";
import { StyleSourceInput, type ItemState, type ItemSource } from "./";
@@ -16,7 +16,7 @@ type Item = {
};
const localItem: Item = {
- id: uuid(),
+ id: nanoid(),
label: "Local",
source: "local",
isEditable: false,
@@ -25,21 +25,21 @@ const localItem: Item = {
const getItems = (): Array<Item> => [
{
- id: uuid(),
+ id: nanoid(),
label: "Token",
source: "token",
isEditable: true,
state: "unselected",
},
{
- id: uuid(),
+ id: nanoid(),
label: "Tag",
source: "tag",
isEditable: true,
state: "unselected",
},
{
- id: uuid(),
+ id: nanoid(),
label: "State",
source: "state",
isEditable: true,
@@ -53,7 +53,7 @@ const createItem = (
setValue: (value: Array<Item>) => void
) => {
const item: Item = {
- id: uuid(),
+ id: nanoid(),
label,
source: "token",
isEditable: true,
@@ -108,7 +108,7 @@ export const WithTruncatedItem: ComponentStory<
> = () => {
const [value, setValue] = useState<Array<Item>>([
{
- id: uuid(),
+ id: nanoid(),
label:
"Local Something Something Something Something Something Something Something Something Something Something Something",
source: "local",
@@ -140,7 +140,7 @@ export const Complete: ComponentStory<typeof StyleSourceInput> = () => {
localItem,
...getItems(),
{
- id: uuid(),
+ id: nanoid(),
label: "Disabled",
source: "token",
diff --git a/apps/designer/app/shared/tree-utils.ts b/apps/designer/app/shared/tree-utils.ts
index 5e1896aad3..812a382ea1 100644
--- a/apps/designer/app/shared/tree-utils.ts
+++ b/apps/designer/app/shared/tree-utils.ts
@@ -1,4 +1,4 @@
-import ObjectId from "bson-objectid";
+import { nanoid } from "nanoid";
import produce from "immer";
import type {
Instance,
@@ -55,11 +55,11 @@ export const findSubtree = (
export const cloneInstance = (targetInstance: Instance) => {
const clonedInstanceIds = new Map<Instance["id"], Instance["id"]>();
const clonedInstance = produce((targetInstance) => {
- const newId = ObjectId().toString();
+ const newId = nanoid();
clonedInstanceIds.set(targetInstance.id, newId);
targetInstance.id = newId;
traverseInstances(targetInstance, (instance) => {
- const newId = ObjectId().toString();
+ const newId = nanoid();
clonedInstanceIds.set(instance.id, newId);
instance.id = newId;
});
@@ -82,7 +82,7 @@ export const cloneProps = (
}
clonedProps.push({
...prop,
- id: ObjectId().toString(),
+ id: nanoid(),
instanceId,
});
}
@@ -99,7 +99,7 @@ export const cloneStyleSources = (
if (subsetIds.has(styleSource.id) === false) {
continue;
}
- const newId = ObjectId().toString();
+ const newId = nanoid();
clonedStyleSourceIds.set(styleSource.id, newId);
clonedStyleSources.push({
...styleSource,
diff --git a/apps/designer/package.json b/apps/designer/package.json
index da001d2aa1..cc7037d02e 100644
--- a/apps/designer/package.json
+++ b/apps/designer/package.json
@@ -53,7 +53,6 @@
"@webstudio-is/project-build": "workspace:^",
"@webstudio-is/react-sdk": "workspace:^",
"@webstudio-is/trpc-interface": "workspace:^",
- "bson-objectid": "^2.0.4",
"camelcase": "^6.3.0",
"colord": "^2.9.3",
"css-tree": "^2.3.0",
diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json
index 4409f471db..2913803860 100644
--- a/packages/asset-uploader/package.json
+++ b/packages/asset-uploader/package.json
@@ -20,7 +20,7 @@
"@webstudio-is/fonts": "workspace:^",
"@webstudio-is/prisma-client": "workspace:^",
"app-root-path": "^3.0.0",
- "bson-objectid": "^2.0.4",
+ "nanoid": "^3.2.0",
"sharp": "^0.30.7"
},
"devDependencies": {
diff --git a/packages/asset-uploader/src/utils/get-unique-filename.ts b/packages/asset-uploader/src/utils/get-unique-filename.ts
index 370befe469..120f0833f0 100644
--- a/packages/asset-uploader/src/utils/get-unique-filename.ts
+++ b/packages/asset-uploader/src/utils/get-unique-filename.ts
@@ -1,8 +1,8 @@
import path from "path";
-import ObjectID from "bson-objectid";
+import { nanoid } from "nanoid";
export const getUniqueFilename = (filename: string): string => {
- const id = ObjectID().toString();
+ const id = nanoid();
const extension = path.extname(filename);
const name = path.basename(filename, extension);
return `${name}_${id}${extension}`;
diff --git a/packages/prisma-client/package.json b/packages/prisma-client/package.json
index 78ab3cd10e..14b161fe5b 100644
--- a/packages/prisma-client/package.json
+++ b/packages/prisma-client/package.json
@@ -36,6 +36,7 @@
"dotenv": "^16.0.0",
"execa": "^6.1.0",
"minimist": "^1.2.6",
+ "nanoid": "^3.2.0",
"tsx": "^3.9.0",
"umzug": "^3.2.1",
"uuid": "^9.0.0"
diff --git a/packages/prisma-client/prisma/migrations/20230130160827_build_styles/migration.ts b/packages/prisma-client/prisma/migrations/20230130160827_build_styles/migration.ts
index f4ee4b213a..55578906d0 100644
--- a/packages/prisma-client/prisma/migrations/20230130160827_build_styles/migration.ts
+++ b/packages/prisma-client/prisma/migrations/20230130160827_build_styles/migration.ts
@@ -1,4 +1,4 @@
-import ObjectId from "bson-objectid";
+import { nanoid } from "nanoid";
import { PrismaClient } from "./client";
type InstanceId = string;
@@ -85,7 +85,7 @@ export default async () => {
const { instanceId, breakpointId, property, value } = styleDecl;
let styleSourceId = styleSourceIdPerInstanceId.get(instanceId);
if (styleSourceId === undefined) {
- styleSourceId = ObjectId().toString();
+ styleSourceId = nanoid();
styleSourceIdPerInstanceId.set(instanceId, styleSourceId);
}
diff --git a/packages/project/package.json b/packages/project/package.json
index c5b6798f3f..559aa580f4 100644
--- a/packages/project/package.json
+++ b/packages/project/package.json
@@ -22,7 +22,6 @@
"@webstudio-is/project-build": "workspace:^",
"@webstudio-is/react-sdk": "workspace:^",
"@webstudio-is/trpc-interface": "workspace:^",
- "bson-objectid": "^2.0.4",
"immer": "^9.0.12",
"nanoid": "^3.2.0",
"react": "^17.0.2",
diff --git a/packages/project/src/db/breakpoints.ts b/packages/project/src/db/breakpoints.ts
index ca2eb6ccef..d7a5732ff1 100644
--- a/packages/project/src/db/breakpoints.ts
+++ b/packages/project/src/db/breakpoints.ts
@@ -1,6 +1,6 @@
-import { initialBreakpoints } from "@webstudio-is/react-sdk";
-import ObjectId from "bson-objectid";
+import { nanoid } from "nanoid";
import { applyPatches, type Patch } from "immer";
+import { initialBreakpoints } from "@webstudio-is/react-sdk";
import {
type Breakpoints as DbBreakpoints,
prisma,
@@ -33,7 +33,7 @@ export const createValues = () =>
Breakpoints.parse(
initialBreakpoints.map((breakpoint) => ({
...breakpoint,
- id: ObjectId().toString(),
+ id: nanoid(),
}))
);
diff --git a/packages/project/src/shared/tree-utils/create-instance.ts b/packages/project/src/shared/tree-utils/create-instance.ts
index caddd7cedd..22680b24df 100644
--- a/packages/project/src/shared/tree-utils/create-instance.ts
+++ b/packages/project/src/shared/tree-utils/create-instance.ts
@@ -1,9 +1,9 @@
-import ObjectId from "bson-objectid";
+import { nanoid } from "nanoid";
import type { Instance } from "@webstudio-is/project-build";
import { getComponentMeta } from "@webstudio-is/react-sdk";
export const createInstanceId = () => {
- return ObjectId().toString();
+ return nanoid();
};
export const createInstance = ({
@@ -19,7 +19,7 @@ export const createInstance = ({
return {
type: "instance",
component,
- id: id === undefined ? createInstanceId() : id,
+ id: id ?? createInstanceId(),
children:
children === undefined
? componentMeta?.children?.map((value) => ({ type: "text", value })) ??
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 405f358571..d62852570c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -106,7 +106,6 @@ importers:
'@webstudio-is/trpc-interface': workspace:^
'@webstudio-is/tsconfig': workspace:^
babel-loader: ^8.2.5
- bson-objectid: ^2.0.4
camelcase: ^6.3.0
colord: ^2.9.3
css-tree: ^2.3.0
@@ -193,7 +192,6 @@ importers:
'@webstudio-is/project-build': link:../../packages/project-build
'@webstudio-is/react-sdk': link:../../packages/react-sdk
'@webstudio-is/trpc-interface': link:../../packages/trpc-interface
- bson-objectid: 2.0.4
camelcase: 6.3.0
colord: 2.9.3
css-tree: 2.3.0
@@ -290,8 +288,8 @@ importers:
'@webstudio-is/scripts': workspace:^
'@webstudio-is/tsconfig': workspace:^
app-root-path: ^3.0.0
- bson-objectid: ^2.0.4
jest: ^29.3.1
+ nanoid: ^3.2.0
sharp: ^0.30.7
typescript: 4.7.4
zod: ^3.19.1
@@ -302,7 +300,7 @@ importers:
'@webstudio-is/fonts': link:../fonts
'@webstudio-is/prisma-client': link:../prisma-client
app-root-path: 3.0.0
- bson-objectid: 2.0.4
+ nanoid: 3.3.4
sharp: 0.30.7
devDependencies:
'@jest/globals': 29.3.1
@@ -743,6 +741,7 @@ importers:
dotenv: ^16.0.0
execa: ^6.1.0
minimist: ^1.2.6
+ nanoid: ^3.2.0
prisma: ^4.9.0
tsx: ^3.9.0
typescript: 4.7.4
@@ -756,6 +755,7 @@ importers:
dotenv: 16.0.1
execa: 6.1.0
minimist: 1.2.6
+ nanoid: 3.3.4
tsx: 3.12.1
umzug: 3.2.1
uuid: 9.0.0
@@ -784,7 +784,6 @@ importers:
'@webstudio-is/scripts': workspace:^
'@webstudio-is/trpc-interface': workspace:^
'@webstudio-is/tsconfig': workspace:^
- bson-objectid: ^2.0.4
immer: ^9.0.12
jest: ^29.3.1
nanoid: ^3.2.0
@@ -804,7 +803,6 @@ importers:
'@webstudio-is/project-build': link:../project-build
'@webstudio-is/react-sdk': link:../react-sdk
'@webstudio-is/trpc-interface': link:../trpc-interface
- bson-objectid: 2.0.4
immer: 9.0.15
nanoid: 3.3.4
react: 17.0.2