diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index 64d3fb4..ab873e8 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -1,11 +1,6 @@ name: Acceptance tests on: [push] -env: - ADDON_NAME: "@kitconcept/volto-button-block" - ADDON_PATH: "volto-button-block" - VOLTO_VERSION: "17.0.0-alpha.1" - jobs: acceptance: @@ -47,10 +42,7 @@ jobs: key: binary-20.x-${{ hashFiles('pnpm-lock.yaml') }} - name: Install dependencies - run: | - pnpm i - make install - pnpm i + run: make install - name: Install Cypress if not in cache if: steps.cache-cypress-binary.outputs.cache-hit != 'true' @@ -91,23 +83,6 @@ jobs: - run: make test-acceptance-headless - # - name: "Cypress: Acceptance tests" - # uses: cypress-io/github-action@v6 - # env: - # BABEL_ENV: production - # CYPRESS_RETRIES: 2 - # with: - # # working-directory: core/packages/volto - # # project: ../../../. - # # config-file: ../../../cypress.config.js - # browser: chrome - # spec: cypress/tests/**/*.{js,jsx,ts,tsx} - # install: false - # start: | - # make start-test-acceptance-server-ci - # make start-test-acceptance-frontend - # wait-on: 'npx wait-on --httpTimeout 20000 http-get://localhost:55001/plone http://localhost:3000' - # Upload Cypress screenshots - uses: actions/upload-artifact@v4 if: failure() diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 1894347..34a650b 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -3,9 +3,6 @@ on: [push] jobs: codeanalysis: runs-on: ubuntu-latest - strategy: - matrix: - node-version: [20.x] steps: - name: Main checkout @@ -38,10 +35,7 @@ jobs: ${{ runner.os }}-pnpm-store- - name: Install dependencies - run: | - pnpm i - make install - pnpm i + run: make install - name: Linting run: make lint diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml index 6f8a2e7..46355b9 100644 --- a/.github/workflows/i18n.yml +++ b/.github/workflows/i18n.yml @@ -35,10 +35,7 @@ jobs: ${{ runner.os }}-pnpm-store- - name: Install dependencies - run: | - pnpm i - make install - pnpm i + run: make install - name: test i18n command run: make i18n diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index a000c82..a782e5b 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -35,10 +35,7 @@ jobs: ${{ runner.os }}-pnpm-store- - name: Install dependencies - run: | - pnpm i - make install - pnpm i + run: make install - name: Unit tests run: make test-ci diff --git a/.npmrc b/.npmrc index 15db736..71c6843 100644 --- a/.npmrc +++ b/.npmrc @@ -1,4 +1,6 @@ public-hoist-pattern[]=*eslint* public-hoist-pattern[]=*prettier* public-hoist-pattern[]=*stylelint* +public-hoist-pattern[]=*cypress* +public-hoist-pattern[]=*process* public-hoist-pattern[]=*parcel* diff --git a/Makefile b/Makefile index c8839d2..e91d5eb 100644 --- a/Makefile +++ b/Makefile @@ -31,9 +31,9 @@ help: ## Show this help # Dev Helpers .PHONY: install -install: ## Installs the dev environment using mrs-developer - @echo "$(GREEN)==> Installs the dev environment $(RESET)" - pnpm exec missdev --no-config --fetch-https +install: ## Install task, checks if missdev (mrs-developer) is present and runs it + pnpm dlx mrs-developer missdev --no-config --fetch-https + pnpm i .PHONY: i18n i18n: ## Sync i18n @@ -83,8 +83,8 @@ start-test-acceptance-server-ci: ## Start acceptance server in CI mode (no termi .PHONY: test-acceptance test-acceptance: ## Start Cypress in interactive mode - pnpm --filter @plone/volto exec cypress open --config-file $(CURRENT_DIR)/cypress.config.js --config specPattern=$(CURRENT_DIR)'/cypress/tests/**/*.{js,jsx,ts,tsx}' + pnpm exec cypress open --config-file $(CURRENT_DIR)/cypress.config.js --config specPattern=$(CURRENT_DIR)'/cypress/tests/**/*.{js,jsx,ts,tsx}' .PHONY: test-acceptance-headless test-acceptance-headless: ## Run cypress tests in headless mode for CI - pnpm --filter @plone/volto exec cypress run --config-file $(CURRENT_DIR)/cypress.config.js --config specPattern=$(CURRENT_DIR)'/cypress/tests/**/*.{js,jsx,ts,tsx}' + pnpm exec cypress run --config-file $(CURRENT_DIR)/cypress.config.js --config specPattern=$(CURRENT_DIR)'/cypress/tests/**/*.{js,jsx,ts,tsx}' diff --git a/package.json b/package.json index caed9e3..d9c41be 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "@kitconcept/volto-button-block": "workspace:*" }, "devDependencies": { - "@plone/scripts": "^3.6.1", "mrs-developer": "^2.2.0" }, "packageManager": "pnpm@8.15.4" diff --git a/packages/volto-button-block/src/components/Data.jsx b/packages/volto-button-block/src/components/Data.jsx index 510aa10..99dd6c6 100644 --- a/packages/volto-button-block/src/components/Data.jsx +++ b/packages/volto-button-block/src/components/Data.jsx @@ -11,7 +11,15 @@ const messages = defineMessages({ }); const ButtonData = (props) => { - const { data, block, onChangeBlock, schemaEnhancer } = props; + const { + block, + blocksConfig, + data, + schemaEnhancer, + onChangeBlock, + navRoot, + contentType, + } = props; const intl = useIntl(); const schema = schemaEnhancer ? schemaEnhancer(ButtonSchema({ ...props, intl }), props) @@ -27,9 +35,12 @@ const ButtonData = (props) => { [id]: value, }); }} + onChangeBlock={onChangeBlock} formData={data} - fieldIndex={data.index} block={block} + blocksConfig={blocksConfig} + navRoot={navRoot} + contentType={contentType} /> ); }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0e6995a..3e7b225 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,9 +18,6 @@ importers: specifier: workspace:* version: link:core/packages/volto devDependencies: - '@plone/scripts': - specifier: ^3.6.1 - version: link:core/packages/scripts mrs-developer: specifier: ^2.2.0 version: 2.2.0