Skip to content

Commit a4fedb2

Browse files
JulianCataldoCopilot
andcommitted
fix: deps dupped resolution mess (hf) + catalog + broken api
Co-authored-by: Copilot <copilot@github.com>
1 parent 6b51e1d commit a4fedb2

9 files changed

Lines changed: 174 additions & 64 deletions

File tree

example-app/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@
1616
"@jsfe/engine": "workspace:^",
1717
"@jsfe/generics": "workspace:^",
1818
"@picocss/pico": "^2.1.1",
19-
"@awesome.me/webawesome": "^3.6.0",
19+
"@awesome.me/webawesome": "catalog:",
2020
"@sinclair/typebox": "^0.34.33",
2121
"@vitejs/plugin-react": "^4.4.1",
2222
"@vtaits/react-signals": "^1.0.2",
2323
"arktype": "^2.1.20",
2424
"hono": "^4.7.7",
25-
"lit": "^3.3.2",
26-
"react": "^19.1.0",
25+
"lit": "catalog:",
26+
"react": "catalog:",
2727
"react-dom": "^19.1.0",
2828
"vite": "^6.3.2"
2929
},
3030
"// use-signals": "^0.1.1",
3131
"devDependencies": {
32-
"@types/node": "^22.14.1",
33-
"@types/react": "^19.1.2",
32+
"@types/node": "catalog:",
33+
"@types/react": "catalog:",
3434
"@types/react-dom": "^19.1.2",
35-
"typescript": "^6.0.2",
35+
"typescript": "catalog:",
3636
"vite-plugin-static-copy": "^2.3.1"
3737
}
3838
}

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"devDependencies": {
3939
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
4040
"@types/eslint": "^9.6.1",
41-
"@types/node": "^22.14.1",
41+
"@types/node": "catalog:",
4242
"@typescript-eslint/eslint-plugin": "^8.30.1",
4343
"@typescript-eslint/parser": "^8.30.1",
4444
"eslint": "^9.25.0",
@@ -67,7 +67,7 @@
6767
"turbo": "^2.5.0",
6868
"typedoc": "^0.28.2",
6969
"typedoc-plugin-markdown": "^4.6.2",
70-
"typescript": "^6.0.2"
70+
"typescript": "catalog:"
7171
},
7272
"packageManager": "pnpm@9.12.3",
7373
"engines": {
@@ -91,6 +91,9 @@
9191
"safer-buffer": "npm:@nolyfill/safer-buffer@^1",
9292
"string.prototype.trimend": "npm:@nolyfill/string.prototype.trimend@^1",
9393
"typedarray": "npm:@nolyfill/typedarray@^1"
94+
},
95+
"patchedDependencies": {
96+
"@lit-labs/signals": "patches/@lit-labs__signals.patch"
9497
}
9598
}
9699
}

packages/engine/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
"dependencies": {
6666
"@standard-schema/spec": "^1.0.0",
6767
"@types/json-schema": "^7.0.15",
68-
"signal-polyfill": "^0.2.2"
68+
"signal-polyfill": "0.2.2"
6969
},
7070
"devDependencies": {
7171
"sinon": "19.0.2",
72-
"typescript": "^6.0.2"
72+
"typescript": "catalog:"
7373
},
7474
"publishConfig": {
7575
"access": "public"

packages/generics/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,20 @@
6969
"@rollup/plugin-babel": "^6.0.4",
7070
"@rollup/plugin-node-resolve": "^16.0.1",
7171
"@rollup/plugin-typescript": "^12.1.2",
72-
"@types/react": "^19",
72+
"@types/react": "catalog:",
7373
"@vue/babel-plugin-jsx": "^1.4.0",
7474
"babel-preset-solid": "^1.9.6",
7575
"preact-jsx-runtime": "^1.2.0",
7676
"rollup": "^4.40.1",
7777
"rollup-plugin-node-externals": "^8.0.0",
7878
"sass": "^1.86.3",
79-
"typescript": "^6.0.2"
79+
"typescript": "catalog:"
8080
},
8181
"peerDependencies": {
82-
"@lit-labs/signals": "^0.1.2",
83-
"lit": "^3.3.2",
84-
"react": "^19",
85-
"vue": "^3.5.13"
82+
"@lit-labs/signals": "catalog:",
83+
"lit": "catalog:",
84+
"react": "catalog:",
85+
"vue": "catalog:"
8686
},
8787
"peerDependenciesMeta": {
8888
"lit": {
@@ -102,6 +102,6 @@
102102
"access": "public"
103103
},
104104
"overrides": {
105-
"signal-polyfill": "^0.2.2"
105+
"signal-polyfill": "0.2.2"
106106
}
107107
}

