File tree Expand file tree Collapse file tree 7 files changed +12
-36
lines changed Expand file tree Collapse file tree 7 files changed +12
-36
lines changed Original file line number Diff line number Diff line change 5
5
"fixed" : [],
6
6
"linked" : [],
7
7
"access" : " public" ,
8
- "baseBranch" : " dev " ,
8
+ "baseBranch" : " main " ,
9
9
"updateInternalDependencies" : " patch" ,
10
10
"ignore" : []
11
11
}
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ We use [Changesets](https://github.com/changesets/changesets) to automatically c
22
22
23
23
Please read and apply all [ contribution requirements] ( https://github.com/skeletonlabs/floating-ui-svelte/blob/chore/main/CONTRIBUTING.md ) .
24
24
25
- - [ ] PR targets the ` dev ` branch (NEVER ` master ` )
25
+ - [ ] PR targets the ` main ` branch
26
26
- [ ] All website documentation is current with your changes
27
27
- [ ] Ensure Prettier formatting is current - run ` pnpm format `
28
28
- [ ] Ensure ESLint linting is current - run ` pnpm lint `
Original file line number Diff line number Diff line change 5
5
6
6
env :
7
7
node_version : 20
8
- pnpm_version : 8
9
8
10
9
jobs :
11
10
lint :
12
11
runs-on : ubuntu-latest
13
12
steps :
14
13
- uses : actions/checkout@v4
15
- - uses : pnpm/action-setup@v3
16
- with :
17
- version : ${{ env.pnpm_version }}
14
+ - uses : pnpm/action-setup@v4
18
15
- name : Use Node.js
19
16
uses : actions/setup-node@v4
20
17
with :
28
25
runs-on : ubuntu-latest
29
26
steps :
30
27
- uses : actions/checkout@v4
31
- - uses : pnpm/action-setup@v3
32
- with :
33
- version : ${{ env.pnpm_version }}
28
+ - uses : pnpm/action-setup@v4
34
29
- name : Use Node.js
35
30
uses : actions/setup-node@v4
36
31
with :
44
39
runs-on : ubuntu-latest
45
40
steps :
46
41
- uses : actions/checkout@v4
47
- - uses : pnpm/action-setup@v3
48
- with :
49
- version : ${{ env.pnpm_version }}
42
+ - uses : pnpm/action-setup@v4
50
43
- name : Use Node.js
51
44
uses : actions/setup-node@v4
52
45
with :
60
53
runs-on : ubuntu-latest
61
54
steps :
62
55
- uses : actions/checkout@v4
63
- - uses : pnpm/action-setup@v3
64
- with :
65
- version : ${{ env.pnpm_version }}
56
+ - uses : pnpm/action-setup@v4
66
57
- name : Use Node.js
67
58
uses : actions/setup-node@v4
68
59
with :
78
69
runs-on : ubuntu-latest
79
70
steps :
80
71
- uses : actions/checkout@v4
81
- - uses : pnpm/action-setup@v3
82
- with :
83
- version : ${{ env.pnpm_version }}
72
+ - uses : pnpm/action-setup@v4
84
73
- name : Use Node.js
85
74
uses : actions/setup-node@v4
86
75
with :
Original file line number Diff line number Diff line change @@ -9,7 +9,6 @@ concurrency: ${{ github.workflow }}-${{ github.ref }}
9
9
10
10
env :
11
11
node_version : 20
12
- pnpm_version : 8
13
12
14
13
jobs :
15
14
release :
19
18
- uses : actions/checkout@v4
20
19
with :
21
20
fetch-depth : 0
22
- - uses : pnpm/action-setup@v3
23
- with :
24
- version : ${{ env.pnpm_version }}
21
+ - uses : pnpm/action-setup@v4
25
22
- name : Use Node.js
26
23
uses : actions/setup-node@v4
27
24
with :
39
36
env :
40
37
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
41
38
NPM_TOKEN : ${{ secrets.NPM_TOKEN }}
42
-
43
- - name : Merge main into dev after publish
44
- if : steps.changesets.outputs.published == 'true'
45
- run : |
46
- git checkout dev
47
- git merge main
48
- git push
Original file line number Diff line number Diff line change 1
1
engine-strict = true
2
+ package-manager-strict = false
Original file line number Diff line number Diff line change @@ -37,12 +37,7 @@ The floating UI Svelte project is built using SvelteKit to handle both the docum
37
37
38
38
## Branch
39
39
40
- Floating UI Svelte uses two primary branches. All pull requests should be created again the ` dev ` branch.
41
-
42
- | Branch | Description | Pull Requests |
43
- | --- | --- | --- |
44
- | ` dev ` | The development branch. | Allowed |
45
- | ` main ` | The release branch. | Never |
40
+ All pull requests should be created against the ` main ` branch.
46
41
47
42
### PR Branch Conventions
48
43
Original file line number Diff line number Diff line change 74
74
},
75
75
"svelte" : " ./dist/index.js" ,
76
76
"types" : " ./dist/index.d.ts" ,
77
- "type" : " module"
77
+ "type" : " module" ,
78
+ "packageManager" :
" [email protected] "
78
79
}
You can’t perform that action at this time.
0 commit comments