Skip to content

Commit

Permalink
Merge pull request stencilproject#329 from stencilproject/release/0.15.1
Browse files Browse the repository at this point in the history
Release 0.15.1
djbe authored Jul 31, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents a3df900 + 3a98d1e commit 4f222ac
Showing 5 changed files with 11 additions and 27 deletions.
18 changes: 1 addition & 17 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,11 @@
## Master

### Breaking

_None_

### Enhancements

_None_

### Deprecations

_None_
## 0.15.1

### Bug Fixes

- Fix bug in `LazyValueWrapper`, causing it to never resolve.
[David Jennes](https://github.com/djbe)
[#328](https://github.com/stencilproject/Stencil/pull/328)

### Internal Changes

_None_

## 0.15.0

### Breaking
4 changes: 2 additions & 2 deletions Stencil.podspec.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Stencil",
"version": "0.15.0",
"version": "0.15.1",
"summary": "Stencil is a simple and powerful template language for Swift.",
"homepage": "https://stencil.fuller.li",
"license": {
@@ -13,7 +13,7 @@
"social_media_url": "https://twitter.com/kylefuller",
"source": {
"git": "https://github.com/stencilproject/Stencil.git",
"tag": "0.15.0"
"tag": "0.15.1"
},
"source_files": [
"Sources/Stencil/*.swift"
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -58,9 +58,9 @@
# built documents.
#
# The short X.Y version.
version = '0.15.0'
version = '0.15.1'
# The full version, including alpha/beta/rc tags.
release = '0.15.0'
release = '0.15.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
6 changes: 3 additions & 3 deletions docs/installation.rst
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ dependencies inside ``Package.swift``.
let package = Package(
name: "MyApplication",
dependencies: [
.package(url: "https://github.com/stencilproject/Stencil.git", from: "0.15.0"),
.package(url: "https://github.com/stencilproject/Stencil.git", from: "0.15.1"),
]
)
@@ -26,7 +26,7 @@ If you're using CocoaPods, you can add Stencil to your ``Podfile`` and then run

.. code-block:: ruby
pod 'Stencil', '~> 0.15.0'
pod 'Stencil', '~> 0.15.1'
Carthage
--------
@@ -37,7 +37,7 @@ Carthage

.. code-block:: text
github "stencilproject/Stencil" ~> 0.15.0
github "stencilproject/Stencil" ~> 0.15.1
2) Checkout your dependencies, generate the Stencil Xcode project, and then use Carthage to build Stencil:

6 changes: 3 additions & 3 deletions docs/templates.rst
Original file line number Diff line number Diff line change
@@ -113,19 +113,19 @@ To comment out part of your template, you can use the following syntax:

{# My comment is completely hidden #}

.. _template-inheritance:

Whitespace Control
------------------

Stencil supports the same syntax as Jinja for whitespace control, see [their docs for more information](https://jinja.palletsprojects.com/en/3.1.x/templates/#whitespace-control).
Stencil supports the same syntax as Jinja for whitespace control, see `their docs for more information <https://jinja.palletsprojects.com/en/3.1.x/templates/#whitespace-control>`_.

Essentially, Stencil will **not** trim whitespace by default. However you can:

- Control how this is handled for the whole template by setting the trim behaviour. We provide a few pre-made combinations such as `nothing` (default), `smart` and `all`. More granular combinations are possible.
- You can disable this per-block using the `+` control character. For example `{{+ if … }}` to preserve whitespace before.
- You can force trimming per-block by using the `-` control character. For example `{{ if … -}}` to trim whitespace after.

.. _template-inheritance:

Template inheritance
--------------------

0 comments on commit 4f222ac

Please sign in to comment.