Skip to content

Commit 4ddd237

Browse files
committed
chore: Update ReactDagEditor to accept viewModel prop
1 parent e36bc4f commit 4ddd237

File tree

8 files changed

+868
-880
lines changed

8 files changed

+868
-880
lines changed

package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"devDependencies": {
1717
"@babel/core": "^7.14.5",
1818
"@babel/preset-react": "^7.14.5",
19+
"@chromatic-com/storybook": "1",
1920
"@fluentui/merge-styles": "^8.6.8",
2021
"@nx/eslint": "19.1.0",
2122
"@nx/eslint-plugin": "19.1.0",
@@ -25,13 +26,12 @@
2526
"@nx/storybook": "19.1.0",
2627
"@nx/vite": "19.1.0",
2728
"@nx/web": "19.1.0",
28-
"@storybook/addon-essentials": "7.6.19",
29-
"@storybook/addon-interactions": "^7.5.3",
30-
"@storybook/core-server": "7.6.19",
31-
"@storybook/jest": "^0.2.3",
32-
"@storybook/react-vite": "7.6.19",
29+
"@storybook/addon-essentials": "^8.1.5",
30+
"@storybook/addon-interactions": "^8.1.5",
31+
"@storybook/core-server": "^8.1.5",
32+
"@storybook/react-vite": "^8.1.5",
33+
"@storybook/test": "8.1.5",
3334
"@storybook/test-runner": "^0.13.0",
34-
"@storybook/testing-library": "^0.2.2",
3535
"@swc-node/register": "~1.8.0",
3636
"@swc/core": "~1.3.85",
3737
"@swc/helpers": "~0.5.2",
@@ -63,14 +63,15 @@
6363
"react-jss": "^10.10.0",
6464
"react-test-renderer": "^18.3.1",
6565
"sass": "^1.55.0",
66-
"storybook": "7.6.19",
66+
"storybook": "^8.1.5",
6767
"toposort": "^2.0.2",
6868
"ts-jest": "^29.1.4",
6969
"ts-node": "10.9.1",
7070
"typescript": "^5.4.5",
7171
"uuid": "^9.0.1",
7272
"vite": "~5.0.0",
7373
"vite-plugin-dts": "~3.8.1",
74+
"vite-tsconfig-paths": "^4.3.2",
7475
"vitest": "^1.3.1"
7576
},
7677
"workspaces": [
Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,46 @@
1+
import { dirname, join } from "path";
12
import type { StorybookConfig } from "@storybook/react-vite";
3+
import { mergeConfig } from "vite";
4+
import tsconfigPaths from "vite-tsconfig-paths";
25

36
const config: StorybookConfig = {
4-
stories: ["../stories/**/*.stories.@(js|jsx|ts|tsx|mdx)"],
5-
addons: ["@storybook/addon-essentials", "@storybook/addon-interactions"],
7+
stories: ["../stories/**/*.@(mdx|stories.@(js|jsx|ts|tsx))"],
8+
addons: [
9+
getAbsolutePath("@storybook/addon-essentials"),
10+
getAbsolutePath("@storybook/addon-interactions"),
11+
"@chromatic-com/storybook",
12+
],
13+
async viteFinal(viteConfig) {
14+
return mergeConfig(viteConfig, {
15+
plugins: [
16+
tsconfigPaths({
17+
projects: ["../../tsconfig.base.json"],
18+
}),
19+
],
20+
});
21+
},
622
framework: {
7-
name: "@storybook/react-vite",
23+
name: getAbsolutePath("@storybook/react-vite"),
824
options: {
925
builder: {
1026
viteConfigPath: "vite.config.ts",
1127
},
1228
},
1329
},
30+
31+
docs: {},
32+
33+
typescript: {
34+
reactDocgen: "react-docgen-typescript",
35+
},
1436
};
1537

1638
export default config;
1739

1840
// To customize your Vite configuration you can use the viteFinal field.
1941
// Check https://storybook.js.org/docs/react/builders/vite#configuration
2042
// and https://nx.dev/recipes/storybook/custom-builder-configs
43+
44+
function getAbsolutePath(value: string): any {
45+
return dirname(require.resolve(join(value, "package.json")));
46+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const tags = ["autodocs"];

packages/react-dag-editor-next/tsconfig.lib.json

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../dist/out-tsc",
5-
"types": ["node", "@nx/react/typings/cssmodule.d.ts", "@nx/react/typings/image.d.ts", "vite/client"]
5+
"types": [
6+
"node",
7+
"@nx/react/typings/cssmodule.d.ts",
8+
"@nx/react/typings/image.d.ts",
9+
"vite/client"
10+
]
611
},
712
"exclude": [
813
"**/*.spec.ts",
@@ -12,11 +17,16 @@
1217
"**/*.spec.js",
1318
"**/*.test.js",
1419
"**/*.spec.jsx",
15-
"**/*.test.jsx",
16-
"**/*.stories.ts",
17-
"**/*.stories.js",
18-
"**/*.stories.jsx",
19-
"**/*.stories.tsx"
20+
"**/*.test.jsx"
2021
],
21-
"include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
22-
}
22+
"include": [
23+
"src/**/*.js",
24+
"src/**/*.jsx",
25+
"src/**/*.ts",
26+
"src/**/*.tsx",
27+
"stories/**/*.js",
28+
"stories/**/*.jsx",
29+
"stories/**/*.ts",
30+
"stories/**/*.tsx"
31+
]
32+
}

