Use default theme in main.ts.

mermaid-js · Nov 11, 2023 · 925a2d0 · 925a2d0
1 parent c03e774
commit 925a2d0
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 28 deletions.
diff --git a/cy/defect-406-alt-under-creation.html b/cy/defect-406-alt-under-creation.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />
@@ -13,7 +13,7 @@
   </head>
   <body>
     <div id="diagram" class="diagram">
-      <pre class="zenuml" style="margin: 0;">
+      <pre class="zenuml" style="margin: 0">
 title Title 1
 A.m1 {
   new B(1,2,3,4) {
@@ -35,6 +35,6 @@
       >
     </div>
     <!-- built files will be auto injected -->
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="/src/main-cy.ts"></script>
   </body>
 </html>
diff --git a/cy/smoke-creation.html b/cy/smoke-creation.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />
@@ -13,14 +13,14 @@
   </head>
   <body>
     <div id="diagram" class="diagram">
-      <pre class="zenuml" style="margin: 0;">
+      <pre class="zenuml" style="margin: 0">
 title Title 1
 A.m {
   new B(1,2,3,4)
 }</pre
       >
     </div>
     <!-- built files will be auto injected -->
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="/src/main-cy.ts"></script>
   </body>
 </html>
diff --git a/cy/smoke-fragment-issue.html b/cy/smoke-fragment-issue.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />
@@ -13,7 +13,7 @@
   </head>
   <body>
     <div id="diagram" class="diagram">
-      <pre class="zenuml" style="margin: 0;">
+      <pre class="zenuml" style="margin: 0">
         // This sample is carefully crafted. It shows a known issues: fragment stretched to
         // svc (should not), because parser thinks the return statement returns to svc.
 group G {@VPC svc @RDS rep} Client
@@ -30,6 +30,6 @@
       >
     </div>
     <!-- built files will be auto injected -->
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="/src/main-cy.ts"></script>
   </body>
 </html>
diff --git a/cy/smoke-fragment.html b/cy/smoke-fragment.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />
@@ -13,7 +13,7 @@
   </head>
   <body>
     <div id="diagram" class="diagram">
-      <pre class="zenuml" style="margin: 0;">
+      <pre class="zenuml" style="margin: 0">
         A
         B
         C #FF0000  // we style it to make it more important in image comparison
@@ -38,6 +38,6 @@
     </div>
 
     <!-- built files will be auto injected -->
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="/src/main-cy.ts"></script>
   </body>
 </html>
diff --git a/cy/smoke-interaction.html b/cy/smoke-interaction.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />
@@ -13,7 +13,7 @@
   </head>
   <body>
     <div id="diagram" class="diagram">
-      <pre class="zenuml" style="margin: 0;">
+      <pre class="zenuml" style="margin: 0">
 if(x) {
   A.method() {
     B.method() {
@@ -29,6 +29,6 @@
     </div>
 
     <!-- built files will be auto injected -->
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="/src/main-cy.ts"></script>
   </body>
 </html>
diff --git a/cy/smoke-return.html b/cy/smoke-return.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />
@@ -13,7 +13,7 @@
   </head>
   <body>
     <div id="diagram" class="diagram">
-      <pre class="zenuml" style="margin: 0;">
+      <pre class="zenuml" style="margin: 0">
   Browser->BookController.onPost() {
   BookLibService.Borrow(id) {
       receipt = process(id1)
@@ -33,6 +33,6 @@
       >
     </div>
     <!-- built files will be auto injected -->
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="/src/main-cy.ts"></script>
   </body>
 </html>
diff --git a/cy/smoke.html b/cy/smoke.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />
@@ -13,7 +13,7 @@
   </head>
   <body>
     <div id="diagram" class="diagram">
-      <pre class="zenuml" style="margin: 0;">
+      <pre class="zenuml" style="margin: 0">
 
 title ABCD Title
 // Generating Sequence Diagrams from Java code is experimental.
@@ -37,6 +37,6 @@
       >
     </div>
     <!-- built files will be auto injected -->
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="/src/main-cy.ts"></script>
   </body>
 </html>
diff --git a/cypress/e2e/__image_snapshots__/Smoke test should load the home page #0.png b/cypress/e2e/__image_snapshots__/Smoke test should load the home page #0.png
diff --git a/src/main-cy.ts b/src/main-cy.ts
@@ -0,0 +1,24 @@
+import parentLogger from "./logger/logger";
+import ZenUml from "./core";
+const logger = parentLogger.child({ name: "main" });
+
+// find the fist element with tag `pre` and class `zenuml`
+const elm = document.querySelector("pre.zenuml");
+// get the code from the element
+const code =
+  elm?.textContent?.trim() ||
+  `
+// comment
+A
+A.method`;
+// @ts-ignore
+const zenUml = new ZenUml(elm);
+console.log("set zenUML to window");
+
+// @ts-ignore
+window.zenUml = zenUml;
+zenUml.render(code, { theme: "theme-nab" }).then((r) => {
+  logger.debug("render resolved", r);
+});
+// @ts-ignore
+window.parentLogger = parentLogger;
diff --git a/src/main.ts b/src/main.ts
@@ -1,9 +1,9 @@
-import parentLogger from './logger/logger';
-import ZenUml from './core';
-const logger = parentLogger.child({ name: 'main' });
+import parentLogger from "./logger/logger";
+import ZenUml from "./core";
+const logger = parentLogger.child({ name: "main" });
 
 // find the fist element with tag `pre` and class `zenuml`
-const elm = document.querySelector('pre.zenuml');
+const elm = document.querySelector("pre.zenuml");
 // get the code from the element
 const code =
   elm?.textContent?.trim() ||
@@ -13,12 +13,12 @@ A
 A.method`;
 // @ts-ignore
 const zenUml = new ZenUml(elm);
-console.log('set zenUML to window');
+console.log("set zenUML to window");
 
 // @ts-ignore
 window.zenUml = zenUml;
-zenUml.render(code, {theme: 'theme-nab'}).then((r) => {
-  logger.debug('render resolved', r);
+zenUml.render(code, { theme: "theme-default" }).then((r) => {
+  logger.debug("render resolved", r);
 });
 // @ts-ignore
 window.parentLogger = parentLogger;