Skip to content

Commit

Permalink
fix: upgrade htmljs-parser
Browse files Browse the repository at this point in the history
  • Loading branch information
DylanPiercey committed May 9, 2022
1 parent 713e043 commit 87bb7c4
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 14 deletions.
5 changes: 5 additions & 0 deletions .changeset/wet-jeans-double.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@marko/compiler": patch
---

Pin a newer version of htmljs-parser that fixes some parser bugs. See: https://github.com/marko-js/htmljs-parser/pull/103
9 changes: 6 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
branches: [main, v3, v4]
paths-ignore: ["**.md"]

concurrency:
group: "${{ github.workflow }}-${{ github.event_name == 'pull_request_target' && github.head_ref || github.ref }}"
cancel-in-progress: true

jobs:
format:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -61,22 +65,21 @@ jobs:
release:
runs-on: ubuntu-latest
needs: [format, test]
if: ${{ github.repository == 'marko-js/marko' && github.event_name == 'push' }}
if: "${{ github.repository_owner == 'marko-js' && github.event_name == 'push' }}"
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 16
cache: npm
- name: Install dependencies
run: npm ci
- name: Release
id: changesets
uses: changesets/action@v1
with:
createGithubReleases: true
version: npm run version
publish: npm run publish
commit: "[ci] release"
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"ci:report": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
"report": "nyc report --reporter=html && open ./coverage/index.html",
"set-entry": "npm exec --ws -c 'dot-json package.json main $(dot-json package.json $ENTRY)'",
"version": "changeset version"
"version": "changeset version && npm i --package-lock-only"
},
"devDependencies": {
"@babel/cli": "^7.16.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/compiler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@marko/babel-utils": "^5.21.1",
"complain": "^1.6.0",
"he": "^1.2.0",
"htmljs-parser": "^3.3.2",
"htmljs-parser": "^3.3.4",
"jsesc": "^3.0.2",
"lasso-package-root": "^1.0.1",
"property-handlers": "^1.1.1",
Expand Down

0 comments on commit 87bb7c4

Please sign in to comment.