Skip to content

Commit 7fd44de

Browse files
iRohitSinghsneridaghiFlameing
authored
Fix the enter button feature in the highlight block (#18)
* Fix the enter button feature in the highlight block * Update to use 19 build * fix lock * remove blockHasOwnFocusManagement * fix ci test --------- Co-authored-by: Victor Fernandez de Alba <sneridagh@gmail.com> Co-authored-by: iFlameing <ialokkumarsingh0@gmail.com>
1 parent 4d66bc3 commit 7fd44de

File tree

10 files changed

+8502
-13809
lines changed

10 files changed

+8502
-13809
lines changed

.storybook/main.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ const path = require('path');
44

55
const projectRootPath = path.resolve('.');
66
const lessPlugin = require('@plone/volto/webpack-plugins/webpack-less-plugin');
7-
const scssPlugin = require('razzle-plugin-scss');
7+
const scssPlugin = require('@plone/volto/webpack-plugins/webpack-scss-plugin');
88

9-
const createConfig = require('razzle/config/createConfigAsync.js');
9+
const createConfig = require('@plone/razzle/config/createConfigAsync.js');
1010
const razzleConfig = require(path.join(projectRootPath, 'razzle.config.js'));
1111

1212
const SVGLOADER = {

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ test: ## Run unit tests
9393
ci-test: ## Run unit tests in CI
9494
# Unit Tests need the i18n to be built
9595
VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto i18n
96-
CI=1 RAZZLE_JEST_CONFIG=$(CURRENT_DIR)/jest-addon.config.js pnpm --filter @plone/volto test -- --passWithNoTests
96+
CI=1 pnpm --filter @kitconcept/volto-highlight-block exec vitest --passWithNoTests
9797

9898
.PHONY: backend-docker-start
9999
backend-docker-start: ## Starts a Docker-based backend for development

jest-addon.config.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

mrs.developer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"package": "@plone/volto",
55
"url": "git@github.com:plone/volto.git",
66
"https": "https://github.com/plone/volto.git",
7-
"tag": "18.23.0",
7+
"tag": "19.0.0-alpha.18",
88
"filterBlobs": true
99
}
1010
}

package.json

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"build": "VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto build",
1919
"build:deps": "pnpm --filter @plone/registry --filter @plone/components build",
2020
"i18n": "pnpm --filter @kitconcept/volto-highlight-block i18n && VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto i18n",
21-
"test": "RAZZLE_JEST_CONFIG=$(pwd)/jest-addon.config.js pnpm --filter @plone/volto test -- --passWithNoTests",
21+
"test": "pnpm --filter @kitconcept/volto-highlight-block exec vitest --passWithNoTests",
2222
"lint": "VOLTOCONFIG=$(pwd)/volto.config.js eslint --max-warnings=0 'packages/**/src/**/*.{js,jsx,ts,tsx}'",
2323
"lint:fix": "VOLTOCONFIG=$(pwd)/volto.config.js eslint --fix 'packages/**/src/**/*.{js,jsx,ts,tsx}'",
2424
"prettier": "prettier --check 'packages/**/src/**/*.{js,jsx,ts,tsx}'",
@@ -33,9 +33,9 @@
3333
"storybook-build": "VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto build-storybook -c $(pwd)/.storybook"
3434
},
3535
"dependencies": {
36-
"@plone/volto": "workspace:*",
36+
"@kitconcept/volto-highlight-block": "workspace:*",
3737
"@plone/registry": "workspace:*",
38-
"@kitconcept/volto-highlight-block": "workspace:*"
38+
"@plone/volto": "workspace:*"
3939
},
4040
"devDependencies": {
4141
"mrs-developer": "^2.2.0"
@@ -44,7 +44,17 @@
4444
"overrides": {
4545
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
4646
"react-refresh": "^0.14.2"
47-
}
47+
},
48+
"onlyBuiltDependencies": [
49+
"core-js",
50+
"core-js-pure",
51+
"cypress",
52+
"es5-ext",
53+
"esbuild",
54+
"full-icu",
55+
"lightningcss-cli",
56+
"unrs-resolver"
57+
]
4858
},
49-
"packageManager": "pnpm@9.4.0"
50-
}
59+
"packageManager": "pnpm@10.20.0"
60+
}

packages/volto-highlight-block/babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = function (api) {
22
api.cache(true);
3-
const presets = ['razzle'];
3+
const presets = ['@plone/razzle'];
44
const plugins = [
55
[
66
'react-intl', // React Intl extractor, required for the whole i18n infrastructure to work
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix the enter button feature in the highlight block @iRohitSingh

packages/volto-highlight-block/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@
2828
},
2929
"dependencies": {},
3030
"peerDependencies": {
31-
"react": "18.2.0",
32-
"react-dom": "18.2.0"
31+
"react": "^18.2.0",
32+
"react-dom": "^18.2.0"
3333
},
3434
"devDependencies": {
3535
"@plone/scripts": "^3.6.1",
36-
"release-it": "^17.1.1"
36+
"release-it": "^17.1.1",
37+
"vitest": "^3.2.4"
3738
}
3839
}

packages/volto-highlight-block/src/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ const applyConfig = (config) => {
2121
group: 'teasers',
2222
view: HighlightView,
2323
edit: HighlightEdit,
24-
blockHasOwnFocusManagement: true,
2524
restricted: false,
2625
mostUsed: true,
2726
sidebarTab: 1,

0 commit comments

Comments
 (0)