Skip to content

Commit

Permalink
[ui] Upgrade Next.js and Storybook (#16911)
Browse files Browse the repository at this point in the history
## Summary & Motivation

Staying on top of Next.js and Storybook.

## How I Tested These Changes

Buildkite
  • Loading branch information
hellendag authored Sep 29, 2023
1 parent 0870e20 commit a1325a6
Show file tree
Hide file tree
Showing 7 changed files with 1,673 additions and 1,481 deletions.
3 changes: 0 additions & 3 deletions js_modules/dagster-ui/.yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ packageExtensions:
'@mdx-js/loader@*':
peerDependencies:
react: '*'
'@storybook/core-common@*':
dependencies:
'@storybook/react-webpack5': 7.0.8
apollo-link-context@*:
peerDependencies:
graphql: '*'
Expand Down
3 changes: 0 additions & 3 deletions js_modules/dagster-ui/packages/app-oss/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ const nextConfig = {
},
distDir: 'build',
assetPrefix: 'BUILDTIME_ASSETPREFIX_REPLACE_ME',
experimental: {
appDir: false,
},
};

module.exports = (phase) => {
Expand Down
4 changes: 2 additions & 2 deletions js_modules/dagster-ui/packages/app-oss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"@dagster-io/ui-core": "workspace:*",
"@rive-app/react-canvas": "^3.0.34",
"@types/styled-components": "^5.1.26",
"eslint-config-next": "^13.4.12",
"eslint-config-next": "^13.5.3",
"graphql": "^16.8.1",
"next": "^13.4.12",
"next": "^13.5.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
Expand Down
17 changes: 9 additions & 8 deletions js_modules/dagster-ui/packages/ui-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,13 @@
"@rollup/plugin-node-resolve": "^13.1.3",
"@rollup/plugin-replace": "^4.0.0",
"@rollup/plugin-url": "^6.1.0",
"@storybook/addon-actions": "^7.2.0",
"@storybook/addon-docs": "^7.2.0",
"@storybook/addon-essentials": "^7.2.0",
"@storybook/addon-links": "^7.2.0",
"@storybook/addon-mdx-gfm": "^7.2.0",
"@storybook/react": "^7.2.0",
"@storybook/addon-actions": "^7.4.5",
"@storybook/addon-docs": "^7.4.5",
"@storybook/addon-essentials": "^7.4.5",
"@storybook/addon-links": "^7.4.5",
"@storybook/addon-mdx-gfm": "^7.4.5",
"@storybook/nextjs": "^7.4.5",
"@storybook/react": "^7.4.5",
"@storybook/react-webpack5": "^7.2.0",
"@testing-library/dom": "^9.3.0",
"@testing-library/jest-dom": "^6.1.2",
Expand All @@ -82,7 +83,7 @@
"babel-plugin-macros": "^3.1.0",
"core-js": "^3.21.1",
"eslint": "^8.49.0",
"eslint-plugin-storybook": "^0.6.13",
"eslint-plugin-storybook": "^0.6.14",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"nearest-color": "^0.4.4",
Expand All @@ -95,7 +96,7 @@
"rollup-plugin-node-globals": "^1.4.0",
"rollup-plugin-polyfill-node": "^0.8.0",
"rollup-plugin-styles": "^4.0.0",
"storybook": "^7.2.0",
"storybook": "^7.4.5",
"typescript": "5.2.2",
"webpack": "^5.88.1"
},
Expand Down
2 changes: 1 addition & 1 deletion js_modules/dagster-ui/packages/ui-core/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const config = {
getAbsolutePath('@storybook/addon-mdx-gfm'),
],
framework: {
name: getAbsolutePath('@storybook/react-webpack5'),
name: getAbsolutePath("@storybook/nextjs"),
options: {},
},
// https://storybook.js.org/docs/react/configure/webpack#bundle-splitting
Expand Down
18 changes: 9 additions & 9 deletions js_modules/dagster-ui/packages/ui-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,13 @@
"@graphql-tools/mock": "^8.5.0",
"@graphql-tools/schema": "^8.3.1",
"@mdx-js/react": "^1.6.22",
"@storybook/addon-actions": "^7.2.0",
"@storybook/addon-docs": "^7.2.0",
"@storybook/addon-essentials": "^7.2.0",
"@storybook/addon-links": "^7.2.0",
"@storybook/addon-mdx-gfm": "^7.2.0",
"@storybook/react": "^7.2.0",
"@storybook/react-webpack5": "^7.2.0",
"@storybook/addon-actions": "^7.4.5",
"@storybook/addon-docs": "^7.4.5",
"@storybook/addon-essentials": "^7.4.5",
"@storybook/addon-links": "^7.4.5",
"@storybook/addon-mdx-gfm": "^7.4.5",
"@storybook/nextjs": "^7.4.5",
"@storybook/react": "^7.4.5",
"@testing-library/dom": "^9.3.0",
"@testing-library/jest-dom": "^6.1.2",
"@testing-library/react": "^14.0.0",
Expand Down Expand Up @@ -134,7 +134,7 @@
"child-process": "^1.0.2",
"eslint": "^8.49.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-storybook": "^0.6.13",
"eslint-plugin-storybook": "^0.6.14",
"faker": "5.5.3",
"graphql-codegen-typescript-mock-data": "^3.3.0",
"graphql-config": "^4.5.0",
Expand All @@ -152,7 +152,7 @@
"react-router-dom-v5-compat": "^6.3.0",
"resize-observer-polyfill": "^1.5.1",
"rgb-hex": "^4.0.0",
"storybook": "^7.2.0",
"storybook": "^7.4.5",
"styled-components": "^5.3.3",
"ts-node": "9.1.1",
"ts-prune": "0.10.3",
Expand Down
Loading

2 comments on commit a1325a6

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deploy preview for dagit-core-storybook ready!

✅ Preview
https://dagit-core-storybook-2ibjf70so-elementl.vercel.app

Built with commit a1325a6.
This pull request is being automatically deployed with vercel-action

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deploy preview for dagit-storybook ready!

✅ Preview
https://dagit-storybook-jq90ba5n7-elementl.vercel.app

Built with commit a1325a6.
This pull request is being automatically deployed with vercel-action

Please sign in to comment.