Skip to content

Commit 87bb7c4

Browse files
committed
fix: upgrade htmljs-parser
1 parent 713e043 commit 87bb7c4

File tree

5 files changed

+22
-14
lines changed

5 files changed

+22
-14
lines changed

.changeset/wet-jeans-double.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@marko/compiler": patch
3+
---
4+
5+
Pin a newer version of htmljs-parser that fixes some parser bugs. See: https://github.com/marko-js/htmljs-parser/pull/103

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
branches: [main, v3, v4]
99
paths-ignore: ["**.md"]
1010

11+
concurrency:
12+
group: "${{ github.workflow }}-${{ github.event_name == 'pull_request_target' && github.head_ref || github.ref }}"
13+
cancel-in-progress: true
14+
1115
jobs:
1216
format:
1317
runs-on: ubuntu-latest
@@ -61,22 +65,21 @@ jobs:
6165
release:
6266
runs-on: ubuntu-latest
6367
needs: [format, test]
64-
if: ${{ github.repository == 'marko-js/marko' && github.event_name == 'push' }}
68+
if: "${{ github.repository_owner == 'marko-js' && github.event_name == 'push' }}"
6569
steps:
6670
- name: Checkout code
6771
uses: actions/checkout@v3
6872
- name: Setup node
6973
uses: actions/setup-node@v3
7074
with:
71-
node-version: 16.x
75+
node-version: 16
7276
cache: npm
7377
- name: Install dependencies
7478
run: npm ci
7579
- name: Release
7680
id: changesets
7781
uses: changesets/action@v1
7882
with:
79-
createGithubReleases: true
8083
version: npm run version
8184
publish: npm run publish
8285
commit: "[ci] release"

package-lock.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"ci:report": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
1717
"report": "nyc report --reporter=html && open ./coverage/index.html",
1818
"set-entry": "npm exec --ws -c 'dot-json package.json main $(dot-json package.json $ENTRY)'",
19-
"version": "changeset version"
19+
"version": "changeset version && npm i --package-lock-only"
2020
},
2121
"devDependencies": {
2222
"@babel/cli": "^7.16.0",

packages/compiler/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@marko/babel-utils": "^5.21.1",
1717
"complain": "^1.6.0",
1818
"he": "^1.2.0",
19-
"htmljs-parser": "^3.3.2",
19+
"htmljs-parser": "^3.3.4",
2020
"jsesc": "^3.0.2",
2121
"lasso-package-root": "^1.0.1",
2222
"property-handlers": "^1.1.1",

0 commit comments

Comments
 (0)