fix: merge dev into next

webiny · Jan 5, 2025 · 5c65342 · 5c65342
1 parent 8908091
commit 5c65342
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 13 deletions.
diff --git a/packages/api-page-builder-so-ddb/package.json b/packages/api-page-builder-so-ddb/package.json
@@ -24,8 +24,7 @@
     "@webiny/error": "0.0.0",
     "@webiny/handler-db": "0.0.0",
     "@webiny/utils": "0.0.0",
-    "dataloader": "^2.2.2",
-    "lodash": "^4.17.21"
+    "dataloader": "^2.2.2"
   },
   "devDependencies": {
     "@webiny/api-security": "0.0.0",

diff --git a/packages/api-prerendering-service/src/render/defaultRenderUrlFunction.ts b/packages/api-prerendering-service/src/render/defaultRenderUrlFunction.ts
@@ -35,7 +35,7 @@ export const defaultRenderUrlFunction = async (
             defaultViewport: chromium.defaultViewport,
             executablePath: await chromium.executablePath(),
             headless: chromium.headless,
-            ignoreHTTPSErrors: true
+            acceptInsecureCerts: true
         });
 
         const browserPage = await browser.newPage();

diff --git a/packages/app-page-builder/src/PageBuilder.tsx b/packages/app-page-builder/src/PageBuilder.tsx
@@ -111,7 +111,7 @@ const EditorLoader = React.lazy(() =>
     import(
         /* webpackChunkName: "PageBuilderEditor" */
         "./editor/Editor"
-        ).then(m => ({
+    ).then(m => ({
         default: m.Editor
     }))
 );

diff --git a/packages/app-page-builder/src/render/PageBuilder.tsx b/packages/app-page-builder/src/render/PageBuilder.tsx
@@ -10,10 +10,9 @@ export const PageBuilder = React.memo(() => {
             <AddButtonLinkComponent />
             <AddButtonClickHandlers />
             <InjectElementVariables />
-            <ConvertIconSettings/>
+            <ConvertIconSettings />
         </>
     );
 });
 
 PageBuilder.displayName = "PageBuilder";
-
diff --git a/packages/db-dynamodb/src/utils/put.ts b/packages/db-dynamodb/src/utils/put.ts
@@ -1,17 +1,19 @@
 import { Entity } from "~/toolbox";
 
-export type IPutItem<T extends Record<string, any>> = {
+export type IPutParamsItem<T extends Record<string, any> = Record<string, any>> = {
     PK: string;
     SK: string;
     [key: string]: any;
 } & T;
 
-export interface IPutParams<T extends Record<string, any>> {
+export interface IPutParams<T extends Record<string, any> = Record<string, any>> {
     entity: Entity;
-    item: IPutItem<T>;
+    item: IPutParamsItem<T>;
 }
 
-export const put = async <T extends Record<string, any>>(params: IPutParams<T>) => {
+export const put = async <T extends Record<string, any> = Record<string, any>>(
+    params: IPutParams<T>
+) => {
     const { entity, item } = params;
 
     return await entity.put(item, {

diff --git a/packages/db-dynamodb/src/utils/table/Table.ts b/packages/db-dynamodb/src/utils/table/Table.ts
@@ -11,7 +11,7 @@ import { createTableWriteBatch } from "./TableWriteBatch";
 import { createTableReadBatch } from "./TableReadBatch";
 import { scan } from "../scan";
 
-export class Table<
+export class TableDefinition<
     Name extends string = string,
     PartitionKey extends string = string,
     SortKey extends string = string
@@ -42,3 +42,13 @@ export class Table<
         });
     }
 }
+
+export const defineTable = <
+    Name extends string = string,
+    PartitionKey extends string = string,
+    SortKey extends string = string
+>(
+    params: TableConstructor<Name, PartitionKey, SortKey>
+) => {
+    return new TableDefinition<Name, PartitionKey, SortKey>(params);
+};
diff --git a/yarn.lock b/yarn.lock
@@ -12895,7 +12895,6 @@ __metadata:
     dataloader: "npm:^2.2.2"
     jest: "npm:^29.7.0"
     jest-dynalite: "npm:^3.6.1"
-    lodash: "npm:^4.17.21"
     rimraf: "npm:^6.0.1"
     ttypescript: "npm:^1.5.15"
     typescript: "npm:4.9.5"
@@ -14571,6 +14570,7 @@ __metadata:
     apollo-link: "npm:^1.2.14"
     apollo-link-batch-http: "npm:^1.2.14"
     graphql-tag: "npm:^2.12.6"
+    lz-string: "npm:^1.5.0"
     react: "npm:18.2.0"
     react-dom: "npm:18.2.0"
     react-helmet: "npm:^6.1.0"
@@ -15126,7 +15126,6 @@ __metadata:
     "@webiny/cli": "npm:0.0.0"
     "@webiny/db": "npm:0.0.0"
     "@webiny/error": "npm:0.0.0"
-    "@webiny/handler-db": "npm:0.0.0"
     "@webiny/plugins": "npm:0.0.0"
     "@webiny/project-utils": "npm:0.0.0"
     "@webiny/utils": "npm:0.0.0"