Merge branch 'dev' into next

# Conflicts:
#	packages/cli-plugin-deploy-pulumi/src/commands/watch.ts

Author: Pavel910

packages/app-page-builder/src/editor/contexts/EditorPageElementsProvider/ElementControlsOverlay.tsx

@@ -267,7 +267,9 @@ export const ElementControlsOverlay = (props: Props) => {
             return "block | unknown";
         }
 
-        return getElementTitle(element.type, element.id);
+        const suffix = process.env.REACT_APP_DEBUG ? element.id : "";
+
+        return getElementTitle(element.type, suffix);
     }, [element.data.blockId]);
 
     // Z-index of element controls overlay depends on the depth of the page element.

packages/app-page-builder/src/editor/plugins/elementSettings/save/SaveAction.tsx

@@ -15,7 +15,7 @@ import {
     PbEditorElement
 } from "~/types";
 import { useEventActionHandler } from "~/editor/hooks/useEventActionHandler";
-import { removeElementId } from "~/editor/helpers";
+import { addElementId, removeElementId } from "~/editor/helpers";
 import { useActiveElement } from "~/editor/hooks/useActiveElement";
 import { usePageBlocks } from "~/admin/contexts/AdminPageBuilder/PageBlocks/usePageBlocks";
 
@@ -58,10 +58,12 @@ const SaveAction = ({ children }: { children: React.ReactElement }) => {
 
     const onSubmit = async (formData: SaveElementFormData | SaveBlockFormData) => {
         const pbElement = (await getElementTree({ element })) as PbElement;
-        const newContent = pluginOnSave(removeElementId(pbElement));
 
         if (formData.type === "block") {
-            // We can create a new block, or update an existing one.
+            // We need to create new element IDs when saving a block.
+            const newContent = pluginOnSave(addElementId(pbElement));
+
+            // We can create a new block or update an existing one.
             try {
                 if (formData.overwrite) {
                     await updateBlock({
@@ -89,6 +91,9 @@ const SaveAction = ({ children }: { children: React.ReactElement }) => {
                 </span>
             );
         } else {
+            // When saving a simple element, we remove all element IDs.
+            const newContent = pluginOnSave(removeElementId(pbElement));
+
             const { data: res } = await client.mutate({
                 mutation: CREATE_PAGE_ELEMENT,
                 variables: {

packages/cli-plugin-deploy-pulumi/src/commands/newWatch/listPackages.ts

@@ -22,6 +22,9 @@ export const listPackages = async ({ inputs }: IListPackagesParams) => {
     if (inputs.package) {
         packagesList = Array.isArray(inputs.package) ? [...inputs.package] : [inputs.package];
 
+        // Also split by commas.
+        packagesList = packagesList.map(item => item.split(",")).flat();
+
         // When providing packages manually, we also allow providing names of Webiny packages
         // without the `@webiny` scope. In that case, we need to add the scope to the package name.
         const webinyPrefixedPackagesToAdd = [];