Merge branch 'next' into adrian/5-42-0-minor-feats

webiny · Jan 9, 2025 · 2d7adc1 · 2d7adc1
2 parents 8a5d067 + 2eb1183
commit 2d7adc1
Show file tree

Hide file tree

Showing 91 changed files with 4,205 additions and 2,793 deletions.
diff --git a/.github/workflows/pullRequests.yml b/.github/workflows/pullRequests.yml
@@ -3,7 +3,7 @@
 # and run "github-actions-wac build" (or "ghawac build") to regenerate this file.
 # For more information, run "github-actions-wac --help".
 name: Pull Requests
-'on': pull_request
+"on": pull_request
 concurrency:
   group: pr-${{ github.event.pull_request.number }}
   cancel-in-progress: true
@@ -19,7 +19,7 @@ jobs:
       - uses: webiny/[email protected]
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   validateCommitsDev:
     name: Validate commit messages (dev branch, 'feat' commits not allowed)
@@ -34,7 +34,7 @@ jobs:
           allowed-commit-types: fix,docs,style,refactor,test,build,perf,ci,chore,revert,merge,wip
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   constants:
     name: Create constants
@@ -87,7 +87,7 @@ jobs:
           $GITHUB_OUTPUT
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   assignMilestone:
     name: Assign milestone
@@ -117,7 +117,7 @@ jobs:
           milestone: ${{ steps.get-milestone-to-assign.outputs.milestone }}
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   build:
     name: Build
@@ -149,7 +149,7 @@ jobs:
           path: ${{ github.base_ref }}/.webiny/cached-packages
           key: ${{ needs.constants.outputs.run-cache-key }}
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   staticCodeAnalysis:
     needs:
@@ -190,7 +190,7 @@ jobs:
         working-directory: ${{ github.base_ref }}
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   staticCodeAnalysisTs:
     name: Static code analysis (TypeScript)
@@ -216,7 +216,7 @@ jobs:
         run: yarn cy:ts
         working-directory: ${{ github.base_ref }}
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsNoStorageConstants:
     needs:
@@ -244,7 +244,7 @@ jobs:
           echo '${{
           steps.list-packages-to-jest-test.outputs.packages-to-jest-test }}'
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsNoStorageRun:
     needs:
@@ -265,7 +265,7 @@ jobs:
           }}
     runs-on: ${{ matrix.os }}
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
       AWS_REGION: eu-central-1
     if: needs.jestTestsNoStorageConstants.outputs.packages-to-jest-test != '[]'
@@ -363,7 +363,7 @@ jobs:
           echo '${{
           steps.list-packages-to-jest-test.outputs.packages-to-jest-test }}'
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsddbRun:
     needs:
@@ -383,7 +383,7 @@ jobs:
           fromJson(needs.jestTestsddbConstants.outputs.packages-to-jest-test) }}
     runs-on: ${{ matrix.os }}
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
       AWS_REGION: eu-central-1
     if: needs.jestTestsddbConstants.outputs.packages-to-jest-test != '[]'
@@ -480,7 +480,7 @@ jobs:
           echo '${{
           steps.list-packages-to-jest-test.outputs.packages-to-jest-test }}'
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsddb-esRun:
     needs:
@@ -501,7 +501,7 @@ jobs:
           }}
     runs-on: ${{ matrix.os }}
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
       AWS_REGION: eu-central-1
       AWS_ELASTIC_SEARCH_DOMAIN_NAME: ${{ secrets.AWS_ELASTIC_SEARCH_DOMAIN_NAME }}
@@ -610,7 +610,7 @@ jobs:
           echo '${{
           steps.list-packages-to-jest-test.outputs.packages-to-jest-test }}'
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsddb-osRun:
     needs:
@@ -631,7 +631,7 @@ jobs:
           }}
     runs-on: ${{ matrix.os }}
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
       AWS_REGION: eu-central-1
       AWS_ELASTIC_SEARCH_DOMAIN_NAME: ${{ secrets.AWS_OPEN_SEARCH_DOMAIN_NAME }}

