Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
dackmin committed Jun 5, 2024
2 parents 334cb72 + 997e817 commit 5210c62
Show file tree
Hide file tree
Showing 28 changed files with 2,014 additions and 1,467 deletions.
593 changes: 297 additions & 296 deletions .yarn/releases/yarn-4.1.1.cjs → .yarn/releases/yarn-4.2.2.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ enableGlobalCache: true

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.1.1.cjs
yarnPath: .yarn/releases/yarn-4.2.2.cjs
62 changes: 62 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,68 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.5.6](https://github.com/p3ol/oak/compare/v3.5.5...v3.5.6) (2024-05-29)


### Bug Fixes

* **theme:** update junipero theme ([d342811](https://github.com/p3ol/oak/commit/d3428112fdac359a914350b66c111fa956df6b61))





## [3.5.5](https://github.com/p3ol/oak/compare/v3.5.4...v3.5.5) (2024-05-29)


### Bug Fixes

* **deps:** update dependency @floating-ui/react to v0.26.16 ([2c7fd0a](https://github.com/p3ol/oak/commit/2c7fd0a97a6aba55a23d97b23f8217b6ca586645))
* **deps:** update dependency remirror to v2.0.39 ([9196385](https://github.com/p3ol/oak/commit/9196385f0d181e955c8ab646f044c8f4bf941430))
* **deps:** update dependency styled-components to v6.1.11 ([4b564ad](https://github.com/p3ol/oak/commit/4b564ad6ca9c3b1fb9199f0aa5db49b40fa02415))
* **floating-ui:** add shift option to floating col and row options ([ae48220](https://github.com/p3ol/oak/commit/ae48220616fb50b66262e0950e9ccbdc160bfb20))
* **floating-ui:** add shift option to floating col and row options ([1d79726](https://github.com/p3ol/oak/commit/1d797269cc69e0c2b68fce4fb39dbfdf8a711349))
* upgrade various dependencies ([33eeb54](https://github.com/p3ol/oak/commit/33eeb547b85298cb43c324601cb0d4270358c715))





## [3.5.4](https://github.com/p3ol/oak/compare/v3.5.3...v3.5.4) (2024-04-17)


### Bug Fixes

* **theme:** junipero icons wrongly overridden ([d614c6b](https://github.com/p3ol/oak/commit/d614c6ba2af7665800988dd63b96515350ae28c0))





## [3.5.3](https://github.com/p3ol/oak/compare/v3.5.2...v3.5.3) (2024-04-17)


### Bug Fixes

* **theme:** move junipero theme to standalone file ([6d51e80](https://github.com/p3ol/oak/commit/6d51e8018418b4bbfcd97933d58196edaf36082e))





## [3.5.2](https://github.com/p3ol/oak/compare/v3.5.1...v3.5.2) (2024-04-08)


### Bug Fixes

* **types:** fix some types errors ([c3f7102](https://github.com/p3ol/oak/commit/c3f7102a9d81c9130b539cfd027f366291cefa1f))
* **types:** switch from componentObject to ElementObject ([9e29671](https://github.com/p3ol/oak/commit/9e2967169848df54bb8de5d02bf3345f2a200f8d))
* update various deps ([c1f22bd](https://github.com/p3ol/oak/commit/c1f22bd8dd647a9fbc7f637ba6cad6f931646448))





## [3.5.1](https://github.com/p3ol/oak/compare/v3.5.0...v3.5.1) (2024-02-19)

**Note:** Version bump only for package oak
Expand Down
4 changes: 2 additions & 2 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"packages/*"
],
"npmClient": "yarn",
"version": "3.5.1",
"version": "3.5.6",
"command": {
"publish": {
"conventionalCommits": true
}
}
}
}
58 changes: 29 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@
"test": "BABEL_ENV=tests jest",
"build": "lerna exec -- npm run build",
"storybook": "storybook",
"serve": "yarn storybook dev"
"dev": "yarn storybook dev",
"serve": "yarn dev"
},
"devDependencies": {
"@babel/core": "7.24.4",
"@babel/eslint-parser": "7.24.1",
"@babel/eslint-plugin": "7.23.5",
"@babel/plugin-transform-runtime": "7.24.3",
"@babel/preset-env": "7.24.4",
"@babel/preset-react": "7.24.1",
"@babel/core": "7.24.6",
"@babel/eslint-parser": "7.24.6",
"@babel/eslint-plugin": "7.24.6",
"@babel/plugin-transform-runtime": "7.24.6",
"@babel/preset-env": "7.24.6",
"@babel/preset-react": "7.24.6",
"@ckeditor/ckeditor5-alignment": "40.2.0",
"@ckeditor/ckeditor5-basic-styles": "40.2.0",
"@ckeditor/ckeditor5-block-quote": "40.2.0",
Expand All @@ -43,9 +44,8 @@
"@ckeditor/ckeditor5-theme-lark": "40.2.0",
"@ckeditor/ckeditor5-typing": "40.2.0",
"@ckeditor/ckeditor5-ui": "40.2.0",
"@junipero/core": "3.4.11",
"@junipero/core": "3.4.13",
"@junipero/tailwind-plugin": "3.4.11",
"@junipero/theme": "3.4.11",
"@percy/storybook": "5.0.3",
"@poool/eslint-config": "3.0.1",
"@poool/eslint-config-react": "3.0.1",
Expand All @@ -54,55 +54,55 @@
"@remirror/react": "2.0.35",
"@rollup/plugin-alias": "5.1.0",
"@rollup/plugin-babel": "6.0.4",
"@rollup/plugin-commonjs": "25.0.7",
"@rollup/plugin-commonjs": "25.0.8",
"@rollup/plugin-node-resolve": "15.2.3",
"@rollup/plugin-terser": "0.4.4",
"@storybook/addon-actions": "7.6.17",
"@storybook/react": "7.6.17",
"@storybook/react-webpack5": "7.6.17",
"@storybook/theming": "7.6.17",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "14.3.0",
"@storybook/addon-actions": "7.6.19",
"@storybook/react": "7.6.19",
"@storybook/react-webpack5": "7.6.19",
"@storybook/theming": "7.6.19",
"@testing-library/jest-dom": "6.4.5",
"@testing-library/react": "14.3.1",
"@typescript-eslint/parser": "7.11.0",
"autoprefixer": "10.4.19",
"babel-jest": "29.7.0",
"babel-loader": "9.1.3",
"ckeditor5": "40.2.0",
"css-loader": "7.0.0",
"css-loader": "7.1.2",
"eslint": "8.57.0",
"eslint-config-standard": "17.1.0",
"eslint-plugin-babel": "5.3.1",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-n": "16.6.2",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-react": "7.34.1",
"eslint-plugin-n": "17.7.0",
"eslint-plugin-promise": "6.2.0",
"eslint-plugin-react": "7.34.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.2",
"lerna": "8.1.3",
"lerna-changelog": "2.2.0",
"postcss": "8.4.38",
"postcss-loader": "8.1.1",
"postcss-url": "10.1.3",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-popper": "2.3.0",
"remirror": "2.0.38",
"remirror": "2.0.39",
"resolve-url-loader": "5.0.0",
"rollup": "4.14.1",
"rollup-plugin-dts": "6.1.0",
"rollup": "4.18.0",
"rollup-plugin-dts": "6.1.1",
"rollup-plugin-postcss": "4.0.2",
"sass": "1.74.1",
"sass-loader": "14.1.1",
"storybook": "7.6.17",
"sass": "1.77.2",
"sass-loader": "14.2.1",
"storybook": "7.6.19",
"storybook-dark-mode": "3.0.3",
"style-loader": "3.3.4",
"tailwindcss": "3.4.3",
"terser-webpack-plugin": "5.3.10",
"typescript": "5.4.4",
"typescript": "5.4.5",
"webpack": "5.91.0",
"webpack-cli": "5.1.4"
},
"packageManager": "yarn@4.1.1"
"packageManager": "yarn@4.2.2"
}
22 changes: 22 additions & 0 deletions packages/addon-ckeditor5-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,28 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.5.5](https://github.com/p3ol/oak/compare/v3.5.4...v3.5.5) (2024-05-29)


### Bug Fixes

* upgrade various dependencies ([33eeb54](https://github.com/p3ol/oak/commit/33eeb547b85298cb43c324601cb0d4270358c715))





## [3.5.2](https://github.com/p3ol/oak/compare/v3.5.1...v3.5.2) (2024-04-08)


### Bug Fixes

* update various deps ([c1f22bd](https://github.com/p3ol/oak/commit/c1f22bd8dd647a9fbc7f637ba6cad6f931646448))





## [3.5.1](https://github.com/p3ol/oak/compare/v3.5.0...v3.5.1) (2024-02-19)

**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.5.1",
"version": "3.5.5",
"description": "🌳 Modern, lightweight & modulable page builder",
"main": "dist/oak-addon-ckeditor.cjs.js",
"jsnext:main": "dist/esm/index.js",
Expand Down Expand Up @@ -29,8 +29,8 @@
"react-dom": "^18.0.0"
},
"dependencies": {
"@babel/runtime-corejs3": "7.24.4",
"core-js": "3.36.1"
"@babel/runtime-corejs3": "7.24.6",
"core-js": "3.37.1"
},
"scripts": {
"clean": "rm -rf ./dist || true",
Expand Down
22 changes: 22 additions & 0 deletions packages/addon-remirror/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,28 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.5.5](https://github.com/p3ol/oak/compare/v3.5.4...v3.5.5) (2024-05-29)


### Bug Fixes

* upgrade various dependencies ([33eeb54](https://github.com/p3ol/oak/commit/33eeb547b85298cb43c324601cb0d4270358c715))





## [3.5.2](https://github.com/p3ol/oak/compare/v3.5.1...v3.5.2) (2024-04-08)


### Bug Fixes

* update various deps ([c1f22bd](https://github.com/p3ol/oak/commit/c1f22bd8dd647a9fbc7f637ba6cad6f931646448))





## [3.5.1](https://github.com/p3ol/oak/compare/v3.5.0...v3.5.1) (2024-02-19)

**Note:** Version bump only for package @oakjs/addon-remirror
Expand Down
6 changes: 3 additions & 3 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.5.1",
"version": "3.5.5",
"description": "🌳 Modern, lightweight & modulable page builder",
"main": "dist/oak-addon-remirror.cjs.js",
"jsnext:main": "dist/esm/index.js",
Expand Down Expand Up @@ -29,8 +29,8 @@
"remirror": "^2.0.0"
},
"dependencies": {
"@babel/runtime-corejs3": "7.24.4",
"core-js": "3.36.1"
"@babel/runtime-corejs3": "7.24.6",
"core-js": "3.37.1"
},
"scripts": {
"clean": "rm -rf ./dist || true",
Expand Down
22 changes: 22 additions & 0 deletions packages/ckeditor5-build-custom/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,28 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.5.5](https://github.com/p3ol/oak/compare/v3.5.4...v3.5.5) (2024-05-29)


### Bug Fixes

* upgrade various dependencies ([33eeb54](https://github.com/p3ol/oak/commit/33eeb547b85298cb43c324601cb0d4270358c715))





## [3.5.2](https://github.com/p3ol/oak/compare/v3.5.1...v3.5.2) (2024-04-08)


### Bug Fixes

* update various deps ([c1f22bd](https://github.com/p3ol/oak/commit/c1f22bd8dd647a9fbc7f637ba6cad6f931646448))





## [3.5.1](https://github.com/p3ol/oak/compare/v3.5.0...v3.5.1) (2024-02-19)

**Note:** Version bump only for package @oakjs/ckeditor5-build-custom
Expand Down
6 changes: 3 additions & 3 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.5.1",
"version": "3.5.5",
"license": "SEE LICENSE IN LICENSE.md",
"main": "dist/ckeditor.js",
"files": [
Expand All @@ -18,8 +18,8 @@
"react-dom": "^18.0.0"
},
"dependencies": {
"@babel/runtime-corejs3": "7.24.4",
"core-js": "3.36.1"
"@babel/runtime-corejs3": "7.24.6",
"core-js": "3.37.1"
},
"scripts": {
"build": "webpack --mode production"
Expand Down
26 changes: 26 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,32 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.5.5](https://github.com/p3ol/oak/compare/v3.5.4...v3.5.5) (2024-05-29)


### Bug Fixes

* **floating-ui:** add shift option to floating col and row options ([ae48220](https://github.com/p3ol/oak/commit/ae48220616fb50b66262e0950e9ccbdc160bfb20))
* **floating-ui:** add shift option to floating col and row options ([1d79726](https://github.com/p3ol/oak/commit/1d797269cc69e0c2b68fce4fb39dbfdf8a711349))
* upgrade various dependencies ([33eeb54](https://github.com/p3ol/oak/commit/33eeb547b85298cb43c324601cb0d4270358c715))





## [3.5.2](https://github.com/p3ol/oak/compare/v3.5.1...v3.5.2) (2024-04-08)


### Bug Fixes

* **types:** fix some types errors ([c3f7102](https://github.com/p3ol/oak/commit/c3f7102a9d81c9130b539cfd027f366291cefa1f))
* **types:** switch from componentObject to ElementObject ([9e29671](https://github.com/p3ol/oak/commit/9e2967169848df54bb8de5d02bf3345f2a200f8d))
* update various deps ([c1f22bd](https://github.com/p3ol/oak/commit/c1f22bd8dd647a9fbc7f637ba6cad6f931646448))





## [3.5.1](https://github.com/p3ol/oak/compare/v3.5.0...v3.5.1) (2024-02-19)

**Note:** Version bump only for package @oakjs/core
Expand Down
1 change: 1 addition & 0 deletions packages/core/lib/Builder/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export declare class Builder extends Emitter {
opts?: {
deep?: boolean;
position?: 'before' | 'after';
parent: ElementObject;
}
): ElementObject;
duplicateElement(
Expand Down
Loading

0 comments on commit 5210c62

Please sign in to comment.