diff --git a/.gitignore b/.gitignore index 38265e6..58c49f3 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ data.json # Exclude macOS Finder (System Explorer) View States .DS_Store package-lock.json +.aider* diff --git a/package.json b/package.json index bd6c243..a82c4d0 100644 --- a/package.json +++ b/package.json @@ -16,32 +16,32 @@ "author": "", "license": "MIT", "dependencies": { - "obsidian-dataview": "^0.5.65", - "@popperjs/core": "^2.11.6" + "@popperjs/core": "^2.11.6", + "obsidian-dataview": "^0.5.67" }, "devDependencies": { - "obsidian-excalidraw-plugin": "1.9.14", "@babel/core": "^7.20.12", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", + "@excalidraw/eslint-config": "^1.0.3", + "@excalidraw/prettier-config": "^1.0.2", "@rollup/plugin-babel": "^6.0.3", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", + "@rollup/plugin-terser": "^0.4.4", "@rollup/plugin-typescript": "^11.0.0", "@types/node": "^20.4.8", "cross-env": "^7.0.3", - "obsidian": "^1.4.0", - "rollup": "^2.79.1", - "rollup-plugin-terser": "^7.0.2", - "tslib": "^2.6.1", - "typescript": "^4.9.4", "eslint-config-prettier": "^8.10.0", "eslint-plugin-prettier": "^4.2.1", + "obsidian": "^1.5.7-1", + "obsidian-excalidraw-plugin": "1.9.14", "prettier": "^2.8.2", - "@excalidraw/eslint-config": "^1.0.3", - "@excalidraw/prettier-config": "^1.0.2", - "terser": "^5.19.2" + "rollup": "^2.79.1", + "terser": "^5.19.2", + "tslib": "^2.6.1", + "typescript": "^4.9.4" }, "resolutions": { "@typescript-eslint/typescript-estree": "5.3.0" diff --git a/rollup.config.js b/rollup.config.js index 775d60b..110d0c3 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -4,7 +4,7 @@ import commonjs from '@rollup/plugin-commonjs'; import { env } from "process"; import babel from '@rollup/plugin-babel'; import replace from "@rollup/plugin-replace"; -import { terser } from "rollup-plugin-terser"; +import terser from "@rollup/plugin-terser"; const isProd = (process.env.NODE_ENV === "production"); console.log("Is production", isProd); diff --git a/src/Components/AddToOntologyModal.ts b/src/Components/AddToOntologyModal.ts index 3bf7afb..dab8d1c 100644 --- a/src/Components/AddToOntologyModal.ts +++ b/src/Components/AddToOntologyModal.ts @@ -148,7 +148,7 @@ export class AddToOntologyModal extends Modal { } new Notice(`Added ${this.fieldName} as ${ontology}`); this.fieldName = null; - this.close(); + this.onClose(); } async show( fieldName:string ) { diff --git a/src/excalibrain-main.ts b/src/excalibrain-main.ts index 5b8ba89..592c9fa 100644 --- a/src/excalibrain-main.ts +++ b/src/excalibrain-main.ts @@ -2,7 +2,7 @@ import { App, Editor, MarkdownView, Menu, MenuItem, Notice, Plugin, PluginManife import { Page } from './graph/Page'; import { DEFAULT_SETTINGS, ExcaliBrainSettings, ExcaliBrainSettingTab } from './Settings'; import { errorlog, keepOnTop } from './utils/utils'; -import { getAPI } from "obsidian-dataview" +import { getAPI } from "obsidian-dataview"; import { t } from './lang/helpers'; import { DEFAULT_HIERARCHY_DEFINITION, DEFAULT_LINK_STYLE, DEFAULT_NODE_STYLE, MINEXCALIDRAWVERSION, PLUGIN_NAME, PREDEFINED_LINK_STYLES } from './constants/constants'; import { Pages } from './graph/Pages'; diff --git a/src/utils/dataview.ts b/src/utils/dataview.ts index 5001138..afe42bf 100644 --- a/src/utils/dataview.ts +++ b/src/utils/dataview.ts @@ -43,7 +43,7 @@ const readDailyNoteLinks = (plugin: ExcaliBrain, data: any[], file:TFile):string const res = new Set(); data.forEach((l:any)=>{ if(l?.hasOwnProperty?.("ts")) { - res.add(moment(l.ts).format(plugin.dailyNoteSettings.format)) + res.add(moment.default(l.ts).format(plugin.dailyNoteSettings.format)) } }); return Array.from(res);