Skip to content

Commit f22d915

Browse files
Chore: Remove dev branch (#136)
* removed dev branch reference throughout infra * simplify * update contribution docs --------- Co-authored-by: AdrianGonz97 <[email protected]>
1 parent b6366e9 commit f22d915

File tree

7 files changed

+12
-36
lines changed

7 files changed

+12
-36
lines changed

.changeset/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"fixed": [],
66
"linked": [],
77
"access": "public",
8-
"baseBranch": "dev",
8+
"baseBranch": "main",
99
"updateInternalDependencies": "patch",
1010
"ignore": []
1111
}

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ We use [Changesets](https://github.com/changesets/changesets) to automatically c
2222

2323
Please read and apply all [contribution requirements](https://github.com/skeletonlabs/floating-ui-svelte/blob/chore/main/CONTRIBUTING.md).
2424

25-
- [ ] PR targets the `dev` branch (NEVER `master`)
25+
- [ ] PR targets the `main` branch
2626
- [ ] All website documentation is current with your changes
2727
- [ ] Ensure Prettier formatting is current - run `pnpm format`
2828
- [ ] Ensure ESLint linting is current - run `pnpm lint`

.github/workflows/ci.yml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@ on:
55

66
env:
77
node_version: 20
8-
pnpm_version: 8
98

109
jobs:
1110
lint:
1211
runs-on: ubuntu-latest
1312
steps:
1413
- uses: actions/checkout@v4
15-
- uses: pnpm/action-setup@v3
16-
with:
17-
version: ${{ env.pnpm_version }}
14+
- uses: pnpm/action-setup@v4
1815
- name: Use Node.js
1916
uses: actions/setup-node@v4
2017
with:
@@ -28,9 +25,7 @@ jobs:
2825
runs-on: ubuntu-latest
2926
steps:
3027
- uses: actions/checkout@v4
31-
- uses: pnpm/action-setup@v3
32-
with:
33-
version: ${{ env.pnpm_version }}
28+
- uses: pnpm/action-setup@v4
3429
- name: Use Node.js
3530
uses: actions/setup-node@v4
3631
with:
@@ -44,9 +39,7 @@ jobs:
4439
runs-on: ubuntu-latest
4540
steps:
4641
- uses: actions/checkout@v4
47-
- uses: pnpm/action-setup@v3
48-
with:
49-
version: ${{ env.pnpm_version }}
42+
- uses: pnpm/action-setup@v4
5043
- name: Use Node.js
5144
uses: actions/setup-node@v4
5245
with:
@@ -60,9 +53,7 @@ jobs:
6053
runs-on: ubuntu-latest
6154
steps:
6255
- uses: actions/checkout@v4
63-
- uses: pnpm/action-setup@v3
64-
with:
65-
version: ${{ env.pnpm_version }}
56+
- uses: pnpm/action-setup@v4
6657
- name: Use Node.js
6758
uses: actions/setup-node@v4
6859
with:
@@ -78,9 +69,7 @@ jobs:
7869
runs-on: ubuntu-latest
7970
steps:
8071
- uses: actions/checkout@v4
81-
- uses: pnpm/action-setup@v3
82-
with:
83-
version: ${{ env.pnpm_version }}
72+
- uses: pnpm/action-setup@v4
8473
- name: Use Node.js
8574
uses: actions/setup-node@v4
8675
with:

.github/workflows/release.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ concurrency: ${{ github.workflow }}-${{ github.ref }}
99

1010
env:
1111
node_version: 20
12-
pnpm_version: 8
1312

1413
jobs:
1514
release:
@@ -19,9 +18,7 @@ jobs:
1918
- uses: actions/checkout@v4
2019
with:
2120
fetch-depth: 0
22-
- uses: pnpm/action-setup@v3
23-
with:
24-
version: ${{ env.pnpm_version }}
21+
- uses: pnpm/action-setup@v4
2522
- name: Use Node.js
2623
uses: actions/setup-node@v4
2724
with:
@@ -39,10 +36,3 @@ jobs:
3936
env:
4037
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4138
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

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
engine-strict=true
2+
package-manager-strict=false

CONTRIBUTING.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,7 @@ The floating UI Svelte project is built using SvelteKit to handle both the docum
3737

3838
## Branch
3939

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.
4641

4742
### PR Branch Conventions
4843

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,6 @@
7474
},
7575
"svelte": "./dist/index.js",
7676
"types": "./dist/index.d.ts",
77-
"type": "module"
77+
"type": "module",
78+
"packageManager": "[email protected]"
7879
}

0 commit comments

Comments
 (0)