chore: improve prettier config (#4154)

vitejs · Jul 6, 2021 · a9073cb · a9073cb
1 parent a552f0a
commit a9073cb
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 25 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -46,10 +46,11 @@ body:
     id: logs
     attributes:
       label: Logs
-      description: "Optional if provided reproduction. Please try not to insert an image but copy paste the log text.
+      description: |
+        Optional if provided reproduction. Please try not to insert an image but copy paste the log text.
 
-  1. Run `vite` or `vite build` with the `--debug` flag.
-  2. Provide the error log here."
+        1. Run `vite` or `vite build` with the `--debug` flag.
+        2. Provide the error log here.
       render: shell
   - type: checkboxes
     id: checkboxes

diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -1,9 +1,5 @@
 {
-  "extends": [
-    "config:base",
-    "schedule:weekly",
-    "group:allNonMajor"
-  ],
+  "extends": ["config:base", "schedule:weekly", "group:allNonMajor"],
   "labels": ["dependencies"],
   "ignorePaths": [
     "packages/playground/**",

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
             node_version: 14
       fail-fast: false
 
-    name: 'Build&Test: node-${{ matrix.node_version }}, ${{ matrix.os }}'
+    name: "Build&Test: node-${{ matrix.node_version }}, ${{ matrix.os }}"
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -68,7 +68,7 @@ jobs:
 
   lint:
     runs-on: ubuntu-latest
-    name: 'Lint: node-14, ubuntu-latest'
+    name: "Lint: node-14, ubuntu-latest"
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/issue-close-require.yml b/.github/workflows/issue-close-require.yml
@@ -2,7 +2,7 @@ name: Issue Close Require
 
 on:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: "0 0 * * *"
 
 jobs:
   close-issues:
@@ -11,7 +11,7 @@ jobs:
       - name: need reproduction
         uses: actions-cool/issues-helper@v2.2.1
         with:
-          actions: 'close-issues'
+          actions: "close-issues"
           token: ${{ secrets.GITHUB_TOKEN }}
-          labels: 'need reproduction'
+          labels: "need reproduction"
           inactive-day: 3
diff --git a/.github/workflows/issue-labeled.yml b/.github/workflows/issue-labeled.yml
@@ -12,29 +12,29 @@ jobs:
         if: github.event.label.name == 'contribution welcome' || github.event.label.name == 'help wanted'
         uses: actions-cool/issues-helper@v2.2.1
         with:
-          actions: 'create-comment, remove-labels'
+          actions: "create-comment, remove-labels"
           token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ github.event.issue.number }}
           body: |
             Hello @${{ github.event.issue.user.login }}. We totally like your proposal/feedback, welcome to send us a Pull Request for it. Please provide changelog/TypeScript/documentation/test cases if needed and make sure CI passed, we will review it soon. We appreciate your effort in advance and looking forward to your contribution!
-          labels: 'pending triage, need reproduction'
+          labels: "pending triage, need reproduction"
 
       - name: remove pending
         if: github.event.label.name == 'enhancement' || github.event.label.name == 'bug' || (contains(github.event.label.name, 'pending triage') == false && startsWith(github.event.label.name, 'bug:') == true)
         uses: actions-cool/issues-helper@v2.2.1
         with:
-          actions: 'remove-labels'
+          actions: "remove-labels"
           token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ github.event.issue.number }}
-          labels: 'pending triage'
+          labels: "pending triage"
 
       - name: need reproduction
         if: github.event.label.name == 'need reproduction'
         uses: actions-cool/issues-helper@v2.2.1
         with:
-          actions: 'create-comment, remove-labels'
+          actions: "create-comment, remove-labels"
           token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ github.event.issue.number }}
           body: |
             Hello @${{ github.event.issue.user.login }}. Please provide a online reproduction by [codesandbox](https://codesandbox.io/) or a minimal GitHub repository. Issues labeled by `need reproduction` will be closed if no activities in 3 days.
-          labels: 'pending triage'
+          labels: "pending triage"
diff --git a/.prettierignore b/.prettierignore
@@ -3,4 +3,5 @@ packages/vite/dist/
 packages/plugin-vue/dist/
 packages/*/CHANGELOG.md
 LICENSE.md
-.prettierrc
+.prettierignore
+yarn.lock
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -0,0 +1,22 @@
+{
+  "semi": false,
+  "tabWidth": 2,
+  "singleQuote": true,
+  "printWidth": 80,
+  "trailingComma": "none",
+  "overrides": [
+    {
+      "files": ["*.json5"],
+      "options": {
+        "singleQuote": false,
+        "quoteProps": "preserve"
+      }
+    },
+    {
+      "files": ["*.yml"],
+      "options": {
+        "singleQuote": false
+      }
+    }
+  ]
+}
diff --git a/package.json b/package.json
@@ -9,6 +9,7 @@
     "node": ">=12.0.0"
   },
   "scripts": {
+    "format": "prettier --write .",
     "lint": "eslint --ext .js,.ts packages/*/src/**",
     "test": "run-s test-serve test-build",
     "test-serve": "jest",

diff --git a/packages/plugin-vue-jsx/index.js b/packages/plugin-vue-jsx/index.js
@@ -91,11 +91,7 @@ function vueJsxPlugin(options = {}) {
       const filter = createFilter(include || /\.[jt]sx$/, exclude)
 
       if (filter(id)) {
-        const plugins = [
-          importMeta,
-          [jsx, babelPluginOptions],
-          ...babelPlugins
-        ]
+        const plugins = [importMeta, [jsx, babelPluginOptions], ...babelPlugins]
         if (id.endsWith('.tsx')) {
           plugins.push([
             require('@babel/plugin-transform-typescript'),