Skip to content

Commit c79d830

Browse files
committed
Config path changes and build testing
1 parent 454249f commit c79d830

File tree

5 files changed

+85
-66
lines changed

5 files changed

+85
-66
lines changed

config/eslint/eslint.config.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
// @ts-expect-error The react team don't expose types for the eslint plugin currently
22
import * as reactCompiler from "eslint-plugin-react-compiler";
33
import * as tseslint from "typescript-eslint";
4+
import { includeIgnoreFile } from "@eslint/compat";
45
import eslint from "@eslint/js";
6+
import { resolve } from "node:path";
57
import { dirname } from "path";
68
import { type ConfigArray } from "typescript-eslint";
79

810
const configDirectory: string = dirname(import.meta.dirname);
911
const rootDirectory: string = dirname(configDirectory);
12+
const gitignore: string = resolve(rootDirectory, ".gitignore");
13+
1014
const config: ConfigArray = tseslint.config(
1115
eslint.configs.recommended,
1216
tseslint.configs.strict,
1317
tseslint.configs.stylistic,
18+
includeIgnoreFile(gitignore),
1419
{
1520
...reactCompiler.configs.recommended,
1621
languageOptions: {
1722
parserOptions: {
1823
project: true,
1924
tsconfigRootDir: rootDirectory
2025
}
21-
},
22-
ignores: ["**/dist/**"]
26+
}
2327
}
2428
);
2529

config/typescript/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
"jsx": "react-jsx",
2020
"noImplicitAny": true
2121
},
22-
"include": ["../../"],
22+
"include": ["../../config", "../../src", "../../tests", "../../demo"],
2323
"references": [{ "path": "./tsconfig.node.json" }]
2424
}

config/vite/vite.component.config.ts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ import { resolve } from "node:path";
33
import dts from "vite-plugin-dts";
44
import { defineConfig } from "vitest/config";
55

6-
const outputDirectory = resolve(__dirname, "..", "..", "dist", "component");
7-
8-
export default defineConfig({
6+
const rootDir = resolve(__dirname, "..", "..");
7+
const outputDirectory = resolve(rootDir, "dist", "component");
8+
const tsConfigPath = resolve(rootDir, "tsconfig.json");
9+
const config = defineConfig({
910
plugins: [
1011
dts({
1112
rollupTypes: true,
13+
tsconfigPath: tsConfigPath,
1214
outDir: outputDirectory
1315
}),
1416
react({
@@ -23,7 +25,7 @@ export default defineConfig({
2325
build: {
2426
emptyOutDir: true,
2527
lib: {
26-
entry: resolve(__dirname, "..", "..", "src", "main.tsx"),
28+
entry: resolve(rootDir, "src", "main.tsx"),
2729
name: "ReactP5Wrapper",
2830
fileName: "ReactP5Wrapper",
2931
formats: ["es", "cjs"]
@@ -49,19 +51,15 @@ export default defineConfig({
4951
coverage: {
5052
include: ["src"]
5153
},
52-
setupFiles: resolve(__dirname, "..", "..", "tests", "setup.ts"),
54+
setupFiles: resolve(rootDir, "tests", "setup.ts"),
5355
deps: {
5456
optimizer: {
5557
web: {
5658
include: ["vitest-canvas-mock"]
5759
}
5860
}
59-
},
60-
onConsoleLog() {
61-
return false;
62-
},
63-
onStackTrace() {
64-
return false;
6561
}
6662
}
6763
});
64+
65+
export default config;

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020
},
2121
"scripts": {
2222
"build": "rimraf dist && pnpm build:component && pnpm build:demo",
23-
"build:component": "tsc --declaration --noEmit && vite build --config config/vite/vite.component.config.ts",
23+
"build:component": "tsc --noEmit && vite build --config config/vite/vite.component.config.ts",
2424
"build:demo": "vite build --config config/vite/vite.demo.config.ts",
2525
"ci": "pnpm format:check && pnpm lint && pnpm test && pnpm build",
2626
"dev": "vite --config config/vite/vite.demo.config.ts --host",
2727
"format": "pnpm prettier --write .",
2828
"format:check": "pnpm prettier --check .",
29-
"lint": "eslint --ignore-pattern dist --config config/eslint/eslint.config.ts",
29+
"lint": "eslint --config config/eslint/eslint.config.ts",
3030
"lint:fix": "pnpm lint --fix",
3131
"prettier": "prettier --config config/prettier/prettier.json --ignore-path .gitignore",
32-
"test": "vitest run --config config/vite/vite.component.config.ts",
33-
"test:coverage": "vitest run --coverage --config config/vite/vite.component.config.ts",
32+
"test": "vitest run --silent --config config/vite/vite.component.config.ts",
33+
"test:coverage": "vitest run --silent --coverage --config config/vite/vite.component.config.ts",
3434
"test:watch": "vitest watch --config config/vite/vite.component.config.ts"
3535
},
3636
"keywords": [
@@ -88,12 +88,13 @@
8888
},
8989
"devDependencies": {
9090
"@babel/eslint-plugin": "^7.25.9",
91+
"@eslint/compat": "^1.2.6",
9192
"@eslint/js": "^9.19.0",
9293
"@testing-library/jest-dom": "6.6.3",
9394
"@testing-library/react": "^16.2.0",
9495
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
9596
"@types/jest": "^29.5.14",
96-
"@types/node": "^22.12.0",
97+
"@types/node": "^22.13.0",
9798
"@types/p5": "^1.7.6",
9899
"@types/react": "^19.0.8",
99100
"@types/react-dom": "^19.0.3",

0 commit comments

Comments
 (0)