Solid 1.9 (#2306)

* update dom-expressions to include client-side API placeholders in web/dist/server.js

* update dom-expressions version to temporary one from git for testing

* update lock file

* Add exports to solid-js/store's server build to match the client build, marking the additional export as not supported on the server side

* update dom-expressions

* fix!: Remove browser field from package.json (#2255)

* fix!: Remove browser field from package.json of core packages so that worker export doesn't get mapped back to removeBrowserPackageJson

BREAKING CHANGE: Jest was previously mentioned as the reason that wasn't removed, but Jest now supports package.json modules. That said, some other tooling might still not support esm exports.

* Create rare-birds-train.md

---------

Co-authored-by: Ryan Carniato <ryansolid@gmail.com>

* better handling of exports client/server

* Improve signal setter type for code completion of string literal unions. (#2297)

* fix

* fix test

* Create shy-islands-talk.md

---------

Co-authored-by: Ryan Carniato <ryansolid@gmail.com>

* update TS to NodeNext

---------

Co-authored-by: Joe Pea <joe@trusktr.io>
Co-authored-by: Will Kelly <67284402+wkelly17@users.noreply.github.com>
Co-authored-by: 狐狸 <134658521+Huliiiiii@users.noreply.github.com>

.changeset/odd-onions-agree.md

@@ -0,0 +1,5 @@
+---
+"solid-js": minor
+---
+
+better handling of exports client/server

.changeset/rare-birds-train.md

@@ -0,0 +1,5 @@
+---
+"solid-js": minor
+---
+
+fix!: Remove browser field from package.json

.changeset/shy-islands-talk.md

@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+Improve signal setter type for code completion of string literal unions.

.changeset/tasty-knives-rhyme.md

@@ -0,0 +1,16 @@
+---
+"babel-preset-solid": minor
+"solid-js": minor
+"solid-element": minor
+"test-integration": minor
+---
+
+update dom-expressions
+* Improved Custom Element/Shadow DOM traversal - @olivercoad
+* Better heuristic to determine when to importNode - @titoBouzout
+* handleEvent syntax to allow custom event properties when not delegated - @titoBouzout
+* support for bool: attribute namespace - @titoBouzout
+* add "is" as detection for custom element - @titoBouzout
+* fix missing exports in different envs - @trusktr
+* better hydration mismatch errors - @ryansolid
+* improved HTML validation of JSX partials - @titoBouzout

.changeset/twenty-schools-pretend.md

@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+update TS to NodeNext

package.json

@@ -34,13 +34,13 @@
     "@rollup/plugin-replace": "^5.0.2",
     "@types/node": "^18.11.19",
     "@vitest/coverage-c8": "^0.29.7",
-    "babel-plugin-jsx-dom-expressions": "^0.38.5",
+    "babel-plugin-jsx-dom-expressions": "^0.39.0",
     "coveralls": "^3.1.1",
     "csstype": "^3.1.0",
-    "dom-expressions": "0.38.6",
-    "hyper-dom-expressions": "0.38.6",
+    "dom-expressions": "0.39.0",
+    "hyper-dom-expressions": "0.39.0",
     "jsdom": "^21.1.1",
-    "lit-dom-expressions": "0.38.6",
+    "lit-dom-expressions": "0.39.0",
     "ncp": "^2.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.8",

packages/babel-preset-solid/package.json

@@ -14,7 +14,7 @@
     "test": "node test.js"
   },
   "dependencies": {
-    "babel-plugin-jsx-dom-expressions": "^0.38.5"
+    "babel-plugin-jsx-dom-expressions": "^0.39.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0"

packages/solid/h/jsx-runtime/src/index.ts

@@ -1,6 +1,6 @@
 import h from "solid-js/h";
-export type { JSX } from "./jsx";
-import type { JSX } from "./jsx";
+export type { JSX } from "./jsx.d.ts";
+import type { JSX } from "./jsx.d.ts";
 
 function Fragment(props: { children: JSX.Element }) {
   return props.children;

packages/solid/h/src/index.ts

@@ -1,5 +1,5 @@
-import { createHyperScript } from "./hyperscript";
-import type { HyperScript } from "./hyperscript";
+import { createHyperScript } from "./hyperscript.js";
+import type { HyperScript } from "./hyperscript.js";
 import {
   spread,
   assign,

packages/solid/html/src/index.ts

@@ -1,5 +1,5 @@
-import { createHTML } from "./lit";
-import type { HTMLTag } from "./lit";
+import { createHTML } from "./lit.js";
+import type { HTMLTag } from "./lit.js";
 import {
   effect,
   style,

packages/solid/package.json

@@ -11,10 +11,6 @@
   },
   "main": "./dist/server.cjs",
   "module": "./dist/server.js",
-  "browser": {
-    "./dist/server.cjs": "./dist/solid.cjs",
-    "./dist/server.js": "./dist/solid.js"
-  },
   "unpkg": "./dist/solid.cjs",
   "types": "types/index.d.ts",
   "sideEffects": false,

packages/solid/src/reactive/signal.ts

@@ -179,12 +179,12 @@ export function createRoot<T>(fn: RootFunction<T>, detachedOwner?: typeof Owner)
 export type Accessor<T> = () => T;
 
 export type Setter<in out T> = {
+  <U extends T>(value: Exclude<U, Function> | ((prev: T) => U)): U;
   <U extends T>(...args: undefined extends T ? [] : [value: (prev: T) => U]): undefined extends T
     ? undefined
     : U;
-  <U extends T>(value: (prev: T) => U): U;
   <U extends T>(value: Exclude<U, Function>): U;
-  <U extends T>(value: Exclude<U, Function> | ((prev: T) => U)): U;
+  <U extends T>(value: (prev: T) => U): U;
 };
 
 export type Signal<T> = [get: Accessor<T>, set: Setter<T>];

packages/solid/store/package.json

@@ -2,10 +2,6 @@
   "name": "solid-js/store",
   "main": "./dist/server.cjs",
   "module": "./dist/server.js",
-  "browser": {
-    "./dist/server.cjs": "./dist/store.cjs",
-    "./dist/server.js": "./dist/store.js"
-  },
   "unpkg": "./dist/store.cjs",
   "types": "./types/index.d.ts",
   "type": "module",

packages/solid/store/src/server.ts

@@ -1,5 +1,19 @@
 import type { SetStoreFunction, Store } from "./store.js";
 
+export type {
+  ArrayFilterFn,
+  DeepMutable,
+  DeepReadonly,
+  NotWrappable,
+  Part,
+  SetStoreFunction,
+  SolidStore,
+  Store,
+  StoreNode,
+  StorePathRange,
+  StoreSetter
+} from "./store.js";
+
 export const $RAW = Symbol("state-raw");
 
 export function isWrappable(obj: any) {
@@ -103,6 +117,10 @@ export function createMutable<T>(state: T | Store<T>): T {
   return state as T;
 }
 
+export function modifyMutable<T>(state: T, modifier: (state: T) => T) {
+  modifier(state);
+}
+
 type ReconcileOptions = {
   key?: string | null;
   merge?: boolean;

packages/solid/store/src/store.ts

@@ -14,7 +14,7 @@ type DataNode = {
   (): any;
   $(value?: any): void;
 };
-type DataNodes = Record<PropertyKey, DataNode | undefined>;
+export type DataNodes = Record<PropertyKey, DataNode | undefined>;
 
 export type OnStoreNodeUpdate = (
   state: StoreNode,

packages/solid/universal/src/universal.ts

@@ -1 +1 @@
-export * from "dom-expressions/src/universal";
+export * from "dom-expressions/src/universal.js";

packages/solid/web/package.json

@@ -2,10 +2,6 @@
   "name": "solid-js/web",
   "main": "./dist/server.cjs",
   "module": "./dist/server.js",
-  "browser": {
-    "./dist/server.cjs": "./dist/web.cjs",
-    "./dist/server.js": "./dist/web.js"
-  },
   "unpkg": "./dist/web.cjs",
   "types": "./types/index.d.ts",
   "type": "module",

packages/solid/web/server/index.ts

@@ -12,19 +12,13 @@ export {
   Match,
   Index,
   ErrorBoundary,
+  // This overrides mergeProps from dom-expressions/src/server.js
   mergeProps
 } from "solid-js";
 
 export const isServer: boolean = true;
 export const isDev: boolean = false;
 
-export function render() {}
-export function hydrate() {}
-export function insert() {}
-export function spread() {}
-export function addEventListener() {}
-export function delegateEvents(): void {}
-
 export function Dynamic<T>(
   props: T & { children?: any; component?: Component<T> | string | keyof JSX.IntrinsicElements }
 ) {

packages/solid/web/src/client.ts

@@ -1 +1 @@
-export * from "dom-expressions/src/client";
+export * from "dom-expressions/src/client.js";