Skip to content

Commit

Permalink
Merge branch 'main' into fix-slateWidget
Browse files Browse the repository at this point in the history
  • Loading branch information
nileshgulia1 authored Feb 5, 2025
2 parents 0192de0 + bcc1995 commit cd3d121
Show file tree
Hide file tree
Showing 122 changed files with 4,606 additions and 2,648 deletions.
2 changes: 1 addition & 1 deletion .github/actions/node_env_setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ runs:

- name: Enable corepack
shell: bash
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/api-first.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/code-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
node-version: ${{ matrix.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down
1 change: 1 addition & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ dist
docs
node_modules
packages/registry/lib
build
2 changes: 1 addition & 1 deletion apps/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
"@types/react-dom": "^18",
"eslint": "^8",
"eslint-config-next": "14.2.14",
"typescript": "^5.6.3"
"typescript": "^5.7.3"
}
}
2 changes: 1 addition & 1 deletion apps/remix/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ node_modules
/build
/public/build
.env
.registry.loader.js
registry.loader.js
2 changes: 1 addition & 1 deletion apps/remix/app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import PloneClient from '@plone/client';
import { ReactQueryDevtools } from '@tanstack/react-query-devtools';

import '@plone/components/dist/basic.css';
import '@plone/slots/main.css';
import '@plone/slots/styles/main.css';
import { flattenToAppURL } from './utils';
import { PloneProvider } from '@plone/providers';

Expand Down
2 changes: 1 addition & 1 deletion apps/remix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@tanstack/react-query-devtools": "^5.59.0",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"typescript": "^5.6.3",
"typescript": "^5.7.3",
"vite": "^5.4.9",
"vite-tsconfig-paths": "^4.2.1"
},
Expand Down
2 changes: 1 addition & 1 deletion apps/rr7/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ node_modules
/build
.env
.react-router
.registry.loader.js
registry.loader.js
64 changes: 64 additions & 0 deletions apps/rr7/.registry.loader.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
This file is autogenerated. Don't change it directly.
Instead, change the "addons" setting in your package.json file.
*/

import ploneblocks from '@plone/blocks';
import ploneslots from '@plone/slots';

const addonsInfo = [
{
name: '@plone/blocks',
version: '1.0.0-alpha.1',
isPublishedPackage: true,
isRegisteredAddon: true,
modulePath: '/Users/sneridagh/Development/plone/volto/packages/blocks',
packageJson:
'/Users/sneridagh/Development/plone/volto/packages/blocks/package.json',
basePath: '/Users/sneridagh/Development/plone/volto/packages/blocks',
tsConfigPaths: ['', {}],
addons: [],
},
{
name: '@plone/slots',
version: '1.0.0',
isPublishedPackage: true,
isRegisteredAddon: true,
modulePath: '/Users/sneridagh/Development/plone/volto/packages/slots',
packageJson:
'/Users/sneridagh/Development/plone/volto/packages/slots/package.json',
basePath: '/Users/sneridagh/Development/plone/volto/packages/slots',
tsConfigPaths: ['', {}],
addons: [],
},
];
export { addonsInfo };

const safeWrapper = (func) => (config) => {
const res = func(config);
if (typeof res === 'undefined') {
throw new Error("Configuration function doesn't return config");
}
return res;
};

const projectConfigLoader = false;
const projectConfig = (config) => {
return projectConfigLoader &&
typeof projectConfigLoader.default === 'function'
? projectConfigLoader.default(config)
: config;
};

const load = (config) => {
const addonLoaders = [ploneblocks, ploneslots];
if (!addonLoaders.every((el) => typeof el === 'function')) {
throw new TypeError(
'Each addon has to provide a function applying its configuration to the projects configuration.',
);
}
return projectConfig(
addonLoaders.reduce((acc, apply) => safeWrapper(apply)(acc), config),
);
};
export default load;
2 changes: 1 addition & 1 deletion apps/rr7/app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import installSSR from './config.server';
install();

import themingMain from '@plone/theming/styles/main.css?url';
import slotsMain from '@plone/slots/main.css?url';
import slotsMain from '@plone/slots/styles/main.css?url';

function useNavigate() {
const navigate = useRRNavigate();
Expand Down
2 changes: 1 addition & 1 deletion apps/rr7/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@react-router/dev": "7.1.1",
"@types/react": "^18.3.9",
"@types/react-dom": "^18.3.0",
"typescript": "^5.6.3",
"typescript": "^5.7.3",
"vite": "^5.4.9",
"vite-tsconfig-paths": "^5.0.1"
},
Expand Down
4 changes: 2 additions & 2 deletions apps/vite-ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"isbot": "^4.3.0",
"node-fetch": "^3.3.2",
"serve-static": "^1.15.0",
"typescript": "^5.6.3",
"vite": "^5.2.9",
"typescript": "^5.7.3",
"vite": "^5.4.9",
"vite-plugin-babel": "^1.2.0"
}
}
11 changes: 10 additions & 1 deletion docs/source/configuration/settings-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,16 @@ contentMetadataTagsImageField
The OpenGraph image that will represent this content item, will be used in the metadata HEAD tag as og:image for SEO purposes. Defaults to image. See the OpenGraph Protocol for more details.
hasWorkingCopySupport
This setting will enable working copy support in your site. You need to install the `plone.app.iterate` add-on in your Plone site in order to make it working.
```{versionremoved} Volto 18.8.0
This setting is unnecessary since Volto 18.8.0.
Working copy support is now based on whether the `plone.app.iterate` add-on is installed in the backend.
```
For Plone sites using a Volto version prior to 18.8.0, this setting enables working copy support.
```{seealso}
See {doc}`workingcopy` for configuration.
```
controlpanels
Register a component as control panel.
Expand Down
28 changes: 17 additions & 11 deletions docs/source/configuration/workingcopy.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,9 @@ myst:

