Skip to content

Commit 5fa818c

Browse files
authored
Merge branch 'main' into add-generic-template-args
2 parents 0311699 + f9e6694 commit 5fa818c

File tree

278 files changed

+20122
-10498
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+20122
-10498
lines changed

.changeset/nervous-dodos-deny.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.eslintrc

Lines changed: 0 additions & 39 deletions
This file was deleted.

.github/workflows/format.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313

14-
- uses: pnpm/action-setup@v2.2.4
14+
- uses: pnpm/action-setup@v4
1515

1616
- name: Setup Node.js environment
17-
uses: actions/setup-node@v3
17+
uses: actions/setup-node@v4
1818
with:
19-
node-version: 18
19+
node-version: 20
2020
cache: pnpm
2121

2222
- name: Install dependencies
2323
run: pnpm install
2424

2525
- name: Setup prettier cache
26-
uses: actions/cache@v3
26+
uses: actions/cache@v4
2727
with:
2828
path: node_modules/.cache/prettier
2929
key: prettier-${{ github.sha }}
@@ -34,15 +34,15 @@ jobs:
3434
run: pnpm run format
3535

3636
- name: Add, Commit and Push
37-
uses: stefanzweifel/git-auto-commit-action@v4
37+
uses: stefanzweifel/git-auto-commit-action@v5
3838
with:
3939
commit_message: "Format"
4040

4141
- name: Update Readme
4242
run: pnpm run update-readme
4343

4444
- name: Add, Commit and Push
45-
uses: stefanzweifel/git-auto-commit-action@v4
45+
uses: stefanzweifel/git-auto-commit-action@v5
4646
with:
4747
commit_message: "Update Readme"
4848
file_pattern: README.md

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ jobs:
1010
release:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

15-
- uses: pnpm/action-setup@v2.2.4
15+
- uses: pnpm/action-setup@v4
1616

1717
- name: Setup Node.js environment
18-
uses: actions/setup-node@v3
18+
uses: actions/setup-node@v4
1919
with:
20-
node-version: 18
20+
node-version: 20
2121
cache: pnpm
2222

2323
- name: Install Dependencies
2424
run: pnpm i
2525

2626
- name: Cache turbo build setup
27-
uses: actions/cache@v3
27+
uses: actions/cache@v4
2828
with:
2929
path: node_modules/.cache/turbo
3030
key: turbo-${{ github.sha }}

.github/workflows/tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

16-
- uses: pnpm/action-setup@v2.2.4
16+
- uses: pnpm/action-setup@v4
1717

1818
- name: Setup Node.js environment
19-
uses: actions/setup-node@v3
19+
uses: actions/setup-node@v4
2020
with:
21-
node-version: 18
21+
node-version: 20
2222
cache: pnpm
2323

2424
- name: Install dependencies
2525
run: pnpm install
2626

