Merge branch 'master' into develop

This commit is contained in:
Knut Sveidqvist
2020-07-13 17:22:09 +02:00
5 changed files with 77 additions and 77 deletions
+39 -39
View File
File diff suppressed because one or more lines are too long
+18 -18
View File
@@ -9,24 +9,6 @@
"resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz",
"integrity": "sha512-GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="
},
"@mermaid-js/mermaid": {
"version": "8.6.0-preview.977",
"resolved": "https://npm.pkg.github.com/download/@mermaid-js/mermaid/8.6.0-preview.977/f4391517bbf05df8c11b97a8be14fab7915d322a51efe1c35b9f9c8cfc115b6d",
"integrity": "sha512-gmZzqGEe9uWSzf/xi9/5IKijHT12GDNPRrBmUX2dzZRdMBi4BqttjFaBPyh4ZvM9YxQLlzJGb0VDXwOYG4enRA==",
"requires": {
"@braintree/sanitize-url": "^3.1.0",
"crypto-random-string": "^3.0.1",
"d3": "^5.7.0",
"dagre": "^0.8.4",
"dagre-d3": "^0.6.4",
"entity-decode": "^2.0.2",
"graphlib": "^2.1.7",
"he": "^1.2.0",
"minify": "^4.1.1",
"moment-mini": "^2.22.1",
"scope-css": "^1.2.1"
}
},
"@types/events": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@@ -3879,6 +3861,24 @@
"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
"dev": true
},
"mermaid": {
"version": "8.6.0",
"resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.6.0.tgz",
"integrity": "sha512-TN3q75sGcdXHHOV5ySh1MnrMoRxhuhzFD7XneHrBR07r+In7Nq4JoHY9nG/dxwwktZyP9f+0r1gNNjLaTHA6Qw==",
"requires": {
"@braintree/sanitize-url": "^3.1.0",
"crypto-random-string": "^3.0.1",
"d3": "^5.7.0",
"dagre": "^0.8.4",
"dagre-d3": "^0.6.4",
"entity-decode": "^2.0.2",
"graphlib": "^2.1.7",
"he": "^1.2.0",
"minify": "^4.1.1",
"moment-mini": "^2.22.1",
"scope-css": "^1.2.1"
}
},
"methods": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+1 -1
View File
@@ -20,7 +20,7 @@
"dev": "webpack-dev-server --content-base docs"
},
"dependencies": {
"@mermaid-js/mermaid": "*",
"mermaid": "8.6.0",
"js-base64": "^2.5.1",
"json-lint": "^0.1.0",
"jsonlint": "^1.6.3",
+2 -2
View File
@@ -11,8 +11,8 @@ module.exports = {
resolve: {
alias: {
svelte: path.resolve('node_modules', 'svelte'),
//"@mermaid": 'mermaid'
"@mermaid": '@mermaid-js/mermaid'
"@mermaid": 'mermaid'
// "@mermaid": '@mermaid-js/mermaid'
},
extensions: ['.mjs', '.js', '.svelte'],
mainFields: ['svelte', 'browser', 'module', 'main']
+17 -17
View File
@@ -6,23 +6,6 @@
version "3.1.0"
resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz#8ff71d51053cd5ee4981e5a501d80a536244f7fd"
"@mermaid-js/mermaid@*":
version "8.5.2-preview.946"
resolved "https://npm.pkg.github.com/download/@mermaid-js/mermaid/8.5.2-preview.946/5074ebd4748b1f9e5426c8e38de9996dbff467cd92e7a694138a1836e18e74e1#ebc578d3eb161cf3d3ff3298fd2c74866a9870ed"
integrity sha512-jy82rOjOOeiIta9DxIJk3wbv5EpkvN2iEdBTIPIPMu6a3XYS/bD2QYYZRjtFw6dbJL1vBxMaX1tXHN+3TKrVPg==
dependencies:
"@braintree/sanitize-url" "^3.1.0"
crypto-random-string "^3.0.1"
d3 "^5.7.0"
dagre "^0.8.4"
dagre-d3 "^0.6.4"
entity-decode "^2.0.2"
graphlib "^2.1.7"
he "^1.2.0"
minify "^4.1.1"
moment-mini "^2.22.1"
scope-css "^1.2.1"
"@types/events@*":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -2423,6 +2406,23 @@ merge-descriptors@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
mermaid@8.6.0:
version "8.6.0"
resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.6.0.tgz#570d0e6a156227af6eaf375d989049fba032d53b"
integrity sha512-TN3q75sGcdXHHOV5ySh1MnrMoRxhuhzFD7XneHrBR07r+In7Nq4JoHY9nG/dxwwktZyP9f+0r1gNNjLaTHA6Qw==
dependencies:
"@braintree/sanitize-url" "^3.1.0"
crypto-random-string "^3.0.1"
d3 "^5.7.0"
dagre "^0.8.4"
dagre-d3 "^0.6.4"
entity-decode "^2.0.2"
graphlib "^2.1.7"
he "^1.2.0"
minify "^4.1.1"
moment-mini "^2.22.1"
scope-css "^1.2.1"
methods@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"