Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/p3ol/oak
Browse files Browse the repository at this point in the history
  • Loading branch information
dackmin committed Nov 12, 2024
2 parents c235b74 + 3f72c9a commit 6859966
Show file tree
Hide file tree
Showing 17 changed files with 968 additions and 1,163 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.10.6](https://github.com/p3ol/oak/compare/v3.10.5...v3.10.6) (2024-11-07)


### Bug Fixes

* add root node to html sanitizer ([2f4c967](https://github.com/p3ol/oak/commit/2f4c967ddaffb28d65676dd9066b9c98f3e374b9))
* upgrade various deps ([3f01c8a](https://github.com/p3ol/oak/commit/3f01c8a202bd69a45a73ae2748bcef98e8bf1c6a))





## [3.10.5](https://github.com/p3ol/oak/compare/v3.10.4...v3.10.5) (2024-10-25)


Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages/*"
],
"npmClient": "yarn",
"version": "3.10.5",
"version": "3.10.6",
"command": {
"publish": {
"conventionalCommits": true
Expand Down
46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"p:strapi": "yarn workspace @oakjs/strapi-plugin"
},
"devDependencies": {
"@babel/eslint-plugin": "7.25.7",
"@babel/eslint-plugin": "7.25.9",
"@ckeditor/ckeditor5-alignment": "43.2.0",
"@ckeditor/ckeditor5-basic-styles": "43.2.0",
"@ckeditor/ckeditor5-block-quote": "43.2.0",
Expand Down Expand Up @@ -61,56 +61,56 @@
"@rollup/plugin-node-resolve": "15.3.0",
"@rollup/plugin-swc": "0.4.0",
"@rollup/plugin-terser": "0.4.4",
"@storybook/addon-actions": "8.3.6",
"@storybook/addon-storysource": "8.3.6",
"@storybook/addon-styling-webpack": "1.0.0",
"@storybook/addon-themes": "8.3.6",
"@storybook/addon-actions": "8.4.2",
"@storybook/addon-storysource": "8.4.2",
"@storybook/addon-styling-webpack": "1.0.1",
"@storybook/addon-themes": "8.4.2",
"@storybook/addon-webpack5-compiler-swc": "1.0.5",
"@storybook/react": "8.3.6",
"@storybook/react-webpack5": "8.3.6",
"@storybook/theming": "8.3.6",
"@swc/core": "1.7.39",
"@swc/jest": "0.2.36",
"@storybook/react": "8.4.2",
"@storybook/react-webpack5": "8.4.2",
"@storybook/theming": "8.4.2",
"@swc/core": "1.9.1",
"@swc/jest": "0.2.37",
"@testing-library/dom": "10.4.0",
"@testing-library/jest-dom": "6.6.2",
"@testing-library/jest-dom": "6.6.3",
"@testing-library/react": "16.0.1",
"@types/jest": "29.5.13",
"@types/node": "22.7.8",
"@types/react": "18.3.11",
"@types/jest": "29.5.14",
"@types/node": "22.9.0",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"@typescript-eslint/parser": "8.11.0",
"@typescript-eslint/parser": "8.13.0",
"autoprefixer": "10.4.20",
"ckeditor5": "43.2.0",
"css-loader": "7.1.2",
"eslint": "8.57.1",
"eslint-config-standard": "17.1.0",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-n": "17.11.1",
"eslint-plugin-n": "17.13.0",
"eslint-plugin-promise": "7.1.0",
"eslint-plugin-react": "7.37.1",
"eslint-plugin-react": "7.37.2",
"jest": "29.7.0",
"jest-css-modules-transform": "4.4.2",
"jest-environment-jsdom": "29.7.0",
"jest-transform-stub": "2.0.0",
"lerna": "8.1.8",
"lerna": "8.1.9",
"lerna-changelog": "2.2.0",
"postcss": "8.4.47",
"postcss-loader": "8.1.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"remirror": "3.0.1",
"rollup": "4.24.0",
"rollup": "4.24.4",
"rollup-plugin-postcss": "4.0.2",
"sass": "1.80.3",
"sass-loader": "16.0.2",
"storybook": "8.3.6",
"sass": "1.80.6",
"sass-loader": "16.0.3",
"storybook": "8.4.2",
"storybook-dark-mode": "4.0.2",
"style-loader": "4.0.0",
"swc-loader": "0.2.6",
"tailwindcss": "3.4.14",
"terser-webpack-plugin": "5.3.10",
"typescript": "5.6.3",
"webpack": "5.95.0",
"webpack": "5.96.1",
"webpack-cli": "5.1.4"
},
"packageManager": "yarn@4.5.1"
Expand Down
8 changes: 8 additions & 0 deletions packages/addon-ckeditor5-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.10.6](https://github.com/p3ol/oak/compare/v3.10.5...v3.10.6) (2024-11-07)

**Note:** Version bump only for package @oakjs/addon-ckeditor5-react





## [3.10.5](https://github.com/p3ol/oak/compare/v3.10.4...v3.10.5) (2024-10-25)

**Note:** Version bump only for package @oakjs/addon-ckeditor5-react
Expand Down
6 changes: 3 additions & 3 deletions packages/addon-ckeditor5-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oakjs/addon-ckeditor5-react",
"version": "3.10.5",
"version": "3.10.6",
"description": "🌳 Modern, lightweight & modulable page builder",
"main": "dist/oak-addon-ckeditor.cjs.js",
"module": "dist/esm/index.js",
Expand All @@ -23,11 +23,11 @@
"react-dom": "^18.0.0"
},
"dependencies": {
"@oakjs/ckeditor5-build-custom": "^3.10.5"
"@oakjs/ckeditor5-build-custom": "^3.10.6"
},
"devDependencies": {
"@oakjs/ckeditor5-build-custom": "workspace:*",
"@oakjs/react": "^3.10.5"
"@oakjs/react": "^3.10.6"
},
"scripts": {
"clean": "rm -rf ./dist || true",
Expand Down
8 changes: 8 additions & 0 deletions packages/addon-remirror/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.10.6](https://github.com/p3ol/oak/compare/v3.10.5...v3.10.6) (2024-11-07)

**Note:** Version bump only for package @oakjs/addon-remirror





## [3.10.5](https://github.com/p3ol/oak/compare/v3.10.4...v3.10.5) (2024-10-25)

**Note:** Version bump only for package @oakjs/addon-remirror
Expand Down
4 changes: 2 additions & 2 deletions packages/addon-remirror/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oakjs/addon-remirror",
"version": "3.10.5",
"version": "3.10.6",
"description": "🌳 Modern, lightweight & modulable page builder",
"main": "dist/oak-addon-remirror.cjs.js",
"module": "dist/esm/index.js",
Expand All @@ -25,7 +25,7 @@
"remirror": "^2.0.0"
},
"devDependencies": {
"@oakjs/react": "^3.10.5"
"@oakjs/react": "^3.10.6"
},
"scripts": {
"clean": "rm -rf ./dist || true",
Expand Down
8 changes: 8 additions & 0 deletions packages/ckeditor5-build-custom/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.10.6](https://github.com/p3ol/oak/compare/v3.10.5...v3.10.6) (2024-11-07)

**Note:** Version bump only for package @oakjs/ckeditor5-build-custom





## [3.10.5](https://github.com/p3ol/oak/compare/v3.10.4...v3.10.5) (2024-10-25)

**Note:** Version bump only for package @oakjs/ckeditor5-build-custom
Expand Down
4 changes: 2 additions & 2 deletions packages/ckeditor5-build-custom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@oakjs/ckeditor5-build-custom",
"author": "CKSource",
"description": "A custom CKEditor 5 build made by the CKEditor 5 online builder.",
"version": "3.10.5",
"version": "3.10.6",
"license": "SEE LICENSE IN LICENSE.md",
"main": "dist/ckeditor.js",
"types": "dist/types/index.d.ts",
Expand All @@ -18,7 +18,7 @@
"react-dom": "^18.0.0"
},
"devDependencies": {
"@oakjs/react": "^3.10.5"
"@oakjs/react": "^3.10.6"
},
"scripts": {
"build": "yarn build:code && yarn build:dts",
Expand Down
11 changes: 11 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.10.6](https://github.com/p3ol/oak/compare/v3.10.5...v3.10.6) (2024-11-07)


### Bug Fixes

* upgrade various deps ([3f01c8a](https://github.com/p3ol/oak/commit/3f01c8a202bd69a45a73ae2748bcef98e8bf1c6a))





## [3.10.5](https://github.com/p3ol/oak/compare/v3.10.4...v3.10.5) (2024-10-25)


Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oakjs/core",
"version": "3.10.5",
"version": "3.10.6",
"description": "🌳 Modern, lightweight & modulable page builder",
"main": "dist/oak-core.cjs.js",
"module": "dist/esm/index.js",
Expand All @@ -21,7 +21,7 @@
},
"dependencies": {
"@junipero/core": "3.7.1",
"uuid": "10.0.0"
"uuid": "11.0.2"
},
"scripts": {
"clean": "rm -rf ./dist || true",
Expand Down
12 changes: 12 additions & 0 deletions packages/react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.10.6](https://github.com/p3ol/oak/compare/v3.10.5...v3.10.6) (2024-11-07)


### Bug Fixes

* add root node to html sanitizer ([2f4c967](https://github.com/p3ol/oak/commit/2f4c967ddaffb28d65676dd9066b9c98f3e374b9))
* upgrade various deps ([3f01c8a](https://github.com/p3ol/oak/commit/3f01c8a202bd69a45a73ae2748bcef98e8bf1c6a))





## [3.10.5](https://github.com/p3ol/oak/compare/v3.10.4...v3.10.5) (2024-10-25)


Expand Down
2 changes: 1 addition & 1 deletion packages/react/lib/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const sanitizeHTML = (content: string, opts?: {
}) => {
try {
const parsed = new (opts?.parser || DOMParser)()
.parseFromString(content, 'text/html');
.parseFromString(`<body>${content}</body>`, 'text/html');

// Remove script & style tags
['script', 'style', 'iframe', 'object', 'video', 'audio'].forEach(t => {
Expand Down
6 changes: 3 additions & 3 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oakjs/react",
"version": "3.10.5",
"version": "3.10.6",
"description": "🌳 Modern, lightweight & modulable page builder",
"main": "dist/oak-react.cjs.js",
"module": "dist/esm/index.js",
Expand All @@ -24,11 +24,11 @@
"react-dom": "^18.0.0"
},
"dependencies": {
"@floating-ui/react": "0.26.25",
"@floating-ui/react": "0.26.27",
"@junipero/hooks": "3.7.0",
"@junipero/react": "3.9.0",
"@junipero/transitions": "3.9.0",
"uuid": "10.0.0"
"uuid": "11.0.2"
},
"scripts": {
"clean": "rm -rf ./dist || true",
Expand Down
8 changes: 8 additions & 0 deletions packages/strapi-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.10.6](https://github.com/p3ol/oak/compare/v3.10.5...v3.10.6) (2024-11-07)

**Note:** Version bump only for package @oakjs/strapi-plugin





## [3.10.5](https://github.com/p3ol/oak/compare/v3.10.4...v3.10.5) (2024-10-25)

**Note:** Version bump only for package @oakjs/strapi-plugin
Expand Down
10 changes: 5 additions & 5 deletions packages/strapi-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oakjs/strapi-plugin",
"version": "3.10.5",
"version": "3.10.6",
"description": "🌳 Modern, lightweight & modulable page builder",
"repository": {
"type": "git",
Expand All @@ -22,10 +22,10 @@
},
"dependencies": {
"@ckeditor/ckeditor5-react": "9.3.1",
"@oakjs/addon-ckeditor5-react": "^3.10.5",
"@oakjs/addon-remirror": "^3.10.5",
"@oakjs/ckeditor5-build-custom": "^3.10.5",
"@oakjs/react": "^3.10.5",
"@oakjs/addon-ckeditor5-react": "^3.10.6",
"@oakjs/addon-remirror": "^3.10.6",
"@oakjs/ckeditor5-build-custom": "^3.10.6",
"@oakjs/react": "^3.10.6",
"@oakjs/theme": "^3.10.1",
"@remirror/pm": "3.0.0",
"@remirror/react": "3.0.1",
Expand Down
Loading

0 comments on commit 6859966

Please sign in to comment.