packages/webawesome/package.json

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,35 @@
5656
"css:lint": "stylelint \"src/**/*.css\" --cache"
5757
},
5858
"dependencies": {
59-
"@awesome.me/webawesome": "^3.6.0",
59+
"@awesome.me/webawesome": "catalog:",
6060
"@jsfe/engine": "workspace:*",
61-
"@jsfe/generics": "workspace:*",
62-
"lit": "^3.3.2"
61+
"@jsfe/generics": "workspace:*"
62+
},
63+
"peerDependencies": {
64+
"@lit-labs/signals": "catalog:",
65+
"lit": "catalog:",
66+
"react": "catalog:",
67+
"vue": "catalog:"
68+
},
69+
"peerDependenciesMeta": {
70+
"lit": {
71+
"optional": true
72+
},
73+
"react": {
74+
"optional": true
75+
},
76+
"@lit-labs/signals": {
77+
"optional": true
78+
},
79+
"vue": {
80+
"optional": true
81+
}
6382
},
6483
"devDependencies": {
6584
"@lit/ts-transformers": "^2.0.2",
6685
"jsx-forge": "link:../../../../@gracile/gracile/packages/labs/jsx-forge",
6786
"ts-patch": "^3.3.0",
68-
"typescript": "^6.0.2"
87+
"typescript": "catalog:"
6988
},
7089
"publishConfig": {
7190
"access": "public"

packages/webawesome/src/widgets/array.ts

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import * as widgets from './index.js';
88
export const Arrayy: Widgets['Array'] = (options) => {
99
return html`
1010
<fieldset
11-
id=${options.id}
11+
?disabled=${options.html.disabled}
12+
id=${options.html.id}
13+
name=${options.html.name}
1214
class="theme-webawesome widget-array widget-fieldset level-${options.level}"
1315
part="widget-array"
1416
>
@@ -18,31 +20,31 @@ export const Arrayy: Widgets['Array'] = (options) => {
1820
? html`<p class="widget-fieldset__description">${options.helpText}</p>`
1921
: null}
2022
<!-- -->
21-
${options.items(
22-
(index, widget, controls) => html`
23+
${options.children.map(
24+
(widget, index) => html`
2325
<wa-card
2426
class="widget-array__card"
25-
@dragover=${controls.wrapper.dragover}
26-
@dragenter=${controls.wrapper.dragenter}
27-
@dragleave=${controls.wrapper.dragleave}
28-
@drop=${controls.wrapper.drop}
27+
@dragover=${widget.controls.wrapper.dragover}
28+
@dragenter=${widget.controls.wrapper.dragenter}
29+
@dragleave=${widget.controls.wrapper.dragleave}
30+
@drop=${widget.controls.wrapper.drop}
2931
>
3032
<header slot="header" class="widget-array__header">
3133
<div
3234
class="widget-array__handle"
3335
.draggable=${true}
34-
@mousedown=${controls.handle.mousedown}
35-
@dragstart=${controls.handle.dragstart}
36+
@mousedown=${widget.controls.handle.mousedown}
37+
@dragstart=${widget.controls.handle.dragstart}
3638
>
37-
<wa-tag size="small" pill>${index + 1}</wa-tag>
39+
<wa-tag size="s" pill>${index + 1}</wa-tag>
3840
<div class="widget-array__handle-grip">
3941
<wa-icon name="grip-horizontal" label="Settings"></wa-icon>
4042
</div>
4143
</div>
4244
4345
<nav>
4446
<wa-tooltip content="Delete">
45-
<wa-button size="small" @click=${controls.delete.click}>
47+
<wa-button size="s" @click=${widget.controls.delete.click}>
4648
<wa-icon name="x-lg" label="Settings"></wa-icon>
4749
</wa-button>
4850
</wa-tooltip>
@@ -52,19 +54,19 @@ export const Arrayy: Widgets['Array'] = (options) => {
5254
<wa-button-group>
5355
<wa-tooltip content="Move item up">
5456
<wa-button
55-
size="small"
56-
@click=${controls.up.click}
57-
.disabled=${controls.up.disabled}
57+
size="s"
58+
@click=${widget.controls.up.click}
59+
.disabled=${widget.controls.up.disabled}
5860
>
5961
<wa-icon name="arrow-up" label="Up"></wa-icon>
6062
</wa-button>
6163
</wa-tooltip>
6264
6365
<wa-tooltip content="Move item down">
6466
<wa-button
65-
size="small"
66-
@click=${controls.down.click}
67-
.disabled=${controls.down.disabled}
67+
size="s"
68+
@click=${widget.controls.down.click}
69+
.disabled=${widget.controls.down.disabled}
6870
>
6971
<wa-icon name="arrow-down" label="Down"></wa-icon>
7072
</wa-button>

patches/@lit-labs__signals.patch

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
diff --git a/development/lib/signal-watcher.d.ts b/development/lib/signal-watcher.d.ts
2+
index ef66e229f372a7aad49e60b0456f987df9a1034a..e9440e5ba52cf1dcd7bd9e602bd739baaf4123e6 100644
3+
--- a/development/lib/signal-watcher.d.ts
4+
+++ b/development/lib/signal-watcher.d.ts
5+
@@ -22,7 +22,7 @@ interface EffectOptions {
6+
*/
7+
manualDispose?: boolean;
8+
}
9+
-interface SignalWatcherApi {
10+
+export interface SignalWatcherApi {
11+
updateEffect(fn: () => void, options?: EffectOptions): () => void;
12+
}
13+
type Constructor<T = {}> = new (...args: any[]) => T;
14+
diff --git a/lib/signal-watcher.d.ts b/lib/signal-watcher.d.ts
15+
index ef66e229f372a7aad49e60b0456f987df9a1034a..e9440e5ba52cf1dcd7bd9e602bd739baaf4123e6 100644
16+
--- a/lib/signal-watcher.d.ts
17+
+++ b/lib/signal-watcher.d.ts
18+
@@ -22,7 +22,7 @@ interface EffectOptions {
19+
*/
20+
manualDispose?: boolean;
21+
}
22+
-interface SignalWatcherApi {
23+
+export interface SignalWatcherApi {
24+
updateEffect(fn: () => void, options?: EffectOptions): () => void;
25+
}
26+
type Constructor<T = {}> = new (...args: any[]) => T;

0 commit comments

Comments
 (0)