diff --git a/packages/cli/global.d.ts b/packages/cli/global.d.ts
index e87478baf..f780b47be 100644
--- a/packages/cli/global.d.ts
+++ b/packages/cli/global.d.ts
@@ -1,8 +1,12 @@
+declare var __webpack_public_path__: string;
+
 declare global {
 	namespace jest {
 		interface Matchers<R> {
 			toBeCloseInSize(receivedSize: number, expectedSize: number): R;
-			toFindMatchingKey(receivedKeys: string[]): R;
+			toFindMatchingKey(receivedKey: string): R;
 		}
 	}
 }
+
+export {};
diff --git a/packages/cli/lib/lib/entry.js b/packages/cli/lib/lib/entry.js
index 92e2d616f..5be51642e 100644
--- a/packages/cli/lib/lib/entry.js
+++ b/packages/cli/lib/lib/entry.js
@@ -13,18 +13,19 @@ if (process.env.NODE_ENV === 'development') {
 
 	// only add a debug sw if webpack service worker is not requested.
 	if (process.env.ADD_SW === undefined && 'serviceWorker' in navigator) {
-		// eslint-disable-next-line no-undef
-		navigator.serviceWorker.register(__webpack_public_path__ + 'sw-debug.js');
+		navigator.serviceWorker.register(
+			normalizeURL(__webpack_public_path__) + 'sw-debug.js'
+		);
 	} else if (process.env.ADD_SW && 'serviceWorker' in navigator) {
-		// eslint-disable-next-line no-undef
 		navigator.serviceWorker.register(
-			__webpack_public_path__ + (process.env.ES_BUILD ? 'sw-esm.js' : 'sw.js')
+			normalizeURL(__webpack_public_path__) +
+				(process.env.ES_BUILD ? 'sw-esm.js' : 'sw.js')
 		);
 	}
 } else if (process.env.ADD_SW && 'serviceWorker' in navigator) {
-	// eslint-disable-next-line no-undef
 	navigator.serviceWorker.register(
-		__webpack_public_path__ + (process.env.ES_BUILD ? 'sw-esm.js' : 'sw.js')
+		normalizeURL(__webpack_public_path__) +
+			(process.env.ES_BUILD ? 'sw-esm.js' : 'sw.js')
 	);
 }
 
@@ -57,7 +58,7 @@ if (typeof app === 'function') {
 			hydrate &&
 			currentURL === normalizeURL(location.pathname);
 		const doRender = canHydrate ? hydrate : render;
-		root = doRender(h(app, { CLI_DATA }), document.body, root);
+		doRender(h(app, { CLI_DATA }), document.body, root);
 	};
 
 	if (module.hot) module.hot.accept('preact-cli-entrypoint', init);
diff --git a/packages/cli/tests/images/build.js b/packages/cli/tests/images/build.js
index 602814478..310f2e404 100644
--- a/packages/cli/tests/images/build.js
+++ b/packages/cli/tests/images/build.js
@@ -15,8 +15,8 @@ exports.default = exports.full = Object.assign({}, common, {
 	'ssr-build/ssr-bundle.77c49.css.map': 2070,
 	'ssr-build/ssr-bundle.js': 11090,
 	'ssr-build/ssr-bundle.js.map': 30625,
-	'bundle.17878.js': 21429,
-	'bundle.17878.js.map': 111801,
+	'bundle.32925.js': 21429,
+	'bundle.32925.js.map': 111801,
 	'bundle.9bde9.css': 945,
 	'bundle.9bde9.css.map': 1758,
 	'favicon.ico': 15086,