From 5efe6bb186be097a740fe89785fe48516faae457 Mon Sep 17 00:00:00 2001 From: Dylan Piercey Date: Mon, 9 May 2022 15:57:05 -0700 Subject: [PATCH] fix: upgrade htmljs-parser --- .changeset/wet-jeans-double.md | 5 +++++ .github/workflows/ci.yml | 9 ++++++--- packages/compiler/package.json | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 .changeset/wet-jeans-double.md diff --git a/.changeset/wet-jeans-double.md b/.changeset/wet-jeans-double.md new file mode 100644 index 0000000000..c355a7da7d --- /dev/null +++ b/.changeset/wet-jeans-double.md @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69407f7313..630bdf0beb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -61,14 +65,14 @@ 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 @@ -76,7 +80,6 @@ jobs: id: changesets uses: changesets/action@v1 with: - createGithubReleases: true version: npm run version publish: npm run publish commit: "[ci] release" diff --git a/packages/compiler/package.json b/packages/compiler/package.json index 930d575b4d..087a9575f4 100644 --- a/packages/compiler/package.json +++ b/packages/compiler/package.json @@ -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",