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: stencilproject/Stencil
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: MFB-Technologies-Inc/Stencil
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 4 commits
  • 140 files changed
  • 2 contributors

Commits on May 17, 2024

  1. Fork

    fork
    roanutil committed May 17, 2024
    Copy the full SHA
    1176b89 View commit details

Commits on Jun 1, 2024

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    41785a5 View commit details
  2. Minimal changes to resolve concurrency warnings

    feature/concurrency
    roanutil committed Jun 1, 2024
    Copy the full SHA
    8e35277 View commit details

Commits on Jun 17, 2024

  1. Merge pull request #2 from MFB-Technologies-Inc/feature/concurrency

    Resolve concurrency warnings
    r-jarvis authored Jun 17, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    0126cb1 View commit details
Showing with 10,588 additions and 10,713 deletions.
  1. +44 −0 .devcontainer/devcontainer.json
  2. +48 −0 .github/workflows/ci.yml
  3. +0 −25 .github/workflows/danger.yml
  4. +0 −23 .github/workflows/lint-cocoapods.yml
  5. +0 −23 .github/workflows/release-check-versions.yml
  6. +0 −26 .github/workflows/swiftlint.yml
  7. +0 −44 .github/workflows/tag-publish.yml
  8. +0 −66 .github/workflows/test-spm.yml
  9. +8 −0 .swiftformat
  10. +28 −124 .swiftlint.yml
  11. +0 −21 Gemfile
  12. +0 −189 Gemfile.lock
  13. +2 −0 LICENSE
  14. +12 −22 Package.resolved
  15. +36 −19 Package.swift
  16. +0 −52 Rakefile
  17. +92 −87 Sources/Stencil/Context.swift
  18. +68 −0 Sources/Stencil/Documentation.docc/Stencil Documentation.md
  19. +426 −0 Sources/Stencil/Documentation.docc/built-in-template-tags-and-filters.md
  20. +86 −0 Sources/Stencil/Documentation.docc/custom-template-tags-and-filters.md
  21. +44 −0 Sources/Stencil/Documentation.docc/getting-started.md
  22. +47 −0 Sources/Stencil/Documentation.docc/installation.md
  23. +149 −0 Sources/Stencil/Documentation.docc/template-api.md
  24. +220 −0 Sources/Stencil/Documentation.docc/template-language.md
  25. +19 −14 Sources/Stencil/DynamicMemberLookup.swift
  26. +81 −76 Sources/Stencil/Environment.swift
  27. +66 −61 Sources/Stencil/Errors.swift
  28. +256 −251 Sources/Stencil/Expression.swift
  29. +84 −80 Sources/Stencil/Extension.swift
  30. +33 −28 Sources/Stencil/FilterTag.swift
  31. +105 −100 Sources/Stencil/Filters.swift
  32. +243 −233 Sources/Stencil/ForTag.swift
  33. +264 −257 Sources/Stencil/IfTag.swift
  34. +52 −43 Sources/Stencil/Include.swift
  35. +135 −130 Sources/Stencil/Inheritance.swift
  36. +97 −91 Sources/Stencil/KeyPath.swift
  37. +51 −46 Sources/Stencil/LazyValueWrapper.swift
  38. +242 −225 Sources/Stencil/Lexer.swift
  39. +100 −91 Sources/Stencil/Loader.swift
  40. +144 −136 Sources/Stencil/Node.swift
  41. +49 −44 Sources/Stencil/NowTag.swift
  42. +239 −233 Sources/Stencil/Parser.swift
  43. +79 −75 Sources/Stencil/Template.swift
  44. +139 −129 Sources/Stencil/Tokenizer.swift
  45. +61 −55 Sources/Stencil/TrimBehaviour.swift
  46. +218 −209 Sources/Stencil/Variable.swift
  47. +0 −36 Stencil.podspec.json
  48. +0 −166 Tests/StencilTests/ContextSpec.swift
  49. +250 −0 Tests/StencilTests/ContextTests.swift
  50. +0 −131 Tests/StencilTests/EnvironmentBaseAndChildTemplateSpec.swift
  51. +142 −0 Tests/StencilTests/EnvironmentBaseAndChildTemplateTests.swift
  52. +0 −94 Tests/StencilTests/EnvironmentIncludeTemplateSpec.swift
  53. +88 −0 Tests/StencilTests/EnvironmentIncludeTemplateTests.swift
  54. +0 −227 Tests/StencilTests/EnvironmentSpec.swift
  55. +569 −0 Tests/StencilTests/EnvironmentTests.swift
  56. +0 −361 Tests/StencilTests/ExpressionSpec.swift
  57. +429 −0 Tests/StencilTests/ExpressionTests.swift
  58. +0 −463 Tests/StencilTests/FilterSpec.swift
  59. +0 −60 Tests/StencilTests/FilterTagSpec.swift
  60. +91 −0 Tests/StencilTests/FilterTagTests.swift
  61. +564 −0 Tests/StencilTests/FilterTests.swift
  62. +0 −597 Tests/StencilTests/ForNodeSpec.swift
  63. +769 −0 Tests/StencilTests/ForNodeTests.swift
  64. +0 −69 Tests/StencilTests/Helpers.swift
  65. +23 −0 Tests/StencilTests/Helpers/ErrorNode.swift
  66. +22 −0 Tests/StencilTests/Helpers/ExampleLoader.swift
  67. +102 −0 Tests/StencilTests/Helpers/StencilTestCase.swift
  68. +0 −296 Tests/StencilTests/IfNodeSpec.swift
  69. +331 −0 Tests/StencilTests/IfNodeTests.swift
  70. +0 −78 Tests/StencilTests/IncludeSpec.swift
  71. +117 −0 Tests/StencilTests/IncludeTests.swift
  72. +0 −79 Tests/StencilTests/InheritanceSpec.swift
  73. +115 −0 Tests/StencilTests/InheritanceTests.swift
  74. +0 −167 Tests/StencilTests/LexerSpec.swift
  75. +183 −0 Tests/StencilTests/LexerTests.swift
  76. +0 −61 Tests/StencilTests/LoaderSpec.swift
  77. +79 −0 Tests/StencilTests/LoaderTests.swift
  78. +0 −117 Tests/StencilTests/NodeSpec.swift
  79. +194 −0 Tests/StencilTests/NodeTests.swift
  80. +0 −56 Tests/StencilTests/NowNodeSpec.swift
  81. +74 −0 Tests/StencilTests/NowNodeTests.swift
  82. +0 −85 Tests/StencilTests/ParserSpec.swift
  83. +98 −0 Tests/StencilTests/ParserTests.swift
  84. +0 −76 Tests/StencilTests/StencilSpec.swift
  85. +92 −0 Tests/StencilTests/StencilTests.swift
  86. +0 −25 Tests/StencilTests/TemplateSpec.swift
  87. +37 −0 Tests/StencilTests/TemplateTests.swift
  88. +0 −40 Tests/StencilTests/TokenSpec.swift
  89. +80 −0 Tests/StencilTests/TokenTests.swift
  90. +0 −143 Tests/StencilTests/TrimBehaviourSpec.swift
  91. +163 −0 Tests/StencilTests/TrimBehaviourTests.swift
  92. +0 −404 Tests/StencilTests/VariableSpec.swift
  93. +551 −0 Tests/StencilTests/VariableTests.swift
  94. +17 −0 Tests/StencilTests/fixtures/Fixtures+Base.swift
  95. +20 −0 Tests/StencilTests/fixtures/Fixtures+BaseRepeat.swift
  96. +18 −0 Tests/StencilTests/fixtures/Fixtures+Child.swift
  97. +17 −0 Tests/StencilTests/fixtures/Fixtures+ChildChild.swift
  98. +18 −0 Tests/StencilTests/fixtures/Fixtures+ChildRepeat.swift
  99. +17 −0 Tests/StencilTests/fixtures/Fixtures+ChildSuper.swift
  100. +1,146 −0 Tests/StencilTests/fixtures/Fixtures+Huge.swift
  101. +14 −0 Tests/StencilTests/fixtures/Fixtures+IfBlock.swift
  102. +17 −0 Tests/StencilTests/fixtures/Fixtures+IfBlockChild.swift
  103. +17 −0 Tests/StencilTests/fixtures/Fixtures+InvalidBase.swift
  104. +17 −0 Tests/StencilTests/fixtures/Fixtures+InvalidChildSuper.swift
  105. +14 −0 Tests/StencilTests/fixtures/Fixtures+InvalidInclude.swift
  106. +14 −0 Tests/StencilTests/fixtures/Fixtures+Test.swift
  107. +12 −0 Tests/StencilTests/fixtures/Fixtures.swift
  108. +0 −5 Tests/StencilTests/fixtures/base-repeat.html
  109. +0 −2 Tests/StencilTests/fixtures/base.html
  110. +0 −2 Tests/StencilTests/fixtures/child-child.html
  111. +0 −3 Tests/StencilTests/fixtures/child-repeat.html
  112. +0 −3 Tests/StencilTests/fixtures/child-super.html
  113. +0 −3 Tests/StencilTests/fixtures/child.html
  114. +0 −1,131 Tests/StencilTests/fixtures/huge.html
  115. +0 −2 Tests/StencilTests/fixtures/if-block-child.html
  116. +0 −1 Tests/StencilTests/fixtures/if-block.html
  117. +0 −2 Tests/StencilTests/fixtures/invalid-base.html
  118. +0 −3 Tests/StencilTests/fixtures/invalid-child-super.html
  119. +0 −1 Tests/StencilTests/fixtures/invalid-include.html
  120. +0 −1 Tests/StencilTests/fixtures/test.html
  121. +0 −225 docs/Makefile
  122. +0 −33 docs/_templates/sidebar_intro.html
  123. +0 −150 docs/api.rst
  124. +0 −451 docs/builtins.rst
  125. +0 −341 docs/conf.py
  126. +0 −81 docs/custom-template-tags-and-filters.rst
  127. +0 −37 docs/getting-started.rst
  128. +0 −64 docs/index.rst
  129. +0 −52 docs/installation.rst
  130. +0 −217 docs/templates.rst
  131. +0 −97 rakelib/Dangerfile
  132. +0 −56 rakelib/changelog.rake
  133. +0 −61 rakelib/check_changelog.rb
  134. +0 −52 rakelib/github.rake
  135. +0 −50 rakelib/lint.rake
  136. +0 −35 rakelib/lint.sh
  137. +0 −12 rakelib/pod.rake
  138. +0 −97 rakelib/release.rake
  139. +0 −18 rakelib/spm.rake
  140. +0 −266 rakelib/utils.rake
