Skip to content

Commit

Permalink
Merge branch 'main' into controlpanel_validation
Browse files Browse the repository at this point in the history
  • Loading branch information
davisagli authored Aug 2, 2024
2 parents f81c3df + 9e312ed commit e250677
Show file tree
Hide file tree
Showing 117 changed files with 4,302 additions and 497 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/PLIP.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ projects: 'plone/47'

<!--
Read http://5.docs.plone.org/develop/coredev/docs/plips.html first!
Read https://6.docs.plone.org/contributing/core/plips.html first!
Set "03 type: feature: plip" as label.
Expand Down
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 @@ -36,7 +36,7 @@ runs:

- name: Install Volto dependencies
shell: bash
run: pnpm i
run: make install

- name: Install Cypress if not in cache
if: steps.cache-cypress-binary.outputs.cache-hit != 'true'
Expand Down
38 changes: 2 additions & 36 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -497,45 +497,11 @@ jobs:
steps:
- uses: actions/checkout@v4

# node setup
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
- name: Set up Node.js environment
uses: ./.github/actions/node_env_setup
with:
node-version: ${{ matrix.node-version }}

- name: Enable corepack
run: corepack enable

- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Cache Cypress Binary
id: cache-cypress-binary
uses: actions/cache@v4
with:
path: ~/.cache/Cypress
key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }}

- run: pnpm i

- name: Build dependencies
run: pnpm build:deps

- name: Install Cypress if not in cache
if: steps.cache-cypress-binary.outputs.cache-hit != 'true'
working-directory: packages/volto
run: make cypress-install

# Generator own tests
- name: Generator tests
run: pnpm test
Expand Down
23 changes: 2 additions & 21 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,11 @@ jobs:
steps:
- uses: actions/checkout@v4

# node setup
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
- name: Set up Node.js environment
uses: ./.github/actions/node_env_setup
with:
node-version: ${{ matrix.node-version }}

- name: Enable corepack
run: corepack enable

- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- run: pnpm i

# Locales in place are needed for the tests to pass
- run: pnpm --filter @plone/volto i18n

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ cypress/screenshots
# Local environment setup
.env
public/critical.css
packages/volto/data

# Sphinx and MyST
docs/_build/
Expand Down
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,11 @@ clean: ## Clean development environment
find ./packages -name node_modules -exec rm -rf {} \;

.PHONY: install
install: build-deps ## Set up development environment
install: ## Set up development environment
# Setup ESlint for VSCode
node packages/scripts/vscodesettings.js
pnpm i
node packages/scripts/vscodesettings.js
make build-deps

##### Documentation

Expand Down Expand Up @@ -137,10 +138,10 @@ docs-test: docs-clean docs-linkcheckbroken docs-vale ## Clean docs build, then
cypress-install: ## Install Cypress for acceptance tests
$(NODEBIN)/cypress install

packages/registry/dist: packages/registry/src
packages/registry/dist: $(shell find packages/registry/src -type f)
pnpm build:registry

packages/components/dist: packages/components/src
packages/components/dist: $(shell find packages/components/src -type f)
pnpm build:components

.PHONY: build-deps
Expand Down
2 changes: 1 addition & 1 deletion docs/source/blocks/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ You can also add the behavior programmatically via GenericSetup:
<object name="LRF" meta_type="Dexterity FTI" i18n:domain="plone"
xmlns:i18n="http://xml.zope.org/namespaces/i18n">
<property name="behaviors" purge="false">
<element value="plone.restapi.behaviors.IBlocks" />
<element value="volto.blocks" />
</property>
</object>
```
Expand Down
1 change: 1 addition & 0 deletions docs/source/configuration/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ environmentvariables
expanders
locking
slots
validation
```
Loading

0 comments on commit e250677

Please sign in to comment.