From 22ca1cf462cdb96fa64501de216632b3168a3429 Mon Sep 17 00:00:00 2001 From: yosuke ota Date: Mon, 11 Apr 2022 14:45:08 +0900 Subject: [PATCH 1/2] Add github workflows --- .github/workflows/CI.yml | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/CI.yml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml new file mode 100644 index 000000000..15c7d4193 --- /dev/null +++ b/.github/workflows/CI.yml @@ -0,0 +1,42 @@ +name: CI +on: + push: + branches: [master] + pull_request: + branches: [master] + +jobs: + lint: + name: Lint + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Install Node.js + uses: actions/setup-node@v3 + with: + node-version: 16 + - name: Install Packages + run: npm install --legacy-peer-deps + - name: Lint + run: npm run lint + + test: + name: Test + strategy: + matrix: + node: [16, 17] + os: [ubuntu-latest] + + runs-on: ${{ matrix.os }} + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Install Node.js v${{ matrix.node }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node }} + - name: Install Packages + run: npm install --legacy-peer-deps + - name: Test + run: npm test From dde207f2f9a4a637bbf18cc18875f33b9dd5051f Mon Sep 17 00:00:00 2001 From: yosuke ota Date: Mon, 11 Apr 2022 14:59:24 +0900 Subject: [PATCH 2/2] Fix CI errors --- lib/rules/component-tags-order.js | 8 ++-- tests/lib/rules/component-tags-order.js | 51 ++++++++++++++----------- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/lib/rules/component-tags-order.js b/lib/rules/component-tags-order.js index 289bc381f..09740d111 100644 --- a/lib/rules/component-tags-order.js +++ b/lib/rules/component-tags-order.js @@ -47,7 +47,7 @@ module.exports = { ], messages: { unexpected: - '<{{elementName}}{{elementAttributes}}> should be above <{{firstUnorderedName}}{{firstUnorderedAttributes}}> on line {{line}}.' + "'<{{elementName}}{{elementAttributes}}>' should be above '<{{firstUnorderedName}}{{firstUnorderedAttributes}}>' on line {{line}}." } }, /** @@ -83,7 +83,7 @@ module.exports = { return `${attribute.key.name}${ attribute.value && attribute.value.value - ? '=' + attribute.value.value + ? `=${attribute.value.value}` : '' }` }) @@ -177,11 +177,11 @@ module.exports = { data: { elementName: element.name, elementAttributes: elementAttributes - ? ' ' + elementAttributes + ? ` ${elementAttributes}` : '', firstUnorderedName: firstUnordered.name, firstUnorderedAttributes: firstUnorderedttributes - ? ' ' + firstUnorderedttributes + ? ` ${firstUnorderedttributes}` : '', line: firstUnordered.loc.start.line }, diff --git a/tests/lib/rules/component-tags-order.js b/tests/lib/rules/component-tags-order.js index 84c2daeb6..474d04bf2 100644 --- a/tests/lib/rules/component-tags-order.js +++ b/tests/lib/rules/component-tags-order.js @@ -107,12 +107,18 @@ tester.run('component-tags-order', rule, { { code: '', output: null, - options: [{ order: ['script[setup]', 'script:not([setup])', 'template', 'style'] }] + options: [ + { order: ['script[setup]', 'script:not([setup])', 'template', 'style'] } + ] }, { code: '', output: null, - options: [{ order: [['script[setup]', 'script:not([setup])', 'template'], 'style'] }] + options: [ + { + order: [['script[setup]', 'script:not([setup])', 'template'], 'style'] + } + ] }, { code: '', @@ -122,7 +128,7 @@ tester.run('component-tags-order', rule, { { code: '', output: null, - options: [{ order: [['script, 'template'], 'style'] }] + options: [{ order: [['script', 'template'], 'style'] }] }, { code: '', @@ -155,7 +161,6 @@ tester.run('component-tags-order', rule, { } ] }, - , { code: '', output: null, @@ -200,12 +205,12 @@ tester.run('component-tags-order', rule, { code: '', errors: [ { - message: '