Merge branch 'master' into monorepo-and-tests

Author: rixo

package.json

@@ -1,6 +1,16 @@
 {
   "name": "svelte-hmr-monorepo",
   "private": true,
+  "description": "Bundler agnostic HMR utils for Svelte 3",
+  "license": "ISC",
+  "homepage": "https://github.com/sveltejs/svelte-hmr",
+  "bugs": {
+    "url": "https://github.com/sveltejs/svelte-hmr/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sveltejs/svelte-hmr"
+  },
   "devDependencies": {
     "@changesets/cli": "^2.16.0",
     "@changesets/get-github-info": "^0.5.0",

packages/svelte-hmr/runtime/proxy.js

@@ -261,16 +261,22 @@ class ProxyComponent {
   }
 }
 
-// TODO we should probably delete statics that were added on the previous
-// iteration, to avoid the case where something removed in the code would
-// remain available, and HMR would produce a different result than non-HMR --
-// namely, we'd expect a crash if a static method is still used somewhere but
-// removed from the code, and HMR would hide that until next reload
-const copyStatics = (component, proxy) => {
-  //forward static properties and methods
+const syncStatics = (component, proxy, previousKeys) => {
+  // remove previously copied keys
+  if (previousKeys) {
+    for (const key of previousKeys) {
+      delete proxy[key]
+    }
+  }
+
+  // forward static properties and methods
+  const keys = []
   for (const key in component) {
+    keys.push(key)
     proxy[key] = component[key]
   }
+
+  return keys
 }
 
 const globalListeners = {}
@@ -380,7 +386,7 @@ export function createProxy({
   }[name]
 
   // initialize static members
-  copyStatics(current.Component, proxy)
+  let previousStatics = syncStatics(current.Component, proxy)
 
   const update = newState => Object.assign(current, newState)
 
@@ -390,7 +396,7 @@ export function createProxy({
 
     // copy statics before doing anything because a static prop/method
     // could be used somewhere in the create/render call
-    copyStatics(current.Component, proxy)
+    previousStatics = syncStatics(current.Component, proxy, previousStatics)
 
     const errors = []
 

packages/svelte-hmr/runtime/svelte-hooks.js

@@ -138,7 +138,6 @@ export const createProxiedComponent = (
       return comp
     }
 
-    targetCmp.$$.on_before_hmr = []
     targetCmp.$$.on_hmr = []
 
     // `conservative: true` means we want to be sure that the new component has
@@ -162,7 +161,12 @@ export const createProxiedComponent = (
       }
     ) => {
       const restore = captureState(targetCmp)
-      assignOptions(target, anchor, restore, preserveLocalState)
+      assignOptions(
+        target || options.target,
+        anchor,
+        restore,
+        preserveLocalState
+      )
 
       const callbacks = cmp.$$.on_hmr
 

packages/svelte-hmr/runtime/svelte-native/proxy-adapter-native.js

@@ -137,9 +137,10 @@ export const adapter = class ProxyAdapterNative extends ProxyAdapterDom {
           delete originalNativeView.on
         }
       } else {
-        throw new Error(
-          'Unexpected call: has underlying svelte-native code changed?'
-        )
+        //some other handler wireup, we will just pass it on.
+        if (on) {
+          on(type, handler);
+        }
       }
     }
   }
@@ -160,7 +161,8 @@ export const adapter = class ProxyAdapterNative extends ProxyAdapterDom {
     // TODO is it really true that components' elements cannot move in the
     // DOM? what about keyed list?
     //
-    const isNativePage = target.tagName === 'fragment'
+    
+    const isNativePage = (target.tagName === 'fragment' || target.tagName === 'frame') && target.firstChild && target.firstChild.tagName == 'page'
     if (isNativePage) {
       const nativePageElement = target.firstChild
       this.interceptPageNavigation(nativePageElement)