# Working copy support

Volto provide support for Plone's Working Copy feature. You need to install `plone.app.iterate` add-on in your Plone site that comes available by default. You can do that in Plone's control panel or using the `GenericSetup` facility.

## Volto configuration

You need to enable working copy support in Volto's configuration object:

```js
import config from '@plone/volto/registry'

config.settings.hasWorkingCopySupport = true;
```
Volto supports Plone's working copy feature.
To enable it, you need to install the add-on `plone.app.iterate` in your Plone site.
You can do that either in Plone's {guilabel}`Add-ons` control panel or using the `GenericSetup` facility.

## Features

Expand All @@ -29,3 +21,17 @@ Volto working copy support features include:
- Work on the working copy
- "Check in" the working copy by applying the changes into the original (baseline) object
- Cancel the working copy if required

## Volto configuration

```{versionremoved} Volto 18.8.0
This setting is no longer used.
```

If you have an older version of Volto, you also need to enable working copy support in Volto's configuration object as follows.

```js
import config from '@plone/volto/registry'

config.settings.hasWorkingCopySupport = true;
```
42 changes: 42 additions & 0 deletions docs/source/release-notes/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,48 @@ myst:

<!-- towncrier release notes start -->

## 18.8.1 (2025-02-04)

### Bugfix

- Fix regression in moving blocks from Grid block. @sneridagh [#6642](https://github.com/plone/volto/issues/6642)

### Internal

- Fix `corepack` in CI. @sneridagh
For more info: https://github.com/nodejs/corepack/issues/612 [#6640](https://github.com/plone/volto/issues/6640)
- Update TS version. @sneridagh [#6641](https://github.com/plone/volto/issues/6641)

## 18.8.0 (2025-01-31)

### Feature

- Show the working copy actions (checkin/checkout) based on whether they are enabled in the backend, instead of the `hasWorkingCopySupport` setting. @wesleybl, @davisagli [#5284](https://github.com/plone/volto/issues/5284)
- Expose `robots.txt` setting in Volto control panel, and render `robots.txt` based on REST API call. @robgietema [#5580](https://github.com/plone/volto/issues/5580)
- Update tests to match the new message in the add-ons loader. @sneridagh [#6630](https://github.com/plone/volto/issues/6630)

### Bugfix

- Pass `intl` object to `initialValue` function. @wesleybl [#6529](https://github.com/plone/volto/issues/6529)
- Update Dutch translations @fredvd [#6531](https://github.com/plone/volto/issues/6531)
- Correctly handle when one of the items is `null` in the Relations control panel. @giuliaghisini [#6629](https://github.com/plone/volto/issues/6629)
- Added `field.pattern` as a parameter to the internationalized message. @ionlizarazu [#6631](https://github.com/plone/volto/issues/6631)
- Display the appropriately sized image to eliminate blurring from upsizing smaller images in the `srcSet` generation. @giuliaghisini [#6634](https://github.com/plone/volto/issues/6634)

### Internal

- Add acceptance test for non-manager user editing group memberships. @ksuess [#5786](https://github.com/plone/volto/issues/5786)
- Enhance Volto contributing guidelines. @stevepiercy [#6613](https://github.com/plone/volto/issues/6613)
- Split Read the Docs pull request preview builds between Volto and `@plone/registry`. @stevepiercy [#6617](https://github.com/plone/volto/issues/6617)
- Updates the first-timer message to use the correct link for feature voting. @stevepiercy [#6625](https://github.com/plone/volto/issues/6625)
- Allow `2021.ploneconf.org` to fail readme-link-check. @stevepiercy [#6627](https://github.com/plone/volto/issues/6627)

### Documentation

- Amended version policy documentation. @sneridagh
Added deprecation notice for Semantic UI theming. [#6541](https://github.com/plone/volto/issues/6541)
- Document how to migrate projects to Cookieplone. @stevepiercy @erral [#6626](https://github.com/plone/volto/issues/6626)

## 18.7.0 (2025-01-24)

### Feature
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
},
"devDependencies": {
"concurrently": "^8.2.2",
"husky": "9.0.11",
"lint-staged": "15.2.2",
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
"tsconfig": "workspace:*",
"typescript": "^5.6.3",
"typescript": "^5.7.3",
"vitest": "^2.1.3"
},
"packageManager": "[email protected]",
Expand Down
2 changes: 2 additions & 0 deletions packages/blocks/news/6641.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update internal `peerDependencies` to include React 19.
Update TS version. @sneridagh
2 changes: 1 addition & 1 deletion packages/blocks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"jest-axe": "^8.0.0",
"release-it": "17.1.1",
"tsconfig": "workspace:*",
"typescript": "^5.6.3",
"typescript": "^5.7.3",
"vitest": "^2.1.3"
}
}
1 change: 1 addition & 0 deletions packages/client/news/6640.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update Vite version. @sneridagh
2 changes: 2 additions & 0 deletions packages/client/news/6641.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update internal `peerDependencies` to include React 19.
Update TS version. @sneridagh
Loading

0 comments on commit cd3d121

Please sign in to comment.