Skip to content

Commit 1af4ccc

Browse files
committed
merged nm/update-imodelbrowser-to-itwinui3
1 parent 5c5f95a commit 1af4ccc

10 files changed

Lines changed: 269 additions & 168 deletions

File tree

common/config/rush/pnpm-lock.yaml

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

packages/apps/storybook/.storybook/preview.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55
import React from "react";
66
import { ThemeProvider } from "@itwin/itwinui-react";
7-
import { ThemeProvider as ThemeProviderV3 } from "@itwin/itwinui-react_v3";
87
import addons from "@storybook/addons";
98
import { themes } from "@storybook/theming";
10-
import "@itwin/itwinui-react_v3/styles.css";
119

1210
import { darkTheme, lightTheme } from "./itwinTheme";
1311

@@ -47,14 +45,9 @@ export const decorators = [
4745
const theme = useTheme();
4846

4947
return (
50-
<ThemeProviderV3
51-
style={{ background: "transparent" }}
52-
theme={theme}
53-
>
5448
<ThemeProvider style={{ background: "transparent" }} theme={theme}>
5549
<Story />
5650
</ThemeProvider>
57-
</ThemeProviderV3>
5851
);
5952
},
6053
];

packages/apps/storybook/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"@itwin/delete-itwin-react": "^2.0.0",
1515
"@itwin/imodel-browser-react": "~2.3.2",
1616
"@itwin/itwinui-react": "^2.12.18",
17-
"@itwin/itwinui-react_v3": "npm:@itwin/itwinui-react@^3.17.3",
1817
"@itwin/manage-versions-react": "~2.0.0",
1918
"@itwin/storybook-auth-addon": "^0.1.0",
2019
"@storybook/addon-actions": "^6.5.16",

packages/modules/imodel-browser/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"esm/**/*"
3232
],
3333
"dependencies": {
34-
"@itwin/itwinui-icons-react": "^2.2.0",
3534
"classnames": "^2.2.6",
3635
"react-intersection-observer": "^8.31.1"
3736
},
@@ -64,7 +63,6 @@
6463
"jest": "^27.5.1",
6564
"jest-fetch-mock": "^3.0.3",
6665
"msw": "^0.27.1",
67-
"sass": "^1.69.5",
6866
"postcss": "8.4.31",
6967
"prettier": "^2.0.5",
7068
"react": "^18.3.1",
@@ -75,6 +73,7 @@
7573
"rollup-plugin-peer-deps-external": "^2.2.4",
7674
"rollup-plugin-postcss": "^4.0.0",
7775
"rollup-plugin-typescript2": "^0.36.0",
76+
"sass": "^1.69.5",
7877
"stylelint": "^13.6.1",
7978
"stylelint-config-prettier": "^8.0.2",
8079
"stylelint-config-sass-guidelines": "^7.0.0",
@@ -85,7 +84,8 @@
8584
"typescript": "^4.2.3"
8685
},
8786
"peerDependencies": {
88-
"@itwin/itwinui-react": "^3.17.3",
87+
"@itwin/itwinui-icons-react": "^2.9.0",
88+
"@itwin/itwinui-react": "~3.17.3",
8989
"react": "^18.3.1",
9090
"react-dom": "^18.3.1"
9191
}

0 commit comments

Comments
 (0)