packages/react-dag-editor-next/tsconfig.storybook.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
"stories/**/*.stories.jsx",
2727
"stories/**/*.stories.tsx",
2828
"stories/**/*.stories.mdx",
29+
"stories/**/*.ts",
30+
"stories/**/*.js",
31+
"stories/**/*.jsx",
32+
"stories/**/*.tsx",
2933
".storybook/*.js",
3034
".storybook/*.ts"
3135
]

packages/react-dag-editor-next/vite.config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/// <reference types='vitest' />
2-
import { defineConfig } from "vite";
3-
import react from "@vitejs/plugin-react";
4-
import dts from "vite-plugin-dts";
52
import * as path from "path";
63
import { nxViteTsPaths } from "@nx/vite/plugins/nx-tsconfig-paths.plugin";
4+
import react from "@vitejs/plugin-react";
5+
import { defineConfig } from "vite";
6+
import dts from "vite-plugin-dts";
77

88
export default defineConfig({
99
root: __dirname,
Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,36 @@
1+
import { dirname, join } from "path";
12
import type { StorybookConfig } from "@storybook/react-vite";
23

34
const config: StorybookConfig = {
45
stories: ["../src/stories/**/*.stories.@(js|jsx|ts|tsx|mdx)"],
5-
addons: ["@storybook/addon-essentials", "@storybook/addon-interactions"],
6+
addons: [
7+
getAbsolutePath("@storybook/addon-essentials"),
8+
getAbsolutePath("@storybook/addon-interactions"),
9+
"@chromatic-com/storybook",
10+
],
11+
612
framework: {
7-
name: "@storybook/react-vite",
13+
name: getAbsolutePath("@storybook/react-vite"),
814
options: {
915
builder: {
1016
viteConfigPath: "vite.config.ts",
1117
},
1218
},
1319
},
20+
21+
docs: {},
22+
23+
typescript: {
24+
reactDocgen: "react-docgen-typescript",
25+
},
1426
};
1527

1628
export default config;
1729

1830
// To customize your Vite configuration you can use the viteFinal field.
1931
// Check https://storybook.js.org/docs/react/builders/vite#configuration
2032
// and https://nx.dev/recipes/storybook/custom-builder-configs
33+
34+
function getAbsolutePath(value: string): any {
35+
return dirname(require.resolve(join(value, "package.json")));
36+
}

0 commit comments

Comments
 (0)