From e1fe3eeaabae123b11427b36e5e3a15488e35b99 Mon Sep 17 00:00:00 2001 From: zsviczian Date: Sat, 26 Aug 2023 11:02:00 +0200 Subject: [PATCH] fixed constants.ts filename casing issue. Updated tsconfig and rollout.config --- README-BUILD.md | 2 +- package.json | 11 ++++++----- rollup.config.js | 14 ++++++++++---- src/EmbeddedFileLoader.ts | 2 +- src/ExcalidrawAutomate.ts | 4 ++-- src/ExcalidrawData.ts | 4 ++-- src/ExcalidrawView.ts | 4 ++-- src/LaTeX.ts | 2 +- src/MarkdownPostProcessor.ts | 2 +- src/Scripts.ts | 10 +++++----- src/customEmbeddable.tsx | 2 +- src/dialogs/ExportDialog.ts | 4 ++-- src/dialogs/ImportSVGDialog.ts | 2 +- src/dialogs/InsertImageDialog.ts | 2 +- src/dialogs/InsertLinkDialog.ts | 2 +- src/dialogs/OpenDrawing.ts | 2 +- src/dialogs/PenSettingsModal.ts | 2 +- src/dialogs/UniversalInsertFileModal.ts | 3 +-- src/lang/locale/en.ts | 2 +- src/lang/locale/zh-cn.ts | 2 +- src/main.ts | 2 +- src/menu/EmbeddableActionsMenu.tsx | 2 +- src/menu/ObsidianMenu.tsx | 2 +- src/menu/ToolsPanel.tsx | 2 +- src/settings.ts | 2 +- src/svgToExcalidraw/elements/ExcalidrawScene.ts | 2 +- src/svgToExcalidraw/walker.ts | 2 +- src/utils/CustomEmbeddableUtils.ts | 2 +- src/utils/ExcalidrawViewUtils.ts | 3 +-- src/utils/FileUtils.ts | 2 +- src/utils/ModifierkeyHelper.ts | 2 +- src/utils/ObsidianUtils.ts | 2 +- src/utils/Utils.ts | 4 ++-- tsconfig.prod.json => tsconfig.dev.json | 6 ++++-- tsconfig.json | 5 +++-- 35 files changed, 63 insertions(+), 55 deletions(-) rename tsconfig.prod.json => tsconfig.dev.json (67%) diff --git a/README-BUILD.md b/README-BUILD.md index 37be0aa..c8b26db 100644 --- a/README-BUILD.md +++ b/README-BUILD.md @@ -1,4 +1,4 @@ -The project runs with `node 16.10.0`. Some packages will throw dependency errors if you try to compile with a higher node version. +The project runs with `node 18`. After running `npm -i` you'll need to make two manual changes: diff --git a/package.json b/package.json index 78a8e2a..b26e52d 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "dev": "cross-env NODE_ENV=development rollup --config rollup.config.js -w", "build": "cross-env NODE_ENV=production rollup --config rollup.config.js", "lib": "cross-env NODE_ENV=lib rollup --config rollup.config.js", - "code:fix": "eslint --max-warnings=0 --ext .ts,.tsx ./src --fix" + "code:fix": "eslint --max-warnings=0 --ext .ts,.tsx ./src --fix", + "madge": "madge --circular ." }, "keywords": [], "author": "", @@ -34,18 +35,18 @@ }, "devDependencies": { "@babel/core": "^7.22.9", - "@babel/preset-env": "^7.22.9", + "@babel/preset-env": "^7.22.10", "@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.1.0", - "@rollup/plugin-node-resolve": "^15.1.0", + "@rollup/plugin-node-resolve": "^15.2.1", "@rollup/plugin-replace": "^5.0.2", "@rollup/plugin-typescript": "^11.1.2", "@types/chroma-js": "^2.4.0", "@types/js-beautify": "^1.14.0", - "@types/node": "^20.4.8", + "@types/node": "^20.5.6", "@types/react-dom": "^18.2.7", "@zerollup/ts-transform-paths": "^1.7.18", "cross-env": "^7.0.3", @@ -61,7 +62,7 @@ "rollup-plugin-web-worker-loader": "^1.6.1", "tslib": "^2.6.1", "ttypescript": "^1.5.15", - "typescript": "^4.9.5" + "typescript": "^5.2.2" }, "resolutions": { "@typescript-eslint/typescript-estree": "5.3.0" diff --git a/rollup.config.js b/rollup.config.js index e9c8a50..537dc67 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,4 +1,3 @@ -import typescript from '@rollup/plugin-typescript'; import { nodeResolve } from '@rollup/plugin-node-resolve'; import commonjs from '@rollup/plugin-commonjs'; import { env } from "process"; @@ -6,7 +5,6 @@ import babel from '@rollup/plugin-babel'; import replace from "@rollup/plugin-replace"; import { terser } from "rollup-plugin-terser"; import copy from "rollup-plugin-copy"; -import ttypescript from "ttypescript"; import typescript2 from "rollup-plugin-typescript2"; import webWorker from "rollup-plugin-web-worker-loader"; import fs from'fs'; @@ -60,16 +58,24 @@ const BUILD_CONFIG = { exports: 'default', }, plugins: [ + typescript2({ + tsconfig: isProd ? "tsconfig.json" : "tsconfig.dev.json", + inlineSources: !isProd + }), replace({ preventAssignment: true, "process.env.NODE_ENV": JSON.stringify(env.NODE_ENV), }), babel({ + presets: [['@babel/preset-env', { + targets: { + esmodules: true, + } + }]], exclude: "node_modules/**" }), commonjs(), nodeResolve({ browser: true, preferBuiltins: false }), - typescript({inlineSources: !isProd}), ...isProd ? [ terser({toplevel: false, compress: {passes: 2}}), @@ -98,7 +104,7 @@ const LIB_CONFIG = { name: "Excalidraw (Library)", }, plugins: getRollupPlugins( - { tsconfig: "tsconfig-lib.json", typescript: ttypescript }, + { tsconfig: "tsconfig-lib.json"}, copy({ targets: [{ src: "src/*.d.ts", dest: "lib/typings" }] }) ), } diff --git a/src/EmbeddedFileLoader.ts b/src/EmbeddedFileLoader.ts index d569ad6..2e35246 100644 --- a/src/EmbeddedFileLoader.ts +++ b/src/EmbeddedFileLoader.ts @@ -16,7 +16,7 @@ import { nanoid, THEME_FILTER, VIRGIL_FONT, -} from "./Constants"; +} from "./constants"; import { createSVG } from "./ExcalidrawAutomate"; import { ExcalidrawData, getTransclusion } from "./ExcalidrawData"; import { ExportSettings } from "./ExcalidrawView"; diff --git a/src/ExcalidrawAutomate.ts b/src/ExcalidrawAutomate.ts index 42999ea..fb6c1b3 100644 --- a/src/ExcalidrawAutomate.ts +++ b/src/ExcalidrawAutomate.ts @@ -33,7 +33,7 @@ import { restore, REG_LINKINDEX_INVALIDCHARS, THEME_FILTER, -} from "src/Constants"; +} from "src/constants"; import { getDrawingFilename, getNewUniqueFilepath, } from "src/utils/FileUtils"; import { //debug, @@ -73,7 +73,7 @@ import RYBPlugin from "colormaster/plugins/ryb"; import CMYKPlugin from "colormaster/plugins/cmyk"; import { TInput } from "colormaster/types"; import {ConversionResult, svgToExcalidraw} from "src/svgToExcalidraw/parser" -import { ROUNDNESS } from "src/Constants"; +import { ROUNDNESS } from "src/constants"; import { ClipboardData } from "@zsviczian/excalidraw/types/clipboard"; import { emulateKeysForLinkClick, KeyEvent, PaneTarget } from "src/utils/ModifierkeyHelper"; import { Mutable } from "@zsviczian/excalidraw/types/utility-types"; diff --git a/src/ExcalidrawData.ts b/src/ExcalidrawData.ts index d364c1d..731c4f3 100644 --- a/src/ExcalidrawData.ts +++ b/src/ExcalidrawData.ts @@ -24,10 +24,10 @@ import { getFontString, wrapText, ERROR_IFRAME_CONVERSION_CANCELED, -} from "./Constants"; + JSON_parse, +} from "./constants"; import { _measureText } from "./ExcalidrawAutomate"; import ExcalidrawPlugin from "./main"; -import { JSON_parse } from "./Constants"; import { TextMode } from "./ExcalidrawView"; import { addAppendUpdateCustomData, diff --git a/src/ExcalidrawView.ts b/src/ExcalidrawView.ts index c37a666..59a7041 100644 --- a/src/ExcalidrawView.ts +++ b/src/ExcalidrawView.ts @@ -48,7 +48,7 @@ import { viewportCoordsToSceneCoords, ERROR_IFRAME_CONVERSION_CANCELED, restore, -} from "./Constants"; +} from "./constants"; import ExcalidrawPlugin from "./main"; import { repositionElementsToCursor, @@ -114,7 +114,7 @@ import { ScriptEngine } from "./Scripts"; import { getTextElementAtPointer, getImageElementAtPointer, getElementWithLinkAtPointer } from "./utils/GetElementAtPointer"; import { ICONS, LogoWrapper, saveIcon } from "./menu/ActionIcons"; import { ExportDialog } from "./dialogs/ExportDialog"; -import { getEA } from "src"; +import { getEA } from "src" import { anyModifierKeysPressed, emulateCTRLClickForLinks, emulateKeysForLinkClick, externalDragModifierType, internalDragModifierType, isALT, isCTRL, isMETA, isSHIFT, linkClickModifierType, mdPropModifier, ModifierKeys } from "./utils/ModifierkeyHelper"; import { setDynamicStyle } from "./utils/DynamicStyling"; import { InsertPDFModal } from "./dialogs/InsertPDFModal"; diff --git a/src/LaTeX.ts b/src/LaTeX.ts index 63799f8..16cb1f0 100644 --- a/src/LaTeX.ts +++ b/src/LaTeX.ts @@ -4,7 +4,7 @@ import ExcalidrawPlugin from "./main"; import { FileData, MimeType } from "./EmbeddedFileLoader"; import { FileId } from "@zsviczian/excalidraw/types/element/types"; import { errorlog, getImageSize, log, sleep, svgToBase64 } from "./utils/Utils"; -import { fileid } from "./Constants"; +import { fileid } from "./constants"; import html2canvas from "html2canvas"; import { Notice } from "obsidian"; diff --git a/src/MarkdownPostProcessor.ts b/src/MarkdownPostProcessor.ts index 4db7746..447aca7 100644 --- a/src/MarkdownPostProcessor.ts +++ b/src/MarkdownPostProcessor.ts @@ -4,7 +4,7 @@ import { TFile, Vault, } from "obsidian"; -import { RERENDER_EVENT } from "./Constants"; +import { RERENDER_EVENT } from "./constants"; import { EmbeddedFilesLoader } from "./EmbeddedFileLoader"; import { createPNG, createSVG } from "./ExcalidrawAutomate"; import { ExportSettings } from "./ExcalidrawView"; diff --git a/src/Scripts.ts b/src/Scripts.ts index ef4581b..1a685c5 100644 --- a/src/Scripts.ts +++ b/src/Scripts.ts @@ -5,7 +5,7 @@ import { TFile, WorkspaceLeaf, } from "obsidian"; -import { PLUGIN_ID, VIEW_TYPE_EXCALIDRAW } from "./Constants"; +import { PLUGIN_ID, VIEW_TYPE_EXCALIDRAW } from "./constants"; import ExcalidrawView from "./ExcalidrawView"; import ExcalidrawPlugin from "./main"; import { ButtonDefinition, GenericInputPrompt, GenericSuggester } from "./dialogs/Prompt"; @@ -261,10 +261,10 @@ export class ScriptEngine { /*} catch (e) { new Notice(t("SCRIPT_EXECUTION_ERROR"), 4000); errorlog({ script: this.plugin.ea.activeScript, error: e }); - }*/ - this.plugin.ea.activeScript = null; - return result; - } + }*/ + this.plugin.ea.activeScript = null; + return result; +} private updateToolPannels() { const leaves = diff --git a/src/customEmbeddable.tsx b/src/customEmbeddable.tsx index e748cf6..207c983 100644 --- a/src/customEmbeddable.tsx +++ b/src/customEmbeddable.tsx @@ -3,7 +3,7 @@ import ExcalidrawView from "./ExcalidrawView"; import { Notice, WorkspaceLeaf, WorkspaceSplit } from "obsidian"; import * as React from "react"; import { ConstructableWorkspaceSplit, getContainerForDocument, isObsidianThemeDark } from "./utils/ObsidianUtils"; -import { DEVICE, EXTENDED_EVENT_TYPES, KEYBOARD_EVENT_TYPES } from "./Constants"; +import { DEVICE, EXTENDED_EVENT_TYPES, KEYBOARD_EVENT_TYPES } from "./constants"; import { ExcalidrawImperativeAPI, UIAppState } from "@zsviczian/excalidraw/types/types"; import { ObsidianCanvasNode } from "./utils/CanvasNodeFactory"; import { processLinkText, patchMobileView } from "./utils/CustomEmbeddableUtils"; diff --git a/src/dialogs/ExportDialog.ts b/src/dialogs/ExportDialog.ts index 39cc342..bb25f67 100644 --- a/src/dialogs/ExportDialog.ts +++ b/src/dialogs/ExportDialog.ts @@ -1,7 +1,7 @@ import { ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/types"; -import { Modal, Setting, SliderComponent, TFile } from "obsidian"; +import { Modal, Setting, TFile } from "obsidian"; import { getEA } from "src"; -import { DEVICE } from "src/Constants"; +import { DEVICE } from "src/constants"; import { ExcalidrawAutomate } from "src/ExcalidrawAutomate"; import ExcalidrawView from "src/ExcalidrawView"; import ExcalidrawPlugin from "src/main"; diff --git a/src/dialogs/ImportSVGDialog.ts b/src/dialogs/ImportSVGDialog.ts index a51e2a7..41a22c8 100644 --- a/src/dialogs/ImportSVGDialog.ts +++ b/src/dialogs/ImportSVGDialog.ts @@ -1,5 +1,5 @@ import { App, FuzzySuggestModal, TFile } from "obsidian"; -import { REG_LINKINDEX_INVALIDCHARS } from "../Constants"; +import { REG_LINKINDEX_INVALIDCHARS } from "../constants"; import ExcalidrawView from "../ExcalidrawView"; import { t } from "../lang/helpers"; import ExcalidrawPlugin from "../main"; diff --git a/src/dialogs/InsertImageDialog.ts b/src/dialogs/InsertImageDialog.ts index 9ac9b73..0e8a047 100644 --- a/src/dialogs/InsertImageDialog.ts +++ b/src/dialogs/InsertImageDialog.ts @@ -1,7 +1,7 @@ import { App, FuzzySuggestModal, TFile } from "obsidian"; import { isALT, scaleToFullsizeModifier } from "src/utils/ModifierkeyHelper"; import { fileURLToPath } from "url"; -import { DEVICE, IMAGE_TYPES, REG_LINKINDEX_INVALIDCHARS } from "../Constants"; +import { DEVICE, IMAGE_TYPES, REG_LINKINDEX_INVALIDCHARS } from "../constants"; import ExcalidrawView from "../ExcalidrawView"; import { t } from "../lang/helpers"; import ExcalidrawPlugin from "../main"; diff --git a/src/dialogs/InsertLinkDialog.ts b/src/dialogs/InsertLinkDialog.ts index 1cb264a..5e9fc2c 100644 --- a/src/dialogs/InsertLinkDialog.ts +++ b/src/dialogs/InsertLinkDialog.ts @@ -1,5 +1,5 @@ import { App, FuzzySuggestModal, TFile } from "obsidian"; -import { REG_LINKINDEX_INVALIDCHARS } from "../Constants"; +import { REG_LINKINDEX_INVALIDCHARS } from "../constants"; import { t } from "../lang/helpers"; export class InsertLinkDialog extends FuzzySuggestModal { diff --git a/src/dialogs/OpenDrawing.ts b/src/dialogs/OpenDrawing.ts index ab6be3f..90073dc 100644 --- a/src/dialogs/OpenDrawing.ts +++ b/src/dialogs/OpenDrawing.ts @@ -1,6 +1,6 @@ import { App, FuzzySuggestModal, TFile } from "obsidian"; import ExcalidrawPlugin from "../main"; -import { EMPTY_MESSAGE } from "../Constants"; +import { EMPTY_MESSAGE } from "../constants"; import { t } from "../lang/helpers"; export enum openDialogAction { diff --git a/src/dialogs/PenSettingsModal.ts b/src/dialogs/PenSettingsModal.ts index b3e6083..dc21855 100644 --- a/src/dialogs/PenSettingsModal.ts +++ b/src/dialogs/PenSettingsModal.ts @@ -1,6 +1,6 @@ import { ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/types"; import { ColorComponent, Modal, Setting, SliderComponent, TextComponent, ToggleComponent } from "obsidian"; -import { COLOR_NAMES, VIEW_TYPE_EXCALIDRAW } from "src/Constants"; +import { COLOR_NAMES, VIEW_TYPE_EXCALIDRAW } from "src/constants"; import ExcalidrawView from "src/ExcalidrawView"; import ExcalidrawPlugin from "src/main"; import { setPen } from "src/menu/ObsidianMenu"; diff --git a/src/dialogs/UniversalInsertFileModal.ts b/src/dialogs/UniversalInsertFileModal.ts index ba6718e..ad1baa2 100644 --- a/src/dialogs/UniversalInsertFileModal.ts +++ b/src/dialogs/UniversalInsertFileModal.ts @@ -3,12 +3,11 @@ import ExcalidrawView from "../ExcalidrawView"; import ExcalidrawPlugin from "../main"; import { Modal, Setting, TextComponent } from "obsidian"; import { FileSuggestionModal } from "./FolderSuggester"; -import { IMAGE_TYPES, sceneCoordsToViewportCoords, viewportCoordsToSceneCoords } from "src/Constants"; +import { IMAGE_TYPES, sceneCoordsToViewportCoords, viewportCoordsToSceneCoords, MAX_IMAGE_SIZE } from "src/constants"; import { insertEmbeddableToView, insertImageToView } from "src/utils/ExcalidrawViewUtils"; import { getEA } from "src"; import { InsertPDFModal } from "./InsertPDFModal"; import { ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/types"; -import { MAX_IMAGE_SIZE } from "src/Constants"; import { ExcalidrawAutomate } from "src/ExcalidrawAutomate"; import { cleanSectionHeading } from "src/utils/ObsidianUtils"; diff --git a/src/lang/locale/en.ts b/src/lang/locale/en.ts index ac19ad4..a6beab6 100644 --- a/src/lang/locale/en.ts +++ b/src/lang/locale/en.ts @@ -3,7 +3,7 @@ import { FRONTMATTER_KEY_CUSTOM_LINK_BRACKETS, FRONTMATTER_KEY_CUSTOM_PREFIX, FRONTMATTER_KEY_CUSTOM_URL_PREFIX, -} from "src/Constants"; +} from "src/constants"; import { labelALT, labelCTRL, labelMETA, labelSHIFT } from "src/utils/ModifierkeyHelper"; // English diff --git a/src/lang/locale/zh-cn.ts b/src/lang/locale/zh-cn.ts index 799b055..f944183 100644 --- a/src/lang/locale/zh-cn.ts +++ b/src/lang/locale/zh-cn.ts @@ -3,7 +3,7 @@ import { FRONTMATTER_KEY_CUSTOM_LINK_BRACKETS, FRONTMATTER_KEY_CUSTOM_PREFIX, FRONTMATTER_KEY_CUSTOM_URL_PREFIX, -} from "src/Constants"; +} from "src/constants"; import { labelALT, labelCTRL, labelMETA, labelSHIFT } from "src/utils/ModifierkeyHelper"; // 简体中文 diff --git a/src/main.ts b/src/main.ts index d946ebb..326ac12 100644 --- a/src/main.ts +++ b/src/main.ts @@ -39,7 +39,7 @@ import { EXPORT_TYPES, EXPORT_IMG_ICON_NAME, EXPORT_IMG_ICON, -} from "./Constants"; +} from "./constants"; import ExcalidrawView, { TextMode, getTextMode } from "./ExcalidrawView"; import { changeThemeOfExcalidrawMD, diff --git a/src/menu/EmbeddableActionsMenu.tsx b/src/menu/EmbeddableActionsMenu.tsx index ab374db..6608a71 100644 --- a/src/menu/EmbeddableActionsMenu.tsx +++ b/src/menu/EmbeddableActionsMenu.tsx @@ -7,7 +7,7 @@ import { ActionButton } from "./ActionButton"; import { ICONS } from "./ActionIcons"; import { t } from "src/lang/helpers"; import { ScriptEngine } from "src/Scripts"; -import { ROOTELEMENTSIZE, mutateElement, nanoid, sceneCoordsToViewportCoords } from "src/Constants"; +import { ROOTELEMENTSIZE, mutateElement, nanoid, sceneCoordsToViewportCoords } from "src/constants"; import { REGEX_LINK, REG_LINKINDEX_HYPERLINK } from "src/ExcalidrawData"; import { processLinkText, useDefaultExcalidrawFrame } from "src/utils/CustomEmbeddableUtils"; import { cleanSectionHeading } from "src/utils/ObsidianUtils"; diff --git a/src/menu/ObsidianMenu.tsx b/src/menu/ObsidianMenu.tsx index e2a078c..dc762e4 100644 --- a/src/menu/ObsidianMenu.tsx +++ b/src/menu/ObsidianMenu.tsx @@ -2,7 +2,7 @@ import { AppState, ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/t import clsx from "clsx"; import { TFile } from "obsidian"; import * as React from "react"; -import { VIEW_TYPE_EXCALIDRAW } from "src/Constants"; +import { VIEW_TYPE_EXCALIDRAW } from "src/constants"; import { PenSettingsModal } from "src/dialogs/PenSettingsModal"; import ExcalidrawView from "src/ExcalidrawView"; import { PenStyle } from "src/PenTypes"; diff --git a/src/menu/ToolsPanel.tsx b/src/menu/ToolsPanel.tsx index 3373203..9020b8e 100644 --- a/src/menu/ToolsPanel.tsx +++ b/src/menu/ToolsPanel.tsx @@ -3,7 +3,7 @@ import { Notice, TFile } from "obsidian"; import * as React from "react"; import { ActionButton } from "./ActionButton"; import { ICONS, saveIcon, stringToSVG } from "./ActionIcons"; -import { DEVICE, SCRIPT_INSTALL_FOLDER, VIEW_TYPE_EXCALIDRAW } from "../Constants"; +import { DEVICE, SCRIPT_INSTALL_FOLDER, VIEW_TYPE_EXCALIDRAW } from "../constants"; import { insertLaTeXToView, search } from "../ExcalidrawAutomate"; import ExcalidrawView, { TextMode } from "../ExcalidrawView"; import { t } from "../lang/helpers"; diff --git a/src/settings.ts b/src/settings.ts index dc0646f..be5d5bb 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -7,7 +7,7 @@ import { TextComponent, TFile, } from "obsidian"; -import { GITHUB_RELEASES, VIEW_TYPE_EXCALIDRAW } from "./Constants"; +import { GITHUB_RELEASES, VIEW_TYPE_EXCALIDRAW } from "./constants"; import ExcalidrawView from "./ExcalidrawView"; import { t } from "./lang/helpers"; import type ExcalidrawPlugin from "./main"; diff --git a/src/svgToExcalidraw/elements/ExcalidrawScene.ts b/src/svgToExcalidraw/elements/ExcalidrawScene.ts index 68e6bbd..beee7e9 100644 --- a/src/svgToExcalidraw/elements/ExcalidrawScene.ts +++ b/src/svgToExcalidraw/elements/ExcalidrawScene.ts @@ -1,4 +1,4 @@ -import { GITHUB_RELEASES } from "src/Constants"; +import { GITHUB_RELEASES } from "src/constants"; import { ExcalidrawGenericElement } from "./ExcalidrawElement"; declare const PLUGIN_VERSION:string; diff --git a/src/svgToExcalidraw/walker.ts b/src/svgToExcalidraw/walker.ts index 18b20ec..2d8f4ba 100644 --- a/src/svgToExcalidraw/walker.ts +++ b/src/svgToExcalidraw/walker.ts @@ -25,7 +25,7 @@ import { import { getTransformMatrix, transformPoints } from "./transform"; import { pointsOnPath } from "points-on-path"; import { randomId, getWindingOrder } from "./utils"; -import { ROUNDNESS } from "../Constants"; +import { ROUNDNESS } from "../constants"; const SUPPORTED_TAGS = [ "svg", diff --git a/src/utils/CustomEmbeddableUtils.ts b/src/utils/CustomEmbeddableUtils.ts index fcff741..1024e1b 100644 --- a/src/utils/CustomEmbeddableUtils.ts +++ b/src/utils/CustomEmbeddableUtils.ts @@ -1,5 +1,5 @@ import { NonDeletedExcalidrawElement } from "@zsviczian/excalidraw/types/element/types"; -import { DEVICE, REG_LINKINDEX_INVALIDCHARS } from "src/Constants"; +import { DEVICE, REG_LINKINDEX_INVALIDCHARS } from "src/constants"; import { getParentOfClass } from "./ObsidianUtils"; import { TFile, WorkspaceLeaf } from "obsidian"; import { getLinkParts } from "./Utils"; diff --git a/src/utils/ExcalidrawViewUtils.ts b/src/utils/ExcalidrawViewUtils.ts index 9a5af99..a8aea5f 100644 --- a/src/utils/ExcalidrawViewUtils.ts +++ b/src/utils/ExcalidrawViewUtils.ts @@ -1,7 +1,6 @@ -import { MAX_IMAGE_SIZE } from "src/Constants"; +import { MAX_IMAGE_SIZE, IMAGE_TYPES } from "src/constants"; import { TFile } from "obsidian"; -import { IMAGE_TYPES } from "src/Constants"; import { ExcalidrawAutomate } from "src/ExcalidrawAutomate"; export const insertImageToView = async ( diff --git a/src/utils/FileUtils.ts b/src/utils/FileUtils.ts index 0c377cb..951e32b 100644 --- a/src/utils/FileUtils.ts +++ b/src/utils/FileUtils.ts @@ -1,6 +1,6 @@ import { DataURL } from "@zsviczian/excalidraw/types/types"; import { loadPdfJs, normalizePath, Notice, requestUrl, RequestUrlResponse, TAbstractFile, TFile, TFolder, Vault } from "obsidian"; -import { URLFETCHTIMEOUT } from "src/Constants"; +import { URLFETCHTIMEOUT } from "src/constants"; import { MimeType } from "src/EmbeddedFileLoader"; import { ExcalidrawSettings } from "src/settings"; import { errorlog, getDataURL } from "./Utils"; diff --git a/src/utils/ModifierkeyHelper.ts b/src/utils/ModifierkeyHelper.ts index 40fa328..eafc938 100644 --- a/src/utils/ModifierkeyHelper.ts +++ b/src/utils/ModifierkeyHelper.ts @@ -1,4 +1,4 @@ -import { DEVICE, isDarwin } from "src/Constants"; +import { DEVICE, isDarwin } from "src/constants"; export type ModifierKeys = {shiftKey:boolean, ctrlKey: boolean, metaKey: boolean, altKey: boolean}; export type KeyEvent = PointerEvent | MouseEvent | KeyboardEvent | React.DragEvent | React.PointerEvent | React.MouseEvent | ModifierKeys; export type PaneTarget = "active-pane"|"new-pane"|"popout-window"|"new-tab"|"md-properties"; diff --git a/src/utils/ObsidianUtils.ts b/src/utils/ObsidianUtils.ts index 2c63286..f3dbc3c 100644 --- a/src/utils/ObsidianUtils.ts +++ b/src/utils/ObsidianUtils.ts @@ -5,7 +5,7 @@ import { import ExcalidrawPlugin from "../main"; import { checkAndCreateFolder, splitFolderAndFilename } from "./FileUtils"; import { linkClickModifierType, ModifierKeys } from "./ModifierkeyHelper"; -import { REG_BLOCK_REF_CLEAN, REG_SECTION_REF_CLEAN } from "src/Constants"; +import { REG_BLOCK_REF_CLEAN, REG_SECTION_REF_CLEAN } from "src/constants"; export const getParentOfClass = (element: Element, cssClass: string):HTMLElement | null => { let parent = element.parentElement; diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts index 43b3829..9d7f6ce 100644 --- a/src/utils/Utils.ts +++ b/src/utils/Utils.ts @@ -18,13 +18,13 @@ import { FRONTMATTER_KEY_EXPORT_PADDING, exportToSvg, exportToBlob, -} from "../Constants"; + IMAGE_TYPES +} from "../constants"; import ExcalidrawPlugin from "../main"; import { ExcalidrawElement } from "@zsviczian/excalidraw/types/element/types"; import { ExportSettings } from "../ExcalidrawView"; import { compressToBase64, decompressFromBase64 } from "lz-string"; import { getDataURLFromURL, getIMGFilename, getMimeType, getURLImageExtension } from "./FileUtils"; -import { IMAGE_TYPES } from "../Constants"; import { generateEmbeddableLink } from "./CustomEmbeddableUtils"; import ExcalidrawScene from "src/svgToExcalidraw/elements/ExcalidrawScene"; import { FILENAMEPARTS } from "./UtilTypes"; diff --git a/tsconfig.prod.json b/tsconfig.dev.json similarity index 67% rename from tsconfig.prod.json rename to tsconfig.dev.json index 653fe9e..5f4876b 100644 --- a/tsconfig.prod.json +++ b/tsconfig.dev.json @@ -1,13 +1,15 @@ { "compilerOptions": { "baseUrl": ".", - "sourceMap": false, + "sourceMap": true, "module": "es2015", - "target": "es2017", + "target": "es2017", //es2017 because script engine requires for async execution "allowJs": true, "noImplicitAny": true, "moduleResolution": "node", + "esModuleInterop": true, "importHelpers": true, + "resolveJsonModule": true, "lib": [ "dom", "scripthost", diff --git a/tsconfig.json b/tsconfig.json index 244331d..3441940 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,14 +1,15 @@ { "compilerOptions": { "baseUrl": ".", - "sourceMap": true, + "sourceMap": false, "module": "es2015", - "target": "es2017", //script engine requires for async execution + "target": "es2017", //es2017 because script engine requires for async execution "allowJs": true, "noImplicitAny": true, "moduleResolution": "node", "esModuleInterop": true, "importHelpers": true, + "resolveJsonModule": true, "lib": [ "dom", "scripthost",