diff --git a/.ackrc b/.ackrc index ceba8e6..b5287f2 100644 --- a/.ackrc +++ b/.ackrc @@ -4,5 +4,5 @@ --ignore-dir=dist --ignore-dir=build --ignore-dir=.svelte-kit ---ignore-file=match:yarn.lock +--ignore-file=match:pnpm-lock.yaml --ignore-file=match:tsbuildinfo diff --git a/package.json b/package.json index 832848d..f607209 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@welshman", "private": true, - "version": "0.3.2", + "version": "0.3.3", "workspaces": [ "packages/*" ], diff --git a/packages/app/package.json b/packages/app/package.json index 2dc704d..c8a99d0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/app", - "version": "0.3.2", + "version": "0.3.3", "author": "hodlbod", "license": "MIT", "description": "A collection of svelte stores for use in building nostr client applications.", diff --git a/packages/content/package.json b/packages/content/package.json index ac9ee23..62546cb 100644 --- a/packages/content/package.json +++ b/packages/content/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/content", - "version": "0.3.2", + "version": "0.3.3", "author": "hodlbod", "license": "MIT", "description": "A collection of utilities for parsing nostr note content.", diff --git a/packages/dvm/package.json b/packages/dvm/package.json index cc82948..af8b9c4 100644 --- a/packages/dvm/package.json +++ b/packages/dvm/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/dvm", - "version": "0.3.2", + "version": "0.3.3", "author": "hodlbod", "license": "MIT", "description": "A collection of utilities for building nostr DVMs.", diff --git a/packages/editor/package.json b/packages/editor/package.json index 6465756..82ca805 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/editor", - "version": "0.3.2", + "version": "0.3.3", "author": "hodlbod", "license": "MIT", "description": "A batteries-included nostr editor.", @@ -41,7 +41,7 @@ "@tiptap/suggestion": "^2.11.5", "@welshman/lib": "workspace:*", "@welshman/util": "workspace:*", - "nostr-editor": "npm:nostr-editor-coracle-workaround@0.0.4-pre.17", + "nostr-editor-coracle-workaround": "0.0.4-pre.17", "nostr-tools": "^2.14.2", "tippy.js": "^6.3.7" }, diff --git a/packages/editor/src/extensions/Welshman.ts b/packages/editor/src/extensions/Welshman.ts index 75f4d4d..3ba6eb2 100644 --- a/packages/editor/src/extensions/Welshman.ts +++ b/packages/editor/src/extensions/Welshman.ts @@ -19,7 +19,7 @@ import type { ImageOptions, LinkOptions, NSecRejectOptions, -} from "nostr-editor" +} from "nostr-editor-coracle-workaround" import { NostrExtension, Bolt11Extension, @@ -32,7 +32,7 @@ import { TagExtension, VideoExtension, NSecRejectExtension, -} from "nostr-editor" +} from "nostr-editor-coracle-workaround" import {WordCount} from "./WordCount.js" import {CodeInline, type CodeInlineOptions} from "./CodeInline.js" import {BreakOrSubmit, type BreakOrSubmitOptions} from "./BreakOrSubmit.js" diff --git a/packages/editor/src/index.ts b/packages/editor/src/index.ts index 01cad3f..6cbec8e 100644 --- a/packages/editor/src/index.ts +++ b/packages/editor/src/index.ts @@ -2,4 +2,4 @@ export * from "./nodeviews/index.js" export * from "./extensions/index.js" export * from "./plugins/index.js" export {Editor, NodeViewProps} from "@tiptap/core" -export {UploadTask, FileAttributes} from "nostr-editor" +export {UploadTask, FileAttributes} from "nostr-editor-coracle-workaround" diff --git a/packages/editor/src/plugins/TippySuggestion.ts b/packages/editor/src/plugins/TippySuggestion.ts index 4aa57d4..9a2222c 100644 --- a/packages/editor/src/plugins/TippySuggestion.ts +++ b/packages/editor/src/plugins/TippySuggestion.ts @@ -2,7 +2,7 @@ import type {Instance} from "tippy.js" import tippy from "tippy.js" import {nprofileEncode} from "nostr-tools/nip19" import type {Editor} from "@tiptap/core" -import {makeNProfileAttrs} from "nostr-editor" +import {makeNProfileAttrs} from "nostr-editor-coracle-workaround" import {PluginKey} from "@tiptap/pm/state" import Suggestion from "@tiptap/suggestion" import {throttle, enumerate, clamp} from "@welshman/lib" diff --git a/packages/feeds/package.json b/packages/feeds/package.json index d62988a..884d423 100644 --- a/packages/feeds/package.json +++ b/packages/feeds/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/feeds", - "version": "0.3.2", + "version": "0.3.3", "author": "hodlbod", "license": "MIT", "description": "Utilities for building dynamic nostr feeds.", diff --git a/packages/lib/package.json b/packages/lib/package.json index 6862115..098bef0 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/lib", - "version": "0.3.2", + "version": "0.3.3", "author": "hodlbod", "license": "MIT", "description": "A collection of utilities.", diff --git a/packages/net/package.json b/packages/net/package.json index 33103b5..e28f7a7 100644 --- a/packages/net/package.json +++ b/packages/net/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/net", - "version": "0.3.2", + "version": "0.3.3", "author": "hodlbod", "license": "MIT", "description": "Utilities for connecting with nostr relays.", diff --git a/packages/relay/package.json b/packages/relay/package.json index 03865fe..535db98 100644 --- a/packages/relay/package.json +++ b/packages/relay/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/relay", - "version": "0.3.2", + "version": "0.3.3", "author": "hodlbod", "license": "MIT", "description": "An in-memory nostr relay implementation.", diff --git a/packages/router/package.json b/packages/router/package.json index 73e8e0e..162e0b8 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/router", - "version": "0.3.2", + "version": "0.3.3", "author": "hodlbod", "license": "MIT", "description": "A collection of utilities for nostr relay selection.", diff --git a/packages/signer/package.json b/packages/signer/package.json index 305ad97..5853992 100644 --- a/packages/signer/package.json +++ b/packages/signer/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/signer", - "version": "0.3.2", + "version": "0.3.3", "author": "hodlbod", "license": "MIT", "description": "A nostr signer implemenation supporting several login methods.", diff --git a/packages/store/package.json b/packages/store/package.json index 25ae4ce..f0cb734 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/store", - "version": "0.3.2", + "version": "0.3.3", "author": "hodlbod", "license": "MIT", "description": "A collection of utilities based on svelte/store for use with welshman", diff --git a/packages/util/package.json b/packages/util/package.json index 4785d72..c3e4b67 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/util", - "version": "0.3.2", + "version": "0.3.3", "author": "hodlbod", "license": "MIT", "description": "A collection of nostr-related utilities.", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3174677..1780901 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -203,9 +203,9 @@ importers: '@welshman/util': specifier: workspace:* version: link:../util - nostr-editor: - specifier: npm:nostr-editor-coracle-workaround@0.0.4-pre.17 - version: nostr-editor-coracle-workaround@0.0.4-pre.17(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/extension-image@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)))(@tiptap/extension-link@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(linkifyjs@4.2.0)(nostr-tools@2.14.2(typescript@5.8.2))(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.0)(prosemirror-state@1.4.3)(tiptap-markdown@0.8.10(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))) + nostr-editor-coracle-workaround: + specifier: 0.0.4-pre.17 + version: 0.0.4-pre.17(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/extension-image@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)))(@tiptap/extension-link@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(linkifyjs@4.2.0)(nostr-tools@2.14.2(typescript@5.8.2))(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.0)(prosemirror-state@1.4.3)(tiptap-markdown@0.8.10(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))) nostr-tools: specifier: ^2.14.2 version: 2.14.2(typescript@5.8.2)