Merge branch '6-dev' into color-mode-bootstrap5

Author: stevepiercy

.github/CONTRIBUTING.md

@@ -1 +1 @@
-See our [contributing guidelines](https://6.dev-docs.plone.org/contributing/index.html).
+See our [contributing guidelines](https://6.docs.plone.org/contributing/index.html).

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -2,9 +2,10 @@ Thank you for your contribution to the Plone Documentation.
 
 Before submitting this pull request, please make sure you follow our guides:
 
-- [ ] [Contributing to Plone Documentation](https://6.dev-docs.plone.org/contributing/index.html)
-- [ ] [Building and Checking the Quality of Documentation](https://6.dev-docs.plone.org/contributing/setup-build.html)
-- [ ] [General Guide to Writing Documentation](https://6.dev-docs.plone.org/contributing/writing-docs-guide.html)
+-   [Contributing to Plone documentation](https://6.docs.plone.org/contributing/index.html)
+-   [Building and checking the quality of documentation](https://6.docs.plone.org/contributing/setup-build.html)
+-   [Authors guide](https://6.docs.plone.org/contributing/authors.html)
+-   [MyST reference](https://6.docs.plone.org/contributing/myst-reference.html)
 
 ## Issue Number
 

.github/workflows/build_deploy.yml

@@ -9,13 +9,14 @@ jobs:
   build_deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - name: Setup Graphviz
+        uses: ts-graphviz/setup-graphviz@v1
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
-
+          python-version: '3.10'
+          cache: 'pip'
       - name: Install dependencies
         run: |
           pip install -q -r requirements-initial.txt
@@ -32,31 +33,34 @@ jobs:
         run: make deploy
 
       # node setup
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+      - name: Use Node.js 16
+        uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node-version }}
-
+          node-version: '16'
+      - name: Install Yarn
+        run: npm install -g yarn
       # node cache
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         working-directory: submodules/volto
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v1
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+      - uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-
       - name: StoryBook build
-        run: cd submodules/volto && yarn && yarn build-storybook -o ../../_build/html/storybook
+        run: |
+          cd submodules/volto 
+          yarn install --immutable 
+          yarn build-storybook -o ../../_build/html/storybook
 
       - name: Deploy to server
         id: deploy
-        uses: Pendect/action-rsyncer@v1.1.0
+        uses: Pendect/action-rsyncer@v2.0.0
         env:
           DEPLOY_KEY: ${{secrets.DEPLOY_KEY_DOCS}}
         with:

Makefile

@@ -62,7 +62,7 @@ docs/volto:
 	@echo "Documentation of volto initialized."
 
 .PHONY: deps
-deps: bin/python docs/volto docs/plone.restapi docs/plone.api ## Create Python virtual environment, install requirements, initialize or update the volto, plone.restapi, and plone.api submodules, and finally create symlinks to the source files.
+deps: bin/python docs/volto docs/plone.restapi docs/plone.api  ## Create Python virtual environment, install requirements, initialize or update the volto, plone.restapi, and plone.api submodules, and finally create symlinks to the source files.
 
 
 .PHONY: html

coredev/agreement.md

@@ -0,0 +1,64 @@
+---
+myst:
+  html_meta:
+    "description": "Contributing to Plone"
+    "property=og:description": "Contributing to Plone"
+    "property=og:title": "Contributing to Plone"
+    "keywords": "Contributing, Plone"
+---
+
+(contributing-to-plone-label)=
+
+# Contributing to Plone
+
+There are many people and companies who rely on Plone on a day-to-day basis, so we must enforce some level of code quality control.
+
+Plone's source code is hosted in git repositories at  <https://github.com/plone>, but only members of the developer team have commit rights.
+
+Sending in a contributors agreement does not guarantee your commit access to the repositories, but once you send it in we will always have it on file for when you are ready to contribute.
+
+We ask that before requesting core access you familiarize yourself a little with the community since they will help you get ramped up:
+
+-   Ask and (especially) answer questions on [the Plone forum](https://community.plone.org/) and in {doc}`Plone chat <culture>` with a focus on getting to know the active developers a bit.
+
+-   Attend a [conference](https://plone.org/news-and-events/events/plone-conferences), [symposium](https://plone.org/news-and-events/events/regional), or participate in a [sprint](https://plone.org/news-and-events/events/sprints).
+
+    There are plenty of opportunities to meet the community and start contributing through various coding sessions, either in person or on the web.
+
+    You may even be able to get immediate core access at a conference if you are flexing your mad coding skills and the right people are attending.
+
+-   Get your feet wet by contributing to the [collective](https://collective.github.io/).
+    Don't worry about getting it perfect or asking for help.
+    This way you get to know us and we improve our code together as a community.
+
+-   **Patches:** Historically we encouraged people to submit patches to the ticket collector.
+    These tickets are usually ignored forever.
+    Technically, for us to accept your patch, you must sign the contributors agreement.
+    If you want to contribute fixes, please just sign the agreement and go through the standard GitHub pull request process described below until you feel comfortable to bypass review.
+    If the ticket is trivial, you do not need to sign a contributor's agreement.
+
+Once you have familiarized yourself with the community and you are excited to contribute to the core:
+
+-   Sign the contributor agreement at <https://plone.org/foundation/contributors-agreement/agreement.pdf>, then either send by postal mail to the address provided, or scan and email it to <[email protected]>.
+    This offers both copyright protection and ensures that the Plone Foundation is able to exercise some control over the codebase, ensuring it is not appropriated for someone's unethical purposes.
+    For questions about why the agreement is required, please see [About the Plone Contributor Agreement
+](https://plone.org/foundation/contributors-agreement).
+
+If you aren't sure where to start or just want more direction, feel free to get in the forum or in chat, and ask for help.
+While there is no official mentoring process, there are plenty of people willing to act in that role and guide you through the steps of getting involved in the community.
+A common way to start contributing is to participate in a [Plone sprint](https://plone.org/news-and-events/events/sprints).
+
+**Welcome to the Plone community!**
+
+
+## Dealing with pull requests on GitHub
+
+Before we can merge a pull request, we have to check that the author has signed the contributor's agreement.
+
+If they're listed in <https://github.com/orgs/plone/teams/developers/members>, the author has signed so we can go ahead and merge.
+
+If they aren't listed there, there's still a chance they have signed the contributor's agreement.
+
+If they have signed before the move to GitHub, you can ask <[email protected]> to check.
+
+Pull requests without contributor's agreement can only be merged in trivial cases, and only by the release manager.

coredev/continous-integration.md

@@ -0,0 +1,105 @@
+---
+myst:
+  html_meta:
+    "description": "Essential continuous integration practices"
+    "property=og:description": "Essential continuous integration practices"
+    "property=og:title": "Essential continuous integration practices"
+    "keywords": "Plone, continuous integration, best practices"
+---
+
+# Essential continuous integration practices
+
+The CI system at [jenkins.plone.org](https://jenkins.plone.org) is a shared resource for Plone core developers to notify them of regressions in Plone core code.
+
+Build breakages are a normal and expected part of the development process.
+Our aim is to find errors and eliminate them as quickly as possible, without expecting perfection and zero errors.
+Though, there are some essential rules that needs to be followed in order to achieve a stable build.
+
+
+## 1) Don't check in on a broken build
+
+Do not make things more complicated for the developer who is responsible for breaking the build.
+
+If the build breaks, the developer has to identify the cause of the breakage as soon as possible and should fix it.
+If we adopt this strategy, we will always be in the best position to find out what caused the breakage and fix it immediately.
+If one of the developers has made a check-in and broken the build as a result, we have the best chance of fixing the build if we have a clear look at the problem.
+Checking in further changes and triggering new builds will just lead to more problems.
+
+If the build is broken over a longer period of time (more than a couple of hours) you should either notify the developer who is responsible for the breakage, fix the problem yourself, or just revert the commit in order to be able to continue to work.
+
+```note
+There is one exception to this rule.
+Sometimes there are changes or tests that depend on changes in other packages.
+If this is the case, there is no way around breaking a single build for a certain period of time.
+In this case run the all tests locally with all the changes and commit them within a time frame of ten minutes.
+```
+
+
+## 2) Always run all commit tests locally before committing
+
+Following this practice ensures the build stays green, and other developers can continue to work without breaking the first rule.
+
+There might be changes that have been checked in before your last update from the version control that might lead to a build failure in Jenkins in combination with your changes.
+Therefore it is essential that you check out ({command}`git pull`) and run the tests again before you push your changes to GitHub.
+
+Furthermore, a common source of errors on check-in is to forget to add some files to the repository.
+
+If you follow this rule and your local build passes, you can be sure that this is because someone else checked in in the meantime, or because you forgot to add a new class or configuration file that you have been working on into the version control system.
+
+
+## 3) Wait for commit tests to pass before moving on
+
+Always monitor the build's progress, and fix the problem right away if it fails.
+You have a far better chance of fixing the build, if you just introduced a regression than later.
+Also another developer might have committed in the meantime (by breaking rule 1), making things more complicated for yours.
+
+
+## 4) Never go home on a broken build
+
+Taking into account the first rule of CI ("Don't check in on a broken build"), breaking the build essentially stops all other developers from working on it.
+Therefore going home on a broken build (or even on a build that has not finished yet) is **not** acceptable.
+It will prevent all the other developers to stop working on the build or fixing the errors that you introduced.
+
+
+## 5) Always be prepared to revert to the previous revision
+
+In order for the other developers to be able to work on the build, you should always be prepared to revert to the previous (passing) revision.
+
+
+## 6) Time-box fixing before reverting
+
+When the build breaks on check-in, try to fix it for ten minutes.
+If, after ten minutes, you aren't finished with the solution, revert to the previous version from your version control system.
+This way you will allow other developers to continue to work.
+
+
+## 7) Don't comment out failing tests
+
+Once you begin to enforce the previous rule, the result is often that developers start commenting out failing tests in order to get the build passing again as quick as possible.
+While this impulse is understandable, it is **wrong**.
+
+The tests have been passing for a while and then start to fail.
+This means that we either caused a regression, made assumptions that are no longer valid, or the application has changed the functionality being tested for a valid reason.
+
+You should always either fix the code (if a regression has been found), modify the test (if one of the assumptions has changed), or delete it (if the functionality under test no longer exists).
+
+
+## 8) Take responsibility for all breakages that result from your changes
+
+If you commit a change and all the tests you wrote pass, but others break, the build is still broken.
+This also applies to tests that fail in `buildout.coredev` and don't belong directly to the package you worked on.
+This means that you have introduced a regression bug into the application.
+
+It is **your responsibility**—because you made the change—to fix all tests that are not passing as a result of your changes.
+
+There are some tests in Plone that fail randomly, we are always working on fixing those.
+If you think you hit such a test, try to fix it (better) or re-run the Jenkins job to see if it passes again.
+
+In any case the developer who made the commit is responsible to make it pass.
+
+
+## Further Reading
+
+Those rules were taken from the excellent book "Continuous Delivery" by Jez Humble and David Farley (Addison Wesley), and have been adopted and rewritten for the Plone community.
+
+If you want to learn more about continuous integration and continuous delivery, I'd recommend that you buy this book.