Skip to content

Commit 2c74afa

Browse files
author
Alex Lohr
committed
fix package.json
fix some tests
1 parent 355be22 commit 2c74afa

39 files changed

+875
-731
lines changed

‎packages/composites/package.json

+31-3
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,38 @@
2525
"dist"
2626
],
2727
"type": "module",
28-
"main": "./dist/index.cjs",
29-
"module": "./dist/index.js",
28+
"main": "./dist/server.cjs",
29+
"module": "./dist/server.js",
30+
"browser": {
31+
"./dist/server.cjs": "./dist/index.cjs",
32+
"./dist/server.js": "./dist/index.js"
33+
},
3034
"types": "./dist/index.d.ts",
31-
"scripts": {},
35+
"exports": {
36+
"worker": {
37+
"import": "./dist/server.js",
38+
"require": "./dist/server.cjs"
39+
},
40+
"browser": {
41+
"import": "./dist/index.js",
42+
"require": "./dist/index.cjs"
43+
},
44+
"deno": {
45+
"import": "./dist/server.js",
46+
"require": "./dist/server.cjs"
47+
},
48+
"node": {
49+
"import": "./dist/server.js",
50+
"require": "./dist/server.cjs"
51+
},
52+
"import": "./dist/index.js",
53+
"require": "./dist/index.cjs"
54+
},
55+
"scripts": {
56+
"build": "jiti ../../scripts/build.ts --ssr",
57+
"test": "vitest -c ../../configs/vitest.config.ts",
58+
"test:ssr": "pnpm run test --mode ssr"
59+
},
3260
"keywords": [
3361
"watch",
3462
"effect",

‎packages/composites/src/common.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,6 @@ export const createComputationWatcher = <O extends Object>(
9292
Object.assign(returns, _returns);
9393
return _fn;
9494
}, initialCallback);
95-
const _fn: EffectCallback<any, any> = (a, b, c) => (!disposed ? fn(a, b, c) : c);
96-
return [returns, computation(on(source, _fn, options), options.value, options)];
95+
const _fn: EffectCallback<any, any> = (a: any, b: any, c: any) => (!disposed ? fn(a, b, c) : c);
96+
return [returns, computation(on(source, _fn, options as any), options.value, options)];
9797
};

