marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-12 11:59:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix viewer.js

Browse Source
This commit is contained in:
Sidharth Vinod
2023-02-19 21:43:50 +05:30
parent a88789fe07
commit 284ef24deb
6 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.esbuild/build.ts
View File

@@ -23,7 +23,7 @@ const handler = (e) => {
}; };
const main = async () => { const main = async () => {
await mkdir('stats'); await mkdir('stats').catch(() => {});
const packageNames = Object.keys(packageOptions) as (keyof typeof packageOptions)[]; const packageNames = Object.keys(packageOptions) as (keyof typeof packageOptions)[];
for (const pkg of packageNames) { for (const pkg of packageNames) {
await buildPackage(pkg).catch(handler); await buildPackage(pkg).catch(handler);

7
cypress/platform/e2e.html
View File

@@ -1,7 +1,12 @@
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<script src="./viewer.js" type="module"></script> <script type="module">
import { init } from './viewer.js';
import mermaid from './mermaid.esm.mjs';
import external from './mermaid-example-diagram.esm.mjs';
init(mermaid, external);
</script>
<link <link
href="https://fonts.googleapis.com/css?family=Noto+Sans+SC&display=swap" href="https://fonts.googleapis.com/css?family=Noto+Sans+SC&display=swap"
rel="stylesheet" rel="stylesheet"

9
cypress/platform/viewer.js
View File

@@ -1,5 +1,5 @@
import mermaid2 from '../../packages/mermaid/src/mermaid'; let mermaid2;
import externalExample from '../../packages/mermaid-example-diagram/src/detector'; let externalExample;
function b64ToUtf8(str) { function b64ToUtf8(str) {
return decodeURIComponent(escape(window.atob(str))); return decodeURIComponent(escape(window.atob(str)));
@@ -144,3 +144,8 @@ if (typeof document !== 'undefined') {
false false
); );
} }
export function init(mermaid, external) {
mermaid2 = mermaid;
externalExample = external;
}

21
cypress/platform/xss.html
View File

@@ -1,6 +1,15 @@
<html> <html>
<head> <head>
<script src="./viewer.js" type="module"></script> <script type="module">
import { init } from './viewer.js';
import mermaid from './mermaid.esm.mjs';
import external from './mermaid-example-diagram.esm.mjs';
mermaid.initialize({
startOnLoad: false,
useMaxWidth: true,
});
init(mermaid, external);
</script>
<link href="https://fonts.googleapis.com/css?family=Montserrat&display=swap" rel="stylesheet" /> <link href="https://fonts.googleapis.com/css?family=Montserrat&display=swap" rel="stylesheet" />
<style> <style>
.malware { .malware {
@@ -32,13 +41,5 @@
} }
</script> </script>
</head> </head>
<body> <body></body>
<script type="module">
import mermaid from './mermaid.esm.mjs';
mermaid.initialize({
startOnLoad: false,
useMaxWidth: true,
});
</script>
</body>
</html> </html>

1
package.json
View File

@@ -74,7 +74,6 @@
"@vitest/coverage-c8": "^0.28.4", "@vitest/coverage-c8": "^0.28.4",
"@vitest/spy": "^0.28.4", "@vitest/spy": "^0.28.4",
"@vitest/ui": "^0.28.4", "@vitest/ui": "^0.28.4",
"chokidar": "^3.5.3",
"concurrently": "^7.5.0", "concurrently": "^7.5.0",
"cors": "^2.8.5", "cors": "^2.8.5",
"coveralls": "^3.1.1", "coveralls": "^3.1.1",

13
pnpm-lock.yaml generated
View File

@@ -64,9 +64,6 @@ importers:
'@vitest/ui': '@vitest/ui':
specifier: ^0.28.4 specifier: ^0.28.4
version: 0.28.4 version: 0.28.4
chokidar:
specifier: ^3.5.3
version: 3.5.3
concurrently: concurrently:
specifier: ^7.5.0 specifier: ^7.5.0
version: 7.5.0 version: 7.5.0
@@ -4258,7 +4255,7 @@ packages:
/axios/0.21.4_debug@4.3.2: /axios/0.21.4_debug@4.3.2:
resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
dependencies: dependencies:
follow-redirects: 1.15.2_debug@4.3.2 follow-redirects: 1.15.2_debug@4.3.4
transitivePeerDependencies: transitivePeerDependencies:
- debug - debug
dev: true dev: true
@@ -4266,7 +4263,7 @@ packages:
/axios/0.27.2_debug@4.3.4: /axios/0.27.2_debug@4.3.4:
resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==} resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
dependencies: dependencies:
follow-redirects: 1.15.2_debug@4.3.2 follow-redirects: 1.15.2_debug@4.3.4
form-data: 4.0.0 form-data: 4.0.0
transitivePeerDependencies: transitivePeerDependencies:
- debug - debug
@@ -6857,7 +6854,7 @@ packages:
resolution: {integrity: sha512-XGozTsMPYkm+6b5QL3Z9wQcJjNYxp0CYn3U1gO7dwD6PAqU1SVWZxI9CCg3z+ml3YfqdPnrBehaBrnH2AGKbNA==} resolution: {integrity: sha512-XGozTsMPYkm+6b5QL3Z9wQcJjNYxp0CYn3U1gO7dwD6PAqU1SVWZxI9CCg3z+ml3YfqdPnrBehaBrnH2AGKbNA==}
dev: true dev: true
/follow-redirects/1.15.2_debug@4.3.2: /follow-redirects/1.15.2_debug@4.3.4:
resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
engines: {node: '>=4.0'} engines: {node: '>=4.0'}
peerDependencies: peerDependencies:
@@ -6866,7 +6863,7 @@ packages:
debug: debug:
optional: true optional: true
dependencies: dependencies:
debug: 4.3.2 debug: 4.3.4
dev: true dev: true
/foreground-child/2.0.0: /foreground-child/2.0.0:
@@ -7406,7 +7403,7 @@ packages:
engines: {node: '>=8.0.0'} engines: {node: '>=8.0.0'}
dependencies: dependencies:
eventemitter3: 4.0.7 eventemitter3: 4.0.7
follow-redirects: 1.15.2_debug@4.3.2 follow-redirects: 1.15.2_debug@4.3.4
requires-port: 1.0.0 requires-port: 1.0.0
transitivePeerDependencies: transitivePeerDependencies:
- debug - debug