Skip to content

Commit f835bc0

Browse files
Merge pull request #452 from melfore/merge-from-beta
Merge from beta
2 parents a0e8af3 + 2a44349 commit f835bc0

File tree

276 files changed

+69007
-7404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

276 files changed

+69007
-7404
lines changed

.eslintignore

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

.eslintrc.json

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

.releaserc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
{
66
"preset": "angular",
77
"releaseRules": [
8+
{ "breaking": true, "release": "major" },
89
{ "type": "chore", "release": "patch" },
910
{ "type": "ci", "release": "patch" },
1011
{ "type": "docs", "release": "patch" },

.storybook/preview.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import "@fontsource/roboto/500.css";
44
import "@fontsource/roboto/700.css";
55
import "@fontsource/material-icons";
66

7-
import { CssBaseline, ThemeProvider, createTheme } from "@mui/material";
7+
import { createTheme, CssBaseline, ThemeProvider } from "@mui/material";
88
import { withThemeFromJSXProvider } from "@storybook/addon-themes";
99

1010
const lightTheme = createTheme();

.storybook/test-runner.ts

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import { getStoryContext, TestHook, TestRunnerConfig } from "@storybook/test-runner";
2+
23
import {
3-
waitFor,
4-
SBStory,
5-
initDatabase,
6-
getDatabase,
4+
getComponentDescription,
5+
getComponentImport,
6+
getComponentProps,
77
getComponentTitle,
8+
getDatabase,
9+
initDatabase,
810
parseStory,
9-
getComponentProps,
11+
SBStory,
12+
waitFor,
1013
writeDatabase,
11-
getComponentDescription,
12-
getComponentImport,
1314
} from "./utils";
1415

1516
// TODO@luciob: move this to an environment variable
@@ -23,7 +24,7 @@ let storySourceData: SBStory;
2324
const getStorybookStoryData: TestHook = async (page) => {
2425
page
2526
.evaluate<SBStory>(() => {
26-
return new Promise((resolve, reject) => {
27+
return new Promise((resolve) => {
2728
const channel = globalThis.__STORYBOOK_ADDONS_CHANNEL__;
2829
channel.on("@storybook/core/docs/snippet-rendered", (data: SBStory) => resolve(data));
2930
});
@@ -45,7 +46,6 @@ const writeStoryDataToDB: TestHook = async (page, context) => {
4546
const importCode = getComponentImport(name);
4647
const props = getComponentProps(argTypes);
4748
database = [
48-
// @ts-ignore
4949
...database,
5050
{
5151
name,
@@ -54,7 +54,6 @@ const writeStoryDataToDB: TestHook = async (page, context) => {
5454
extension: "tsx",
5555
docs: {
5656
import: importCode,
57-
// @ts-ignore
5857
props,
5958
examples: [example],
6059
},
@@ -96,7 +95,7 @@ const validateSnapshot: TestHook = async (page, context) => {
9695
}
9796

9897
const innerHTML = await elementHandler.innerHTML();
99-
// @ts-ignore
98+
// @ts-expect-error global expect
10099
expect(innerHTML).toMatchSnapshot();
101100
};
102101

.storybook/utils.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { existsSync, readFileSync, writeFileSync } from "fs";
1+
/* eslint-disable @typescript-eslint/no-explicit-any */
22
import { StoryContextForEnhancers } from "@storybook/types";
3+
import { existsSync, readFileSync, writeFileSync } from "fs";
34

45
type Snippet = {
56
code: string;
@@ -36,8 +37,6 @@ export type Component = {
3637
};
3738
};
3839

39-
type StoryResolver = (story: Story | PromiseLike<Story>) => void;
40-
4140
const CONDITION_RECHECK_INTERVAL_MS = 100;
4241
const CONDITION_OVERALL_TIMEOUT_MS = 2000;
4342

@@ -78,7 +77,7 @@ const getPropertyType = (sbType?: any): { required: boolean; type: string } => {
7877
}
7978

8079
const { name, required } = sbType;
81-
let type = sbType.name;
80+
let type = name;
8281
if (type === "other" || type === "function") {
8382
type = sbType.value;
8483
}
@@ -95,7 +94,7 @@ const getPropertyValues = (sbOptions?: readonly any[]) => {
9594
return undefined;
9695
}
9796

98-
let options: string[] = [];
97+
const options: string[] = [];
9998
sbOptions.forEach((option) => {
10099
if (!options.includes(option)) {
101100
options.push(option);

CHANGELOG.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
# [11.0.0-beta.1](https://github.com/melfore/mosaic/compare/v10.3.4-beta.4...v11.0.0-beta.1) (2025-05-08)
2+
3+
4+
### Continuous Integration
5+
6+
* 🎡 bump major version for all commit types if breaking ([6cda3c2](https://github.com/melfore/mosaic/commit/6cda3c2f49ae2ff03f284ed720e9c24325ec90ce)), closes [#450](https://github.com/melfore/mosaic/issues/450)
7+
8+
9+
### BREAKING CHANGES
10+
11+
* 🧨 bump major version for all commit types if breaking
12+
13+
## [10.3.4-beta.4](https://github.com/melfore/mosaic/compare/v10.3.4-beta.3...v10.3.4-beta.4) (2025-05-07)
14+
15+
16+
### Bug Fixes
17+
18+
* 🐛 incorrect warning on Select component ([3bee0f4](https://github.com/melfore/mosaic/commit/3bee0f4eabe1d5d974407a832af0e1d69cc30140))
19+
* 🐛 mobile view in DateTimePicker ([31ba662](https://github.com/melfore/mosaic/commit/31ba662ceb45f98a2af7a9369bf5b4b8c4aeaa61)), closes [#447](https://github.com/melfore/mosaic/issues/447)
20+
21+
22+
### chore
23+
24+
* 🤖 upgrade mui v7 and mui-date-pickers v8 ([20c1070](https://github.com/melfore/mosaic/commit/20c10703dc69549400fabe892c6e5b075cd04ca3)), closes [#447](https://github.com/melfore/mosaic/issues/447)
25+
26+
27+
### BREAKING CHANGES
28+
29+
* 🧨 updated mui to 7 and mui-date-pickers to 8
30+
31+
## [10.3.4-beta.3](https://github.com/melfore/mosaic/compare/v10.3.4-beta.2...v10.3.4-beta.3) (2025-05-07)
32+
33+
## [10.3.4-beta.2](https://github.com/melfore/mosaic/compare/v10.3.4-beta.1...v10.3.4-beta.2) (2025-05-07)
34+
35+
## [10.3.4-beta.1](https://github.com/melfore/mosaic/compare/v10.3.3...v10.3.4-beta.1) (2025-05-05)
36+
137
## [10.3.3](https://github.com/melfore/mosaic/compare/v10.3.2...v10.3.3) (2025-01-13)
238

339
## [10.3.2](https://github.com/melfore/mosaic/compare/v10.3.1...v10.3.2) (2024-12-17)
@@ -195,6 +231,8 @@ ModalWithTabs.
195231
* 🎸 [DateTimePicker] Added props ([0eb116c](https://github.com/melfore/mosaic/commit/0eb116c7fed8c00862f6bc4bfd547b9d380cffbd)), closes [#336](https://github.com/melfore/mosaic/issues/336)
196232
* 🎸 [TimePicker] added new component ([d1453ad](https://github.com/melfore/mosaic/commit/d1453ad9a4f1c2e24ac652fde810a4f35454449b)), closes [#336](https://github.com/melfore/mosaic/issues/336)
197233

234+
## [9.2.2-beta.1](https://github.com/melfore/mosaic/compare/v9.2.1...v9.2.2-beta.1) (2023-10-19)
235+
198236
## [9.2.1](https://github.com/melfore/mosaic/compare/v9.2.0...v9.2.1) (2023-09-19)
199237

200238
# [9.2.0](https://github.com/melfore/mosaic/compare/v9.1.0...v9.2.0) (2023-09-06)

docs/beta/209.327fec6e.iframe.bundle.js

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

docs/beta/209.327fec6e.iframe.bundle.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/beta/285.202290ed.iframe.bundle.js

Lines changed: 184 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)