Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: harttle/liquidjs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v9.37.0
Choose a base ref
...
head repository: harttle/liquidjs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v9.38.0
Choose a head ref
  • 10 commits
  • 38 files changed
  • 4 contributors

Commits on May 3, 2022

  1. Verified

    This commit was signed with the committer’s verified signature.
    dtolnay David Tolnay
    Copy the full SHA
    2f6d84b View commit details

Commits on May 17, 2022

  1. docs: update security policy

    harttle authored May 17, 2022

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    bb8f8f5 View commit details

Commits on Jun 10, 2022

  1. chore(deps-dev): bump semantic-release from 17.2.3 to 19.0.3

    Bumps [semantic-release](https://github.com/semantic-release/semantic-release) from 17.2.3 to 19.0.3.
    - [Release notes](https://github.com/semantic-release/semantic-release/releases)
    - [Commits](semantic-release/semantic-release@v17.2.3...v19.0.3)
    
    ---
    updated-dependencies:
    - dependency-name: semantic-release
      dependency-type: direct:development
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and harttle committed Jun 10, 2022
    Copy the full SHA
    c9e4220 View commit details

Commits on Jul 2, 2022

  1. chore(deps-dev): bump jsdom from 13.2.0 to 16.5.0

    Bumps [jsdom](https://github.com/jsdom/jsdom) from 13.2.0 to 16.5.0.
    - [Release notes](https://github.com/jsdom/jsdom/releases)
    - [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md)
    - [Commits](jsdom/jsdom@13.2.0...16.5.0)
    
    ---
    updated-dependencies:
    - dependency-name: jsdom
      dependency-type: direct:development
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and harttle committed Jul 2, 2022
    Copy the full SHA
    4a0186d View commit details

Commits on Jul 7, 2022

  1. feat: inline comment tag (#514)

    * style: remove unnecessary intermediate constant
    
    * feat: add inline comment tag
    
    * refactor: use readIdentifier when reading tag names
    
    * docs: add inline comment tag
    jg-rp authored Jul 7, 2022
    Copy the full SHA
    2f87708 View commit details
  2. Copy the full SHA
    3dc4290 View commit details
  3. Copy the full SHA
    0f82435 View commit details
  4. chore: update to node 16

    harttle committed Jul 7, 2022
    Copy the full SHA
    ed95d9a View commit details
  5. chore(deps): bump moment from 2.29.2 to 2.29.4 in /docs

    Bumps [moment](https://github.com/moment/moment) from 2.29.2 to 2.29.4.
    - [Release notes](https://github.com/moment/moment/releases)
    - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
    - [Commits](moment/moment@2.29.2...2.29.4)
    
    ---
    updated-dependencies:
    - dependency-name: moment
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and harttle committed Jul 7, 2022
    Copy the full SHA
    392b859 View commit details
  6. chore(release): 9.38.0 [skip ci]

    # [9.38.0](v9.37.0...v9.38.0) (2022-07-07)
    
    ### Bug Fixes
    
    * stack overflow on large number of templates, [#513](#513) ([3dc4290](3dc4290))
    
    ### Features
    
    * inline comment tag ([#514](#514)) ([2f87708](2f87708))
    semantic-release-bot committed Jul 7, 2022
    Copy the full SHA
    e87f068 View commit details
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# [9.38.0](https://github.com/harttle/liquidjs/compare/v9.37.0...v9.38.0) (2022-07-07)


### Bug Fixes

* stack overflow on large number of templates, [#513](https://github.com/harttle/liquidjs/issues/513) ([3dc4290](https://github.com/harttle/liquidjs/commit/3dc4290b56265cfafbee8d9836e912d9b8492f90))


### Features

* inline comment tag ([#514](https://github.com/harttle/liquidjs/issues/514)) ([2f87708](https://github.com/harttle/liquidjs/commit/2f8770898963e35ac4491f6975a8abd03dc09067))

# [9.37.0](https://github.com/harttle/liquidjs/compare/v9.36.2...v9.37.0) (2022-04-21)


8 changes: 4 additions & 4 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ Only the latest major version is supported with security updates. It can be chan

## Reporting a Vulnerability

Please contact yangjvn@126.com to report a vulnerability.
Please contact yangjvn@126.com to report a vulnerability or change request.

- It will be fixed very soon (maybe within 1 week or couple of days) if that vulnerability obviously affects common use cases.
- Otherwise, it'll be scheduled with a priority just like requested features (which is lower than bugs).
- If it's declined, you'll receive an email (more oftenly there will be a discuss).
- If the vulnerability in question affects common use cases, it will be treated as a bug and fixed very soon (typically within 1 week).
- Otherwise, it'll be scheduled in the same priority of feature request (which is lower than bugs).
- If the request is declined, you'll receive a reply email anyway (most likely there will be a discussion).
12 changes: 6 additions & 6 deletions docs/package-lock.json

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

1 change: 1 addition & 0 deletions docs/source/_data/sidebar.yml
Original file line number Diff line number Diff line change
@@ -78,6 +78,7 @@ filters:

tags:
overview: overview.html
"# (inline comment)": inline_comment.html
assign: assign.html
capture: capture.html
case: case.html
50 changes: 50 additions & 0 deletions docs/source/tags/inline_comment.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
---
title: "# (inline comment)"
---

{% since %}v9.38.0{% endsince %}

Add comments to a Liquid template using an inline tag. Text enclosed in an inline comment tag will not be printed.

Input
```liquid
Anything inside an inline comment tag will not be printed.
{% # this is an inline comment %}
But every line must start with a '#'.
{%
# this is a comment
# that spans multiple lines
%}
```

Output
```text
Anything inside an inline comment tag will not be printed.
But every line must start with a '#'.
```

Inline comments are useful inside <a href="./liquid.html">`liquid`</a> tags too.

```liquid
{% liquid
# required args
assign product = collection.products.first
# optional args
assign should_show_border = should_show_border | default: true
assign should_highlight = should_highlight | default: false
%}
```

But they don't work well for commenting out blocks of Liquid code. The <a href="./comment.html">`comment`</a> block tag is the better option when you need to temporarily stop other tags from being executed.

Input
```liquid
{%- # {% echo 'Welcome to LiquidJS!' %} -%}
{% comment %}{% echo 'Welcome to LiquidJS!' %}{% endcomment %}
```

Output
```text
-%}
```
2 changes: 1 addition & 1 deletion docs/source/tags/overview.md
Original file line number Diff line number Diff line change
@@ -13,6 +13,6 @@ Iteration | iterate over a collection | for, cycle, tablerow
Control Flow | control the execution branch of template rendering | if, unless, elsif, else, case, when
Variable | define and alter variables | assign, increment, decrement, capture, echo
File | include another template or extend a layout template | render, include, layout
Language | temporarily disable LiquidJS syntax | raw, comment, liquid
Language | temporarily disable LiquidJS syntax | # (inline comment), raw, comment, liquid

[shopify/liquid]: https://github.com/Shopify/liquid
50 changes: 50 additions & 0 deletions docs/source/zh-cn/tags/inline_comment.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
---
title: "#(单行注释)"
---

{% since %}v9.38.0{% endsince %}

在 Liquid 模板中添加注释,注释标签内的文字不会被输出。

输入
```liquid
注释标签内的东西都不会输出。
{% # this is an inline comment %}
但每行都必须以 '#' 开头。
{%
# this is a comment
# that spans multiple lines
%}
```

输出
```text
注释标签内的东西都不会输出。
但每行都必须以 '#' 开头。
```

在 <a href="./liquid.html">`liquid`</a> 标签里也可以使用注释标签。

```liquid
{% liquid
# required args
assign product = collection.products.first
# optional args
assign should_show_border = should_show_border | default: true
assign should_highlight = should_highlight | default: false
%}
```

但注释标签不能用于把其他标签注释掉。这时应该使用 <a href="./comment.html">`comment`</a> 标签来临时禁用其他标签。

输入
```liquid
{%- # {% echo 'Welcome to LiquidJS!' %} -%}
{% comment %}{% echo 'Welcome to LiquidJS!' %}{% endcomment %}
```

输出
```text
-%}
```
2 changes: 1 addition & 1 deletion docs/source/zh-cn/tags/overview.md
Original file line number Diff line number Diff line change
@@ -13,6 +13,6 @@ LiquidJS 支持十几个过滤器,可以分为如下几类:
控制流 | 控制模板渲染的执行分支 | if, unless, elif, else, case, when
变量 | 定义和修改变量 | assign, increment, decrement, capture, echo
文件 | 引入或继承其他模板 | render, include, layout
语言 | 暂时禁用 Liquid 语法 | raw, comment, liquid
语言 | 暂时禁用 Liquid 语法 | # (单行注释), raw, comment, liquid

[shopify/liquid]: https://github.com/Shopify/liquid
1 change: 1 addition & 0 deletions docs/themes/navy/languages/zh-cn.yml
Original file line number Diff line number Diff line change
@@ -59,6 +59,7 @@ sidebar:
overview: 概述
tags:
overview: 概述
'# (inline comment)': '#(单行注释)'
api:
quick_entry: 快速入口
classes:
1 change: 1 addition & 0 deletions docs/themes/navy/layout/partial/all-contributors.swig
Original file line number Diff line number Diff line change
@@ -55,6 +55,7 @@
<td align="center"><a href="https://github.com/ameyaapte1"><img src="https://avatars.githubusercontent.com/u/16054747?v=4?s=100" width="100px;" alt=""/></a></td>
<td align="center"><a href="https://github.com/tbdrz"><img src="https://avatars.githubusercontent.com/u/50599116?v=4?s=100" width="100px;" alt=""/></a></td>
<td align="center"><a href="http://santialbo.com"><img src="https://avatars.githubusercontent.com/u/1557563?v=4?s=100" width="100px;" alt=""/></a></td>
<td align="center"><a href="https://github.com/YahangWu"><img src="https://avatars.githubusercontent.com/u/12295975?v=4?s=100" width="100px;" alt=""/></a></td>
</tr>
</table>

2 changes: 1 addition & 1 deletion libs.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
declare module 'rollup-plugin-uglify' {
export function uglify (): any
export function uglify (options?: any): any
}
declare module 'rollup-plugin-replace' {
export default function replace(options: any): any
Loading