Skip to content

Commit

Permalink
Merge branch 'develop' into unify-variants-styling
Browse files Browse the repository at this point in the history
  • Loading branch information
Eevolee authored Mar 3, 2025
2 parents 9aac609 + 746c492 commit 6cb17e3
Show file tree
Hide file tree
Showing 7 changed files with 1,673 additions and 1,397 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,5 @@ After Testing
- [ ] The artifact was released on Nexus
- [ ] If applicable, corresponding academy pages were published
- [ ] The module was published on the store
- [ ] The [modules releases log page](https://edit.jahia.com/jahia/page-composer/default/en/sites/academy/home/customer-center/release-lifecycle-1.html) on the Academy was updated
- [ ] The [modules releases log page](https://edit.jahia.com/jahia/page-composer/default/en/sites/academy/home/customer-center/modules-releases-log.html) on the Academy was updated
- [ ] A message was published on slack #releases channel
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# Documentation: https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms
# Syntax: https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema

name: Support Request
description: File a support request.
name: Internal Support Request
description: File a support request, reserved to Jahia employees.
title: "<title>"
labels: ["support-request"]
type: Sup
Expand Down
7 changes: 6 additions & 1 deletion .github/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ changelog:
exclude:
labels:
- ignore-for-release
authors:
- jahia-ci
categories:
- title: Breaking Changes
labels:
Expand All @@ -21,4 +23,7 @@ changelog:
- fix
- title: Other Changes
labels:
- "*"
- "*"
- title: Excluded (needs review)
labels:
- no-changelog
556 changes: 278 additions & 278 deletions .yarn/releases/yarn-4.5.1.cjs → .yarn/releases/yarn-4.6.0.cjs

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
nodeLinker: node-modules
checksumBehavior: reset
yarnPath: .yarn/releases/yarn-4.5.1.cjs

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.6.0.cjs
96 changes: 47 additions & 49 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
"types": "dist/index.d.ts",
"sideEffects": false,
"dependencies": {
"@babel/runtime": "^7.26.7",
"@babel/runtime": "^7.26.9",
"@jahia/scripts": "^1.3.7",
"clsx": "^2.1.1",
"prop-types": "^15.8.1",
"re-resizable": "^6.10.3",
"re-resizable": "^6.11.2",
"to-px": "^1.1.0"
},
"peerDependencies": {
"react": "^16.11.0",
"react-table": "^7.7.0"
"react": "^18.3.1",
"react-table": "^7.8.0"
},
"scripts": {
"start": "storybook dev -p 6006",
Expand All @@ -39,43 +39,41 @@
},
"repository": "https://github.com/Jahia/moonstone.git",
"devDependencies": {
"@babel/cli": "^7.25.7",
"@babel/core": "^7.25.8",
"@babel/plugin-transform-runtime": "^7.25.7",
"@babel/preset-env": "^7.25.8",
"@babel/preset-react": "^7.25.7",
"@babel/preset-typescript": "^7.25.7",
"@cyclonedx/webpack-plugin": "^3.14.0",
"@babel/cli": "^7.26.4",
"@babel/core": "^7.26.9",
"@babel/plugin-transform-runtime": "^7.26.9",
"@babel/preset-env": "^7.26.9",
"@babel/preset-react": "^7.26.3",
"@babel/preset-typescript": "^7.26.0",
"@cyclonedx/webpack-plugin": "^4.0.1",
"@jahia/eslint-config": "^2.1.2",
"@jahia/stylelint-config": "^0.0.3",
"@storybook/addon-a11y": "^8.4.7",
"@storybook/addon-actions": "^8.4.7",
"@storybook/addon-backgrounds": "^8.4.7",
"@storybook/addon-controls": "^8.4.7",
"@storybook/addon-docs": "^8.4.7",
"@storybook/addon-viewport": "^8.4.7",
"@storybook/addon-webpack5-compiler-babel": "3.0.3",
"@storybook/core-events": "^8.4.7",
"@storybook/manager-api": "^8.4.7",
"@storybook/preview-api": "^8.4.7",
"@storybook/react": "^8.4.7",
"@storybook/react-webpack5": "^8.4.7",
"@storybook/source-loader": "^8.4.7",
"@storybook/addon-a11y": "^8.6.0",
"@storybook/addon-actions": "^8.6.0",
"@storybook/addon-backgrounds": "^8.6.0",
"@storybook/addon-controls": "^8.6.0",
"@storybook/addon-docs": "^8.6.0",
"@storybook/addon-viewport": "^8.6.0",
"@storybook/addon-webpack5-compiler-babel": "3.0.5",
"@storybook/core-events": "^8.6.0",
"@storybook/manager-api": "^8.6.0",
"@storybook/preview-api": "^8.6.0",
"@storybook/react": "^8.6.0",
"@storybook/react-webpack5": "^8.6.0",
"@storybook/source-loader": "^8.6.0",
"@svgr/cli": "^8.1.0",
"@svgr/core": "^8.1.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.6.2",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.2",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.2.0",
"@testing-library/user-event": "^14.6.1",
"@types/jest": "^29.5.14",
"@types/node": "^22.8.0",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/react-dom": "^19.0.4",
"@types/react-table": "^7.7.20",
"@types/to-px": "^1.1.4",
"@typescript-eslint/eslint-plugin": "^8.11.0",
"@typescript-eslint/parser": "^8.11.0",
"auto": "^11.2.1",
"auto": "^11.3.0",
"babel-eslint": "^10.1.0",
"babel-jest": "^29.7.0",
"babel-loader": "^9.2.1",
Expand All @@ -93,31 +91,31 @@
"identity-obj-proxy": "^3.0.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"mini-css-extract-plugin": "^2.9.1",
"mini-css-extract-plugin": "^2.9.2",
"mkdir-recursive": "^0.4.0",
"postcss": "^8.4.47",
"postcss": "^8.5.3",
"postcss-loader": "^8.1.1",
"postcss-preset-env": "^10.0.7",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-table": "^7.7.0",
"react-test-renderer": "18.2.0",
"postcss-preset-env": "^10.1.5",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-table": "^7.8.0",
"react-test-renderer": "18.3.1",
"rimraf": "5.0.10",
"sass": "^1.44.0",
"sass-loader": "^16.0.2",
"storybook": "8.4.7",
"storybook-addon-tag-badges": "^1.3.2",
"sass": "^1.85.1",
"sass-loader": "^16.0.5",
"storybook": "8.6.0",
"storybook-addon-tag-badges": "^1.4.0",
"style-loader": "^4.0.0",
"stylelint": "13.x.x",
"terser-webpack-plugin": "^5.2.5",
"ts-loader": "^9.2.6",
"typescript": "^5.6.3",
"webpack": "^5.64.4",
"webpack-cli": "^5.1.4",
"stylelint": "^13.13.1",
"terser-webpack-plugin": "^5.3.11",
"ts-loader": "^9.5.2",
"typescript": "^5.7.3",
"webpack": "^5.98.0",
"webpack-cli": "^6.0.1",
"webpack-node-externals": "^3.0.0"
},
"publishConfig": {
"access": "public"
},
"packageManager": "yarn@4.5.1"
"packageManager": "yarn@4.6.0"
}
Loading

0 comments on commit 6cb17e3

Please sign in to comment.