chore: update dependencies

brunozoric · brunozoric · commit 67b88a7a1024 · 2024-12-24T10:57:27.000+01:00
diff --git a/package.json b/package.json
@@ -225,6 +225,7 @@
     ]
   },
   "resolutions": {
+    "systeminformation": "^5.23.18",
     "@emotion/react": "11.10.8",
     "@octokit/rest": "^20.0.2",
     "braces": "^3.0.3",
diff --git a/packages/api-apw/__tests__/utils/defaultIdentity.ts b/packages/api-apw/__tests__/utils/defaultIdentity.ts
@@ -1,5 +1,6 @@
 import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins";
 import { SecurityContext } from "@webiny/api-security/types";
+import { GenericRecord } from "@webiny/api/types";
 
 export const defaultIdentity = () => {
     return new GraphQLSchemaPlugin<SecurityContext>({
@@ -16,7 +17,7 @@ export const defaultIdentity = () => {
         `,
         resolvers: {
             Admin: {
-                __isTypeOf(obj) {
+                __isTypeOf(obj: GenericRecord) {
                     return obj.type === "admin";
                 }
             }
diff --git a/packages/api-prerendering-service/package.json b/packages/api-prerendering-service/package.json
@@ -31,7 +31,6 @@
     "posthtml-noopener": "^1.0.5",
     "posthtml-plugin-link-preload": "^1.0.0",
     "puppeteer-core": "^23.9.0",
-    "shortid": "^2.1.6",
     "srcset": "^4.0.0"
   },
   "devDependencies": {
diff --git a/packages/api-prerendering-service/src/render/renderUrl.ts b/packages/api-prerendering-service/src/render/renderUrl.ts
@@ -14,7 +14,7 @@ import injectRenderTs from "./injectRenderTs";
 import injectTenantLocale from "./injectTenantLocale";
 import injectNotFoundPageFlag from "./injectNotFoundPageFlag";
 import getPsTags from "./getPsTags";
-import shortid from "shortid";
+import { generateAlphaNumericId } from "@webiny/utils/generateId";
 import {
     RenderResult,
     RenderUrlCallableParams,
@@ -51,7 +51,7 @@ export interface File {
 }
 
 export default async (url: string, args: RenderUrlParams): Promise<[File[], Meta]> => {
-    const id = shortid.generate();
+    const id = generateAlphaNumericId();
     const ts = new Date().getTime();
 
     console.log(`Rendering "${url}" (render ID: ${id})...`);
diff --git a/packages/api-security/__tests__/mocks/defaultIdentity.ts b/packages/api-security/__tests__/mocks/defaultIdentity.ts
@@ -1,5 +1,6 @@
 import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins";
 import { SecurityContext } from "~/types";
+import { GenericRecord } from "@webiny/api/types";
 
 export const defaultIdentity = () => {
     return new GraphQLSchemaPlugin<SecurityContext>({
@@ -14,7 +15,7 @@ export const defaultIdentity = () => {
         `,
         resolvers: {
             Admin: {
-                __isTypeOf(obj) {
+                __isTypeOf(obj: GenericRecord) {
                     return obj.type === "admin";
                 }
             }
diff --git a/packages/app-form-builder/package.json b/packages/app-form-builder/package.json
@@ -55,8 +55,7 @@
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "18.2.0",
     "react-google-recaptcha": "^1.1.0",
-    "react-hotkeyz": "^1.0.4",
-    "shortid": "^2.1.6"
+    "react-hotkeyz": "^1.0.4"
   },
   "devDependencies": {
     "@emotion/babel-plugin": "^11.11.0",
diff --git a/packages/app-form-builder/src/admin/components/FormEditor/Context/useFormEditorFactory.tsx b/packages/app-form-builder/src/admin/components/FormEditor/Context/useFormEditorFactory.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import shortid from "shortid";
+import { generateAlphaNumericId } from "@webiny/utils/generateId";
 import cloneDeep from "lodash/cloneDeep";
 import pick from "lodash/pick";
 import {
@@ -390,7 +390,7 @@ export const useFormEditorFactory = (
              */
             insertField: ({ data, destination, target }) => {
                 const field = cloneDeep(data);
-                field._id = shortid.generate();
+                field._id = generateAlphaNumericId();
 
                 if (!data.name) {
                     throw new Error(`Field "name" missing.`);
diff --git a/packages/cli/files/references.json b/packages/cli/files/references.json
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -43,6 +43,7 @@
     "@rmwc/typography": "^14.2.2",
     "@svgr/webpack": "^6.1.1",
     "@tanstack/react-table": "^8.5.22",
+    "@webiny/utils": "0.0.0",
     "brace": "^0.11.1",
     "classnames": "^2.5.1",
     "cropperjs": "^1.4.3",
@@ -64,7 +65,6 @@
     "react-loading-skeleton": "^3.1.0",
     "react-spinner-material": "1.1.4",
     "react-transition-group": "^4.4.5",
-    "shortid": "^2.1.6",
     "timeago-react": "^3.0.6"
   },
   "devDependencies": {
@@ -74,7 +74,6 @@
     "@types/react-color": "^2.17.11",
     "@types/react-custom-scrollbars": "^4.0.10",
     "@types/react-transition-group": "^4.4.4",
-    "@types/shortid": "^0.0.29",
     "@webiny/cli": "0.0.0",
     "@webiny/form": "0.0.0",
     "@webiny/project-utils": "0.0.0",
diff --git a/packages/ui/src/RichTextEditor/RichTextEditor.tsx b/packages/ui/src/RichTextEditor/RichTextEditor.tsx
@@ -1,5 +1,4 @@
 import React, { Fragment, useEffect, useRef } from "react";
-import shortid from "shortid";
 import EditorJS, {
     LogLevels,
     OutputBlockData,
@@ -11,6 +10,7 @@ import { FormElementMessage } from "~/FormElementMessage";
 import { css } from "emotion";
 import classNames from "classnames";
 import { FormComponentProps } from "@webiny/form";
+import { generateAlphaNumericId } from "@webiny/utils/generateId";
 
 const classes = {
     wrapper: css({
@@ -83,7 +83,7 @@ const waitForDom = (id: string, callback: () => void) => {
 };
 
 export const RichTextEditor = (props: RichTextEditorProps) => {
-    const elementId = useRef("rte-" + shortid.generate());
+    const elementId = useRef("rte-" + generateAlphaNumericId());
     const editorRef = useRef<EditorJSType>();
 
     useEffect(() => {
diff --git a/packages/ui/src/Tabs/Tab.tsx b/packages/ui/src/Tabs/Tab.tsx
@@ -1,6 +1,6 @@
 import React, { useContext, useEffect, useRef } from "react";
 import { TabProps as RmwcTabProps } from "@rmwc/tabs";
-import shortid from "shortid";
+import { generateAlphaNumericId } from "@webiny/utils/generateId";
 import { TabsContext } from "./Tabs";
 
 export type TabProps = RmwcTabProps & {
@@ -23,7 +23,7 @@ export type TabProps = RmwcTabProps & {
 
 export const Tab = React.memo((props: TabProps) => {
     const tabsContext = useContext(TabsContext);
-    const idRef = useRef(shortid.generate());
+    const idRef = useRef(generateAlphaNumericId(12));
 
     useEffect(() => {
         tabsContext!.addTab({ ...props, id: idRef.current, visible: props.visible ?? true });
diff --git a/packages/ui/tsconfig.build.json b/packages/ui/tsconfig.build.json
@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.build.json",
   "include": ["src"],
   "references": [
+    { "path": "../utils/tsconfig.build.json" },
     { "path": "../form/tsconfig.build.json" },
     { "path": "../validation/tsconfig.build.json" }
   ],
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
@@ -1,14 +1,16 @@
 {
   "extends": "../../tsconfig.json",
   "include": ["src", "__tests__"],
-  "references": [{ "path": "../form" }, { "path": "../validation" }],
+  "references": [{ "path": "../utils" }, { "path": "../form" }, { "path": "../validation" }],
   "compilerOptions": {
     "rootDirs": ["./src", "./__tests__"],
     "outDir": "./dist",
     "declarationDir": "./dist",
     "paths": {
       "~/*": ["./src/*"],
       "~tests/*": ["./__tests__/*"],
+      "@webiny/utils/*": ["../utils/src/*"],
+      "@webiny/utils": ["../utils/src"],
       "@webiny/form/*": ["../form/src/*"],
       "@webiny/form": ["../form/src"],
       "@webiny/validation/*": ["../validation/src/*"],
diff --git a/yarn.lock b/yarn.lock
@@ -11115,13 +11115,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/shortid@npm:^0.0.29":
-  version: 0.0.29
-  resolution: "@types/shortid@npm:0.0.29"
-  checksum: 10/f0ba8dcc3ba0da60a16fe11edb745b0cc6b1d1acbe26f33d4193ad23a5a86a05220b4637619673dee0009f7e6ba80bd5bb72e6346bb49e1e4477d52a9653630d
-  languageName: node
-  linkType: hard
-
 "@types/sinon@npm:^17.0.3":
   version: 17.0.3
   resolution: "@types/sinon@npm:17.0.3"
@@ -13014,7 +13007,6 @@ __metadata:
     prettier: "npm:^2.8.8"
     puppeteer-core: "npm:^23.9.0"
     rimraf: "npm:^6.0.1"
-    shortid: "npm:^2.1.6"
     srcset: "npm:^4.0.0"
     ttypescript: "npm:^1.5.15"
     typescript: "npm:4.9.5"
@@ -13866,7 +13858,6 @@ __metadata:
     react-google-recaptcha: "npm:^1.1.0"
     react-hotkeyz: "npm:^1.0.4"
     rimraf: "npm:^6.0.1"
-    shortid: "npm:^2.1.6"
     ttypescript: "npm:^1.5.15"
     typescript: "npm:4.9.5"
   languageName: unknown
@@ -15996,10 +15987,10 @@ __metadata:
     "@types/react-color": "npm:^2.17.11"
     "@types/react-custom-scrollbars": "npm:^4.0.10"
     "@types/react-transition-group": "npm:^4.4.4"
-    "@types/shortid": "npm:^0.0.29"
     "@webiny/cli": "npm:0.0.0"
     "@webiny/form": "npm:0.0.0"
     "@webiny/project-utils": "npm:0.0.0"
+    "@webiny/utils": "npm:0.0.0"
     "@webiny/validation": "npm:0.0.0"
     babel-loader: "npm:^9.2.1"
     brace: "npm:^0.11.1"
@@ -16027,7 +16018,6 @@ __metadata:
     react-spinner-material: "npm:1.1.4"
     react-transition-group: "npm:^4.4.5"
     rimraf: "npm:^6.0.1"
-    shortid: "npm:^2.1.6"
     timeago-react: "npm:^3.0.6"
     ttypescript: "npm:^1.5.15"
     typescript: "npm:4.9.5"
@@ -29550,13 +29540,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nanoid@npm:^2.1.0":
-  version: 2.1.11
-  resolution: "nanoid@npm:2.1.11"
-  checksum: 10/cf2a2eedcf9d8893a4687f11743ccf8381f047bc2b3d3887a23721bbef8fe64c5759b9cba6eb945e40efeb4a7e7379b3417e4dc5f6cc03050322d2c24a7ff69b
-  languageName: node
-  linkType: hard
-
 "nanoid@npm:^3.1.22, nanoid@npm:^3.3.7, nanoid@npm:^3.3.8":
   version: 3.3.8
   resolution: "nanoid@npm:3.3.8"
@@ -35463,15 +35446,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shortid@npm:^2.1.6":
-  version: 2.2.16
-  resolution: "shortid@npm:2.2.16"
-  dependencies:
-    nanoid: "npm:^2.1.0"
-  checksum: 10/0a00ce19fd319d9f3a2e646adf985a99f246475624f2e5d0d1811354b77d342e84c590ef5a7b22ea3e866f5c5821eac4905308f295fa95de74afccc8fed6ea2e
-  languageName: node
-  linkType: hard
-
 "side-channel@npm:^1.0.4":
   version: 1.0.4
   resolution: "side-channel@npm:1.0.4"
@@ -36688,9 +36662,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"systeminformation@npm:^5.7":
-  version: 5.22.6
-  resolution: "systeminformation@npm:5.22.6"
+"systeminformation@npm:^5.23.18":
+  version: 5.23.18
+  resolution: "systeminformation@npm:5.23.18"
   bin:
     systeminformation: lib/cli.js
   conditions: (os=darwin | os=linux | os=win32 | os=freebsd | os=openbsd | os=netbsd | os=sunos | os=android)
@@ -39135,8 +39109,8 @@ __metadata:
   linkType: hard
 
 "ws@npm:^7.0.0":
-  version: 7.5.9
-  resolution: "ws@npm:7.5.9"
+  version: 7.5.10
+  resolution: "ws@npm:7.5.10"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ^5.0.2
@@ -39145,7 +39119,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10/171e35012934bd8788150a7f46f963e50bac43a4dc524ee714c20f258693ac4d3ba2abadb00838fdac42a47af9e958c7ae7e6f4bc56db047ba897b8a2268cf7c
+  checksum: 10/9c796b84ba80ffc2c2adcdfc9c8e9a219ba99caa435c9a8d45f9ac593bba325563b3f83edc5eb067cc6d21b9a6bf2c930adf76dd40af5f58a5ca6859e81858f0
   languageName: node
   linkType: hard
 

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,7 @@`
`225`	`225`	`]`
`226`	`226`	`},`
`227`	`227`	`"resolutions": {`
	`228`	`+ "systeminformation": "^5.23.18",`
`228`	`229`	`"@emotion/react": "11.10.8",`
`229`	`230`	`"@octokit/rest": "^20.0.2",`
`230`	`231`	`"braces": "^3.0.3",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins";`
`2`	`2`	`import { SecurityContext } from "@webiny/api-security/types";`
	`3`	`+import { GenericRecord } from "@webiny/api/types";`
`3`	`4`
`4`	`5`	`export const defaultIdentity = () => {`
`5`	`6`	`return new GraphQLSchemaPlugin<SecurityContext>({`
`@@ -16,7 +17,7 @@ export const defaultIdentity = () => {`
`16`	`17`	`,
`17`	`18`	`resolvers: {`
`18`	`19`	`Admin: {`
`19`		`- __isTypeOf(obj) {`
	`20`	`+ __isTypeOf(obj: GenericRecord) {`
`20`	`21`	`return obj.type === "admin";`
`21`	`22`	`}`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins";`
`2`	`2`	`import { SecurityContext } from "~/types";`
	`3`	`+import { GenericRecord } from "@webiny/api/types";`
`3`	`4`
`4`	`5`	`export const defaultIdentity = () => {`
`5`	`6`	`return new GraphQLSchemaPlugin<SecurityContext>({`
`@@ -14,7 +15,7 @@ export const defaultIdentity = () => {`
`14`	`15`	`,
`15`	`16`	`resolvers: {`
`16`	`17`	`Admin: {`
`17`		`- __isTypeOf(obj) {`
	`18`	`+ __isTypeOf(obj: GenericRecord) {`
`18`	`19`	`return obj.type === "admin";`
`19`	`20`	`}`
`20`	`21`	`}`