From c0e9a0553e61baa8c502b2bacc7d522dc6a16629 Mon Sep 17 00:00:00 2001 From: zsviczian Date: Thu, 29 Aug 2024 20:24:59 +0200 Subject: [PATCH] minor build changes --- README-BUILD.md | 28 ---------------------------- package.json | 4 ++-- rollup.config.js | 5 +---- src/EmbeddedFileLoader.ts | 2 ++ src/ExcalidrawAutomate.ts | 30 +++++++++++++++--------------- src/types/types.d.ts | 1 + src/utils/DynamicStyling.ts | 2 +- src/utils/FileUtils.ts | 2 -- 8 files changed, 22 insertions(+), 52 deletions(-) diff --git a/README-BUILD.md b/README-BUILD.md index c8b26db..42e1961 100644 --- a/README-BUILD.md +++ b/README-BUILD.md @@ -2,31 +2,3 @@ The project runs with `node 18`. After running `npm -i` you'll need to make two manual changes: -## postprocess -postprocess is used in rollup.config.js. -However, the version available on npmjs does not work, after installing packages you need this update: -`npm install brettz9/rollup-plugin-postprocess#update --save-dev`` - -More info here: https://github.com/developit/rollup-plugin-postprocess/issues/10 - -## colormaster -1.2.1 misses 3 plugin references after installing the package you need to update -`node_modules/colormaster/package.json` adding the following to the `exports:` section: -```typescript -, - "./plugins/luv": { - "import": "./plugins/luv.mjs", - "require": "./plugins/luv.js", - "default": "./plugins/luv.mjs" - }, - "./plugins/uvw": { - "import": "./plugins/uvw.mjs", - "require": "./plugins/uvw.js", - "default": "./plugins/uvw.mjs" - }, - "./plugins/ryb": { - "import": "./plugins/ryb.mjs", - "require": "./plugins/ryb.js", - "default": "./plugins/ryb.mjs" - } -``` diff --git a/package.json b/package.json index 3fb4753..25ba096 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@zsviczian/excalidraw": "0.17.1-obsidian-43", "chroma-js": "^2.4.2", "clsx": "^2.0.0", - "colormaster": "^1.2.1", + "@zsviczian/colormaster": "^1.2.2", "gl-matrix": "^3.4.3", "js-yaml": "^4.1.0", "lucide-react": "^0.263.1", @@ -70,7 +70,7 @@ "prettier": "^3.0.1", "rollup": "^2.70.1", "rollup-plugin-copy": "^3.5.0", - "rollup-plugin-postprocess": "github:brettz9/rollup-plugin-postprocess#update", + "@zsviczian/rollup-plugin-postprocess": "^1.0.3", "rollup-plugin-terser": "^7.0.2", "rollup-plugin-typescript2": "^0.34.1", "tslib": "^2.6.1", diff --git a/rollup.config.js b/rollup.config.js index 7c089c9..9869587 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -6,7 +6,7 @@ import copy from "rollup-plugin-copy"; import typescript2 from "rollup-plugin-typescript2"; import fs from 'fs'; import LZString from 'lz-string'; -import postprocess from 'rollup-plugin-postprocess'; +import postprocess from '@zsviczian/rollup-plugin-postprocess'; import cssnano from 'cssnano'; // Load environment variables @@ -107,9 +107,6 @@ const BUILD_CONFIG = { comments: false, // Remove all comments }, }), - //!postprocess - the version available on npmjs does not work, need this update: - // npm install brettz9/rollup-plugin-postprocess#update --save-dev - // https://github.com/developit/rollup-plugin-postprocess/issues/10 postprocess([ [/React=require\("react"\),state=require\("@codemirror\/state"\),view=require\("@codemirror\/view"\)/, `state=require("@codemirror/state"),view=require("@codemirror/view")` + packageString], diff --git a/src/EmbeddedFileLoader.ts b/src/EmbeddedFileLoader.ts index 64da5a0..376438b 100644 --- a/src/EmbeddedFileLoader.ts +++ b/src/EmbeddedFileLoader.ts @@ -473,6 +473,8 @@ export class EmbeddedFilesLoader { return null; } + const app = this.plugin.app; + const isHyperLink = inFile instanceof EmbeddedFile ? inFile.isHyperLink : false; const isLocalLink = inFile instanceof EmbeddedFile ? inFile.isLocalLink : false; const hyperlink = inFile instanceof EmbeddedFile ? inFile.hyperlink : ""; diff --git a/src/ExcalidrawAutomate.ts b/src/ExcalidrawAutomate.ts index d1a4eb2..a05434a 100644 --- a/src/ExcalidrawAutomate.ts +++ b/src/ExcalidrawAutomate.ts @@ -63,21 +63,21 @@ import { GenericInputPrompt, NewFileActions } from "src/dialogs/Prompt"; import { t } from "src/lang/helpers"; import { ScriptEngine } from "src/Scripts"; import { ConnectionPoint, DeviceType } from "src/types/types"; -import CM, { ColorMaster, extendPlugins } from "colormaster"; -import HarmonyPlugin from "colormaster/plugins/harmony"; -import MixPlugin from "colormaster/plugins/mix" -import A11yPlugin from "colormaster/plugins/accessibility" -import NamePlugin from "colormaster/plugins/name" -import LCHPlugin from "colormaster/plugins/lch"; -import LUVPlugin from "colormaster/plugins/luv"; -import LABPlugin from "colormaster/plugins/lab"; -import UVWPlugin from "colormaster/plugins/uvw"; -import XYZPlugin from "colormaster/plugins/xyz"; -import HWBPlugin from "colormaster/plugins/hwb"; -import HSVPlugin from "colormaster/plugins/hsv"; -import RYBPlugin from "colormaster/plugins/ryb"; -import CMYKPlugin from "colormaster/plugins/cmyk"; -import { TInput } from "colormaster/types"; +import CM, { ColorMaster, extendPlugins } from "@zsviczian/colormaster"; +import HarmonyPlugin from "@zsviczian/colormaster/plugins/harmony"; +import MixPlugin from "@zsviczian/colormaster/plugins/mix" +import A11yPlugin from "@zsviczian/colormaster/plugins/accessibility" +import NamePlugin from "@zsviczian/colormaster/plugins/name" +import LCHPlugin from "@zsviczian/colormaster/plugins/lch"; +import LUVPlugin from "@zsviczian/colormaster/plugins/luv"; +import LABPlugin from "@zsviczian/colormaster/plugins/lab"; +import UVWPlugin from "@zsviczian/colormaster/plugins/uvw"; +import XYZPlugin from "@zsviczian/colormaster/plugins/xyz"; +import HWBPlugin from "@zsviczian/colormaster/plugins/hwb"; +import HSVPlugin from "@zsviczian/colormaster/plugins/hsv"; +import RYBPlugin from "@zsviczian/colormaster/plugins/ryb"; +import CMYKPlugin from "@zsviczian/colormaster/plugins/cmyk"; +import { TInput } from "@zsviczian/colormaster/types"; import {ConversionResult, svgToExcalidraw} from "src/svgToExcalidraw/parser" import { ROUNDNESS } from "src/constants/constants"; import { ClipboardData } from "@zsviczian/excalidraw/types/excalidraw/clipboard"; diff --git a/src/types/types.d.ts b/src/types/types.d.ts index 45bf829..c41cabb 100644 --- a/src/types/types.d.ts +++ b/src/types/types.d.ts @@ -28,6 +28,7 @@ export type DeviceType = { declare global { interface Window { ExcalidrawAutomate: ExcalidrawAutomate; + pdfjsLib: any; } } diff --git a/src/utils/DynamicStyling.ts b/src/utils/DynamicStyling.ts index 9a93cfa..dbca669 100644 --- a/src/utils/DynamicStyling.ts +++ b/src/utils/DynamicStyling.ts @@ -1,5 +1,5 @@ import { ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/excalidraw/types"; -import { ColorMaster } from "colormaster"; +import { ColorMaster } from "@zsviczian/colormaster"; import { ExcalidrawAutomate } from "src/ExcalidrawAutomate"; import ExcalidrawView from "src/ExcalidrawView"; import { DynamicStyle } from "src/types/types"; diff --git a/src/utils/FileUtils.ts b/src/utils/FileUtils.ts index 319b7f1..055f582 100644 --- a/src/utils/FileUtils.ts +++ b/src/utils/FileUtils.ts @@ -291,9 +291,7 @@ export const blobToBase64 = async (blob: Blob): Promise => { } export const getPDFDoc = async (f: TFile): Promise => { - //@ts-ignore if(typeof window.pdfjsLib === "undefined") await loadPdfJs(); - //@ts-ignore return await window.pdfjsLib.getDocument(app.vault.getResourcePath(f)).promise; }