Merge branch 'master' into svelte

# Conflicts:
#	pnpm-lock.yaml
#	src/main.ts
#	src/modal.ts
This commit is contained in:
Simon Cambier
2022-04-15 17:43:56 +02:00
8 changed files with 19 additions and 43 deletions

24
pnpm-lock.yaml generated
View File

@@ -14,7 +14,6 @@ specifiers:
eslint-plugin-import: 2.22.1
eslint-plugin-node: 11.1.0
eslint-plugin-promise: 5.0.0
markdown-to-txt: ^2.0.0
minisearch: ^5.0.0-beta1
obsidian: latest
prettier: ^2.6.2
@@ -25,7 +24,6 @@ specifiers:
typescript: ^4.6.3
dependencies:
markdown-to-txt: 2.0.0
minisearch: 5.0.0-beta1
devDependencies:
@@ -1536,18 +1534,10 @@ packages:
path-exists: 3.0.0
dev: true
/lodash.escape/4.0.1:
resolution: {integrity: sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=}
dev: false
/lodash.merge/4.6.2:
resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
dev: true
/lodash.unescape/4.0.1:
resolution: {integrity: sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=}
dev: false
/lodash/4.17.21:
resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
dev: true
@@ -1577,20 +1567,6 @@ packages:
sourcemap-codec: 1.4.8
dev: true
/markdown-to-txt/2.0.0:
resolution: {integrity: sha512-H5DSAY6frUQ6/CR0nJMlGCEuSA3pvi14dYfICJPKLAvd/rDk6eb+cj84zU5XTNYzECyCcujoAL1PHhjmOgeqUw==}
dependencies:
lodash.escape: 4.0.1
lodash.unescape: 4.0.1
marked: 3.0.8
dev: false
/marked/3.0.8:
resolution: {integrity: sha512-0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw==}
engines: {node: '>= 12'}
hasBin: true
dev: false
/merge2/1.4.1:
resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
engines: {node: '>= 8'}