Skip to content

Commit d629e64

Browse files
andymac4182andymac4182
committed
Update manifest for release.
1 parent ef37365 commit d629e64

File tree

10 files changed

+235
-285
lines changed

10 files changed

+235
-285
lines changed

‎CHANGELOG.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,38 @@
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.0.0](https://github.com/markdown-confluence/markdown-confluence/compare/obsidian-confluence-v4.9.0...obsidian-confluence-v5.0.0) (2023-05-03)
11+
12+
13+
### ⚠ BREAKING CHANGES
14+
15+
* Remove ADFView. It adds a lot of complexity and size to Obsidian Plugin. If you need it log an issue and I will create a separate plugin for that feature.
16+
17+
### Features
18+
19+
* Apply themes from Obsidian to Mermaid ([b599336](https://github.com/markdown-confluence/markdown-confluence/commit/b5993369e03cdcc0bdbdd6c83f0b6a18dd8effaa))
20+
* Enable and fix all strict type checks ([c16ee2d](https://github.com/markdown-confluence/markdown-confluence/commit/c16ee2d83b6e30065f8c607afda652c4c21af6b3))
21+
* Remove ADFView. It adds a lot of complexity and size to Obsidian Plugin ([74c8436](https://github.com/markdown-confluence/markdown-confluence/commit/74c84360bf0fe2afeafd4d769f11b41a5f9d6e03))
22+
23+
24+
### Bug Fixes
25+
26+
* frontmatterHeader adds content direct to ADF instead of Markdown now ([1230878](https://github.com/markdown-confluence/markdown-confluence/commit/12308783ae23fbb2fbcd9f39871bf4429c47e18b))
27+
* Remove ADFView from main.ts ([a21abbd](https://github.com/markdown-confluence/markdown-confluence/commit/a21abbd28c8a63cc09989b0cf9ad7d43fc5e56ae))
28+
29+
30+
### Documentation
31+
32+
* amended the broken readme image paths for obsidian package ([97876cf](https://github.com/markdown-confluence/markdown-confluence/commit/97876cf7c55e3ac4de89d85a70dfd4ba4e8b3f15))
33+
34+
35+
### Dependencies
36+
37+
* The following workspace dependencies were updated
38+
* dependencies
39+
* @markdown-confluence/lib bumped from 4.9.0 to 5.0.0
40+
* @markdown-confluence/mermaid-electron-renderer bumped from 4.9.0 to 5.0.0
41+
1042
## [4.9.0](https://github.com/markdown-confluence/markdown-confluence/compare/obsidian-confluence-v4.8.0...obsidian-confluence-v4.9.0) (2023-04-30)
1143

1244

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ Copyright (c) 2022 Atlassian US, Inc.
3232
- `Atlassian API Token`: Your Atlassian API token. You can generate one from your [Atlassian Account Settings](https://id.atlassian.com/manage-profile/security/api-tokens).
3333
- `Folder To Publish`: The name of the folder in Obsidian containing the notes you want to publish (default: "Confluence Pages")
3434

35-
![Settings](./docs/screenshots/settings.png)
35+
![Settings](../../docs/screenshots/settings.png)
3636

3737
## Usage
3838

3939
### Ribbon Icon
4040

4141
Click the cloud icon in the ribbon to publish the notes from the configured folder to Confluence.
4242

43-
![Ribbon icon](./docs/screenshots/ribbon.png)
43+
![Ribbon icon](../../docs/screenshots/ribbon.png)
4444

4545

4646
### Commands
4747

4848
Use the command palette (`Ctrl/Cmd + P`) to execute the "Publish All to Confluence" command, which publishes all the notes from the configured folder to Confluence.
4949

50-
![Commands](./docs/screenshots/commands.png)
50+
![Commands](../../docs/screenshots/commands.png)
5151

5252
### connie-publish Frontmatter
5353

‎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": "4.9.0",
4+
"version": "5.0.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 & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "obsidian-confluence",
3-
"version": "4.9.0",
3+
"version": "5.0.0",
44
"description": "This library allows you to publish your notes to Confluence",
55
"main": "main.js",
66
"type": "module",
@@ -16,24 +16,16 @@
1616
"license": "Apache 2.0",
1717
"devDependencies": {
1818
"@types/mime-types": "^2.1.1",
19-
"@types/prosemirror-model": "1.16.2",
2019
"@types/react-dom": "^18.0.11",
21-
"@types/prosemirror-state": "^1.3.0",
22-
"@types/prosemirror-transform": "^1.4.2",
23-
"@types/prosemirror-view": "^1.23.1",
2420
"obsidian": "1.1.1"
2521
},
2622
"dependencies": {
27-
"@atlaskit/adf-utils": "^18.1.1",
28-
"@atlaskit/editor-json-transformer": "^8.8.4",
29-
"@atlaskit/renderer": "^107.3.3",
3023
"confluence.js": "^1.6.3",
3124
"mime-types": "^2.1.35",
3225
"react": "^16.14.0",
3326
"react-dom": "^16.14.0",
34-
"react-intl-next": "npm:react-intl@^5.18.1",
35-
"@markdown-confluence/lib": "4.9.0",
36-
"@markdown-confluence/mermaid-electron-renderer": "4.9.0"
27+
"@markdown-confluence/lib": "5.0.0",
28+
"@markdown-confluence/mermaid-electron-renderer": "5.0.0"
3729
},
3830
"resolutions": {
3931
"prosemirror-model": "1.14.3"

‎src/AdfView.ts‎

Lines changed: 0 additions & 124 deletions
This file was deleted.

‎src/CompletedModal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ export class CompletedModal extends Modal {
144144
this.uploadResults = uploadResults;
145145
}
146146

147-
onOpen() {
147+
override onOpen() {
148148
const { contentEl } = this;
149149
ReactDOM.render(
150150
React.createElement(CompletedView, this.uploadResults),
151151
contentEl
152152
);
153153
}
154154

155-
onClose() {
155+
override onClose() {
156156
const { contentEl } = this;
157157
ReactDOM.unmountComponentAtNode(contentEl);
158158
contentEl.empty();

‎src/ConfluencePerPageForm.tsx‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import { Property } from "csstype";
66

77
export type ConfluencePerPageUIValues = {
88
[K in keyof ConfluencePageConfig.ConfluencePerPageConfig]: {
9-
value?: ConfluencePageConfig.ConfluencePerPageConfig[K]["default"];
9+
value:
10+
| ConfluencePageConfig.ConfluencePerPageConfig[K]["default"]
11+
| undefined;
1012
isSet: boolean;
1113
};
1214
};
@@ -155,10 +157,10 @@ const renderTextInput = (
155157
</td>
156158
</tr>
157159
<tr key={`${key}-errors`}>
158-
{errors[key]?.length > 0 && (
160+
{(errors[key]?.length ?? 0) > 0 && (
159161
<td colSpan={3}>
160162
<div className="error" style={styles.errorTd}>
161-
{errors[key].map((error) => (
163+
{(errors[key] ?? []).map((error) => (
162164
<p key={error.message}>{error.message}</p>
163165
))}
164166
</div>
@@ -251,10 +253,10 @@ const renderArrayText = (
251253
</td>
252254
</tr>
253255
<tr key={`${key}-errors`}>
254-
{errors[key]?.length > 0 && (
256+
{(errors[key]?.length ?? 0) > 0 && (
255257
<td colSpan={3}>
256258
<div className="error" style={styles.errorTd}>
257-
{errors[key].map((error) => (
259+
{(errors[key] ?? []).map((error) => (
258260
<p key={error.message}>{error.message}</p>
259261
))}
260262
</div>
@@ -319,10 +321,10 @@ const renderBoolean = (
319321
</td>
320322
</tr>
321323
<tr key={`${key}-errors`}>
322-
{errors[key]?.length > 0 && (
324+
{(errors[key]?.length ?? 0) > 0 && (
323325
<td colSpan={3}>
324326
<div className="error" style={styles.errorTd}>
325-
{errors[key].map((error) => (
327+
{(errors[key] ?? []).map((error) => (
326328
<p key={error.message}>{error.message}</p>
327329
))}
328330
</div>
@@ -395,10 +397,10 @@ const renderOptions = (
395397
</td>
396398
</tr>
397399
<tr key={`${key}-errors`}>
398-
{errors[key]?.length > 0 && (
400+
{(errors[key]?.length ?? 0) > 0 && (
399401
<td colSpan={3}>
400402
<div className="error" style={styles.errorTd}>
401-
{errors[key].map((error) => (
403+
{(errors[key] ?? []).map((error) => (
402404
<p key={error.message}>{error.message}</p>
403405
))}
404406
</div>
@@ -503,7 +505,7 @@ export class ConfluencePerPageForm extends Modal {
503505
this.modalProps = modalProps;
504506
}
505507

506-
onOpen() {
508+
override onOpen() {
507509
const { contentEl } = this;
508510
const test: FormProps = {
509511
...this.modalProps,
@@ -515,7 +517,7 @@ export class ConfluencePerPageForm extends Modal {
515517
ReactDOM.render(React.createElement(ConfluenceForm, test), contentEl);
516518
}
517519

518-
onClose() {
520+
override onClose() {
519521
const { contentEl } = this;
520522
ReactDOM.unmountComponentAtNode(contentEl);
521523
contentEl.empty();

‎src/ConfluenceSettingTab.ts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,29 @@ export class ConfluenceSettingTab extends PluginSettingTab {
9696
await this.plugin.saveSettings();
9797
})
9898
);
99+
100+
new Setting(containerEl)
101+
.setName("Mermaid Diagram Theme")
102+
.setDesc("Pick the theme to apply to mermaid diagrams")
103+
.addDropdown((dropdown) => {
104+
/* eslint-disable @typescript-eslint/naming-convention */
105+
dropdown
106+
.addOptions({
107+
"match-obsidian": "Match Obsidian",
108+
"light-obsidian": "Obsidian Theme - Light",
109+
"dark-obsidian": "Obsidian Theme - Dark",
110+
default: "Mermaid - Default",
111+
neutral: "Mermaid - Neutral",
112+
dark: "Mermaid - Dark",
113+
forest: "Mermaid - Forest",
114+
})
115+
.setValue(this.plugin.settings.mermaidTheme)
116+
.onChange(async (value) => {
117+
// @ts-expect-error
118+
this.plugin.settings.mermaidTheme = value;
119+
await this.plugin.saveSettings();
120+
});
121+
/* eslint-enable @typescript-eslint/naming-convention */
122+
});
99123
}
100124
}

0 commit comments

Comments
 (0)