From cdd40df9d33f3789c696b57d8c680d8e1d869273 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Wed, 8 Feb 2023 18:54:19 +0100 Subject: [PATCH 01/11] disable sw in dev --- website/astro.config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/astro.config.mjs b/website/astro.config.mjs index 646a3b3c..f1b8395d 100644 --- a/website/astro.config.mjs +++ b/website/astro.config.mjs @@ -53,7 +53,7 @@ export default defineConfig({ ], }, devOptions: { - enabled: true, + enabled: false, }, manifest: { includeAssets: ['favicon.ico', 'icons/apple-icon-180.png', 'favicon.svg'], From 30b149053ceaf7fb5d041fa3e4c6fffb436b7ce0 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Wed, 8 Feb 2023 18:54:34 +0100 Subject: [PATCH 02/11] basic theme switcher --- packages/react/src/components/CodeMirror6.jsx | 13 +- packages/react/src/components/style.css | 8 +- pnpm-lock.yaml | 177 ++++++++++++++++++ website/package.json | 1 + website/src/repl/Footer.jsx | 21 ++- website/src/repl/Repl.jsx | 5 + website/src/repl/themes.mjs | 31 +++ 7 files changed, 250 insertions(+), 6 deletions(-) create mode 100644 website/src/repl/themes.mjs diff --git a/packages/react/src/components/CodeMirror6.jsx b/packages/react/src/components/CodeMirror6.jsx index 8b05a727..1dbc1066 100644 --- a/packages/react/src/components/CodeMirror6.jsx +++ b/packages/react/src/components/CodeMirror6.jsx @@ -79,9 +79,17 @@ const highlightField = StateField.define({ provide: (f) => EditorView.decorations.from(f), }); -const extensions = [javascript(), strudelTheme, highlightField, flashField]; +const extensions = [javascript(), highlightField, flashField]; -export default function CodeMirror({ value, onChange, onViewChanged, onSelectionChange, options, editorDidMount }) { +export default function CodeMirror({ + value, + onChange, + onViewChanged, + onSelectionChange, + theme, + options, + editorDidMount, +}) { const handleOnChange = useCallback( (value) => { onChange?.(value); @@ -106,6 +114,7 @@ export default function CodeMirror({ value, onChange, onViewChanged, onSelection <> <_CodeMirror value={value} + theme={theme || strudelTheme} onChange={handleOnChange} onCreateEditor={handleOnCreateEditor} onUpdate={handleOnUpdate} diff --git a/packages/react/src/components/style.css b/packages/react/src/components/style.css index d3aed9d7..cb6bd3ff 100644 --- a/packages/react/src/components/style.css +++ b/packages/react/src/components/style.css @@ -1,14 +1,18 @@ .cm-editor { - background-color: transparent !important; + /* background-color: transparent !important; */ height: 100%; z-index: 11; font-size: 18px; } +.cm-theme { + width: 100%; +} + .cm-theme-light { width: 100%; } .cm-line > * { - background: #00000095; + /* background: #00000095; */ } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 477cb723..3c0ea11f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -373,6 +373,7 @@ importers: '@types/node': ^18.0.0 '@types/react': ^18.0.26 '@types/react-dom': ^18.0.9 + '@uiw/codemirror-themes-all': ^4.19.7 '@vite-pwa/astro': ^0.0.1 astro: ^1.7.2 canvas: ^2.11.0 @@ -415,6 +416,7 @@ importers: '@types/node': 18.11.18 '@types/react': 18.0.27 '@types/react-dom': 18.0.10 + '@uiw/codemirror-themes-all': 4.19.7 astro: 1.9.2_@types+node@18.11.18 canvas: 2.11.0 fraction.js: 4.2.0 @@ -3994,6 +3996,181 @@ packages: '@codemirror/view': 6.7.3 dev: false + /@uiw/codemirror-theme-abcdef/4.19.7: + resolution: {integrity: sha512-mkZrkcq0AfRXNfUQ9sZWe6is8VKfbFWvtbFLGtMqTctdzUbZS/SJj4+W5D1fHMdRBegWn3T5u3fDshtJq/Ky5Q==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-androidstudio/4.19.7: + resolution: {integrity: sha512-emZ9xWH/kOF3TZcCghQWBz5XUG2sM0/okVkXKIbt28uMp5EgPiSKxCR8tUNOXU2WvyFhkgfoNFl5kH+YfjCaNA==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-atomone/4.19.7: + resolution: {integrity: sha512-YBljhvQz2VynKt0bk6jOdPRblK/JtIRst6JDCfXg0TZGkxsNng9uJgYeIT7uNRDvXPtmg47hSqpjL7X0XeSFKg==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-aura/4.19.7: + resolution: {integrity: sha512-n1P3nD0f3RucFeqWZ4tGpKTz/G352XNN7JCCx0pTTSrcC6gXVwrTazAGjjmq60R5za2lufEP3u/PYGgz8joVlg==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-bbedit/4.19.7: + resolution: {integrity: sha512-WjrkNhwHNU+KiwJLbrdTin9YVq5UmveLuH3VFtswLxw8hlFjjEziKgpErD4C8PsC125o6Dlcc7p1nbqVSmQjog==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-bespin/4.19.7: + resolution: {integrity: sha512-ta0o7eX0G3OmDKbQJci51+YM1XFEAR5+21pbcjAQMgD85ZRV23A+8iW+simHNRiRA31cv09pi+tdfXQGcx4drg==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-darcula/4.19.7: + resolution: {integrity: sha512-BNRoEOjTHfolU+VfwT2MZehVaokG3bJuq1we2PcHXSKZtGUT2fHmDNZQ3BSiLUDfC/1f6/Aqf63T8u7mAWB2zw==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-dracula/4.19.7: + resolution: {integrity: sha512-QnVjtq31vqjVcq5GItbfXuaB7c9DAwSvqiTtFLxLXqPO37lwwyYmrMdd5AbFsGlVv3Bxq4zvJ3LbyVlF6mexcA==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-duotone/4.19.7: + resolution: {integrity: sha512-SncdJtjQVBAReEtOPAYJoxitZqxHCbmkJCyZqOj81VB8HI8sdC9pOvdOVviT22/1nzosspmRYoPSHNbq0Jzx6Q==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-eclipse/4.19.7: + resolution: {integrity: sha512-msy5pkECeslpb9J8RT+Oj1XIV7GfOMIl400BG/A2beMXktdBTvomtsjBvn2i124pxevafK0iiuXDm8Rpk9x/9w==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-github/4.19.7: + resolution: {integrity: sha512-yeBKOS31bJWvxHWv/hO8CC5Hz657poyuCRX533B+7c2W3B5TX48i49GC9k91yX/BfCsTVqneONk4ZgRWGJkDww==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-gruvbox-dark/4.19.7: + resolution: {integrity: sha512-Qc1eTPv5KFJ96HIv4tyGFKZ4cWJeEQfwQ6PCHPCMEjEhQEXrT2jkveEUWL/JiUADrF3B32eB3k8f6D0kfZiDyw==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-material/4.19.7: + resolution: {integrity: sha512-uJmausR247K31mM3mjHAAFDQJSB+PB9Wux+aXksGU8QMVSCm7QGBUD6oKrtdQ0+KusdtpO3x+XprlNXhAXDcIw==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-noctis-lilac/4.19.7: + resolution: {integrity: sha512-7j7jA+s0skPKp7BRPI8AmWjgounCgf+1lYDnGjezPsZhM60v9GN9JQRZgI0zNub4kaRz9efXI65E5yN0chjR5w==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-nord/4.19.7: + resolution: {integrity: sha512-nAz4mBHMURyZ/o0b1W1VN9Qp5SvS8frOVEbJyDoCg6MFQ3NYOE8QNPzWIl7525Z8D+bpSHZz9leGuopT2vmXzA==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-okaidia/4.19.7: + resolution: {integrity: sha512-a2NONl4hGW9toluBfhr530BolSRoFGAhqFZMSq4RT/GeeKACE3hI7+uDeJID9B3D9Xh0d9C0VEksvGgEDuVD2g==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-solarized/4.19.7: + resolution: {integrity: sha512-do+SQtXzEVokfFcfIRr6MLceVfE3cHiTFaWQ0npWi5rzc/0i+BNe3J4ewGjUyU2Bofi/LYhAuTTiVoaKNdc5gQ==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-sublime/4.19.7: + resolution: {integrity: sha512-TakRTzdbiLJTfM1htEKVPcHFpnHzUYOFexE5UQQD9BLPfTABTAWLSjb+DeCfbP+m0gsTyzvHd8gH4t+WDIK4gQ==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-tokyo-night-day/4.19.7: + resolution: {integrity: sha512-0oyfyoNNfaKOW2TkJFHMUyI/kyoI6DXYd+Drkp4vHGd8zaLZWm/yyi05b0Nk/RKXnOfzrmLY0uU0FL4471rM1w==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-tokyo-night-storm/4.19.7: + resolution: {integrity: sha512-ObXQDcfECWd9EeawRXqkQQUxdwFF6RdqusEmRl5SJYorcGZA/6zsmxpIjtmXRKwBj0vv+pMk/RKoEmedglMMjw==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-tokyo-night/4.19.7: + resolution: {integrity: sha512-D/oLEsamQ7goFYnP46kyrt60vc2Tx8nC9FWyHqJvD3DL8+ugUsQvCL2oIadCadfMm7pQrFj1ILfokb8uC9W5eg==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-vscode/4.19.7: + resolution: {integrity: sha512-LaT9kSr7U6JTKxTYN0XkKZva5dtM63ltp7ae3JQsinL4ePoI1xNgn0Z4XapCK0VK1VyYbFKEWz3RN8s+pX+N1Q==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-theme-xcode/4.19.7: + resolution: {integrity: sha512-Le3qV3kJe2QgHjfxHHkEvpXF+XSQVUAdDPY2xnyDzijBooxd61ukFqgEPDPHVPT1Aqh+VHglafQRNOxChnlwdQ==} + dependencies: + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-themes-all/4.19.7: + resolution: {integrity: sha512-JCVwjZF9+omz+RaNEJXd0estiD7VliKZe1XvaPG3dy0MqQMJLzoUPxaagetPJlaCskrz1piXYL4V0Qp0J6ni8Q==} + dependencies: + '@uiw/codemirror-theme-abcdef': 4.19.7 + '@uiw/codemirror-theme-androidstudio': 4.19.7 + '@uiw/codemirror-theme-atomone': 4.19.7 + '@uiw/codemirror-theme-aura': 4.19.7 + '@uiw/codemirror-theme-bbedit': 4.19.7 + '@uiw/codemirror-theme-bespin': 4.19.7 + '@uiw/codemirror-theme-darcula': 4.19.7 + '@uiw/codemirror-theme-dracula': 4.19.7 + '@uiw/codemirror-theme-duotone': 4.19.7 + '@uiw/codemirror-theme-eclipse': 4.19.7 + '@uiw/codemirror-theme-github': 4.19.7 + '@uiw/codemirror-theme-gruvbox-dark': 4.19.7 + '@uiw/codemirror-theme-material': 4.19.7 + '@uiw/codemirror-theme-noctis-lilac': 4.19.7 + '@uiw/codemirror-theme-nord': 4.19.7 + '@uiw/codemirror-theme-okaidia': 4.19.7 + '@uiw/codemirror-theme-solarized': 4.19.7 + '@uiw/codemirror-theme-sublime': 4.19.7 + '@uiw/codemirror-theme-tokyo-night': 4.19.7 + '@uiw/codemirror-theme-tokyo-night-day': 4.19.7 + '@uiw/codemirror-theme-tokyo-night-storm': 4.19.7 + '@uiw/codemirror-theme-vscode': 4.19.7 + '@uiw/codemirror-theme-xcode': 4.19.7 + '@uiw/codemirror-themes': 4.19.7 + dev: false + + /@uiw/codemirror-themes/4.19.7: + resolution: {integrity: sha512-M/42RkPI60ItlssmNuEoZO2MQvlY6fRmdX7XRUAhKjxczZoaq8xS6HIvv1whGf2zGsTrwdVTPCm6ls0l17dvPA==} + dependencies: + '@codemirror/language': 6.4.0 + '@codemirror/state': 6.2.0 + '@codemirror/view': 6.7.3 + dev: false + /@uiw/codemirror-themes/4.19.7_a4vbhepr4qhxm5cldqd4jpyase: resolution: {integrity: sha512-M/42RkPI60ItlssmNuEoZO2MQvlY6fRmdX7XRUAhKjxczZoaq8xS6HIvv1whGf2zGsTrwdVTPCm6ls0l17dvPA==} peerDependencies: diff --git a/website/package.json b/website/package.json index b07c9f0f..1ee37756 100644 --- a/website/package.json +++ b/website/package.json @@ -38,6 +38,7 @@ "@types/node": "^18.0.0", "@types/react": "^18.0.26", "@types/react-dom": "^18.0.9", + "@uiw/codemirror-themes-all": "^4.19.7", "astro": "^1.7.2", "canvas": "^2.11.0", "fraction.js": "^4.2.0", diff --git a/website/src/repl/Footer.jsx b/website/src/repl/Footer.jsx index 31468e81..c47f19a7 100644 --- a/website/src/repl/Footer.jsx +++ b/website/src/repl/Footer.jsx @@ -5,11 +5,12 @@ import { nanoid } from 'nanoid'; import React, { useContext, useCallback, useLayoutEffect, useRef, useState } from 'react'; import { useEvent, loadedSamples, ReplContext } from './Repl'; import { Reference } from './Reference'; +import * as themes from './themes.mjs'; export function Footer({ context }) { // const [activeFooter, setActiveFooter] = useState('console'); // const { activeFooter, setActiveFooter, isZen } = useContext?.(ReplContext); - const { activeFooter, setActiveFooter, isZen } = context; + const { activeFooter, setActiveFooter, isZen, setTheme } = context; const footerContent = useRef(); const [log, setLog] = useState([]); @@ -69,11 +70,12 @@ export function Footer({ context }) { return (
-
+
+
{activeFooter !== '' && (
)} + {activeFooter === 'settings' && ( +
+ {Object.entries(themes).map(([k, t]) => ( +
  • + { + setTheme(t); + }} + > + {k} + +
    • + ))} +
    + )} {activeFooter === 'reference' && }
    )} diff --git a/website/src/repl/Repl.jsx b/website/src/repl/Repl.jsx index b26f2bbc..d01c1ec0 100644 --- a/website/src/repl/Repl.jsx +++ b/website/src/repl/Repl.jsx @@ -22,6 +22,7 @@ import { Header } from './Header'; import { prebake } from './prebake.mjs'; import * as tunes from './tunes.mjs'; import PlayCircleIcon from '@heroicons/react/20/solid/PlayCircleIcon'; +import strudelTheme from '@strudel.cycles/react/src/themes/strudel-theme'; initAudioOnFirstClick(); @@ -109,6 +110,7 @@ export const ReplContext = createContext(null); export function Repl({ embedded = false }) { const isEmbedded = embedded || window.location !== window.parent.location; const [view, setView] = useState(); // codemirror view + const [theme, setTheme] = useState(strudelTheme); const [lastShared, setLastShared] = useState(); const [activeFooter, setActiveFooter] = useState(''); const [isZen, setIsZen] = useState(false); @@ -255,6 +257,8 @@ export function Repl({ embedded = false }) { handleShare, isZen, setIsZen, + theme, + setTheme, }; return ( // bg-gradient-to-t from-blue-900 to-slate-900 @@ -269,6 +273,7 @@ export function Repl({ embedded = false }) {
    Date: Wed, 8 Feb 2023 23:43:02 +0100 Subject: [PATCH 03/11] basic theme picker --- website/src/repl/Footer.jsx | 39 ++++++++++++------- website/src/repl/themes.mjs | 77 ++++++++++++++++++++++++++++++++++++- 2 files changed, 102 insertions(+), 14 deletions(-) diff --git a/website/src/repl/Footer.jsx b/website/src/repl/Footer.jsx index c47f19a7..3ddf1dc4 100644 --- a/website/src/repl/Footer.jsx +++ b/website/src/repl/Footer.jsx @@ -5,12 +5,12 @@ import { nanoid } from 'nanoid'; import React, { useContext, useCallback, useLayoutEffect, useRef, useState } from 'react'; import { useEvent, loadedSamples, ReplContext } from './Repl'; import { Reference } from './Reference'; -import * as themes from './themes.mjs'; +import { themes, themeColors } from './themes.mjs'; export function Footer({ context }) { // const [activeFooter, setActiveFooter] = useState('console'); // const { activeFooter, setActiveFooter, isZen } = useContext?.(ReplContext); - const { activeFooter, setActiveFooter, isZen, setTheme } = context; + const { activeFooter, setActiveFooter, isZen, theme, setTheme } = context; const footerContent = useRef(); const [log, setLog] = useState([]); @@ -166,22 +166,31 @@ export function Footer({ context }) { ))} )} + {activeFooter === 'reference' && } {activeFooter === 'settings' && ( -
    +
    {Object.entries(themes).map(([k, t]) => ( -
  • - { - setTheme(t); - }} - > - {k} - -
    • +
    { + console.log(k, themeColors(t)); + setTheme(t); + }} + > +
    {k}
    +
    + {themeColors(t).map((c, i) => ( +
    + ))} +
    +
    ))}
    )} - {activeFooter === 'reference' && }
    )}
    @@ -212,3 +221,7 @@ function linkify(inputText) { return replacedText; } + +function classNames(...classes) { + return classes.filter(Boolean).join(' '); +} diff --git a/website/src/repl/themes.mjs b/website/src/repl/themes.mjs index f956a875..9303ca00 100644 --- a/website/src/repl/themes.mjs +++ b/website/src/repl/themes.mjs @@ -1,4 +1,4 @@ -export { +import { abcdef, androidstudio, atomone, @@ -29,3 +29,78 @@ export { tokyoNightDay, xcodeLight, } from '@uiw/codemirror-themes-all'; + +export const themes = { + abcdef, + androidstudio, + atomone, + aura, + bespin, + darcula, + dracula, + duotoneDark, + eclipse, + githubDark, + gruvboxDark, + materialDark, + nord, + okaidia, + solarizedDark, + sublime, + tokyoNight, + tokyoNightStorm, + vscodeDark, + xcodeDark, + bbedit, + duotoneLight, + githubLight, + gruvboxLight, + materialLight, + noctisLilac, + solarizedLight, + tokyoNightDay, + xcodeLight, +}; + +export const vars = { + abcdef: { + bg: '#0f0f0f', + activeLine: '#314151', + }, +}; + +function getColors(str) { + const colorRegex = /#([0-9A-Fa-f]{6}|[0-9A-Fa-f]{3})/g; + const colors = []; + + let match; + while ((match = colorRegex.exec(str)) !== null) { + const color = match[0]; + if (!colors.includes(color)) { + colors.push(color); + } + } + + return colors; +} + +export function themeColors(theme) { + return getColors(stringifySafe(theme)); +} + +function getCircularReplacer() { + const seen = new WeakSet(); + return (key, value) => { + if (typeof value === 'object' && value !== null) { + if (seen.has(value)) { + return; + } + seen.add(value); + } + return value; + }; +} + +function stringifySafe(json) { + return JSON.stringify(json, getCircularReplacer()); +} From 0326244956b82da507f8fa47980ff0909dab5af1 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Fri, 10 Feb 2023 09:25:58 +0100 Subject: [PATCH 04/11] update themes --- pnpm-lock.yaml | 268 +++++++++++++++++++++++++------------------ website/package.json | 2 +- 2 files changed, 160 insertions(+), 110 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3c0ea11f..9c7090c2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -373,7 +373,7 @@ importers: '@types/node': ^18.0.0 '@types/react': ^18.0.26 '@types/react-dom': ^18.0.9 - '@uiw/codemirror-themes-all': ^4.19.7 + '@uiw/codemirror-themes-all': ^4.19.8 '@vite-pwa/astro': ^0.0.1 astro: ^1.7.2 canvas: ^2.11.0 @@ -416,7 +416,7 @@ importers: '@types/node': 18.11.18 '@types/react': 18.0.27 '@types/react-dom': 18.0.10 - '@uiw/codemirror-themes-all': 4.19.7 + '@uiw/codemirror-themes-all': 4.19.8 astro: 1.9.2_@types+node@18.11.18 canvas: 2.11.0 fraction.js: 4.2.0 @@ -3996,179 +3996,171 @@ packages: '@codemirror/view': 6.7.3 dev: false - /@uiw/codemirror-theme-abcdef/4.19.7: - resolution: {integrity: sha512-mkZrkcq0AfRXNfUQ9sZWe6is8VKfbFWvtbFLGtMqTctdzUbZS/SJj4+W5D1fHMdRBegWn3T5u3fDshtJq/Ky5Q==} + /@uiw/codemirror-theme-abcdef/4.19.8: + resolution: {integrity: sha512-sR7srfMJRGTsAFQYEs+8IogUxUHDsMqNqZ4waIA6rNIvOH9Q1NYFEqTpqf4AeivkNeXm3N1LI+1nQAKhWzWpOA==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-androidstudio/4.19.7: - resolution: {integrity: sha512-emZ9xWH/kOF3TZcCghQWBz5XUG2sM0/okVkXKIbt28uMp5EgPiSKxCR8tUNOXU2WvyFhkgfoNFl5kH+YfjCaNA==} + /@uiw/codemirror-theme-androidstudio/4.19.8: + resolution: {integrity: sha512-xhvEPZ1NvihIJVx7MA1Z8A8NwaTbM6mtBsfwM3mKAmzW6K6JcIJftcKe5z5wSPZk4J3S66vq8RYEMOBygSOdEQ==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-atomone/4.19.7: - resolution: {integrity: sha512-YBljhvQz2VynKt0bk6jOdPRblK/JtIRst6JDCfXg0TZGkxsNng9uJgYeIT7uNRDvXPtmg47hSqpjL7X0XeSFKg==} + /@uiw/codemirror-theme-atomone/4.19.8: + resolution: {integrity: sha512-enZR8RPiKohyuEU4DOWA7A/xLs/+NsuvZAuGmg5PU43CQITzK1Wqri43/WxkGGsEIztejX439s1QuYxUwCCeUg==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-aura/4.19.7: - resolution: {integrity: sha512-n1P3nD0f3RucFeqWZ4tGpKTz/G352XNN7JCCx0pTTSrcC6gXVwrTazAGjjmq60R5za2lufEP3u/PYGgz8joVlg==} + /@uiw/codemirror-theme-aura/4.19.8: + resolution: {integrity: sha512-DLoi2XEPNBD6Cxsp3v/nYw7jJ7sDEXET9+C43KZnk1dQ9H5e0HSpZhOkw1xmaCGzoXn9q7HInPa7GgUEMv8NPA==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-bbedit/4.19.7: - resolution: {integrity: sha512-WjrkNhwHNU+KiwJLbrdTin9YVq5UmveLuH3VFtswLxw8hlFjjEziKgpErD4C8PsC125o6Dlcc7p1nbqVSmQjog==} + /@uiw/codemirror-theme-bbedit/4.19.8: + resolution: {integrity: sha512-1vaVaVhMP2IB7H77W9yvPRhVr+8HGBWPDfFEVWAc7tfeU0xC2MFby05gO/7T6K2JWyj2lXnVw/i+oFNeDdcekQ==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-bespin/4.19.7: - resolution: {integrity: sha512-ta0o7eX0G3OmDKbQJci51+YM1XFEAR5+21pbcjAQMgD85ZRV23A+8iW+simHNRiRA31cv09pi+tdfXQGcx4drg==} + /@uiw/codemirror-theme-bespin/4.19.8: + resolution: {integrity: sha512-JyzmgCloEWhduH5GVYzHQ3vPc3zC0YVRiu7lOjgdOVRhr49M6KmwTytmbmqXbaqmSZKFUJqiHjz8VswqcNC4dw==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-darcula/4.19.7: - resolution: {integrity: sha512-BNRoEOjTHfolU+VfwT2MZehVaokG3bJuq1we2PcHXSKZtGUT2fHmDNZQ3BSiLUDfC/1f6/Aqf63T8u7mAWB2zw==} + /@uiw/codemirror-theme-darcula/4.19.8: + resolution: {integrity: sha512-fPKyzMqCtBfez2ubC/77AP0BfE+XOio+sy8oRYfX3HqRQEivnnEddQJnTZVz0kKSLYSryQHbOMw/qwgInPvBCA==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-dracula/4.19.7: - resolution: {integrity: sha512-QnVjtq31vqjVcq5GItbfXuaB7c9DAwSvqiTtFLxLXqPO37lwwyYmrMdd5AbFsGlVv3Bxq4zvJ3LbyVlF6mexcA==} + /@uiw/codemirror-theme-dracula/4.19.8: + resolution: {integrity: sha512-YHQJUDnYKrew/YkEPQG3SQFcnKr6MzVbIXxmdKuxlCTrySNFNMK19dKrzY3fwc+Lgpp5r26QLLocTZyCvu1xeA==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-duotone/4.19.7: - resolution: {integrity: sha512-SncdJtjQVBAReEtOPAYJoxitZqxHCbmkJCyZqOj81VB8HI8sdC9pOvdOVviT22/1nzosspmRYoPSHNbq0Jzx6Q==} + /@uiw/codemirror-theme-duotone/4.19.8: + resolution: {integrity: sha512-SJkjyKxU2Nazv6uEctvRdz62/ZQ8rBP4xtXrjF/zcjOdWmx2ecUAGn/j5Euw5V55Dr74yIQFs0L+GB5UTHCHDA==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-eclipse/4.19.7: - resolution: {integrity: sha512-msy5pkECeslpb9J8RT+Oj1XIV7GfOMIl400BG/A2beMXktdBTvomtsjBvn2i124pxevafK0iiuXDm8Rpk9x/9w==} + /@uiw/codemirror-theme-eclipse/4.19.8: + resolution: {integrity: sha512-6XXzYFC809e5MWT/NNTqoZ0N9H6P8mXwIEGDfigh33VU1TJPPpO1LCWdf59VcXx/xIY0ctDp7rU7hTy3f3tHkw==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-github/4.19.7: - resolution: {integrity: sha512-yeBKOS31bJWvxHWv/hO8CC5Hz657poyuCRX533B+7c2W3B5TX48i49GC9k91yX/BfCsTVqneONk4ZgRWGJkDww==} + /@uiw/codemirror-theme-github/4.19.8: + resolution: {integrity: sha512-RUAzHGkG2G2PXTxsH4KbKVCKqPs/+H6xvhCT3Q4YiPj1W2aGSfPwZZ8cLLCm9dYaIh/+H6L+AcoiUtvADjyKsQ==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-gruvbox-dark/4.19.7: - resolution: {integrity: sha512-Qc1eTPv5KFJ96HIv4tyGFKZ4cWJeEQfwQ6PCHPCMEjEhQEXrT2jkveEUWL/JiUADrF3B32eB3k8f6D0kfZiDyw==} + /@uiw/codemirror-theme-gruvbox-dark/4.19.8: + resolution: {integrity: sha512-EQepnqhfcu7HY2uutigzflZ9OFzDcF9eq4xF53UylD+WZBdwq2qarZMQgBfOXZZKYI3XcTny064fa7Xxklhs1g==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-material/4.19.7: - resolution: {integrity: sha512-uJmausR247K31mM3mjHAAFDQJSB+PB9Wux+aXksGU8QMVSCm7QGBUD6oKrtdQ0+KusdtpO3x+XprlNXhAXDcIw==} + /@uiw/codemirror-theme-material/4.19.8: + resolution: {integrity: sha512-dm7FtZkJSZ4AV+9vXxKUDnXLTHaqWnsmn9HOb6AmLiHmHcLFLDgeosSBnA80fwXBhd6QswJI0cEnKHAvcC/vFg==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-noctis-lilac/4.19.7: - resolution: {integrity: sha512-7j7jA+s0skPKp7BRPI8AmWjgounCgf+1lYDnGjezPsZhM60v9GN9JQRZgI0zNub4kaRz9efXI65E5yN0chjR5w==} + /@uiw/codemirror-theme-noctis-lilac/4.19.8: + resolution: {integrity: sha512-vPH8KOiRgcBK1V7/BN04n8K03cfR4CEmOGZUMKpcLlSZwWRe0+JPk6S2qtjbJ072Fsn1ZrcLRYrqtaAJQNOVnw==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-nord/4.19.7: - resolution: {integrity: sha512-nAz4mBHMURyZ/o0b1W1VN9Qp5SvS8frOVEbJyDoCg6MFQ3NYOE8QNPzWIl7525Z8D+bpSHZz9leGuopT2vmXzA==} + /@uiw/codemirror-theme-nord/4.19.8: + resolution: {integrity: sha512-qBqKJI9fa35rFefXqaiw3FCXWSpD+65+Weji3g/AgB0m0+MHG+3rkC+rLZ4PE2QpkcMz6wHj89EMwOW9W1i3cA==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-okaidia/4.19.7: - resolution: {integrity: sha512-a2NONl4hGW9toluBfhr530BolSRoFGAhqFZMSq4RT/GeeKACE3hI7+uDeJID9B3D9Xh0d9C0VEksvGgEDuVD2g==} + /@uiw/codemirror-theme-okaidia/4.19.8: + resolution: {integrity: sha512-gxEThgbbfIxKjk7UzD0D8gw5bVpgxDct3e6r9/WegZw7tTvTHMnz9wutGbJp2cYSwdgLHoQJZzZBi6jKhExZSg==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-solarized/4.19.7: - resolution: {integrity: sha512-do+SQtXzEVokfFcfIRr6MLceVfE3cHiTFaWQ0npWi5rzc/0i+BNe3J4ewGjUyU2Bofi/LYhAuTTiVoaKNdc5gQ==} + /@uiw/codemirror-theme-solarized/4.19.8: + resolution: {integrity: sha512-xHp2i6zWBMw2+kZX0GUYi7pCL3ZL1qWSO8OaleHCkpY3jn+lfLSJOAYYkajvNyu3tPsiKQuAgpCQ6AYFWOr6BQ==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-sublime/4.19.7: - resolution: {integrity: sha512-TakRTzdbiLJTfM1htEKVPcHFpnHzUYOFexE5UQQD9BLPfTABTAWLSjb+DeCfbP+m0gsTyzvHd8gH4t+WDIK4gQ==} + /@uiw/codemirror-theme-sublime/4.19.8: + resolution: {integrity: sha512-tapkCty8lwpRw2CAY5bPiK8S2ptdTL4d1X/IkCVyHqbC0B8728iQJu3E4Rrka7yggFx4QGUpyZB9UTIFYURtsw==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-tokyo-night-day/4.19.7: - resolution: {integrity: sha512-0oyfyoNNfaKOW2TkJFHMUyI/kyoI6DXYd+Drkp4vHGd8zaLZWm/yyi05b0Nk/RKXnOfzrmLY0uU0FL4471rM1w==} + /@uiw/codemirror-theme-tokyo-night-day/4.19.8: + resolution: {integrity: sha512-HDKp2KDjluubpe+7M31SohWUFCW7wGQIvoD60xr86OkPZDdqsCVUFmna6rqfttV6S2OsgVNJPBzZvOF398Eapg==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-tokyo-night-storm/4.19.7: - resolution: {integrity: sha512-ObXQDcfECWd9EeawRXqkQQUxdwFF6RdqusEmRl5SJYorcGZA/6zsmxpIjtmXRKwBj0vv+pMk/RKoEmedglMMjw==} + /@uiw/codemirror-theme-tokyo-night-storm/4.19.8: + resolution: {integrity: sha512-Kp8HIf1H+pgbRx/ZhRsqqN5qfyx3SVVfjnUPGltsdBymqh8QGdr7LC8Tp0P5+Yjb6CqF6Dgx7RnQDj1XZ94rbA==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-tokyo-night/4.19.7: - resolution: {integrity: sha512-D/oLEsamQ7goFYnP46kyrt60vc2Tx8nC9FWyHqJvD3DL8+ugUsQvCL2oIadCadfMm7pQrFj1ILfokb8uC9W5eg==} + /@uiw/codemirror-theme-tokyo-night/4.19.8: + resolution: {integrity: sha512-LrfB+EgZqBNlMF6Zqk8RrlsfVzKe6Ple7ckvREV6kSuwxncF5FlhzVL3cWgxNfNQ7TJ5ySVSvw4fWOcxIcc1LQ==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-vscode/4.19.7: - resolution: {integrity: sha512-LaT9kSr7U6JTKxTYN0XkKZva5dtM63ltp7ae3JQsinL4ePoI1xNgn0Z4XapCK0VK1VyYbFKEWz3RN8s+pX+N1Q==} + /@uiw/codemirror-theme-vscode/4.19.8: + resolution: {integrity: sha512-UdUuJfNjG2y88taP5gsEA9AQlhRTURnl+9kl+LOJkQtXavrqp3J8gUAHRhEWxN7k8q8YimsSVcQ4yw0FKAgXQQ==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-theme-xcode/4.19.7: - resolution: {integrity: sha512-Le3qV3kJe2QgHjfxHHkEvpXF+XSQVUAdDPY2xnyDzijBooxd61ukFqgEPDPHVPT1Aqh+VHglafQRNOxChnlwdQ==} + /@uiw/codemirror-theme-xcode/4.19.8: + resolution: {integrity: sha512-VYCRhStYujUNGIkiaZZ1o5OO2Z2edsKkYCCYSy0rwb4G17vT6sd4YDnmJQuF0gzqQkTIdDxSb6aCM9ISkPABlg==} dependencies: - '@uiw/codemirror-themes': 4.19.7 + '@uiw/codemirror-themes': 4.19.8 dev: false - /@uiw/codemirror-themes-all/4.19.7: - resolution: {integrity: sha512-JCVwjZF9+omz+RaNEJXd0estiD7VliKZe1XvaPG3dy0MqQMJLzoUPxaagetPJlaCskrz1piXYL4V0Qp0J6ni8Q==} + /@uiw/codemirror-themes-all/4.19.8: + resolution: {integrity: sha512-0kAWabe46Vkz+gwNfaXvn/0adeUSCTAuZC0d7Nu8ebcr1TjT1fDLFNZIXlwidn40suiXq8FDfZ9euArx3RPg0Q==} dependencies: - '@uiw/codemirror-theme-abcdef': 4.19.7 - '@uiw/codemirror-theme-androidstudio': 4.19.7 - '@uiw/codemirror-theme-atomone': 4.19.7 - '@uiw/codemirror-theme-aura': 4.19.7 - '@uiw/codemirror-theme-bbedit': 4.19.7 - '@uiw/codemirror-theme-bespin': 4.19.7 - '@uiw/codemirror-theme-darcula': 4.19.7 - '@uiw/codemirror-theme-dracula': 4.19.7 - '@uiw/codemirror-theme-duotone': 4.19.7 - '@uiw/codemirror-theme-eclipse': 4.19.7 - '@uiw/codemirror-theme-github': 4.19.7 - '@uiw/codemirror-theme-gruvbox-dark': 4.19.7 - '@uiw/codemirror-theme-material': 4.19.7 - '@uiw/codemirror-theme-noctis-lilac': 4.19.7 - '@uiw/codemirror-theme-nord': 4.19.7 - '@uiw/codemirror-theme-okaidia': 4.19.7 - '@uiw/codemirror-theme-solarized': 4.19.7 - '@uiw/codemirror-theme-sublime': 4.19.7 - '@uiw/codemirror-theme-tokyo-night': 4.19.7 - '@uiw/codemirror-theme-tokyo-night-day': 4.19.7 - '@uiw/codemirror-theme-tokyo-night-storm': 4.19.7 - '@uiw/codemirror-theme-vscode': 4.19.7 - '@uiw/codemirror-theme-xcode': 4.19.7 - '@uiw/codemirror-themes': 4.19.7 - dev: false - - /@uiw/codemirror-themes/4.19.7: - resolution: {integrity: sha512-M/42RkPI60ItlssmNuEoZO2MQvlY6fRmdX7XRUAhKjxczZoaq8xS6HIvv1whGf2zGsTrwdVTPCm6ls0l17dvPA==} - dependencies: - '@codemirror/language': 6.4.0 - '@codemirror/state': 6.2.0 - '@codemirror/view': 6.7.3 + '@uiw/codemirror-theme-abcdef': 4.19.8 + '@uiw/codemirror-theme-androidstudio': 4.19.8 + '@uiw/codemirror-theme-atomone': 4.19.8 + '@uiw/codemirror-theme-aura': 4.19.8 + '@uiw/codemirror-theme-bbedit': 4.19.8 + '@uiw/codemirror-theme-bespin': 4.19.8 + '@uiw/codemirror-theme-darcula': 4.19.8 + '@uiw/codemirror-theme-dracula': 4.19.8 + '@uiw/codemirror-theme-duotone': 4.19.8 + '@uiw/codemirror-theme-eclipse': 4.19.8 + '@uiw/codemirror-theme-github': 4.19.8 + '@uiw/codemirror-theme-gruvbox-dark': 4.19.8 + '@uiw/codemirror-theme-material': 4.19.8 + '@uiw/codemirror-theme-noctis-lilac': 4.19.8 + '@uiw/codemirror-theme-nord': 4.19.8 + '@uiw/codemirror-theme-okaidia': 4.19.8 + '@uiw/codemirror-theme-solarized': 4.19.8 + '@uiw/codemirror-theme-sublime': 4.19.8 + '@uiw/codemirror-theme-tokyo-night': 4.19.8 + '@uiw/codemirror-theme-tokyo-night-day': 4.19.8 + '@uiw/codemirror-theme-tokyo-night-storm': 4.19.8 + '@uiw/codemirror-theme-vscode': 4.19.8 + '@uiw/codemirror-theme-xcode': 4.19.8 + '@uiw/codemirror-themes': 4.19.8 dev: false /@uiw/codemirror-themes/4.19.7_a4vbhepr4qhxm5cldqd4jpyase: @@ -4182,6 +4174,14 @@ packages: '@codemirror/view': 6.7.3 dev: false + /@uiw/codemirror-themes/4.19.8: + resolution: {integrity: sha512-k+0molX6YuQZ7vYymS5DEl3NcHxVE4VP4J0nB7RBnzLrhDwT2K8R5ie7J2eH+4bpppIK1ZZdZ6Mie7U48dH5dQ==} + dependencies: + '@codemirror/language': 6.4.0 + '@codemirror/state': 6.2.0 + '@codemirror/view': 6.7.3 + dev: false + /@uiw/react-codemirror/4.19.7_b6o5qp6ml4k7skggixohr5abde: resolution: {integrity: sha512-IHvpYWVSdiaHX0Fk6oY6YyAJigDnyvSpWKNUTRzsMNxB+8/wqZ8lior4TprXH0zyLxW5F1+bTyifFFTeg+X3Sw==} peerDependencies: @@ -10398,6 +10398,17 @@ packages: - supports-color dev: true + /postcss-import/14.1.0: + resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==} + engines: {node: '>=10.0.0'} + peerDependencies: + postcss: ^8.0.0 + dependencies: + postcss-value-parser: 4.2.0 + read-cache: 1.0.0 + resolve: 1.22.1 + dev: false + /postcss-import/14.1.0_postcss@8.4.21: resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==} engines: {node: '>=10.0.0'} @@ -10408,6 +10419,16 @@ packages: postcss-value-parser: 4.2.0 read-cache: 1.0.0 resolve: 1.22.1 + dev: true + + /postcss-js/4.0.0: + resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==} + engines: {node: ^12 || ^14 || >= 16} + peerDependencies: + postcss: ^8.3.3 + dependencies: + camelcase-css: 2.0.1 + dev: false /postcss-js/4.0.0_postcss@8.4.21: resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==} @@ -10417,6 +10438,23 @@ packages: dependencies: camelcase-css: 2.0.1 postcss: 8.4.21 + dev: true + + /postcss-load-config/3.1.4: + resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} + engines: {node: '>= 10'} + peerDependencies: + postcss: '>=8.0.9' + ts-node: '>=9.0.0' + peerDependenciesMeta: + postcss: + optional: true + ts-node: + optional: true + dependencies: + lilconfig: 2.0.6 + yaml: 1.10.2 + dev: false /postcss-load-config/3.1.4_postcss@8.4.21: resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} @@ -10434,6 +10472,15 @@ packages: postcss: 8.4.21 yaml: 1.10.2 + /postcss-nested/6.0.0: + resolution: {integrity: sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==} + engines: {node: '>=12.0'} + peerDependencies: + postcss: ^8.2.14 + dependencies: + postcss-selector-parser: 6.0.11 + dev: false + /postcss-nested/6.0.0_postcss@8.4.21: resolution: {integrity: sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==} engines: {node: '>=12.0'} @@ -10442,6 +10489,7 @@ packages: dependencies: postcss: 8.4.21 postcss-selector-parser: 6.0.11 + dev: true /postcss-selector-parser/6.0.10: resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==} @@ -12050,6 +12098,8 @@ packages: resolution: {integrity: sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==} engines: {node: '>=12.13.0'} hasBin: true + peerDependencies: + postcss: ^8.0.9 dependencies: arg: 5.0.2 chokidar: 3.5.3 @@ -12066,10 +12116,10 @@ packages: object-hash: 3.0.0 picocolors: 1.0.0 postcss: 8.4.21 - postcss-import: 14.1.0_postcss@8.4.21 - postcss-js: 4.0.0_postcss@8.4.21 - postcss-load-config: 3.1.4_postcss@8.4.21 - postcss-nested: 6.0.0_postcss@8.4.21 + postcss-import: 14.1.0 + postcss-js: 4.0.0 + postcss-load-config: 3.1.4 + postcss-nested: 6.0.0 postcss-selector-parser: 6.0.11 postcss-value-parser: 4.2.0 quick-lru: 5.1.1 diff --git a/website/package.json b/website/package.json index 1ee37756..5393d1b8 100644 --- a/website/package.json +++ b/website/package.json @@ -38,7 +38,7 @@ "@types/node": "^18.0.0", "@types/react": "^18.0.26", "@types/react-dom": "^18.0.9", - "@uiw/codemirror-themes-all": "^4.19.7", + "@uiw/codemirror-themes-all": "^4.19.8", "astro": "^1.7.2", "canvas": "^2.11.0", "fraction.js": "^4.2.0", From 0b994a1b0fde4736a049ce0ffdb3a94246b87937 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Fri, 10 Feb 2023 11:32:36 +0100 Subject: [PATCH 05/11] switchable css variables for theming --- packages/react/src/components/style.css | 4 ++-- website/src/components/HeadCommon.astro | 31 +++++++++++++++++++++++++ website/src/layouts/MainLayout.astro | 2 +- website/src/pages/index.astro | 2 +- website/src/repl/Footer.jsx | 18 +++++++++++++- website/src/repl/Header.jsx | 2 +- website/src/repl/Repl.css | 4 ---- website/src/repl/themes.mjs | 12 ++++++++++ website/src/styles/index.css | 4 ---- website/tailwind.config.cjs | 10 ++++++++ 10 files changed, 75 insertions(+), 14 deletions(-) diff --git a/packages/react/src/components/style.css b/packages/react/src/components/style.css index cb6bd3ff..8f09e0f7 100644 --- a/packages/react/src/components/style.css +++ b/packages/react/src/components/style.css @@ -1,5 +1,5 @@ .cm-editor { - /* background-color: transparent !important; */ + background-color: transparent !important; height: 100%; z-index: 11; font-size: 18px; @@ -14,5 +14,5 @@ } .cm-line > * { - /* background: #00000095; */ + background: var(--background); } diff --git a/website/src/components/HeadCommon.astro b/website/src/components/HeadCommon.astro index ce00f97e..b1f948d4 100644 --- a/website/src/components/HeadCommon.astro +++ b/website/src/components/HeadCommon.astro @@ -28,3 +28,34 @@ const base = BASE_URL; {pwaInfo && } + + diff --git a/website/src/layouts/MainLayout.astro b/website/src/layouts/MainLayout.astro index 84eb320b..8fd78ccb 100644 --- a/website/src/layouts/MainLayout.astro +++ b/website/src/layouts/MainLayout.astro @@ -31,7 +31,7 @@ const githubEditUrl = `${CONFIG.GITHUB_EDIT_URL}/${currentFile}`; - +
    diff --git a/website/src/pages/index.astro b/website/src/pages/index.astro index fd6f96c1..24365321 100644 --- a/website/src/pages/index.astro +++ b/website/src/pages/index.astro @@ -8,7 +8,7 @@ import { Repl } from '../repl/Repl.jsx'; Strudel REPL - + diff --git a/website/src/repl/Footer.jsx b/website/src/repl/Footer.jsx index 3ddf1dc4..898722f9 100644 --- a/website/src/repl/Footer.jsx +++ b/website/src/repl/Footer.jsx @@ -68,7 +68,7 @@ export function Footer({ context }) { return null; } return ( -