admin-manifest: Fix url query param issue (WordPress#38755)

* Add query param to admin manifest in a safe way
ajlende · Feb 16, 2022 · 9e34e5f · 9e34e5f
1 parent 7cb61f9
commit 9e34e5f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/admin-manifest/package.json b/packages/admin-manifest/package.json
@@ -26,7 +26,8 @@
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0"
+		"@babel/runtime": "^7.16.0",
+		"@wordpress/url": "file:../url"
 	},
 	"publishConfig": {
 		"access": "public"

diff --git a/packages/admin-manifest/src/index.js b/packages/admin-manifest/src/index.js
@@ -1,3 +1,8 @@
+/**
+ * WordPress dependencies
+ */
+import { addQueryArgs } from '@wordpress/url';
+
 function addManifest( manifest ) {
 	const link = document.createElement( 'link' );
 	link.rel = 'manifest';
@@ -164,6 +169,8 @@ window.addEventListener( 'load', () => {
 		),
 	] ).then( () => {
 		addManifest( manifest );
-		window.navigator.serviceWorker.register( adminUrl + '?service-worker' );
+		window.navigator.serviceWorker.register(
+			addQueryArgs( adminUrl, { 'service-worker': true } )
+		);
 	} );
 } );