diff --git a/apps/admin/package.json b/apps/admin/package.json
@@ -3,10 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@editorjs/delimiter": "^1.2.0",
-    "@editorjs/list": "^1.6.0",
-    "@editorjs/quote": "^2.4.0",
-    "@editorjs/underline": "^1.0.0",
+    "@editorjs/delimiter": "^1.3.0",
+    "@editorjs/list": "^1.8.0",
+    "@editorjs/quote": "^2.5.0",
+    "@editorjs/underline": "^1.1.0",
     "@types/react": "18.2.79",
     "@webiny/app-admin": "0.0.0",
     "@webiny/app-admin-users-cognito": "0.0.0",
@@ -18,12 +18,12 @@
     "@webiny/plugins": "0.0.0",
     "@webiny/react-properties": "0.0.0",
     "@webiny/serverless-cms-aws": "0.0.0",
-    "core-js": "^3.0.1",
-    "cross-fetch": "^3.0.4",
-    "prop-types": "^15.7.2",
+    "core-js": "3.39.0",
+    "cross-fetch": "^3.1.5",
+    "prop-types": "^15.8.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "regenerator-runtime": "^0.13.5",
+    "regenerator-runtime": "^0.13.11",
     "theme": "^1.0.0",
     "tslib": "^2.8.1"
   },

diff --git a/apps/admin/src/plugins/formBuilder/richTextEditor.ts b/apps/admin/src/plugins/formBuilder/richTextEditor.ts
@@ -1,13 +1,6 @@
-/**
- * Package @editorjs/* is missing types.
- */
-// @ts-expect-error
 import Delimiter from "@editorjs/delimiter";
-// @ts-expect-error
 import Quote from "@editorjs/quote";
-// @ts-expect-error
 import List from "@editorjs/list";
-// @ts-expect-error
 import Underline from "@editorjs/underline";
 import Image from "@webiny/app-admin/components/RichTextEditor/tools/image";
 import TextColor from "@webiny/app-admin/components/RichTextEditor/tools/textColor";

diff --git a/apps/admin/src/plugins/headlessCMS/richTextEditor.ts b/apps/admin/src/plugins/headlessCMS/richTextEditor.ts
@@ -1,13 +1,6 @@
-/**
- * Package @editorjs/* is missing types.
- */
-// @ts-expect-error
 import Delimiter from "@editorjs/delimiter";
-// @ts-expect-error
 import Quote from "@editorjs/quote";
-// @ts-expect-error
 import List from "@editorjs/list";
-// @ts-expect-error
 import Underline from "@editorjs/underline";
 import Image from "@webiny/app-admin/components/RichTextEditor/tools/image";
 import TextColor from "@webiny/app-admin/components/RichTextEditor/tools/textColor";

diff --git a/apps/admin/src/plugins/pageBuilder/richTextEditor.ts b/apps/admin/src/plugins/pageBuilder/richTextEditor.ts
@@ -1,13 +1,6 @@
-/**
- * Package @editorjs/* is missing types.
- */
-// @ts-expect-error
 import Delimiter from "@editorjs/delimiter";
-// @ts-expect-error
 import Quote from "@editorjs/quote";
-// @ts-expect-error
 import List from "@editorjs/list";
-// @ts-expect-error
 import Underline from "@editorjs/underline";
 import Image from "@webiny/app-admin/components/RichTextEditor/tools/image";
 import TextColor from "@webiny/app-admin/components/RichTextEditor/tools/textColor";

diff --git a/apps/website/package.json b/apps/website/package.json
@@ -15,12 +15,12 @@
     "@webiny/serverless-cms-aws": "0.0.0",
     "apollo-client": "^2.6.10",
     "apollo-link": "^1.2.14",
