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
6 changes: 3 additions & 3 deletions .github/workflows/pkg-pr-new.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ jobs:
run: pnpm exec playwright install --with-deps chromium

# Build the library first so `site/` (which imports `solid-three`
# via `link:..`) can resolve types in the Typecheck step.
# via `link:..`) can resolve types in the lint:types step.
- name: Build
run: pnpm build

- name: Typecheck
run: pnpm lint:types
- name: Lint
run: pnpm lint

- name: Test
run: pnpm test --run
Expand Down
5 changes: 1 addition & 4 deletions demo/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ export function App() {
<Canvas camera={{ position: [0, 0, 5] }} style={{ width: "100%", height: "100%" }}>
<T.AmbientLight intensity={0.5} />
<T.DirectionalLight position={[5, 5, 5]} intensity={1} />
<T.Mesh
onPointerEnter={() => setHovered(true)}
onPointerLeave={() => setHovered(false)}
>
<T.Mesh onPointerEnter={() => setHovered(true)} onPointerLeave={() => setHovered(false)}>
<T.BoxGeometry args={[2, 2, 2]} />
<T.MeshStandardMaterial color={hovered() ? "green" : "red"} />
</T.Mesh>
Expand Down
16 changes: 8 additions & 8 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { defineConfig, globalIgnores } from "eslint/config";
import typescriptEslint from "@typescript-eslint/eslint-plugin";
import noOnlyTests from "eslint-plugin-no-only-tests";
import eslintComments from "eslint-plugin-eslint-comments";
import importPlugin from "eslint-plugin-import";
import tsParser from "@typescript-eslint/parser";
import { defineConfig, globalIgnores } from "eslint/config"
import typescriptEslint from "@typescript-eslint/eslint-plugin"
import noOnlyTests from "eslint-plugin-no-only-tests"
import eslintComments from "eslint-plugin-eslint-comments"
import importPlugin from "eslint-plugin-import"
import tsParser from "@typescript-eslint/parser"

export default defineConfig([
globalIgnores([
Expand Down Expand Up @@ -46,7 +46,7 @@ export default defineConfig([
],
"@typescript-eslint/no-useless-empty-export": "warn",
"eslint-comments/no-unused-disable": "warn",
"import/extensions": ["error", "always"],
"import/extensions": ["error", "always", { ignorePackages: true }],
"no-console": [
"error",
{
Expand All @@ -58,4 +58,4 @@ export default defineConfig([
"prefer-const": "warn",
},
},
]);
])
15 changes: 5 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@
"build:site": "pnpm -C site build",
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
"dev:site": "pnpm -C site dev",
"lint": "pnpm lint:circular && pnpm lint:code && pnpm lint:types",
"format": "prettier --write 'src/**/*.{ts,tsx}' 'tests/**/*.{ts,tsx}' 'demo/**/*.{ts,tsx}' 'site/src/**/*.{ts,tsx,mdx}' '*.{ts,js,mjs,cjs}'",
"lint": "pnpm lint:circular && pnpm lint:code && pnpm lint:format && pnpm lint:types",
"lint:circular": "dpdm -T src",
"lint:code": "eslint --max-warnings 0 src/**/*.{ts,tsx}",
"lint:code": "eslint --max-warnings 0 'src/**/*.{ts,tsx}' 'tests/**/*.{ts,tsx}' 'site/src/**/*.{ts,tsx}'",
"lint:format": "prettier --check 'src/**/*.{ts,tsx}' 'tests/**/*.{ts,tsx}' 'demo/**/*.{ts,tsx}' 'site/src/**/*.{ts,tsx,mdx}' '*.{ts,js,mjs,cjs}'",
"lint:types": "tsc --noEmit",
"prepublishOnly": "pnpm lint && pnpm build",
"test": "vitest run",
Expand Down Expand Up @@ -94,22 +96,18 @@
"dpdm": "^3.14.0",
"esbuild": "^0.21.4",
"esbuild-plugin-solid": "^0.6.0",
"esbuild-register": "^3.5.0",
"eslint": "^9.32.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-no-only-tests": "^3.3.0",
"jest": "^29.7.0",
"jiti": "^2.5.1",
"playwright": "^1.60.0",
"prettier": "3.8.3",
"remark-gfm": "^3.0.1",
"rollup": "^4.18.0",
"rollup-plugin-dts": "^6.1.1",
"solid-app-router": "^0.1.14",
"solid-js": "^1.8.17",
"three": "^0.181.2",
"three-stdlib": "^2.36.0",
"tsm": "^2.3.0",
"tsup": "^8.0.2",
"tsup-preset-solid": "^2.2.0",
"typescript": "^5.4.5",
Expand All @@ -122,8 +120,5 @@
"@types/three": "*",
"solid-js": "*",
"three": "*"
},
"jest": {
"preset": "scripts/jest/node"
}
}
Loading
Loading