Merge branch 'main' into issue-4058

plone · Mar 15, 2024 · 933bd92 · 933bd92
2 parents 136bbe8 + 0deb876
commit 933bd92
Show file tree

Hide file tree

Showing 45 changed files with 286 additions and 173 deletions.
diff --git a/apps/nextjs/README.md b/apps/nextjs/README.md
@@ -8,6 +8,7 @@ To start, from the root of the monorepo:
 
 ```shell
 pnpm install
+pnpm build:deps && pnpm build:components
 pnpm --filter plone-nextjs run dev
 ```
 

diff --git a/docs/source/client/future-improvements.md b/docs/source/client/future-improvements.md
@@ -53,7 +53,10 @@ The steps for this approach are as follows:
 3. Render the component to string on the server
 4. Pass the data from collected queries to TanStack Query cache hydration
 
-Refer to official docs for more information: https://tanstack.com/query/v4/docs/framework/react/guides/ssr
+```{seealso}
+[TanStack Query Server Rendering & Hydration documentation](https://tanstack.com/query/latest/docs/framework/react/guides/ssr)
+```
+
 
 ### Automatic caching approach
 

diff --git a/docs/source/release-notes/index.md b/docs/source/release-notes/index.md
@@ -17,6 +17,42 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.20 (2024-03-14)
+
+### Bugfix
+
+- Add BBB code for removed WysiwygWidget @sneridagh [#5874](https://github.com/plone/volto/issues/5874)
+
+## 18.0.0-alpha.19 (2024-03-14)
+
+### Breaking
+
+- Remove legacy `text`, `table` and `hero` blocks based in `draftJS` @sneridagh [#5846](https://github.com/plone/volto/issues/5846)
+
+### Feature
+
+- Do not display options for Site Administrator to create, modify, or delete Manager users. @wesleybl [#5244](https://github.com/plone/volto/issues/5244)
+
+### Bugfix
+
+- (fix):  make search block sort and facets work on edit @dobri1408 [#5262](https://github.com/plone/volto/issues/5262)
+- Upgrade `@typescript-eslint` version @sneridagh [#5844](https://github.com/plone/volto/issues/5844)
+- Fix the introduction of a mutable (referenced) object when assigning the default inner `blocksConfig` object for the `grid` block, pass by value instead. sneridagh [#5850](https://github.com/plone/volto/issues/5850)
+- Fix other occurrences of mutable (referenced) objects when assigning the default inner `blocksConfig` object for the `grid` block, pass by value instead. sneridagh [#5859](https://github.com/plone/volto/issues/5859)
+
+### Internal
+
+- Upgrade versions of Cypress @sneridagh [#5845](https://github.com/plone/volto/issues/5845)
+
+### Documentation
+
+- Update link to cssnano documentation. @stevepiercy [#5853](https://github.com/plone/volto/issues/5853)
+- Update docs for the `defaultBlockType` setting. @davisagli [#5854](https://github.com/plone/volto/issues/5854)
+- The proper name is Semantic UI. @stevepiercy [#5855](https://github.com/plone/volto/issues/5855)
+- Add missing nextjs install step. @gomez [#5857](https://github.com/plone/volto/issues/5857)
+- Add reference to Docker installation for some Linux distributions. @stevepiercy [#5861](https://github.com/plone/volto/issues/5861)
+- Fix broken link to TanStack Query. @stevepiercy [#5871](https://github.com/plone/volto/issues/5871)
+
 ## 18.0.0-alpha.18 (2024-03-05)
 
 ### Bugfix

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -8,6 +8,16 @@
 
 <!-- towncrier release notes start -->
 
+## 2.0.0-alpha.7 (2024-03-14)
+
+### Bugfix
+
+- Missing CSS in build for `Container` @sneridagh [#5849](https://github.com/plone/volto/issues/5849)
+
+### Internal
+
+- Cleanup deps @sneridagh [#5846](https://github.com/plone/volto/issues/5846)
+
 ## 2.0.0-alpha.6 (2024-03-06)
 
 ### Breaking

diff --git a/packages/components/news/5846.internal b/packages/components/news/5846.internal
diff --git a/packages/components/news/5849.bugfix b/packages/components/news/5849.bugfix
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -8,7 +8,7 @@
     }
   ],
   "license": "MIT",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.7",
   "repository": {
     "type": "git",
     "url": "http://github.com/plone/components.git"

diff --git a/packages/generator-volto/CHANGELOG.md b/packages/generator-volto/CHANGELOG.md
@@ -8,6 +8,13 @@
 
 <!-- towncrier release notes start -->
 
+## 9.0.0-alpha.11 (2024-03-14)
+
+### Bugfix
+
+- Upgrade all versions in generator templates @sneridagh [#5844](https://github.com/plone/volto/issues/5844)
+- Improve deps in project generator. @sneridagh @wesleybl [#5870](https://github.com/plone/volto/issues/5870)
+
 ## 9.0.0-alpha.10 (2024-03-05)
 
 ### Bugfix

diff --git a/packages/generator-volto/generators/app/templates/.browserslistrc b/packages/generator-volto/generators/app/templates/.browserslistrc
@@ -0,0 +1,5 @@
+> 1%
+last 4 versions
+Firefox ESR
+not ie 11
+not dead
diff --git a/packages/generator-volto/generators/app/templates/.prettierrc b/packages/generator-volto/generators/app/templates/.prettierrc
@@ -0,0 +1,12 @@
+{
+  "trailingComma": "all",
+  "singleQuote": true,
+  "overrides": [
+    {
+      "files": "*.overrides",
+      "options": {
+        "parser": "less"
+      }
+    }
+  ]
+}
diff --git a/packages/generator-volto/generators/app/templates/.stylelintrc b/packages/generator-volto/generators/app/templates/.stylelintrc
@@ -0,0 +1,23 @@
+{
+  "extends": ["stylelint-config-idiomatic-order"],
+  "plugins": ["stylelint-prettier"],
+  "overrides": [
+    {
+      "files": ["**/*.less"],
+      "customSyntax": "postcss-less"
+    },
+    {
+      "files": ["**/*.overrides"],
+      "customSyntax": "postcss-less"
+    },
+    {
+      "files": ["**/*.scss"],
+      "customSyntax": "postcss-scss"
+    }
+  ],
+  "rules": {
+    "prettier/prettier": true,
+    "order/properties-alphabetical-order": null
+  },
+  "ignoreFiles": "theme/themes/default/**/*.overrides"
+}
diff --git a/packages/generator-volto/generators/app/templates/package.json.tpl b/packages/generator-volto/generators/app/templates/package.json.tpl
@@ -7,12 +7,12 @@
     "start": "razzle start",
     "postinstall": "make omelette && make patches",
     "build": "razzle build --noninteractive",
-    "lint": "./node_modules/eslint/bin/eslint.js --max-warnings=0 'src/**/*.{js,jsx,ts,tsx}'",
-    "lint:fix": "./node_modules/eslint/bin/eslint.js --fix 'src/**/*.{js,jsx,ts,tsx}'",
-    "lint:ci": "./node_modules/eslint/bin/eslint.js --max-warnings=0 -f checkstyle 'src/**/*.{js,jsx,ts,tsx}' > eslint.xml",
-    "prettier": "./node_modules/.bin/prettier --single-quote --check 'src/**/*.{js,jsx,ts,tsx,css,scss}'",
-    "prettier:fix": "./node_modules/.bin/prettier --single-quote --write 'src/**/*.{js,jsx,ts,tsx,css,scss}'",
-    "prettier:ci": "./node_modules/.bin/prettier --single-quote --check 'src/**/*.{js,jsx,ts,tsx,css,scss}'",
+    "lint": "eslint --max-warnings=0 'src/**/*.{js,jsx,ts,tsx}'",
+    "lint:fix": "eslint --fix 'src/**/*.{js,jsx,ts,tsx}'",
+    "lint:ci": "eslint --max-warnings=0 -f checkstyle 'src/**/*.{js,jsx,ts,tsx}' > eslint.xml",
+    "prettier": "prettier --single-quote --check 'src/**/*.{js,jsx,ts,tsx,css,scss}'",
+    "prettier:fix": "prettier --single-quote --write 'src/**/*.{js,jsx,ts,tsx,css,scss}'",
+    "prettier:ci": "prettier --single-quote --check 'src/**/*.{js,jsx,ts,tsx,css,scss}'",
     "stylelint": "stylelint 'theme/**/*.{css,scss,less}' 'src/**/*.{css,scss,less}' --allow-empty-input",
     "stylelint:overrides": "stylelint 'theme/**/*.overrides' 'src/**/*.overrides' --allow-empty-input",
     "stylelint:fix": "yarn stylelint --fix && yarn stylelint:overrides --fix",
@@ -71,83 +71,44 @@
       "__DEV__": true
     }
   },
-  "prettier": {
-    "trailingComma": "all",
-    "singleQuote": true,
-    "overrides": [
-      {
-        "files": "*.overrides",
-        "options": {
-          "parser": "less"
-        }
-      }
-    ]
-  },
-  "stylelint": {
-    "extends": [
-      "stylelint-config-idiomatic-order"
-    ],
-    "plugins": [
-      "stylelint-prettier"
-    ],
-    "overrides": [
-      {
-        "files": [
-          "**/*.less"
-        ],
-        "customSyntax": "postcss-less"
-      },
-      {
-        "files": [
-          "**/*.overrides"
-        ],
-        "customSyntax": "postcss-less"
-      },
-      {
-        "files": [
-          "**/*.scss"
-        ],
-        "customSyntax": "postcss-scss"
-      }
-    ],
-    "rules": {
-      "prettier/prettier": true,
-      "rule-empty-line-before": [
-        "always-multi-line",
-        {
-          "except": [
-            "first-nested"
-          ],
-          "ignore": [
-            "after-comment"
-          ]
-        }
-      ]
-    },
-    "ignoreFiles": "theme/themes/default/**/*.overrides"
-  },
-  "browserslist": [
-    ">1%",
-    "last 4 versions",
-    "Firefox ESR",
-    "not ie 11",
-    "not dead"
-  ],
   "engines": {
-    "node": "^16 || ^18 || ^20"
+    "node": "^18 || ^20"
   },
   "dependencies": <%- dependencies %>,
   "devDependencies": {
-    "@plone/scripts": "^3.0.0",
+    "@plone/scripts": "^3.5.0",
+    "@plone/types": "^1.0.0-alpha.5",
     "@storybook/addon-actions": "^6.3.0",
     "@storybook/addon-controls": "6.3.0",
     "@storybook/addon-essentials": "^6.3.0",
     "@storybook/addon-links": "^6.3.0",
     "@storybook/builder-webpack5": "^6.5.15",
     "@storybook/manager-webpack5": "^6.5.15",
     "@storybook/react": "^6.3.0",
-    "@typescript-eslint/eslint-plugin": "7.1.1",
-    "@typescript-eslint/parser": "7.1.1",
+    "@testing-library/cypress": "10.0.1",
+    "@testing-library/jest-dom": "6.4.2",
+    "@testing-library/react": "14.2.0",
+    "@testing-library/react-hooks": "8.0.1",
+    "@types/jest": "^29.5.8",
+    "@types/lodash": "^4.14.201",
+    "@types/react": "^18",
+    "@types/react-dom": "^18",
+    "@types/react-router-dom": "^5.3.3",
+    "@types/uuid": "^9.0.8",
+    "@typescript-eslint/eslint-plugin": "7.2.0",
+    "@typescript-eslint/parser": "7.2.0",
+    "cypress": "13.6.6",
+    "cypress-axe": "1.5.0",
+    "cypress-file-upload": "5.0.8",
+    "eslint": "8.49.0",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-config-react-app": "7.0.1",
+    "eslint-import-resolver-alias": "1.1.2",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-prettier": "5.1.3",
+    "eslint-plugin-react": "7.33.2",
+    "eslint-plugin-react-hooks": "4.6.0",
     "jest-junit": "8.0.0",
     "mrs-developer": "^2.1.1",
     "postcss": "8.4.13",
@@ -158,7 +119,7 @@
     "stylelint-prettier": "5.0.0",
     "ts-jest": "^26.4.2",
     "ts-loader": "9.4.4",
-    "typescript": "5.3.3"
+    "typescript": "5.4.2"
   },
   "resolutions": {
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",

diff --git a/packages/generator-volto/news/5844.bugfix b/packages/generator-volto/news/5844.bugfix
diff --git a/packages/generator-volto/package.json b/packages/generator-volto/package.json
@@ -10,7 +10,7 @@
     }
   ],
   "license": "MIT",
-  "version": "9.0.0-alpha.10",
+  "version": "9.0.0-alpha.11",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/plone/generator-volto.git"

diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
@@ -8,6 +8,12 @@
 
 <!-- towncrier release notes start -->
 
+## 1.0.0-alpha.6 (2024-03-14)
+
+### Internal
+
+- Cleanup deps @sneridagh [#5846](https://github.com/plone/volto/issues/5846)
+
 ## 1.0.0-alpha.5 (2024-03-01)
 
 ### Feature

diff --git a/packages/types/news/5846.internal b/packages/types/news/5846.internal
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -9,7 +9,7 @@
   ],
   "funding": "https://github.com/sponsors/plone",
   "license": "MIT",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/plone/volto.git"

diff --git a/packages/volto-slate/CHANGELOG.md b/packages/volto-slate/CHANGELOG.md
@@ -8,6 +8,20 @@
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.10 (2024-03-14)
+
+### Breaking
+
+- Remove legacy `text`, `table` and `hero` blocks based in `draftJS` @sneridagh [#5846](https://github.com/plone/volto/issues/5846)
+
+### Bugfix
+
+- Fix other occurrences of mutable (referenced) objects when assigning the default inner `blocksConfig` object for the `grid` block, pass by value instead. sneridagh [#5859](https://github.com/plone/volto/issues/5859)
+
+### Internal
+
+- Fix CSS lint @sneridagh [#5849](https://github.com/plone/volto/issues/5849)
+
 ## 18.0.0-alpha.9 (2024-03-02)
 
 ### Internal

diff --git a/packages/volto-slate/news/5846.breaking b/packages/volto-slate/news/5846.breaking
diff --git a/packages/volto-slate/news/5849.internal b/packages/volto-slate/news/5849.internal
diff --git a/packages/volto-slate/news/5859.bugfix b/packages/volto-slate/news/5859.bugfix
diff --git a/packages/volto-slate/package.json b/packages/volto-slate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@plone/volto-slate",
-  "version": "18.0.0-alpha.9",
+  "version": "18.0.0-alpha.10",
   "description": "Slate.js integration with Volto",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",