-    "core-js": "^3.0.1",
-    "cross-fetch": "^3.0.4",
+    "core-js": "3.39.0",
+    "cross-fetch": "^3.1.5",
     "graphql": "^15.9.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "regenerator-runtime": "^0.13.5",
+    "regenerator-runtime": "^0.13.11",
     "theme": "^1.0.0"
   },
   "devDependencies": {

diff --git a/extensions/theme/package.json b/extensions/theme/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@apollo/react-hooks": "^3.1.5",
     "@emotion/react": "11.10.8",
-    "@emotion/styled": "^11.10.6",
+    "@emotion/styled": "11.10.6",
     "@webiny/app-form-builder": "0.0.0",
     "@webiny/app-page-builder": "0.0.0",
     "@webiny/app-page-builder-elements": "0.0.0",
@@ -18,7 +18,7 @@
     "@webiny/validation": "0.0.0",
     "graphql": "^15.9.0",
     "react": "18.2.0",
-    "react-hamburger-menu": "^1.1.1"
+    "react-hamburger-menu": "1.2.1"
   },
   "devDependencies": {
     "@types/react-hamburger-menu": "^0.0.4"

diff --git a/package.json b/package.json
@@ -59,8 +59,8 @@
     "@types/prettier": "^2.7.3",
     "@types/react": "18.2.79",
     "@types/react-dom": "18.2.25",
-    "@typescript-eslint/eslint-plugin": "^5.5.0",
-    "@typescript-eslint/parser": "^5.5.0",
+    "@typescript-eslint/eslint-plugin": "^5.51.0",
+    "@typescript-eslint/parser": "^5.51.0",
     "adio": "^1.0.1",
     "axios": "^1.7.9",
     "babel-jest": "29.7.0",
@@ -76,13 +76,13 @@
     "env-ci": "2.0.1",
     "eslint": "^8.57.1",
     "eslint-config-standard": "^16.0.3",
-    "eslint-import-resolver-babel-module": "^5.3.1",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-jest": "^25.3.0",
+    "eslint-import-resolver-babel-module": "^5.3.2",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jest": "^25.7.0",
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.2.0",
-    "eslint-plugin-react": "^7.27.1",
+    "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-standard": "^5.0.0",
     "execa": "^5.1.1",
     "folder-hash": "^4.0.4",
@@ -118,7 +118,7 @@
     "ts-node": "^10.9.2",
     "typescript": "4.9.5",
     "typescript-transform-paths": "^3.4.6",
-    "verdaccio": "^5.29.1",
+    "verdaccio": "^6.0.5",
     "write-json-file": "^4.3.0",
     "yargs": "^17.7.2"
   },
@@ -241,7 +241,6 @@
     "crypto-js": "^4.2.0",
     "ip": "^2.0.1",
     "tar": "^6.2.1",
-    "express": "^4.21.2",
     "ejs": "^3.1.10",
     "@grpc/grpc-js": "^1.11.1",
     "postcss": "^8.4.35",

