Skip to content

Commit

Permalink
Merge branch 'main' into feat-cli-clearScreen
Browse files Browse the repository at this point in the history
  • Loading branch information
hi-ogawa authored Feb 20, 2024
2 parents c092a05 + 09c1c76 commit dc92e2e
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 50 deletions.
14 changes: 6 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ flowchart TD
real --NO--> intended{Is the intended\nbehaviour?}
intended --YES--> explain[Explain and close\npoint to docs if needed]
intended --NO--> open[Keep open for discussion\nRemove 'pending triage' label]
real --YES--> real2["1. Remove 'pending triage' label\n2. Add 'bug' label\n3. Add related feature label if\napplicable (e.g. 'bug: ssr'\nor 'plugin: vue')\n4. Add priority label (see below)"]
real --YES--> real2["1. Remove 'pending triage' label\n2. Add related feature label if\napplicable (e.g. 'feat: browser')\n3. Add priority and meta labels (see below)"]
real2 --> unusable{Does the\nbug make Vitest\nunusable?}
unusable --YES--> maj{Does the bug\naffect the majority\nof Vitest users?}
maj --YES--> p5[p5: urgent]
maj --NO--> p4[p4: important]
unusable --NO--> workarounds{Are there\nworkarounds for\nthe bug?}
workarounds --YES--> p2[p2: has workaround]
workarounds --YES--> p2[p2: edge case\nhas workaround]
workarounds --NO--> p3[p3: minor bug]
```

Expand All @@ -122,14 +122,12 @@ flowchart TD
start{Bug fix\nor\nfeature}
start --BUG FIX--> strict_bug{"Is a 'strict fix'\ni.e. fixes an obvious\noversight with no\nside effects"}
start --FEATURE--> feature[- Discuss feature necessity\n- Is this the best way to address the need\n- Review code quality\n- Add feature labels\n- Approve if you feel strongly\nthat the feature is needed]
feature --> evan[Await input from Evan]
evan -.-> merge
feature --> merge
strict_bug --YES--> strict[- Verify the fix locally\n- Review code quality\n- Require test case if applicable\n- Request changes if necessary]
strict_bug --NO--> non_strict[Discuss the potential side\neffects of the fix, e.g.\n- Could it introduce implicit\nbehavior changes in other\ncases?\n- Does it introduce too much\nchanges?]
strict_bug --NO--> non_strict[- Discuss the potential side\neffects of the fix, e.g.\n- Could it introduce implicit\nbehavior changes in other\ncases?\n- Does it introduce too much\nchanges?]
non_strict --> label["Add priority labels\n(see issue triaging workflow)"]
label --> evan_non_strict[Await input from Evan]
evan_non_strict -.-> strict
strict --> approve
strict --> label
label --> approve
approve --> merge["Merge if approved by 2 or\nmore team members\n- Use 'Squash and Merge'\n- Edit commit message to follow\nconvention\n- In commit message body, list\nrelevant issues being fixed\ne.g. 'fix #1234, fix #1235'"]
```

Expand Down
2 changes: 1 addition & 1 deletion examples/lit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"jsdom": "latest",
"vite": "latest",
"vitest": "latest",
"webdriverio": "^8.31.1"
"webdriverio": "^8.32.2"
},
"stackblitz": {
"startCommand": "npm run test:ui"
Expand Down
2 changes: 1 addition & 1 deletion packages/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,6 @@
"playwright-core": "^1.41.0",
"safaridriver": "^0.1.2",
"vitest": "workspace:*",
"webdriverio": "^8.31.1"
"webdriverio": "^8.32.2"
}
}
82 changes: 43 additions & 39 deletions pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion test/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"playwright": "^1.41.0",
"url": "^0.11.3",
"vitest": "workspace:*",
"webdriverio": "^8.31.1"
"webdriverio": "^8.32.2"
}
}

0 comments on commit dc92e2e

Please sign in to comment.