fix: lint-staged and merge eslint-config-html

mermaid-js · Dec 11, 2021 · 956caa7 · 956caa7
1 parent b7eb71e
commit 956caa7
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 31 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -14,7 +14,7 @@
     "sourceType": "module"
   },
   "extends": ["eslint:recommended", "plugin:jsdoc/recommended", "plugin:markdown/recommended", "plugin:prettier/recommended"],
-  "plugins": ["jest", "jsdoc", "prettier"],
+  "plugins": ["html", "jest", "jsdoc", "prettier"],
   "rules": {
     "no-prototype-builtins": 0,
     "no-unused-vars": 0,

diff --git a/.gitignore b/.gitignore
@@ -4,19 +4,14 @@ node_modules/
 coverage/
 .idea/
 
-dist/*.js
-dist/*.map
+dist/
 
 yarn-error.log
 .npmrc
 token
 
 package-lock.json
 
-dist/classTest.html
-
-dist/sequenceTest.html
-
 .vscode/
 cypress/platform/current.html
 cypress/platform/experimental.html

diff --git a/.lintstagedrc.json b/.lintstagedrc.json
@@ -1,5 +1,5 @@
 {
-  "*": [
+  "*.{js,html,md}": [
       "yarn lint:fix" 
    ]
 }
diff --git a/cypress/platform/xss14.html b/cypress/platform/xss14.html
@@ -46,8 +46,8 @@
   <script src="./mermaid.js"></script>
     <script>
       mermaid.parseError = function (err, hash) {
-          // console.error('Mermaid error: ', err);
-        };
+        // console.error('Mermaid error: ', err);
+      };
       mermaid.initialize({
         theme: 'forest',
         arrowMarkerAbsolute: true,
@@ -58,46 +58,50 @@
         },
         flowchart: {
           // defaultRenderer: 'dagre-wrapper',
-          nodeSpacing: 10, curve: 'cardinal', htmlLabels: true
+          nodeSpacing: 10,
+    curve: 'cardinal',
+    htmlLabels: true,
         },
         htmlLabels: true,
         // gantt: { axisFormat: '%m/%d/%Y' },
-        sequence: { actorFontFamily: 'courier',actorMargin: 50, showSequenceNumbers: false },
+        sequence: { actorFontFamily: 'courier', actorMargin: 50, showSequenceNumbers: false },
         // sequenceDiagram: { actorMargin: 300 } // deprecated
         // fontFamily: '"times", sans-serif',
         // fontFamily: 'courier',
         fontSize: 18,
         curve: 'basis',
         securityLevel: 'antiscript',
         startOnLoad: false,
-        secure: ['secure', 'securityLevel', 'startOnLoad', 'maxTextSize']
+        secure: ['secure', 'securityLevel', 'startOnLoad', 'maxTextSize'],
         // themeVariables: {relationLabelColor: 'red'}
       });
-      function callback(){alert('It worked');}
-      function xssAttack(){
-        const div = document.createElement('div')
-        div.id = 'the-malware'
-        div.className = 'malware'
-        div.innerHTML = 'XSS Succeeded'
+      function callback() {
+  alert('It worked');
+}
+      function xssAttack() {
+        const div = document.createElement('div');
+        div.id = 'the-malware';
+        div.className = 'malware';
+        div.innerHTML = 'XSS Succeeded';
         document.getElementsByTagName('body')[0].appendChild(div);
         throw new Error('XSS Succeded');
       }
 
-      var diagram = "classDiagram\n"
-diagram += "classA <-- classB : <ifr";
+      var diagram = 'classDiagram\n';
+diagram += 'classA <-- classB : <ifr';
 diagram += "ame/srcdoc='<scr";
-diagram += "ipt>parent.xssAttack(`XSS`)</";
+diagram += 'ipt>parent.xssAttack(`XSS`)</';
 diagram += "script>'>";
 
-    //   var diagram = "stateDiagram-v2\n";
-    //  diagram += "<img/src='1'/onerror"
-    //  diagram += "=xssAttack()> --> B";
-  console.log(diagram);
-  // document.querySelector('#diagram').innerHTML = diagram;
-  mermaid.render('diagram', diagram, (res) => {
-    console.log(res);
-    document.querySelector('#res').innerHTML = res;
-  });
+//   var diagram = "stateDiagram-v2\n";
+//  diagram += "<img/src='1'/onerror"
+//  diagram += "=xssAttack()> --> B";
+console.log(diagram);
+// document.querySelector('#diagram').innerHTML = diagram;
+mermaid.render('diagram', diagram, (res) => {
+  console.log(res);
+  document.querySelector('#res').innerHTML = res;
+});
     </script>
   </body>
 </html>