diff --git a/packages/api-headless-cms-tasks-ddb-es/package.json b/packages/api-headless-cms-tasks-ddb-es/package.json
@@ -14,7 +14,8 @@
   "license": "MIT",
   "dependencies": {
     "@webiny/api-headless-cms-bulk-actions": "0.0.0",
-    "@webiny/api-headless-cms-import-export": "0.0.0"
+    "@webiny/api-headless-cms-import-export": "0.0.0",
+    "@webiny/api-headless-cms-tasks": "0.0.0"
   },
   "devDependencies": {
     "@webiny/cli": "0.0.0",

diff --git a/packages/api-headless-cms-tasks-ddb-es/src/index.ts b/packages/api-headless-cms-tasks-ddb-es/src/index.ts
@@ -14,6 +14,7 @@ import {
     createUnpublishEntry
 } from "@webiny/api-headless-cms-bulk-actions";
 import { createHeadlessCmsImportExport } from "@webiny/api-headless-cms-import-export";
+import { createDeleteModelTask } from "@webiny/api-headless-cms-tasks";
 
 const createEsBulkActionEntriesTasks = () => {
     return [
@@ -56,9 +57,12 @@ const createEsBulkActionEntriesTasks = () => {
     ];
 };
 
-export const createHcmsTasks = () => [
-    createHcmsBulkActions(),
-    createEsBulkActionEntriesTasks(),
-    createEmptyTrashBinsTask(),
-    createHeadlessCmsImportExport()
-];
+export const createHcmsTasks = () => {
+    return [
+        createHcmsBulkActions(),
+        createEsBulkActionEntriesTasks(),
+        createEmptyTrashBinsTask(),
+        createHeadlessCmsImportExport(),
+        createDeleteModelTask()
+    ];
+};
diff --git a/packages/api-headless-cms-tasks-ddb-es/tsconfig.build.json b/packages/api-headless-cms-tasks-ddb-es/tsconfig.build.json
@@ -3,7 +3,8 @@
   "include": ["src"],
   "references": [
     { "path": "../api-headless-cms-bulk-actions/tsconfig.build.json" },
-    { "path": "../api-headless-cms-import-export/tsconfig.build.json" }
+    { "path": "../api-headless-cms-import-export/tsconfig.build.json" },
+    { "path": "../api-headless-cms-tasks/tsconfig.build.json" }
   ],
   "compilerOptions": {
     "rootDir": "./src",

diff --git a/packages/api-headless-cms-tasks-ddb-es/tsconfig.json b/packages/api-headless-cms-tasks-ddb-es/tsconfig.json
@@ -3,7 +3,8 @@
   "include": ["src", "__tests__"],
   "references": [
     { "path": "../api-headless-cms-bulk-actions" },
-    { "path": "../api-headless-cms-import-export" }
+    { "path": "../api-headless-cms-import-export" },
+    { "path": "../api-headless-cms-tasks" }
   ],
   "compilerOptions": {
     "rootDirs": ["./src", "./__tests__"],
@@ -15,7 +16,9 @@
       "@webiny/api-headless-cms-bulk-actions/*": ["../api-headless-cms-bulk-actions/src/*"],
       "@webiny/api-headless-cms-bulk-actions": ["../api-headless-cms-bulk-actions/src"],
       "@webiny/api-headless-cms-import-export/*": ["../api-headless-cms-import-export/src/*"],
-      "@webiny/api-headless-cms-import-export": ["../api-headless-cms-import-export/src"]
+      "@webiny/api-headless-cms-import-export": ["../api-headless-cms-import-export/src"],
+      "@webiny/api-headless-cms-tasks/*": ["../api-headless-cms-tasks/src/*"],
+      "@webiny/api-headless-cms-tasks": ["../api-headless-cms-tasks/src"]
     },
     "baseUrl": "."
   }

diff --git a/packages/api-headless-cms-tasks/src/index.ts b/packages/api-headless-cms-tasks/src/index.ts
@@ -6,6 +6,8 @@ import {
 import { createHeadlessCmsImportExport } from "@webiny/api-headless-cms-import-export";
 import { createDeleteModelTask } from "~/tasks/deleteModel";
 
+export { createDeleteModelTask };
+
 export const createHcmsTasks = () => [
     createHcmsBulkActions(),
     createBulkActionEntriesTasks(),

diff --git a/packages/api-page-builder-import-export/src/export/process/exporters/PageTemplateExporter.ts b/packages/api-page-builder-import-export/src/export/process/exporters/PageTemplateExporter.ts
@@ -12,6 +12,7 @@ export interface ExportedTemplateData {
         | "description"
         | "content"
         | "layout"
+        | "pageCategory"
         | "dataBindings"
         | "dataSources"
     >;
@@ -45,6 +46,7 @@ export class PageTemplateExporter {
                 description: template.description,
                 content: template.content,
                 layout: template.layout,
+                pageCategory: template.pageCategory,
                 dataBindings: template.dataBindings,
                 dataSources: template.dataSources
             },