Skip to content

Commit 242628f

Browse files
committed
Update manifest for release.
1 parent e0a3bca commit 242628f

File tree

5 files changed

+65
-6
lines changed

5 files changed

+65
-6
lines changed

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,31 @@
77
* @markdown-confluence/lib bumped from 3.0.4 to 3.0.0
88
* @markdown-confluence/mermaid-electron-renderer bumped from 3.0.4 to 3.0.0
99

10+
## [5.1.0](https://github.com/markdown-confluence/markdown-confluence/compare/obsidian-confluence-v5.0.1...obsidian-confluence-v5.1.0) (2023-05-09)
11+
12+
13+
### Features
14+
15+
* ADF To Markdown ([7257893](https://github.com/markdown-confluence/markdown-confluence/commit/725789372481baef6ba20aaf37a82dc5ca126b2e))
16+
17+
18+
### Bug Fixes
19+
20+
* Move SettingsLoaders to own files to help with TreeShaking ([f241a11](https://github.com/markdown-confluence/markdown-confluence/commit/f241a11a3967d8a06e827ec100dca15533d38902))
21+
22+
23+
### Documentation
24+
25+
* Update Obsidian docs to remove need for BRAT install ([9fc8fc8](https://github.com/markdown-confluence/markdown-confluence/commit/9fc8fc8236c369b53c3d5bdcc63777525f30a0c9))
26+
27+
28+
### Dependencies
29+
30+
* The following workspace dependencies were updated
31+
* dependencies
32+
* @markdown-confluence/lib bumped from 5.0.1 to 5.1.0
33+
* @markdown-confluence/mermaid-electron-renderer bumped from 5.0.1 to 5.1.0
34+
1035
## [5.0.1](https://github.com/markdown-confluence/markdown-confluence/compare/obsidian-confluence-v5.0.0...obsidian-confluence-v5.0.1) (2023-05-03)
1136

1237

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Copyright (c) 2022 Atlassian US, Inc.
1919
Please log issues to https://github.com/markdown-confluence/markdown-confluence/issues as this is where the code is being developed.
2020

2121
## Getting Started
22+
2223
1. Install the `confluence-integration` plugin from Obsidian's community plugins browser.
2324
2. Open the plugin settings and configure the following fields:
2425

manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "confluence-integration",
33
"name": "Confluence Integration",
4-
"version": "5.0.1",
4+
"version": "5.1.0",
55
"minAppVersion": "1.0.0",
66
"description": "This plugin allows you to publish your notes to Confluence",
77
"author": "andymac4182",

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "obsidian-confluence",
3-
"version": "5.0.1",
3+
"version": "5.1.0",
44
"description": "This library allows you to publish your notes to Confluence",
55
"main": "main.js",
66
"type": "module",
@@ -24,8 +24,8 @@
2424
"mime-types": "^2.1.35",
2525
"react": "^16.14.0",
2626
"react-dom": "^16.14.0",
27-
"@markdown-confluence/lib": "5.0.1",
28-
"@markdown-confluence/mermaid-electron-renderer": "5.0.1"
27+
"@markdown-confluence/lib": "5.1.0",
28+
"@markdown-confluence/mermaid-electron-renderer": "5.1.0"
2929
},
3030
"resolutions": {
3131
"prosemirror-model": "1.14.3"

src/main.ts

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import {
33
ConfluenceUploadSettings,
44
Publisher,
55
ConfluencePageConfig,
6+
StaticSettingsLoader,
7+
renderADFDoc,
68
} from "@markdown-confluence/lib";
79
import { ElectronMermaidRenderer } from "@markdown-confluence/mermaid-electron-renderer";
810
import { ConfluenceSettingTab } from "./ConfluenceSettingTab";
@@ -67,8 +69,7 @@ export default class ConfluencePlugin extends Plugin {
6769
},
6870
});
6971

70-
const settingsLoader =
71-
new ConfluenceUploadSettings.StaticSettingsLoader(this.settings);
72+
const settingsLoader = new StaticSettingsLoader(this.settings);
7273
this.publisher = new Publisher(
7374
this.adaptor,
7475
settingsLoader,
@@ -175,6 +176,38 @@ export default class ConfluencePlugin extends Plugin {
175176
}
176177
});
177178

179+
this.addCommand({
180+
id: "adf-to-markdown",
181+
name: "ADF To Markdown",
182+
callback: async () => {
183+
console.log("HMMMM");
184+
const json = JSON.parse(
185+
'{"type":"doc","content":[{"type":"paragraph","content":[{"text":"Testing","type":"text"}]}],"version":1}'
186+
);
187+
console.log({ json });
188+
189+
const confluenceClient = new ObsidianConfluenceClient({
190+
host: this.settings.confluenceBaseUrl,
191+
authentication: {
192+
basic: {
193+
email: this.settings.atlassianUserName,
194+
apiToken: this.settings.atlassianApiToken,
195+
},
196+
},
197+
});
198+
const testingPage =
199+
await confluenceClient.content.getContentById({
200+
id: "9732097",
201+
expand: ["body.atlas_doc_format", "space"],
202+
});
203+
const adf = JSON.parse(
204+
testingPage.body?.atlas_doc_format?.value ||
205+
'{type: "doc", content:[]}'
206+
);
207+
renderADFDoc(adf);
208+
},
209+
});
210+
178211
this.addCommand({
179212
id: "publish-current",
180213
name: "Publish Current File to Confluence",

0 commit comments

Comments
 (0)