44 changes: 44 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"name": "Stencil",
"image": "swift:5.10",
"features": {
"ghcr.io/devcontainers/features/common-utils:2": {
"installZsh": "false",
"username": "vscode",
"userUid": "1000",
"userGid": "1000",
"upgradePackages": "false"
},
"ghcr.io/devcontainers/features/git:1": {
"version": "os-provided",
"ppa": "false"
}
},
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
"seccomp=unconfined"
],
// Configure tool-specific properties.
"customizations": {
// Configure properties specific to VS Code.
"vscode": {
// Set *default* container specific settings.json values on container create.
"settings": {
"lldb.library": "/usr/lib/liblldb.so"
},
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"sswg.swift-lang"
]
}
},
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "swift --version",

// Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode"
}
48 changes: 48 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: ci

on:
push:
branches:
- main
pull_request:
branches:
- '*'
workflow_dispatch:

jobs:
lint:
runs-on: macos-14
environment: default
steps:
- uses: actions/checkout@v3
- name: SwiftFormat version
run: swiftformat --version
- name: Format lint
run: swiftformat --lint .
- name: Install SwiftLint
run: brew install swiftlint
- name: SwiftLint version
run: swiftlint --version
- name: Lint
run: swiftlint lint --quiet
macos-test:
runs-on: macos-14
environment: default
strategy:
matrix:
xcode: ['15.4']
# Swift: 5.10
steps:
- uses: actions/checkout@v3
- name: Select Xcode ${{ matrix.xcode }}
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
- name: Run Tests
run: TEMP_DIR=${{ runner.temp }} swift test --enable-code-coverage
linux-test:
runs-on: ubuntu-latest
environment: default

steps:
- uses: actions/checkout@v3
- name: Run Tests
run: TEMP_DIR=${{ runner.temp }} swift test
25 changes: 0 additions & 25 deletions .github/workflows/danger.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/lint-cocoapods.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/release-check-versions.yml

This file was deleted.

26 changes: 0 additions & 26 deletions .github/workflows/swiftlint.yml

This file was deleted.

44 changes: 0 additions & 44 deletions .github/workflows/tag-publish.yml

This file was deleted.

66 changes: 0 additions & 66 deletions .github/workflows/test-spm.yml

This file was deleted.

8 changes: 8 additions & 0 deletions .swiftformat
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--extensionacl on-declarations
--redundanttype explicit
--swiftversion 5.10
--maxwidth 120
--header "{file}\nStencil\n\nCopyright (c) 2022, Kyle Fuller\nAll rights reserved.\n\nCopyright 2024 MFB Technologies, Inc.\n\nThis source code is licensed under the BSD-2-Clause License found in the\nLICENSE file in the root directory of this source tree.""
--allman false
--wraparguments before-first
--wrapcollections before-first
Loading