2727
- name: Cache turbo build setup
28-
uses: actions/cache@v3
28+
uses: actions/cache@v4
2929
with:
3030
path: node_modules/.cache/turbo
3131
key: turbo-${{ github.sha }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ node_modules/
7474
jspm_packages/
7575
dist/
7676

77+
7778
# TypeScript v1 declaration files
7879
typings/
7980

@@ -153,6 +154,7 @@ dist/
153154

154155
# vscode settings
155156
.vscode/settings.json
157+
.vscode/launch.json
156158

157159
# Temporary folders
158160
tmp/

.nvmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

README.md

Lines changed: 7 additions & 6 deletions
Large diffs are not rendered by default.

configs/vitest.config.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
import { defineConfig } from "vitest/config";
22
import solidPlugin from "vite-plugin-solid";
3+
import * as utils from "../scripts/utils/index.js"
34

4-
const fromRoot = process.env.CI === "true";
5+
const package_name = utils.getPackageNameFromCWD()
6+
7+
if (package_name == null) {
8+
utils.logLine("Testing ALL packages...")
9+
} else {
10+
utils.logLine("Testing "+package_name+" package...")
11+
}
12+
13+
const from_root = package_name == null
514

615
export default defineConfig(({ mode }) => {
716
// test in server environment
@@ -25,7 +34,7 @@ export default defineConfig(({ mode }) => {
2534
transformMode: {
2635
web: [/\.[jt]sx$/],
2736
},
28-
...(fromRoot
37+
...(from_root
2938
? // Testing all packages from root
3039
{
3140
...(testSSR && { include: ["packages/*/test/server.test.{ts,tsx}"] }),

eslint.config.mjs

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
import typescriptEslint from "@typescript-eslint/eslint-plugin";
2+
import noOnlyTests from "eslint-plugin-no-only-tests";
3+
import eslintComments from "eslint-plugin-eslint-comments";
4+
import tsParser from "@typescript-eslint/parser";
5+
6+
/** @type {import("eslint").Linter.Config} */
7+
export default {
8+
9+
files: ["**/*.{js,mjs,jsx,ts,tsx}"],
10+
ignores: ["**/{dist,node_modules,__snapshots__}/**/*", "packages/*/dev/**/*", "site/**/*"],
11+
12+
plugins: {
13+
"@typescript-eslint": typescriptEslint,
14+
"no-only-tests": noOnlyTests,
15+
"eslint-comments": eslintComments,
16+
},
17+
18+
languageOptions: {
19+
parser: tsParser,
20+
ecmaVersion: 5,
21+
sourceType: "module",
22+
23+
parserOptions: {
24+
project: "./tsconfig.json",
25+
tsconfigRootDir: ".",
26+
},
27+
},
28+
29+
rules: {
30+
"no-console": "warn",
31+
"no-debugger": "warn",
32+
"prefer-const": "warn",
33+
34+
"@typescript-eslint/no-unused-vars": ["warn", {
35+
argsIgnorePattern: "^_",
36+
varsIgnorePattern: "^_",
37+
caughtErrorsIgnorePattern: "^_",
38+
}],
39+
40+
"@typescript-eslint/no-unnecessary-boolean-literal-compare": "warn",
41+
"@typescript-eslint/no-unnecessary-condition": "warn",
42+
"@typescript-eslint/no-unnecessary-qualifier": "warn",
43+
"@typescript-eslint/no-unnecessary-type-arguments": "warn",
44+
"@typescript-eslint/no-unnecessary-type-assertion": "warn",
45+
"@typescript-eslint/no-unnecessary-type-constraint": "warn",
46+
"@typescript-eslint/no-useless-empty-export": "warn",
47+
"eslint-comments/no-unused-disable": "warn",
48+
"no-only-tests/no-only-tests": "warn",
49+
},
50+
};

netlify.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[build]
22
base = "/"
3-
publish = "site/dist/public"
3+
publish = "site/dist"
44
command = "pnpm build && pnpm -dir site run deploy"

package.json

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"scripts": {
1414
"dev": "pnpm -dir site run dev",
1515
"format": "prettier --cache -w {site,packages,scripts,template}/**/*.{js,ts,json,css,tsx,jsx,md,html} --ignore-path .gitignore",
16-
"lint:packages": "eslint --ignore-path .gitignore --max-warnings 0 packages/*/src/**/*",
17-
"lint:tests": "eslint --ignore-path .gitignore packages/*/test/** --quiet --rule \"no-only-tests/no-only-tests: error\"",
18-
"lint": "concurrently pnpm:lint:*",
19-
"test:client": "cross-env CI=true vitest -c ./configs/vitest.config.ts",
16+
"lint:packages": "eslint --max-warnings 0 \"packages/*/src/**/*\"",
17+
"lint:tests": "eslint \"packages/*/test/**\" --rule \"no-only-tests/no-only-tests: error\"",
18+
"lint": "pnpm run \"/^lint:.*/\"",
19+
"test:client": "vitest -c ./configs/vitest.config.ts",
2020
"test:ssr": "pnpm run test:client --mode ssr",
2121
"test": "pnpm run test:client && pnpm run test:ssr",
2222
"build:ci": "turbo run build --filter='./packages/*'",
@@ -28,42 +28,36 @@
2828
"release": "pnpm build && changeset publish"
2929
},
3030
"devDependencies": {
31-
"@changesets/cli": "^2.27.1",
32-
"@solidjs/testing-library": "^0.8.5",
33-
"@types/fs-extra": "^11.0.4",
34-
"@types/jsdom": "^21.1.6",
35-
"@types/node": "^20.10.5",
36-
"@typescript-eslint/eslint-plugin": "^6.15.0",
37-
"@typescript-eslint/parser": "^6.15.0",
38-
"concurrently": "^8.2.2",
39-
"cross-env": "^7.0.3",
31+
"@changesets/cli": "^2.27.8",
32+
"@types/jsdom": "^21.1.7",
33+
"@types/node": "^22.5.4",
34+
"@typescript-eslint/eslint-plugin": "^8.5.0",
35+
"@typescript-eslint/parser": "^8.5.0",
4036
"esbuild": "^0.19.11",
41-
"eslint": "^8.56.0",
37+
"eslint": "^9.10.0",
4238
"eslint-plugin-eslint-comments": "^3.2.0",
43-
"eslint-plugin-no-only-tests": "^3.1.0",
44-
"fs-extra": "^11.2.0",
45-
"gzip-size": "^7.0.0",
46-
"jsdom": "^22.1.0",
39+
"eslint-plugin-no-only-tests": "^3.3.0",
40+
"jsdom": "^25.0.0",
4741
"json-to-markdown-table": "^1.0.0",
48-
"prettier": "^3.1.1",
49-
"prettier-plugin-tailwindcss": "^0.5.9",
42+
"prettier": "^3.3.3",
43+
"prettier-plugin-tailwindcss": "^0.6.6",
5044
"rehype-autolink-headings": "^7.1.0",
5145
"rehype-highlight": "^7.0.0",
5246
"rehype-slug": "^6.0.0",
5347
"remark-gfm": "^4.0.0",
54-
"solid-devtools": "^0.29.2",
55-
"solid-js": "^1.8.7",
56-
"solid-start": "^0.3.10",
57-
"tsup": "^7.2.0",
48+
"solid-js": "^1.8.22",
49+
"@solidjs/start": "^1.0.6",
50+
"tsup": "^8.2.4",
5851
"tsup-preset-solid": "^2.2.0",
59-
"tsx": "^4.7.0",
60-
"turbo": "^1.11.2",
61-
"typescript": "~5.2.2",
52+
"tsx": "^4.19.1",
53+
"turbo": "^1.12.5",
54+
"vinxi": "^0.4.2",
55+
"vite-plugin-solid": "^2.10.2",
56+
"typescript": "~5.6.2",
6257
"valibot": "^0.20.1",
63-
"vite": "^4.5.1",
64-
"vite-plugin-solid": "^2.8.0",
65-
"vitest": "^0.34.6"
58+
"vite": "5.4.4",
59+
"vitest": "^2.1.0"
6660
},
67-
"packageManager": "pnpm@8.15.6+sha256.01c01eeb990e379b31ef19c03e9d06a14afa5250b82e81303f88721c99ff2e6f",
68-
"engines": {"node": ">=18.0.0"}
61+
"packageManager": "pnpm@9.9.0",
62+
"engines": {"node": ">=20.0.0"}
6963
}

packages/active-element/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
##### Non-reactive primitives:
1313

14-
- [`makeActiveElementListener`](#makeActiveElementListener) - Listen for changes to the `document.activeElement`.
15-
- [`makeFocusListener`](#makeFocusListener) - Attaches "blur" and "focus" event listeners to the element.
14+
- [`makeActiveElementListener`](#makeactiveelementlistener) - Listen for changes to the `document.activeElement`.
15+
- [`makeFocusListener`](#makefocuslistener) - Attaches "blur" and "focus" event listeners to the element.
1616

1717
##### Reactive primitives:
1818

19-
- [`createActiveElement`](#createActiveElement) - Provides reactive signal of `document.activeElement`.
20-
- [`createFocusSignal`](#createFocusSignal) - Provides a signal representing element's focus state.
19+
- [`createActiveElement`](#createactiveelement) - Provides reactive signal of `document.activeElement`.
20+
- [`createFocusSignal`](#createfocussignal) - Provides a signal representing element's focus state.
2121

2222
##### Directives:
2323

packages/active-element/test/index.test.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { fireEvent, createEvent } from "@solidjs/testing-library";
21
import { createRoot } from "solid-js";
32
import { describe, test, expect } from "vitest";
43
import {
@@ -9,8 +8,12 @@ import {
98
focus,
109
} from "../src/index.js";
1110

12-
const dispatchFocusEvent = (target: Element | Window = window, event: "focus" | "blur" = "focus") =>
13-
fireEvent(target, createEvent(event, window));
11+
const dispatchFocusEvent = (
12+
target: Element | Window = window,
13+
event: "focus" | "blur" = "focus",
14+
) => {
15+
target.dispatchEvent(new FocusEvent(event));
16+
};
1417

1518
describe("makeActiveElementListener", () => {
1619
test("works properly", () =>

packages/audio/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# @solid-primitives/audio
22

3+
## 1.3.18
4+
5+
### Patch Changes
6+
7+
- b993fff: Set "COMPLETE" state on "ended"
8+
9+
Improved ssr support by setting the initial duration and volume to zero for `createAudio` to match the server state.
10+
311
## 1.3.17
412

513
### Patch Changes

0 commit comments

Comments
 (0)