diff --git a/package.json b/package.json index 960169c5..d696f4eb 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "hammerjs": "^2.0.8", "js-base64": "3.7.7", "lodash-es": "^4.17.21", - "mermaid": "^11.8.1", + "mermaid": "^11.9.0", "mode-watcher": "^0.5.1", "monaco-editor": "0.52.2", "pako": "2.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f2de4d79..a907b54f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -37,13 +37,13 @@ importers: version: 6.1.4(@codemirror/language@6.11.0)(@codemirror/state@6.5.2)(@codemirror/view@6.36.7)(@lezer/highlight@1.2.1) '@mermaid-js/examples': specifier: ^1.0.0 - version: 1.0.0(mermaid@11.8.1) + version: 1.0.0(mermaid@11.9.0) '@mermaid-js/layout-elk': specifier: ^0.1.8 - version: 0.1.8(mermaid@11.8.1) + version: 0.1.8(mermaid@11.9.0) '@mermaid-js/mermaid-zenuml': specifier: ^0.2.1 - version: 0.2.1(mermaid@11.8.1) + version: 0.2.1(mermaid@11.9.0) codemirror: specifier: ^6.0.1 version: 6.0.1 @@ -60,8 +60,8 @@ importers: specifier: ^4.17.21 version: 4.17.21 mermaid: - specifier: ^11.8.1 - version: 11.8.1 + specifier: ^11.9.0 + version: 11.9.0 mode-watcher: specifier: ^0.5.1 version: 0.5.1(svelte@5.28.2) @@ -714,8 +714,8 @@ packages: peerDependencies: mermaid: ^10 || ^11 - '@mermaid-js/parser@0.6.1': - resolution: {integrity: sha512-lCQNpV8R4lgsGcjX5667UiuDLk2micCtjtxR1YKbBXvN5w2v+FeLYoHrTSSrjwXdMcDYvE4ZBPvKT31dfeSmmA==} + '@mermaid-js/parser@0.6.2': + resolution: {integrity: sha512-+PO02uGF6L6Cs0Bw8RpGhikVvMWEysfAyl27qTlroUB8jSWr1lL0Sf6zi78ZxlSnmgSY2AMMKVgghnN9jTtwkQ==} '@nodelib/fs.scandir@2.1.5': resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} @@ -2414,8 +2414,8 @@ packages: json-stable-stringify-without-jsonify@1.0.1: resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} - katex@0.16.21: - resolution: {integrity: sha512-XvqR7FgOHtWupfMiigNzmh+MgUVmDGU2kXZm899ZkPfcuoPuFxyHmXsgATDpFZDAXCI8tvinaVcDo8PIIJSo4A==} + katex@0.16.22: + resolution: {integrity: sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==} hasBin: true keyv@4.5.4: @@ -2523,9 +2523,9 @@ packages: resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==} engines: {node: '>=10'} - marked@15.0.7: - resolution: {integrity: sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==} - engines: {node: '>= 18'} + marked@16.1.1: + resolution: {integrity: sha512-ij/2lXfCRT71L6u0M29tJPhP0bM5shLL3u5BePhFwPELj2blMJ6GDtD7PfJhRLhJ/c2UwrK17ySVcDzy2YHjHQ==} + engines: {node: '>= 20'} hasBin: true marked@4.3.0: @@ -2550,8 +2550,8 @@ packages: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} - mermaid@11.8.1: - resolution: {integrity: sha512-VSXJLqP1Sqw5sGr273mhvpPRhXwE6NlmMSqBZQw+yZJoAJkOIPPn/uT3teeCBx60Fkt5zEI3FrH2eVT0jXRDzw==} + mermaid@11.9.0: + resolution: {integrity: sha512-YdPXn9slEwO0omQfQIsW6vS84weVQftIyyTGAZCwM//MGhPzL1+l6vO6bkf0wnP4tHigH1alZ5Ooy3HXI2gOag==} micromatch@4.0.8: resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} @@ -4417,25 +4417,25 @@ snapshots: '@marijn/find-cluster-break@1.0.2': {} - '@mermaid-js/examples@1.0.0(mermaid@11.8.1)': + '@mermaid-js/examples@1.0.0(mermaid@11.9.0)': dependencies: - mermaid: 11.8.1 + mermaid: 11.9.0 - '@mermaid-js/layout-elk@0.1.8(mermaid@11.8.1)': + '@mermaid-js/layout-elk@0.1.8(mermaid@11.9.0)': dependencies: d3: 7.9.0 elkjs: 0.9.3 - mermaid: 11.8.1 + mermaid: 11.9.0 - '@mermaid-js/mermaid-zenuml@0.2.1(mermaid@11.8.1)': + '@mermaid-js/mermaid-zenuml@0.2.1(mermaid@11.9.0)': dependencies: '@zenuml/core': 3.32.4 - mermaid: 11.8.1 + mermaid: 11.9.0 transitivePeerDependencies: - '@types/react' - ts-node - '@mermaid-js/parser@0.6.1': + '@mermaid-js/parser@0.6.2': dependencies: langium: 3.3.1 @@ -6330,7 +6330,7 @@ snapshots: json-stable-stringify-without-jsonify@1.0.1: {} - katex@0.16.21: + katex@0.16.22: dependencies: commander: 8.3.0 @@ -6451,7 +6451,7 @@ snapshots: dependencies: semver: 7.7.1 - marked@15.0.7: {} + marked@16.1.1: {} marked@4.3.0: {} @@ -6465,11 +6465,11 @@ snapshots: merge2@1.4.1: {} - mermaid@11.8.1: + mermaid@11.9.0: dependencies: '@braintree/sanitize-url': 7.1.1 '@iconify/utils': 2.3.0 - '@mermaid-js/parser': 0.6.1 + '@mermaid-js/parser': 0.6.2 '@types/d3': 7.4.3 cytoscape: 3.31.1 cytoscape-cose-bilkent: 4.1.0(cytoscape@3.31.1) @@ -6479,10 +6479,10 @@ snapshots: dagre-d3-es: 7.0.11 dayjs: 1.11.13 dompurify: 3.2.6 - katex: 0.16.21 + katex: 0.16.22 khroma: 2.1.0 lodash-es: 4.17.21 - marked: 15.0.7 + marked: 16.1.1 roughjs: 4.6.6 stylis: 4.3.6 ts-dedent: 2.2.0 diff --git a/src/lib/util/state.ts b/src/lib/util/state.ts index 0e0742a0..15ad8bc8 100644 --- a/src/lib/util/state.ts +++ b/src/lib/util/state.ts @@ -132,10 +132,12 @@ export const stateStore: Readable = derived( export const urlsStore = derived([stateStore], ([{ code, serialized }]) => { const { krokiRendererUrl, rendererUrl } = env; - const png = `${rendererUrl}/img/${serialized}?type=png`; + const png = rendererUrl ? `${rendererUrl}/img/${serialized}?type=png` : ''; return { - kroki: `${krokiRendererUrl}/mermaid/svg/${pakoSerde.serialize(code)}`, - mdCode: `[![](${png})](${window.location.protocol}//${window.location.host}${window.location.pathname}#${serialized})`, + kroki: krokiRendererUrl ? `${krokiRendererUrl}/mermaid/svg/${pakoSerde.serialize(code)}` : '', + mdCode: png + ? `[![](${png})](${window.location.protocol}//${window.location.host}${window.location.pathname}#${serialized})` + : '', mermaidChart: ({ medium }: { @@ -154,7 +156,7 @@ export const urlsStore = derived([stateStore], ([{ code, serialized }]) => { }, new: `${window.location.protocol}//${window.location.host}${window.location.pathname}#${serializeState(defaultState)}`, png, - svg: `${rendererUrl}/svg/${serialized}`, + svg: rendererUrl ? `${rendererUrl}/svg/${serialized}` : '', view: `/view#${serialized}` }; }); diff --git a/src/routes/+layout.js b/src/routes/+layout.ts similarity index 100% rename from src/routes/+layout.js rename to src/routes/+layout.ts