upgrade svelte-hmr (preservation of local state, reactive blocks, acc…

…essors, & named exports)

index.js

@@ -130,7 +130,7 @@ module.exports = function(source, map) {
 		if (options.hotReload && !isProduction && !isServer) {
 			const hotOptions = Object.assign({}, options.hotOptions);
 			const id = JSON.stringify(relative(process.cwd(), compileOptions.filename));
-			js.code = makeHot(id, js.code, hotOptions, compiled);
+			js.code = makeHot(id, js.code, hotOptions, compiled, source, compileOptions);
 		}
 
 		if (options.emitCss && css.code) {

lib/resolve-svelte.js

@@ -30,15 +30,17 @@ const { version } = req(`${base}/package.json`);
 
 const major_version = +version[0];
 
-const { compile, preprocess } =
-	major_version >= 3 ? req(`${base}/compiler`) : req(`${base}`);
-
-const makeHot =
-	major_version >= 3 ? require('./svelte3/make-hot') : require('./make-hot');
+const { compile, preprocess, walk } =
+  major_version >= 3 ? req(`${base}/compiler`) : req(`${base}`);
 
 module.exports = {
 	major_version,
 	compile,
 	preprocess,
-	makeHot,
+	walk,
 };
+
+// NOTE svelte3/make-hot requires this module to get the walk function, so we
+// need to have walk available on module.exports before requiring it from here
+module.exports.makeHot =
+  major_version >= 3 ? require('./svelte3/make-hot') : require('./make-hot');

lib/svelte3/make-hot.js

@@ -1,9 +1,11 @@
+const { walk } = require('../resolve-svelte');
 const { createMakeHot } = require('svelte-hmr');
 
 const hotApi = require.resolve('./hot-api.js');
 
 const makeHot = createMakeHot(hotApi, {
 	meta: 'module',
+	walk,
 });
 
 module.exports = makeHot;

package.json

@@ -27,7 +27,7 @@
 	"dependencies": {
 		"loader-utils": "^1.1.0",
 		"svelte-dev-helper": "^1.1.9",
-		"svelte-hmr": "^0.1.4"
+		"svelte-hmr": "^0.3.1"
 	},
 	"devDependencies": {
 		"chai": "^4.1.2",

yarn.lock

@@ -819,9 +819,9 @@ svelte-dev-helper@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/svelte-dev-helper/-/svelte-dev-helper-1.1.9.tgz#7d187db5c6cdbbd64d75a32f91b8998bde3273c3"
 
-svelte-hmr@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.1.4.tgz#dfcdfe7ef8099c832e43794c362c86dbab62f01f"
+svelte-hmr@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.3.1.tgz#a4092afe0e0b993869dbaaabac5722ef9e2967db"
 
 svelte@3.12:
   version "3.12.1"