Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/template/forks/polyipseity'
Browse files Browse the repository at this point in the history
Signed-off-by: William So <[email protected]>

# Conflicts:
#	package-lock.json
#	package.json
#	pnpm-lock.yaml
  • Loading branch information
polyipseity committed Sep 22, 2023
2 parents 9f4aac2 + d644490 commit d4958f2
Show file tree
Hide file tree
Showing 4 changed files with 148 additions and 142 deletions.
6 changes: 6 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,12 @@
"no-confusing-arrow": "off",
"no-console": "off",
"no-continue": "off",
"no-inline-comments": [
"error",
{
"ignorePattern": "^ @__PURE__ $"
}
],
"no-magic-numbers": [
"error",
{
Expand Down
150 changes: 75 additions & 75 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"url": "https://github.com/polyipseity/PLACEHOLDER"
},
"dependencies": {
"@polyipseity/obsidian-plugin-library": "^1.21.0",
"@polyipseity/obsidian-plugin-library": "^1.22.0",
"acorn": "^8.10.0",
"ansi-escape-sequences": "^6.2.2",
"async-lock": "^1.4.0",
Expand Down Expand Up @@ -34,17 +34,17 @@
"@changesets/cli": "^2.26.2",
"@polyipseity/obsidian": "^1.2.8",
"@tsconfig/node16": "^16.1.1",
"@tsconfig/recommended": "^1.0.2",
"@tsconfig/recommended": "^1.0.3",
"@tsconfig/strictest": "^2.0.2",
"@types/ansi-escape-sequences": "^4.0.0",
"@types/async-lock": "^1.4.0",
"@types/browser-util-inspect": "^0.2.1",
"@types/estree": "^1.0.1",
"@types/lodash-es": "^4.17.9",
"@types/node": "^20.6.0",
"@types/node": "^20.6.3",
"@types/semver": "^7.5.2",
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.7.0",
"@typescript-eslint/eslint-plugin": "^6.7.2",
"@typescript-eslint/parser": "^6.7.2",
"builtin-modules": "^3.3.0",
"esbuild": "^0.19.3",
"esbuild-compress": "^2.0.0",
Expand Down
Loading

0 comments on commit d4958f2

Please sign in to comment.