Skip to content

fix(apollo-wind): complete future-dark and future-light CodeBlock theme integration #772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
1980computer wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

fix(apollo-wind): complete future-dark and future-light CodeBlock theme integration #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5802989
fix(apollo-wind): connect future-dark and future-light CodeBlock them…
1980computer Jun 3, 2026
7785066
feat(storybook): add Monaco/CodeMirror live demos and restructure Cod…
1980computer Jun 4, 2026
936dd79
feat(apollo-wind): migrate Code Editors stories and remove CodeBlock …
1980computer Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion apps/storybook/.storybook/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,23 @@ const config: StorybookConfig = {

return {
...config,
optimizeDeps: {
...config.optimizeDeps,
include: [
...(config.optimizeDeps?.include ?? []),
'@monaco-editor/react',
'@codemirror/lang-javascript',
'@codemirror/language',
'@codemirror/state',
'@codemirror/view',
'@lezer/highlight',
],
exclude: [
...(config.optimizeDeps?.exclude ?? []),
'monaco-editor',
],
},
// biome-ignore lint/suspicious/noExplicitAny: plugins array typed as unknown[] after flat/filter; cast required
plugins: [
...plugins,
react({ babel: { plugins: ['@lingui/babel-plugin-lingui-macro'] } }),
Expand All @@ -159,7 +176,7 @@ const config: StorybookConfig = {
// keep resolving as assets.
svgr({ include: '**/apollo-react/src/material/**/*.svg' }),
tailwindcss(),
],
] as any,
resolve: {
...config.resolve,
alias: mergeAlias(config.resolve?.alias, [
Expand Down
30 changes: 29 additions & 1 deletion packages/apollo-wind/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
"./postcss": {
"import": "./dist/postcss.config.export.js",
"require": "./dist/postcss.config.export.cjs"
},
"./editor-themes": {
"import": "./dist/editor-themes/index.js",
"require": "./dist/editor-themes/index.cjs",
"types": "./dist/editor-themes/index.d.ts"
}
Comment on lines +50 to 54
},
"files": [
Expand All @@ -69,7 +74,23 @@
},
"peerDependencies": {
"react": ">=18.0.0",
"react-dom": ">=18.0.0"
"react-dom": ">=18.0.0",
"@monaco-editor/react": ">=4.0.0",
"monaco-editor": ">=0.50.0",
"@codemirror/lang-javascript": ">=6.0.0",
"@codemirror/language": ">=6.0.0",
"@codemirror/state": ">=6.0.0",
"@codemirror/view": ">=6.0.0",
"@lezer/highlight": ">=1.0.0"
},
"peerDependenciesMeta": {
"@monaco-editor/react": { "optional": true },
"monaco-editor": { "optional": true },
"@codemirror/lang-javascript": { "optional": true },
"@codemirror/language": { "optional": true },
"@codemirror/state": { "optional": true },
"@codemirror/view": { "optional": true },
"@lezer/highlight": { "optional": true }
},
"dependencies": {
"@dnd-kit/core": "^6.3.1",
Expand Down Expand Up @@ -129,6 +150,12 @@
"zod": "^4.3.5"
},
"devDependencies": {
"@codemirror/lang-javascript": "^6.2.5",
"@codemirror/language": "^6.12.3",
"@codemirror/state": "^6.6.0",
"@codemirror/view": "^6.43.0",
"@lezer/highlight": "^1.2.3",
"@monaco-editor/react": "^4.7.0",
"@rsbuild/plugin-react": "^1.4.1",
"@rslib/core": "^0.19.6",
"@semantic-release/changelog": "^6.0.3",
Expand Down Expand Up @@ -156,6 +183,7 @@
"globals": "^16.5.0",
"jest-axe": "^10.0.0",
"jsdom": "^27.2.0",
"monaco-editor": "^0.55.1",
"postcss": "^8.5.6",
"postcss-import": "^16.1.1",
"react": "19.2.3",
Expand Down
Loading
Loading