‎packages/composites/src/modifiers.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export const atMost = createModifier<
5151
true
5252
>((s, callback, config, stop) => {
5353
const [count, setCount] = createSignal(0);
54-
const _fn: EffectCallback<any, any> = (a, b, c) => {
54+
const _fn: EffectCallback<any, any> = (a: any, b: any, c: any) => {
5555
setCount(p => p + 1);
5656
count() + 1 >= access(config.limit) && stop();
5757
return callback(a, b, c);
@@ -68,8 +68,8 @@ export const atMost = createModifier<
6868
* ```
6969
*/
7070
export const debounce = createModifier<number>((s, fn, wait) => {
71-
const [_fn, clear] = _debounce(fn, wait);
72-
onCleanup(clear);
71+
const _fn = _debounce(fn, wait);
72+
onCleanup(_fn.clear);
7373
return [_fn, {}];
7474
});
7575

@@ -158,7 +158,7 @@ export const ignorable = createModifier<
158158
>((s, fn) => {
159159
const [ignoringNext, setIgnoringNext] = createSignal(0);
160160
let ignoring = false;
161-
const _fn: EffectCallback<any, any> = (a, b, c) => {
161+
const _fn: EffectCallback<any, any> = (a: any, b: any, c: any) => {
162162
if (ignoring) return c;
163163
if (ignoringNext() > 0) {
164164
setIgnoringNext(p => p - 1);

‎packages/context/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"type": "module",
2929
"main": "./dist/index.cjs",
3030
"module": "./dist/index.js",
31-
"types": "./dist/index.d.ts",
3231
"browser": {},
32+
"types": "./dist/index.d.ts",
3333
"exports": {
3434
"browser": {
3535
"import": "./dist/index.js",

‎packages/fetch/package.json

+1-11
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,7 @@
7575
"primitives"
7676
],
7777
"devDependencies": {
78-
"@types/node": "^18.7.16",
79-
"jsdom": "^20.0.0",
80-
"prettier": "^2.7.1",
81-
"rimraf": "^3.0.2",
82-
"solid-js": "^1.5.0",
83-
"tslib": "^2.4.0",
84-
"tsup": "^6.2.3",
85-
"typescript": "^4.8.2",
86-
"vite": "^3.0.1",
87-
"vite-plugin-solid": "2.3.0",
88-
"vitest": "^0.23.1"
78+
"@types/node": "^18.7.16"
8979
},
9080
"peerDependencies": {
9181
"node-fetch": ">=3.2.10",

‎packages/gestures/package.json

+38-2
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,53 @@
44
"description": "Directives to react to gestures",
55
"author": "Moshe Uminer",
66
"license": "MIT",
7-
"typings": "dist/index.d.ts",
87
"keywords": [
98
"gesture",
109
"gestures",
1110
"solid",
1211
"primitives"
1312
],
13+
"files": ["dist"],
14+
"type": "module",
15+
"main": "./dist/server.cjs",
16+
"module": "./dist/server.js",
17+
"browser": {
18+
"./dist/server.cjs": "./dist/index.cjs",
19+
"./dist/server.js": "./dist/index.js"
20+
},
21+
"types": "./dist/index.d.ts",
22+
"exports": {
23+
"worker": {
24+
"import": "./dist/server.js",
25+
"require": "./dist/server.cjs"
26+
},
27+
"browser": {
28+
"development": {
29+
"import": "./dist/dev.js",
30+
"require": "./dist/dev.cjs"
31+
},
32+
"import": "./dist/index.js",
33+
"require": "./dist/index.cjs"
34+
},
35+
"deno": {
36+
"import": "./dist/server.js",
37+
"require": "./dist/server.cjs"
38+
},
39+
"node": {
40+
"import": "./dist/server.js",
41+
"require": "./dist/server.cjs"
42+
},
43+
"development": {
44+
"import": "./dist/dev.js",
45+
"require": "./dist/dev.cjs"
46+
},
47+
"import": "./dist/index.js",
48+
"require": "./dist/index.cjs"
49+
},
1450
"scripts": {
1551
"start": "vite serve dev --host",
1652
"dev": "npm run start",
17-
"build": "echo noop build",
53+
"build": "jiti ../../scripts/build.ts --ssr --dev",
1854
"test": "vitest -c ../../configs/vitest.config.ts",
1955
"test:ssr": "pnpm run test --mode ssr"
2056
},

‎packages/gestures/test/index.test.ts

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { describe, it } from "vitest";
2+
3+
describe("gestures", () => {
4+
it.todo("write tests");
5+
});

‎packages/i18n/package.json

-22
Original file line numberDiff line numberDiff line change
@@ -77,27 +77,5 @@
7777
},
7878
"peerDependencies": {
7979
"solid-js": "^1.5.0"
80-
},
81-
"jest": {
82-
"preset": "ts-jest",
83-
"globals": {
84-
"ts-jest": {
85-
"tsconfig": "tsconfig.json",
86-
"babelConfig": {
87-
"presets": [
88-
"babel-preset-solid",
89-
"@babel/preset-env"
90-
]
91-
}
92-
}
93-
},
94-
"setupFiles": [
95-
"./test/setup.ts"
96-
],
97-
"testEnvironment": "jsdom",
98-
"moduleNameMapper": {
99-
"solid-js/web": "<rootDir>/node_modules/solid-js/web/dist/web.cjs",
100-
"solid-js": "^1.5.0"
101-
}
10280
}
10381
}

‎packages/idle/package.json

+26-2
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,42 @@
2323
},
2424
"private": false,
2525
"sideEffects": false,
26-
"type": "module",
2726
"files": [
2827
"dist"
2928
],
29+
"type": "module",
3030
"main": "./dist/server.cjs",
31-
"module": "./dist/index.js",
31+
"module": "./dist/server.js",
32+
"browser": {
33+
"./dist/server.cjs": "./dist/index.cjs",
34+
"./dist/server.js": "./dist/index.js"
35+
},
3236
"types": "./dist/index.d.ts",
3337
"exports": {
38+
"worker": {
39+
"import": "./dist/server.js",
40+
"require": "./dist/server.cjs"
41+
},
42+
"browser": {
43+
"development": {
44+
"import": "./dist/dev.js",
45+
"require": "./dist/dev.cjs"
46+
},
47+
"import": "./dist/index.js",
48+
"require": "./dist/index.cjs"
49+
},
50+
"deno": {
51+
"import": "./dist/server.js",
52+
"require": "./dist/server.cjs"
53+
},
3454
"node": {
3555
"import": "./dist/server.js",
3656
"require": "./dist/server.cjs"
3757
},
58+
"development": {
59+
"import": "./dist/dev.js",
60+
"require": "./dist/dev.cjs"
61+
},
3862
"import": "./dist/index.js",
3963
"require": "./dist/index.cjs"
4064
},

‎packages/mouse/package.json

+1-12
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,7 @@
5151
"primitives"
5252
],
5353
"devDependencies": {
54-
"@solid-primitives/raf": "workspace:^2.1.2",
55-
"jsdom": "^20.0.0",
56-
"prettier": "^2.7.1",
57-
"solid-js": "^1.5.0",
58-
"solid-register": "^0.2.5",
59-
"tslib": "^2.4.0",
60-
"tsup": "^6.2.3",
61-
"unocss": "^0.45.15",
62-
"uvu": "^0.5.6",
63-
"vite": "^3.0.9",
64-
"vite-plugin-solid": "^2.3.0",
65-
"watchlist": "^0.3.1"
54+
"@solid-primitives/raf": "workspace:^2.1.2"
6655
},
6756
"peerDependencies": {
6857
"solid-js": "^1.5.0"

0 commit comments

Comments
 (0)