Skip to content

Commit

Permalink
Merge branch 'main' into labl-on-side
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahgm committed Nov 10, 2022
2 parents eb44e1b + 57af4bb commit 088acc2
Show file tree
Hide file tree
Showing 92 changed files with 3,024 additions and 1,742 deletions.
6 changes: 0 additions & 6 deletions .changeset/moody-humans-press.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/thick-apricots-judge.md

This file was deleted.

6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/2.bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ Steps to reproduce the behavior:
3. Scroll down to '....'
4. See error

<!-- Or! Create a small example using the following template -->

[Repl.it Example](https://replit.com/@sebald/Marigold-Template)

<!-- ℹ️ Dont forget to change the link to your fork! -->

## Expected behavior

<!-- A clear and concise description of what you expected to happen. -->
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
# Setup
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.2 # Uses version from package.json#packageManager
- uses: pnpm/action-setup@v2.2.4 # Uses version from package.json#packageManager
- name: Setup Node (using .node-version)
uses: actions/setup-node@v3
with:
Expand All @@ -37,7 +37,7 @@ jobs:
steps:
# Setup
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.2 # Uses version from package.json#packageManager
- uses: pnpm/action-setup@v2.2.4 # Uses version from package.json#packageManager
- name: Setup Node (using .node-version)
uses: actions/setup-node@v3
with:
Expand All @@ -58,7 +58,7 @@ jobs:
steps:
# Setup
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.2 # Uses version from package.json#packageManager
- uses: pnpm/action-setup@v2.2.4 # Uses version from package.json#packageManager
- name: Setup Node (using .node-version)
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Required to retrieve git history, do not delete!
- uses: pnpm/action-setup@v2.2.2 # Uses version from package.json#packageManager
- uses: pnpm/action-setup@v2.2.4 # Uses version from package.json#packageManager
- name: Setup Node (using .node-version)
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
# Setup
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.2 # Uses version from package.json#packageManager
- uses: pnpm/action-setup@v2.2.4 # Uses version from package.json#packageManager
- name: Setup Node (using .node-version)
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
# Setup
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.2 # Uses version from package.json#packageManager
- uses: pnpm/action-setup@v2.2.4 # Uses version from package.json#packageManager
- name: Setup Node (using .node-version)
uses: actions/setup-node@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
# Setup
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.2 # Uses version from package.json#packageManager
- uses: pnpm/action-setup@v2.2.4 # Uses version from package.json#packageManager
- name: Setup Node (using .node-version)
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
run: pnpm release:notification --packages '${{ steps.changesets.outputs.publishedPackages }}'
- name: Slack Notification
if: steps.changesets.outputs.published == 'true'
uses: slackapi/slack-github-action@v1.22.0
uses: slackapi/slack-github-action@v1.23.0
with:
payload-file-path: './slack-notification.json'
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v6.0.0
- uses: actions/stale@v6.0.1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-label: 'status:stale'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
# Setup
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.2 # Uses version from package.json#packageManager
- uses: pnpm/action-setup@v2.2.4 # Uses version from package.json#packageManager
- name: Setup Node (using .node-version)
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
# Setup
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.2 # Uses version from package.json#packageManager
- uses: pnpm/action-setup@v2.2.4 # Uses version from package.json#packageManager
- name: Setup Node (using .node-version)
uses: actions/setup-node@v3
with:
Expand Down
8 changes: 8 additions & 0 deletions config/eslint/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @marigold/eslint-config

## 0.4.4

### Patch Changes

- [#2591](https://github.com/marigold-ui/marigold/pull/2591) [`be3f2060`](https://github.com/marigold-ui/marigold/commit/be3f20600b195f62d8d5bc1b784329d7bf152d9a) Thanks [@renovate](https://github.com/apps/renovate)! - chore(deps): update dependency @babel/core to v7.19.6

- [#2600](https://github.com/marigold-ui/marigold/pull/2600) [`7056cb3d`](https://github.com/marigold-ui/marigold/commit/7056cb3d820531b905813a5888a6876ed82db7e3) Thanks [@renovate](https://github.com/apps/renovate)! - chore(deps): update eslint

## 0.4.3

### Patch Changes
Expand Down
16 changes: 8 additions & 8 deletions config/eslint/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@marigold/eslint-config",
"description": "marigold's eslint configuration",
"version": "0.4.3",
"version": "0.4.4",
"license": "MIT",
"keywords": [
"marigiold",
Expand All @@ -19,30 +19,30 @@
"directory": "config/eslint"
},
"dependencies": {
"@babel/core": "7.19.3",
"@babel/core": "7.19.6",
"@babel/eslint-parser": "^7.18.9",
"@babel/plugin-syntax-flow": "^7.16.7",
"@babel/plugin-transform-react-jsx": "^7.17.3",
"@typescript-eslint/eslint-plugin": "5.36.2",
"@typescript-eslint/parser": "5.36.2",
"@typescript-eslint/eslint-plugin": "5.41.0",
"@typescript-eslint/parser": "5.41.0",
"eslint-config-prettier": "^8.5.0",
"eslint-config-react-app": "7.0.1",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-jest": "27.0.4",
"eslint-plugin-jest": "27.1.3",
"eslint-plugin-jsx-a11y": "6.6.1",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-react": "7.31.8",
"eslint-plugin-react": "7.31.10",
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-testing-library": "5.6.3",
"eslint-plugin-testing-library": "5.9.1",
"prettier": "2.7.1"
},
"peerDependencies": {
"eslint": "8.x.x",
"typescript": "4.8.x"
},
"devDependencies": {
"eslint": "8.23.0",
"eslint": "8.26.0",
"typescript": "4.8.4"
}
}
8 changes: 8 additions & 0 deletions config/jest/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @marigold/jest-config

## 1.0.9

### Patch Changes

- [#2591](https://github.com/marigold-ui/marigold/pull/2591) [`be3f2060`](https://github.com/marigold-ui/marigold/commit/be3f20600b195f62d8d5bc1b784329d7bf152d9a) Thanks [@renovate](https://github.com/apps/renovate)! - chore(deps): update dependency @babel/core to v7.19.6

- [#2599](https://github.com/marigold-ui/marigold/pull/2599) [`940bc912`](https://github.com/marigold-ui/marigold/commit/940bc912d30b311e275174bc6ada34a996e8c767) Thanks [@renovate](https://github.com/apps/renovate)! - chore(deps): update testing

## 1.0.8

### Patch Changes
Expand Down
18 changes: 9 additions & 9 deletions config/jest/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@marigold/jest-config",
"description": "Marigold's jest configuration",
"version": "1.0.8",
"version": "1.0.9",
"license": "MIT",
"keywords": [
"marigold",
Expand All @@ -21,16 +21,16 @@
"directory": "config/jest"
},
"dependencies": {
"@babel/core": "7.19.3",
"@swc/core": "1.3.5",
"@swc/jest": "0.2.22",
"@types/jest": "29.0.0",
"babel-jest": "29.0.3",
"@babel/core": "7.19.6",
"@swc/core": "1.3.11",
"@swc/jest": "0.2.23",
"@types/jest": "29.2.1",
"babel-jest": "29.2.2",
"find-up": "5.0.0",
"jest-watch-typeahead": "2.1.1",
"jest-watch-typeahead": "2.2.0",
"merge-deep": "3.0.3",
"react-test-renderer": "18.2.0",
"ts-jest": "29.0.0"
"ts-jest": "29.0.3"
},
"peerDependencies": {
"jest": "29.x",
Expand All @@ -39,7 +39,7 @@
"typescript": "4.x"
},
"devDependencies": {
"jest": "29.0.3",
"jest": "29.2.2",
"react": "18.2.0",
"typescript": "4.8.4"
}
Expand Down
34 changes: 34 additions & 0 deletions config/storybook/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,39 @@
# @marigold/storybook-config

## 0.7.15

### Patch Changes

- [#2591](https://github.com/marigold-ui/marigold/pull/2591) [`be3f2060`](https://github.com/marigold-ui/marigold/commit/be3f20600b195f62d8d5bc1b784329d7bf152d9a) Thanks [@renovate](https://github.com/apps/renovate)! - chore(deps): update dependency @babel/core to v7.19.6

- Updated dependencies [[`0c548546`](https://github.com/marigold-ui/marigold/commit/0c54854648e18244453a672ac555b224b64b6265), [`41f60e3d`](https://github.com/marigold-ui/marigold/commit/41f60e3d3c95a21e4a3a1a167905270d6f5dc966), [`31e1219d`](https://github.com/marigold-ui/marigold/commit/31e1219dd684fde238aac17ef00c68cf7e458519), [`eb35da96`](https://github.com/marigold-ui/marigold/commit/eb35da96a52dc4b2b47d57ea115897bd7ee3bc69)]:
- @marigold/theme-core@15.0.0
- @marigold/components@4.0.0
- @marigold/theme-b2b@15.0.0
- @marigold/theme-unicorn@12.0.0

## 0.7.14

### Patch Changes

- [#2594](https://github.com/marigold-ui/marigold/pull/2594) [`060db713`](https://github.com/marigold-ui/marigold/commit/060db713c17b6796a19a97790b8f3742f4573eb0) Thanks [@renovate](https://github.com/apps/renovate)! - chore(deps): update storybook monorepo to v6.5.13

- Updated dependencies [[`0e923ccc`](https://github.com/marigold-ui/marigold/commit/0e923ccc22d2d2a8ad24e6a6193f5aa6b97d202a)]:
- @marigold/theme-core@14.0.6
- @marigold/components@3.0.6
- @marigold/theme-b2b@14.0.6
- @marigold/theme-unicorn@11.0.6

## 0.7.13

### Patch Changes

- Updated dependencies [[`0441cd20`](https://github.com/marigold-ui/marigold/commit/0441cd20fcdfc1964b8854ae8910e52586b85a4a), [`e73554ed`](https://github.com/marigold-ui/marigold/commit/e73554ed7a4d434335cc2fac5375686d0916658b), [`c9f785e0`](https://github.com/marigold-ui/marigold/commit/c9f785e093efa6a8186a798a6d660d170167b5e9), [`bc604461`](https://github.com/marigold-ui/marigold/commit/bc60446149f2a5b50f0da36cbb79a4018d324199)]:
- @marigold/components@3.0.5
- @marigold/theme-b2b@14.0.5
- @marigold/theme-core@14.0.5
- @marigold/theme-unicorn@11.0.5

## 0.7.12

### Patch Changes
Expand Down
12 changes: 6 additions & 6 deletions config/storybook/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@marigold/storybook-config",
"description": "Marigold's storybook configuration",
"version": "0.7.12",
"version": "0.7.15",
"license": "MIT",
"type": "module",
"exports": "./main.js",
Expand All @@ -19,17 +19,17 @@
"directory": "config/prettier"
},
"dependencies": {
"@babel/core": "7.19.3",
"@babel/core": "7.19.6",
"@emotion/react": "^11.0.0-rc.0",
"@emotion/styled": "^11.8.1",
"@marigold/components": "workspace:*",
"@marigold/theme-b2b": "workspace:*",
"@marigold/theme-core": "workspace:*",
"@marigold/theme-unicorn": "workspace:*",
"@mdx-js/react": "1.6.22",
"@storybook/addon-a11y": "6.5.12",
"@storybook/addon-essentials": "6.5.12",
"@storybook/addon-interactions": "6.5.12",
"@storybook/addon-a11y": "6.5.13",
"@storybook/addon-essentials": "6.5.13",
"@storybook/addon-interactions": "6.5.13",
"@storybook/jest": "0.0.10",
"@storybook/testing-library": "0.0.13",
"@types/react": "18",
Expand All @@ -45,7 +45,7 @@
"typescript": "4.8.4"
},
"peerDependencies": {
"@storybook/react": "6.5.12",
"@storybook/react": "6.5.13",
"react": "18.x",
"react-dom": "18.x",
"typescript": "4.8.4"
Expand Down
41 changes: 41 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,46 @@
# @marigold/docs

## 4.0.0

### Major Changes

- [#2610](https://github.com/marigold-ui/marigold/pull/2610) [`eb35da96`](https://github.com/marigold-ui/marigold/commit/eb35da96a52dc4b2b47d57ea115897bd7ee3bc69) Thanks [@sebald](https://github.com/sebald)! - feat: `<Tiles>` can now be used as a grid with fixed widths or fully respsonsive.

BREAKING CHANGE: Renamed the whole API. Please checkout the documentation at https://marigold-ui.io/components/tiles/#props

### Patch Changes

- [#2598](https://github.com/marigold-ui/marigold/pull/2598) [`f38ae20a`](https://github.com/marigold-ui/marigold/commit/f38ae20a23badf8cf141f582f0c20d85fdd6534b) Thanks [@renovate](https://github.com/apps/renovate)! - chore(deps): update dependency @types/react to v18.0.24

- Updated dependencies [[`02bd8efe`](https://github.com/marigold-ui/marigold/commit/02bd8efe1a5660910338a9f2cba39cc061588793), [`be3f2060`](https://github.com/marigold-ui/marigold/commit/be3f20600b195f62d8d5bc1b784329d7bf152d9a), [`f38ae20a`](https://github.com/marigold-ui/marigold/commit/f38ae20a23badf8cf141f582f0c20d85fdd6534b), [`4554b26e`](https://github.com/marigold-ui/marigold/commit/4554b26ef49986d2ebf457cc000284db5d8d85e8), [`41f60e3d`](https://github.com/marigold-ui/marigold/commit/41f60e3d3c95a21e4a3a1a167905270d6f5dc966), [`31e1219d`](https://github.com/marigold-ui/marigold/commit/31e1219dd684fde238aac17ef00c68cf7e458519), [`eb35da96`](https://github.com/marigold-ui/marigold/commit/eb35da96a52dc4b2b47d57ea115897bd7ee3bc69)]:
- @marigold/icons@1.1.7
- @marigold/system@4.0.0
- @marigold/types@0.5.5
- @marigold/components@4.0.0
- @marigold/theme-b2b@15.0.0

## 3.0.6

### Patch Changes

- Updated dependencies [[`d8fc387d`](https://github.com/marigold-ui/marigold/commit/d8fc387df8ce1afef229bc421ed5cee114e24190)]:
- @marigold/system@3.0.6
- @marigold/components@3.0.6
- @marigold/icons@1.1.6
- @marigold/theme-b2b@14.0.6

## 3.0.5

### Patch Changes

- [#2575](https://github.com/marigold-ui/marigold/pull/2575) [`0441cd20`](https://github.com/marigold-ui/marigold/commit/0441cd20fcdfc1964b8854ae8910e52586b85a4a) Thanks [@sarahgm](https://github.com/sarahgm)! - feat: <XLoader> component for loading states

- Updated dependencies [[`0441cd20`](https://github.com/marigold-ui/marigold/commit/0441cd20fcdfc1964b8854ae8910e52586b85a4a), [`e73554ed`](https://github.com/marigold-ui/marigold/commit/e73554ed7a4d434335cc2fac5375686d0916658b)]:
- @marigold/components@3.0.5
- @marigold/theme-b2b@14.0.5
- @marigold/system@3.0.5
- @marigold/icons@1.1.5

## 3.0.4

### Patch Changes
Expand Down
1 change: 1 addition & 0 deletions docs/next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export default async function configuration() {
'Content',
],
},
{ name: 'hooks' },
{ name: 'develop' },
],
});
Expand Down
Loading

0 comments on commit 088acc2

Please sign in to comment.