chore: update branch references
This commit is contained in:
parent
b5b103a736
commit
54753c3401
2
.github/contributing.md
vendored
2
.github/contributing.md
vendored
@ -17,7 +17,7 @@ Hi! I'm really excited that you are interested in contributing to Vue.js. Before
|
|||||||
|
|
||||||
## Pull Request Guidelines
|
## Pull Request Guidelines
|
||||||
|
|
||||||
- Checkout a topic branch from a base branch, e.g. `master`, and merge back against that branch.
|
- Checkout a topic branch from a base branch, e.g. `main`, and merge back against that branch.
|
||||||
|
|
||||||
- If adding a new feature:
|
- If adding a new feature:
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
export default {
|
export default {
|
||||||
master: [
|
main: [
|
||||||
{
|
{
|
||||||
sha: 'd1527fbee422c7170e56845e55b49c4fd6de72a7',
|
sha: 'd1527fbee422c7170e56845e55b49c4fd6de72a7',
|
||||||
node_id:
|
node_id:
|
||||||
@ -273,7 +273,7 @@ export default {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
sync: [
|
'v2-compat': [
|
||||||
{
|
{
|
||||||
sha: 'ecf4da822eea97f5db5fa769d39f994755384a4b',
|
sha: 'ecf4da822eea97f5db5fa769d39f994755384a4b',
|
||||||
node_id:
|
node_id:
|
||||||
|
@ -22,7 +22,7 @@ describe('e2e: commits', () => {
|
|||||||
status: 200,
|
status: 200,
|
||||||
contentType: 'application/json',
|
contentType: 'application/json',
|
||||||
headers: { 'Access-Control-Allow-Origin': '*' },
|
headers: { 'Access-Control-Allow-Origin': '*' },
|
||||||
body: JSON.stringify(mocks[match[1] as 'master' | 'sync'])
|
body: JSON.stringify(mocks[match[1] as 'main' | 'v2-compat'])
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -31,16 +31,16 @@ describe('e2e: commits', () => {
|
|||||||
await page().waitForSelector('li')
|
await page().waitForSelector('li')
|
||||||
expect(await count('input')).toBe(2)
|
expect(await count('input')).toBe(2)
|
||||||
expect(await count('label')).toBe(2)
|
expect(await count('label')).toBe(2)
|
||||||
expect(await text('label[for="master"]')).toBe('master')
|
expect(await text('label[for="main"]')).toBe('main')
|
||||||
expect(await text('label[for="sync"]')).toBe('sync')
|
expect(await text('label[for="v2-compat"]')).toBe('v2-compat')
|
||||||
expect(await isChecked('#master')).toBe(true)
|
expect(await isChecked('#main')).toBe(true)
|
||||||
expect(await isChecked('#sync')).toBe(false)
|
expect(await isChecked('#v2-compat')).toBe(false)
|
||||||
expect(await text('p')).toBe('vuejs/vue@master')
|
expect(await text('p')).toBe('vuejs/core@main')
|
||||||
expect(await count('li')).toBe(3)
|
expect(await count('li')).toBe(3)
|
||||||
expect(await count('li .commit')).toBe(3)
|
expect(await count('li .commit')).toBe(3)
|
||||||
expect(await count('li .message')).toBe(3)
|
expect(await count('li .message')).toBe(3)
|
||||||
await click('#sync')
|
await click('#v2-compat')
|
||||||
expect(await text('p')).toBe('vuejs/vue@sync')
|
expect(await text('p')).toBe('vuejs/core@v2-compat')
|
||||||
expect(await count('li')).toBe(3)
|
expect(await count('li')).toBe(3)
|
||||||
expect(await count('li .commit')).toBe(3)
|
expect(await count('li .commit')).toBe(3)
|
||||||
expect(await count('li .message')).toBe(3)
|
expect(await count('li .message')).toBe(3)
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
v-model="currentBranch">
|
v-model="currentBranch">
|
||||||
<label :for="branch">{{ branch }}</label>
|
<label :for="branch">{{ branch }}</label>
|
||||||
</template>
|
</template>
|
||||||
<p>vuejs/vue@{{ currentBranch }}</p>
|
<p>vuejs/core@{{ currentBranch }}</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li v-for="{ html_url, sha, author, commit } in commits">
|
<li v-for="{ html_url, sha, author, commit } in commits">
|
||||||
<a :href="html_url" target="_blank" class="commit">{{ sha.slice(0, 7) }}</a>
|
<a :href="html_url" target="_blank" class="commit">{{ sha.slice(0, 7) }}</a>
|
||||||
@ -26,8 +26,8 @@ const API_URL = `https://api.github.com/repos/vuejs/core/commits?per_page=3&sha=
|
|||||||
|
|
||||||
Vue.createApp({
|
Vue.createApp({
|
||||||
data: () => ({
|
data: () => ({
|
||||||
branches: ['master', 'sync'],
|
branches: ['main', 'v2-compat'],
|
||||||
currentBranch: 'master',
|
currentBranch: 'main',
|
||||||
commits: null
|
commits: null
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
v-model="currentBranch">
|
v-model="currentBranch">
|
||||||
<label :for="branch">{{ branch }}</label>
|
<label :for="branch">{{ branch }}</label>
|
||||||
</template>
|
</template>
|
||||||
<p>vuejs/vue@{{ currentBranch }}</p>
|
<p>vuejs/core@{{ currentBranch }}</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li v-for="{ html_url, sha, author, commit } in commits">
|
<li v-for="{ html_url, sha, author, commit } in commits">
|
||||||
<a :href="html_url" target="_blank" class="commit">{{ sha.slice(0, 7) }}</a>
|
<a :href="html_url" target="_blank" class="commit">{{ sha.slice(0, 7) }}</a>
|
||||||
@ -34,7 +34,7 @@ const formatDate = v => v.replace(/T|Z/g, ' ')
|
|||||||
|
|
||||||
createApp({
|
createApp({
|
||||||
setup() {
|
setup() {
|
||||||
const currentBranch = ref('master')
|
const currentBranch = ref('main')
|
||||||
const commits = ref(null)
|
const commits = ref(null)
|
||||||
|
|
||||||
watchEffect(() => {
|
watchEffect(() => {
|
||||||
@ -47,7 +47,7 @@ createApp({
|
|||||||
})
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
branches: ['master', 'sync'],
|
branches: ['main', 'v2-compat'],
|
||||||
currentBranch,
|
currentBranch,
|
||||||
commits,
|
commits,
|
||||||
truncate,
|
truncate,
|
||||||
|
Loading…
Reference in New Issue
Block a user