Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/cool-pears-arrive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'clerk-solidjs': minor
---

Remove bun, fix bundling
5 changes: 5 additions & 0 deletions .changeset/swift-zebras-cross.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'clerk-solidjs': patch
---

Still trying to fix build
16 changes: 11 additions & 5 deletions .github/actions/ci-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@ description: 'CI setup for clerk-solidjs'
runs:
using: 'composite'
steps:
- name: Use Bun
uses: oven-sh/setup-bun@v2
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
bun-version: 1.1.17
run_install: false

- name: Install Dependencies
run: bun install
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'

- name: Install dependencies
run: pnpm install
shell: bash
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
- uses: actions/checkout@v3
- uses: ./.github/actions/ci-setup
- name: Test
run: bun run test
run: pnpm run test
6 changes: 3 additions & 3 deletions .github/workflows/quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v3
- uses: ./.github/actions/ci-setup
- name: Run Prettier check
run: bun run format:check
run: pnpm run format:check

eslint:
name: 'ESLint'
Expand All @@ -23,7 +23,7 @@ jobs:
- uses: actions/checkout@v3
- uses: ./.github/actions/ci-setup
- name: Run ESLint check
run: bun run lint
run: pnpm run lint

types:
name: 'TypeScript'
Expand All @@ -32,4 +32,4 @@ jobs:
- uses: actions/checkout@v3
- uses: ./.github/actions/ci-setup
- name: Run TypeScript type check
run: bun run type-check
run: pnpm run type-check
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
id: changesets
uses: changesets/action@v1
with:
version: bun run version
publish: bun run release
version: pnpm run version
publish: pnpm run release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
dist
node_modules
node_modules
pnpm-lock.yaml
Binary file removed bun.lockb
Binary file not shown.
10 changes: 5 additions & 5 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The current setup is based on:

### Prerequisites

Ensure that you have Bun installed ([How to install Bun](https://bun.sh/docs/installation)). Its version should be equal or higher than `1.0.0`.
Ensure that you have Node.js installed ([How to install Node](https://nodejs.org/en/download/)). Its version should be equal or higher than `18`.

### Setting up your local environment

Expand All @@ -49,17 +49,17 @@ To set up your development environment, please follow these steps:
git clone https://github.com/ian-pascoe/clerk-solidjs
```

1. Install the dependencies. We're using bun, so you **should always run `bun install`**, as it will install all of the dependencies:
1. Install the dependencies. We're using pnpm, so you **should always run `pnpm install`**, as it will install all of the dependencies:

```sh
cd clerk-solidjs
bun install
pnpm install
```

1. Build the project

```sh
bun run build
pnpm run build
```

This ensures that all internal TypeScript types are generated.
Expand Down Expand Up @@ -91,7 +91,7 @@ If your change can't only be tested by unit tests, you should add/edit an integr
1. Fork the project
1. Create your feature branch (`git checkout -b feat/amazing_feature`)
1. It's highly recommended to [write tests](#writing-tests) to ensure your change works and will continue to work in the future
1. If required, create a `changeset` that describes your changes (`bun run changeset`). In cases where a changeset is not required, an empty changeset can be created instead (`bun run changeset:empty`) - an empty changeset will not generate a changelog entry for the change, so please use it as an escape hatch or for internal refactors only.
1. If required, create a `changeset` that describes your changes (`pnpm run changeset`). In cases where a changeset is not required, an empty changeset can be created instead (`pnpm run changeset:empty`) - an empty changeset will not generate a changelog entry for the change, so please use it as an escape hatch or for internal refactors only.
1. Commit your changes (`git commit -m 'feat: Add amazing_feature'`)
1. Push to the branch (`git push origin feat/amazing_feature`)
1. [Open a Pull Request](https://github.com/ian-pascoe/clerk-solidjs/compare?expand=1). Make sure the description includes enough information for the reviewer to understand what the PR is about.
Expand Down
8 changes: 5 additions & 3 deletions eslint.config.mjs → eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ import pluginJs from '@eslint/js';
import globals from 'globals';
import tseslint from 'typescript-eslint';

export default [
{ files: ['**/*.{js,jsx,mjs,cjs,ts,tsx}'] },
export default tseslint.config(
{
ignores: ['node_modules/**', 'dist/**']
},
{ languageOptions: { globals: { ...globals.browser, ...globals.node } } },
pluginJs.configs.recommended,
...tseslint.configs.recommended,
Expand All @@ -13,4 +15,4 @@ export default [
'@typescript-eslint/ban-ts-comment': 'warn'
}
}
];
);
32 changes: 17 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,28 +108,32 @@
}
}
},
"browser": {
"./dist/index/server.js": "./dist/index/index.js",
"./dist/index/server.cjs": "./dist/index/index.cjs"
},
"source": "src/index.ts",
"files": [
"dist"
],
"scripts": {
"build": "tsup",
"dev": "tsup --watch",
"dev:publish": "bun run dev -- --env.publish",
"dev:publish": "pnpm run dev -- --env.publish",
"type-check": "tsc --noEmit",
"format": "prettier --write .",
"format:check": "prettier --check .",
"lint": "eslint src",
"lint:fix": "eslint src --fix",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"test": "vitest run",
"test:watch": "vitest watch",
"prepare": "bun run build",
"prepare": "pnpm run build",
"changeset": "changeset",
"prerelease": "bun run lint && bun run test",
"version": "changeset version && bun install --no-frozen-lockfile",
"prerelease": "pnpm run lint && pnpm run test",
"version": "changeset version && pnpm install --no-frozen-lockfile",
"release": "changeset publish",
"clean": "rimraf dist",
"publish:local": "bunx yalc push --replace --sig"
"publish:local": "pnpm dlx yalc push --replace --sig"
},
"dependencies": {
"@clerk/backend": "^1.3.1",
Expand All @@ -146,11 +150,13 @@
"devDependencies": {
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.7",
"@clerk/localizations": "^2.4.6",
"@clerk/themes": "^2.1.10",
"@clerk/types": "^4.6.1",
"@eslint/js": "^9.6.0",
"@testing-library/jest-dom": "^6.4.6",
"@testing-library/user-event": "^14.5.2",
"@types/node": "^20.14.10",
"changeset": "^0.2.6",
"esbuild-plugin-solid": "^0.6.0",
"eslint": "^9.6.0",
Expand All @@ -168,23 +174,19 @@
"vitest": "^2.0.2"
},
"peerDependencies": {
"solid-js": "^1.8",
"@solidjs/start": "^1"
"@solidjs/start": "^1",
"solid-js": "^1.8"
},
"engines": {
"node": ">=18"
},
"packageManager": "bun@1.1.17",
"packageManager": "pnpm@9.4.0",
"publishConfig": {
"access": "public"
},
"trustedDependencies": [
"@clerk/shared",
"browser-tabs-lock",
"core-js"
],
"browser": {
"./dist/index/server.js": "./dist/index/index.js",
"./dist/index/server.cjs": "./dist/index/index.cjs"
}
]
}
Loading