Skip to content

Commit

Permalink
v2022.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
monosans committed May 18, 2022
1 parent 8907336 commit ee65bfe
Show file tree
Hide file tree
Showing 5 changed files with 160 additions and 194 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog

We follow [Semantic Versions](https://semver.org/).
## [2022.5.0] - 2022-05-18

- Huge refactoring.
- Remove the djLint installer because it was causing problems. It was decided that it is better to let users install it themselves.
- Fix venv detection.
- Switch to `webpack` for module bundling.

## [1.1.0] - 2022-05-04

Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ Visual Studio Code extension for formatting and linting Django/Jinja/Nunjucks/Tw

## Installation

Search for `djLint` in VS Code extensions.

[Visual Studio Code Marketplace page](https://marketplace.visualstudio.com/items?itemName=monosans.djlint)
- [Install djLint itself](https://djlint.com/docs/getting-started/).
- [Install djLint VS Code extension](https://marketplace.visualstudio.com/items?itemName=monosans.djlint).

## Usage

`djlint-vscode` automatically sets djLint's `profile` setting in accordance with language ID.
If you have the [Python extension](https://marketplace.visualstudio.com/items?itemName=ms-python.python) installed, `djlint-vscode` will use the `djLint` installed in the currently activated Python environment, unless you have the `djlint.useVenv` extension setting disabled.

`djlint-vscode` automatically sets djLint's `profile` setting in accordance with language ID:

| djLint profile | Language ID |
| -------------- | ----------------------------------------------------------------------------------------------- |
Expand All @@ -20,7 +21,7 @@ Search for `djLint` in VS Code extensions.
| jinja | jinja, [jinja-html](https://marketplace.visualstudio.com/items?itemName=samuelcolvin.jinjahtml) |
| nunjucks | nj, njk, nunjucks, twig |

Some djLint options, such as `indent` and `ignore`, can be configured directly in the VSCode settings. Other djLint options can be set through the configuration file, as indicated in the [corresponding documentation](https://djlint.com/docs/configuration/). Please do not change the `linter_output_format` setting, otherwise linter will work incorrectly.
Some djLint options, such as `indent` and `ignore`, can be configured directly in the VS Code settings. Other djLint options can be set through the configuration file, as indicated in the [corresponding documentation](https://djlint.com/docs/configuration/). Please do not change the `linter_output_format` setting, otherwise linter will work incorrectly.

Add this to your `settings.json` to format all supported file types with `djLint`:

Expand Down Expand Up @@ -62,7 +63,7 @@ Add this to your `settings.json` to format all supported file types with `djLint

## Known issues

Non-ASCII characters turn into `?`. [Solution](https://github.com/Riverside-Healthcare/djLint/issues/243#issuecomment-1124603803).
Non-ASCII characters turn into `?` on Windows. Solution - update `djLint` to version 1.1.1 or higher.

## Disclaimer

Expand Down
40 changes: 20 additions & 20 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 13 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "djlint",
"displayName": "djLint",
"description": "Django/Jinja/Nunjucks/Twig/Handlebars/Mustache HTML template formatter and linter",
"version": "1.1.0",
"version": "2022.5.0",
"publisher": "monosans",
"license": "MIT",
"homepage": "https://github.com/monosans/djlint-vscode",
Expand Down Expand Up @@ -36,12 +36,6 @@
],
"main": "./dist/extension.js",
"contributes": {
"commands": [
{
"command": "djlint.reinstall",
"title": "Reinstall djLint"
}
],
"configuration": {
"properties": {
"djlint.enableLinting": {
Expand Down Expand Up @@ -87,17 +81,17 @@
"vsce-package": "vsce package -o djlint.vsix"
},
"devDependencies": {
"@types/node": "14.x",
"@types/vscode": "~1.66.0",
"@typescript-eslint/eslint-plugin": "^5.25.0",
"@typescript-eslint/parser": "^5.25.0",
"eslint": "^8.15.0",
"eslint-config-prettier": "^8.5.0",
"prettier": "^2.6.2",
"ts-loader": "^9.3.0",
"typescript": "^4.6.4",
"vsce": "^2.7.0",
"webpack": "^5.72.1",
"webpack-cli": "^4.9.2"
"@types/node": "~14",
"@types/vscode": "~1.66",
"@typescript-eslint/eslint-plugin": "~5",
"@typescript-eslint/parser": "~5",
"eslint": "~8",
"eslint-config-prettier": "~8",
"prettier": "~2",
"ts-loader": "~9",
"typescript": "~4",
"vsce": "~2",
"webpack": "~5",
"webpack-cli": "~4"
}
}
Loading

0 comments on commit ee65bfe

Please sign in to comment.