Skip to content

Commit

Permalink
Merge branch 'release/v5.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
manuth committed Sep 26, 2022
2 parents a134f52 + d1191f1 commit 6388d1b
Show file tree
Hide file tree
Showing 168 changed files with 1,797 additions and 1,572 deletions.
6 changes: 3 additions & 3 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ steps:
depends_on:
- check release prerequisites
commands:
- npx vsce package
- npm run package
when:
event:
- tag
Expand All @@ -106,7 +106,7 @@ steps:
OVSX_TOKEN:
from_secret: ovsx_token
commands:
- npx ovsx publish --pat $OVSX_TOKEN
- npm run ovsx -- publish --pat $OVSX_TOKEN
when:
event:
- tag
Expand All @@ -120,7 +120,7 @@ steps:
VSCE_TOKEN:
from_secret: vsce_token
commands:
- npx vsce publish --pat $VSCE_TOKEN
- npm run vsce -- publish --pat $VSCE_TOKEN
when:
event:
- tag
Expand Down
3 changes: 2 additions & 1 deletion .eslintrc.js → .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { join } = require("path");
const { join } = require("node:path");
const { PluginName, PresetName } = require("@manuth/eslint-plugin-typescript");

module.exports = {
Expand All @@ -11,6 +11,7 @@ module.exports = {
},
parserOptions: {
project: [
join(__dirname, "scripts.tsconfig.json"),
join(__dirname, "tsconfig.app.json"),
join(__dirname, "tsconfig.eslint.json"),
join(__dirname, "tsconfig.web.json"),
Expand Down
13 changes: 8 additions & 5 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ build/Release
node_modules/
jspm_packages/

# Required dependencies
!node_modules/highlight.js/styles

# TypeScript v1 declaration files
typings/

Expand Down Expand Up @@ -121,13 +124,13 @@ tsconfig.*.json
[Ll]ib/**/*.map

# Unit-Tests and debug-files
[Ll]ib/!(index.js)
test/
[Ll]ib/temp/
[Ll]ib/test/
[Ll]ib/tests/

# Unused node-modules
node_modules/!(highlight.js)
node_modules/highlight.js/!(styles)
# Script files
scripts/

# Visual Studio Code-Environment
.vscode/
Expand All @@ -148,7 +151,7 @@ node_modules/highlight.js/!(styles)
.drone.yml

# Webpack configuration
webpack.config.ts
webpack.config.cts

# Temporary release-assets
.tagName.txt
Expand Down
13 changes: 8 additions & 5 deletions .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ build/Release
node_modules/
jspm_packages/

# Required dependencies
!node_modules/highlight.js/styles

# TypeScript v1 declaration files
typings/

Expand Down Expand Up @@ -121,13 +124,13 @@ tsconfig.*.json
[Ll]ib/**/*.map

# Unit-Tests and debug-files
[Ll]ib/!(index.js)
test/
[Ll]ib/temp/
[Ll]ib/test/
[Ll]ib/tests/

# Unused node-modules
node_modules/!(highlight.js)
node_modules/highlight.js/!(styles)
# Script files
scripts/

# Visual Studio Code-Environment
.vscode/
Expand All @@ -148,7 +151,7 @@ node_modules/highlight.js/!(styles)
.drone.yml

# Webpack configuration
webpack.config.ts
webpack.config.cts

# Temporary release-assets
.tagName.txt
Expand Down
17 changes: 16 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## MarkdownConverter [Unreleased]

[Show differences](https://github.com/manuth/MarkdownConverter/compare/v5.1.3...dev)
[Show differences](https://github.com/manuth/MarkdownConverter/compare/v5.2.0...dev)

## MarkdownConverter v5.2.0
### Fixed
- Broken extension build
- Incorrect code snippets in `README.md` (as indicated in [#174](https://github.com/manuth/MarkdownConverter/issues/174))
Thanks [@karmeye](https://github.com/karmeye)
- `ConversionRunner`s behavior which caused Chromium instances to sometimes not close properly (as indicated in [#188](https://github.com/manuth/MarkdownConverter/issues/188))
Thanks [@nixtar](https://github.com/)

### Updated
- Unit tests in order to improve stability
- The extension's source code to the `ESModule` format
- All dependencies

[Show differences](https://github.com/manuth/MarkdownConverter/compare/v5.1.3...v5.2.0)

## MarkdownConverter v5.1.3
### Updated
Expand Down
9 changes: 5 additions & 4 deletions MarkdownConverter.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
},
{
"name": "Common Tests",
"path": "./src/tests/common"
"path": "./test/common"
},
{
"name": "Single-File Tests",
"path": "./src/tests/single-file"
"path": "./test/single-file"
},
{
"name": "Single-Folder Tests",
"path": "./src/tests/single-folder"
"path": "./test/single-folder"
},
{
"name": "Workspace Tests",
"path": "./src/tests/workspace"
"path": "./test/workspace"
}
],
"extensions": {
Expand Down Expand Up @@ -200,6 +200,7 @@
"mochaExplorer.autoload": false,
"mochaExplorer.files": "./lib/test/essentials.test.js",
"mochaExplorer.ui": "tdd",
"mochaExplorer.timeout": 0,
"mochaExplorer.launcherScript": "./lib/test/runMocha.js",
"mochaExplorer.require": "source-map-support/register",
"mochaExplorer.ipcRole": "server",
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ This document has been created by {{ Author }} at {{ FormatDate ChangeDate "HH:m
Optionally, the `FormatDate` can be omitted:
```md
---
Date: 01-08-1291
Date: 1291-08-01
---
Date taken from an attribute: {{ Date "dddd" }}

Expand All @@ -117,7 +117,7 @@ You can override the default date-format for an individual document by adding a
***Example:***
```md
---
DateFormat: dd mmmm yyyy
DateFormat: dd. MMMM yyyy
---
The current date is {{ CurrentDate }}
```
Expand Down Expand Up @@ -165,7 +165,9 @@ The content of the individual header- and footer-sections can be overridden for
---
Header:
Left: My Individual Company
Center: John Doe
Right: John Doe
Footer:
Center: {{ CurrentDate }}
---
# Test
This is a test.
Expand Down Expand Up @@ -278,7 +280,7 @@ The `markdownConverter.Assets.PictureInsertion`-option allows you to set whether
```json
{
"markdownConverter.Assets.PictureInsertion": {
"Link": "Include",
"Link": "Link",
"AbsolutePath": "Include",
"RelativePath": "Include"
}
Expand Down
Loading

0 comments on commit 6388d1b

Please sign in to comment.