From 61aa26ee6fa7fec07daa34068d9c8c7f6442d10f Mon Sep 17 00:00:00 2001
From: Ryan Carniato <ryansolid@gmail.com>
Date: Sat, 27 Apr 2019 21:40:39 -0700
Subject: [PATCH] Fix referential linking

---
 dom/package.json  |  4 ++--
 h/package.json    |  4 ++--
 html/package.json |  4 ++--
 package-lock.json |  2 +-
 package.json      |  2 +-
 rollup.config.js  | 12 ++++++------
 src/state.ts      |  4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dom/package.json b/dom/package.json
index 41ed11b8c..32fe97f5a 100644
--- a/dom/package.json
+++ b/dom/package.json
@@ -1,7 +1,7 @@
 {
   "name": "solid-js/dom",
-  "main": "../lib/dom.js",
-  "module": "../dist/dom.js",
+  "main": "../lib/dom/index.js",
+  "module": "../dist/dom/index.js",
   "types": "../types/dom/index.d.ts",
   "sideEffects": false
 }
\ No newline at end of file
diff --git a/h/package.json b/h/package.json
index c61c11543..6dd20849a 100644
--- a/h/package.json
+++ b/h/package.json
@@ -1,7 +1,7 @@
 {
   "name": "solid-js/h",
-  "main": "../lib/h.js",
-  "module": "../dist/h.js",
+  "main": "../lib/dom/h.js",
+  "module": "../dist/dom/h.js",
   "types": "../types/dom/h.d.ts",
   "sideEffects": false
 }
\ No newline at end of file
diff --git a/html/package.json b/html/package.json
index ce9ea630d..2ef72549b 100644
--- a/html/package.json
+++ b/html/package.json
@@ -1,7 +1,7 @@
 {
   "name": "solid-js/html",
-  "main": "../lib/html.js",
-  "module": "../dist/html.js",
+  "main": "../lib/dom/html.js",
+  "module": "../dist/dom/html.js",
   "types": "../types/dom/html.d.ts",
   "sideEffects": false
 }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 190fe2656..1bb4822d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "solid-js",
-  "version": "0.5.1-beta.2",
+  "version": "0.5.1-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cd636ce5e..cae49a6b6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "0.5.1-beta.2",
+  "version": "0.5.1-beta.3",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
diff --git a/rollup.config.js b/rollup.config.js
index fa6c57a01..18f05a1be 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -23,10 +23,10 @@ export default [{
 }, {
   input: 'src/dom/index.ts',
   output: [{
-    file: 'lib/dom.js',
+    file: 'lib/dom/index.js',
     format: 'cjs'
   }, {
-    file: 'dist/dom.js',
+    file: 'dist/dom/index.js',
     format: 'es'
   }],
   external: ['s-js', 'dom-expressions'],
@@ -34,10 +34,10 @@ export default [{
 }, {
   input: 'src/dom/html.ts',
   output: [{
-    file: 'lib/html.js',
+    file: 'lib/dom/html.js',
     format: 'cjs'
   }, {
-    file: 'dist/html.js',
+    file: 'dist/dom/html.js',
     format: 'es'
   }],
   external: ['./index', 'lit-dom-expressions'],
@@ -45,10 +45,10 @@ export default [{
 }, {
   input: 'src/dom/h.ts',
   output: [{
-    file: 'lib/h.js',
+    file: 'lib/dom/h.js',
     format: 'cjs'
   }, {
-    file: 'dist/h.js',
+    file: 'dist/dom/h.js',
     format: 'es'
   }],
   external: ['./index', 'hyper-dom-expressions'],
diff --git a/src/state.ts b/src/state.ts
index fe05a878f..eb7052ba4 100644
--- a/src/state.ts
+++ b/src/state.ts
@@ -10,11 +10,11 @@ type StateNode = {
 }
 type Proxy<T> = {
   get(): any,
-  set(): boolean,
+  set(): boolean
 }
 type Wrapped<T> = {
   [P in keyof T]: Proxy<T[P]>;
-}
+} & { _state: T }
 
 function wrap<T extends StateNode>(value: T): Wrapped<T> { return value[SPROXY] || (value[SPROXY] = new Proxy(value, proxyTraps)); }