Merge branch '6.0' into gforcada-patch-2

stevepiercy · web-flow · commit 869997bb5bc5 · 2024-03-17T08:48:08.000-04:00
diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml
@@ -15,13 +15,13 @@ jobs:
       name: docs.plone.org
       url: https://docs.plone.org
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Graphviz
-        uses: ts-graphviz/setup-graphviz@v1
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: ts-graphviz/setup-graphviz@v2
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.12'
           cache: 'pip'
       - name: Install dependencies
         run: |
@@ -39,11 +39,11 @@ jobs:
         run: make deploy
 
       - name: Use Node.js ${{ env.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.node-version }}
 
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
           version: 8
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,12 +6,12 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
 
       - name: Install dependencies
         run: |
diff --git a/.github/workflows/update_submodule.yml b/.github/workflows/update_submodule.yml
@@ -1,3 +1,4 @@
+# See https://github.com/plone/documentation/issues/1214 for current status
 name: Get latest version of submodules and push back to 6.0 branch
 
 on:
diff --git a/docs/classic-ui/icons.md b/docs/classic-ui/icons.md
@@ -67,13 +67,14 @@ To use a different icon than the system default, you can override the registrati
 
 ## Icon expression
 
-```{todo}
-How does this work? We need an example here!
-```
-
-- The field `icon_expression` is used again to define icons for actions, content types, and other purposes.
+- The field `icon_expr` is used again to define icons for actions, content types, and other purposes.
 - Use the icon name for icon expressions.
 
+Example:
+
+```xml
+<property name="icon_expr">string:list-check</property>
+```
 
 (classic-ui-icons-icon-resolver-label)=
 
diff --git a/docs/classic-ui/theming/from-scratch.md b/docs/classic-ui/theming/from-scratch.md
@@ -66,6 +66,8 @@ prefix = /++theme++plonetheme.munich
 doctype = <!DOCTYPE html>
 ```
 
+(classic-ui-from-scratch-bundle-registration-label)=
+
 ### Bundle registration
 
 ```xml
@@ -120,7 +122,61 @@ yarn dist
 -   Tweak basic settings like rounded corners, shadows, and so on.
 -   Set custom fonts
 -   Define your own stuff
--   Import Boostrap (as basis)
+-   Import Bootstrap (as basis)
+
+
+#### Minimal backend styling
+
+When you create a theme from scratch, it is convenient to reuse the Barceloneta theme for:
+
+-   Plone toolbar
+-   add and edit forms
+-   control panels
+
+To do so, follow this guide.
+
+-   Create a new CSS file in your theme, such as the following.
+
+    ```scss
+    @import "@plone/plonetheme-barceloneta-base/scss/variables.colors.plone";
+    @import "@plone/plonetheme-barceloneta-base/scss/variables.colors.dark.plone";
+    @import "@plone/plonetheme-barceloneta-base/scss/root_variables";
+    @import "bootstrap/scss/bootstrap";
+    
+    @import "@plone/plonetheme-barceloneta-base/scss/toolbar";
+    @import "@plone/plonetheme-barceloneta-base/scss/controlpanels";
+    @import "@plone/plonetheme-barceloneta-base/scss/forms";
+    ```
+
+    ```{tip}
+    See all the available [Barceloneta SCSS files](https://github.com/plone/plonetheme.barceloneta/tree/master/scss), and import the ones that you want to use.
+    ```
+
+-   Add `@plone/plonetheme-barceloneta-base` as a dependency.
+
+    ```shell
+    yarn add @plone/plonetheme-barceloneta-base
+    ```
+
+-   Add a script in {file}`package.json` to compile the CSS.
+
+    ```json
+      "css-compile-main": "sass --load-path=node_modules --style expanded --source-map --embed-sources --no-error-css plone.scss:../static/plone.css"
+    ```
+
+    ```{tip}
+    Look at [`plonetheme.barcelonta`'s {file}`package.json`](https://github.com/plone/plonetheme.barceloneta/blob/master/package.json) for a few more scripts that can prefix and minify your CSS and get a bundle for use in production.
+    ```
+
+-   Run the compilation.
+
+    ```shell
+    yarn run css-compile-main
+    ```
+
+-   Finally, {ref}`register the bundle <classic-ui-from-scratch-bundle-registration-label>`.
+
+With this guide, you will save yourself quite some work on styling the toolbar, the add and edit forms, and control panels, while keeping the rest of your theming separate.
 
 
 #### Templates
diff --git a/docs/glossary.md b/docs/glossary.md
@@ -701,4 +701,13 @@ Nick
 predicate
 predicates
     In programming, a predicate is a test which returns `true` or `false`.
+
+pnpm workspace
+workspace
+    pnpm has built-in support for monorepositories (also known as multi-package repositories, multi-project repositories, or monolithic repositories).
+    Workspaces provide support to manage multiple packages from your local file system from within a singular top-level, root package.
+    By defining a single `package.json` file at the root of the repository and specifying the individual packages as workspaces, pnpm treats them as interdependent projects.
+
+    When you run `pnpm install` at the root of the repository, pnpm installs dependencies for all workspaces, ensuring consistency across the entire project.
+    This centralized approach streamlines development, facilitates code sharing, and simplifies the maintenance of complex projects.
 ```
diff --git a/docs/install/create-project.md b/docs/install/create-project.md
@@ -228,6 +228,10 @@ You will be presented with a series of prompts.
 You can accept the default values in square brackets (`[default-option]`) by hitting the {kbd}`Enter` key, or enter your preferred values.
 For ease of documentation, we will use the default values.
 
+```{tip}
+See the cookiecutter's README for how to [Use options to avoid prompts](https://github.com/collective/cookiecutter-plone-starter/?tab=readme-ov-file#use-options-to-avoid-prompts).
+```
+
 (avoid-plone-core-package-names)=
 
 ```{important}
diff --git a/submodules/plone.restapi b/submodules/plone.restapi
@@ -1 +1 @@
-Subproject commit ce7bfbef8bb2d1fd7388bb8bb384eecb0dc81f81
+Subproject commit e62bea2121d929d9c35298e7e5841332bd1dcbc5
diff --git a/submodules/volto b/submodules/volto
@@ -1 +1 @@
-Subproject commit 7bc30cb15160b5a18a519c0959df8fb5af07c15a
+Subproject commit 0deb876b34bcd698dc46282884ce5417aeae0fce

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# See https://github.com/plone/documentation/issues/1214 for current status`
`1`	`2`	`name: Get latest version of submodules and push back to 6.0 branch`
`2`	`3`
`3`	`4`	`on:`