add support for manifest merging

Author: antony

README.md

@@ -28,13 +28,16 @@ Install the adapter and `npm run build`. Go to your browser's extension page and
 
 If you get an error about `_app` being a disallowed folder, delete `_app` from within the build dir. It appears there sometimes and I'm not sure why - I'll fix as soon as possible!
 
+## Configuration
+
+To specify your own manifest information (it will be merged with the generated one), simply have a manifest file local within your app directory.
+
 ## Roadmap
 
 I am looking for help to build and maintain this module. Roadmap is:
 
 * Specifying the type of extension via config
 * Allowing icons and such to be driven by configuration
-* Bring-your-own manifest where you can merge a provided manifest with the generated one.
 
 ## License
 

adapter-browser-extension.mjs

@@ -1,58 +1,74 @@
 import { join } from 'path'
-import { writeFileSync, readFileSync } from 'fs'
+import { writeFileSync, readFileSync, existsSync } from 'fs'
 import sjcl from 'sjcl'
 import cheerio from 'cheerio'
+import { applyToDefaults } from '@hapi/hoek'
 
-/** @type {import('.')} */
-export default function ({ pages = 'build', assets = pages, fallback } = {}) {
-	function generate_manifest (html) {
-		return JSON.stringify({
-			browser_action: {
-				default_title: 'SvelteKit',
-				default_popup: 'index.html'
-			},
-			content_security_policy: generate_csp(html),
-			manifest_version: 2,
-			name: 'TODO',
-			version: '0.1'
-		})
-	};
-
-	function hash_script (s) {
-		const hashed = sjcl.hash.sha256.hash(s);
-		return sjcl.codec.base64.fromBits(hashed);
+const manifest_filename = 'manifest.json'
+
+function hash_script (s) {
+	const hashed = sjcl.hash.sha256.hash(s);
+	return sjcl.codec.base64.fromBits(hashed);
+}
+
+function generate_csp (html) {
+	const $ = cheerio.load(html)
+	const csp_hashes = $('script[type="module"]')
+		.map((i, el) => hash_script($(el).get()[0].children[0].data))
+		.toArray()
+		.map(h => `'sha256-${h}'`)
+		.join(' ')
+	return `script-src 'self' ${csp_hashes}; object-src 'self'`
+}
+
+function generate_manifest (html) {
+	return {
+		browser_action: {
+			default_title: 'SvelteKit',
+			default_popup: 'index.html'
+		},
+		content_security_policy: generate_csp(html),
+		manifest_version: 2,
+		name: 'TODO',
+		version: '0.1'
 	}
+}
 
-	function generate_csp (html) {
-		const $ = cheerio.load(html)
-		const csp_hashes = $('script[type="module"]')
-			.map((i, el) => hash_script($(el).get()[0].children[0].data))
-			.toArray()
-			.map(h => `'sha256-${h}'`)
-			.join(' ')
-		return `script-src 'self' ${csp_hashes}; object-src 'self'`
+function load_manifest () {
+	if (existsSync(manifest_filename)) {
+		return JSON.parse(readFileSync(manifest_filename, 'utf-8'))
 	}
 
+	return {}
+}
+
+/** @type {import('.')} */
+export default function ({ pages = 'build', assets = pages, fallback } = {}) {
 	return {
 		name: 'sveltekit-adapter-browser-extension',
 
 		async adapt({ utils }) {
+			const provided_manifest = load_manifest()
+
 			utils.rimraf(assets)
 			utils.rimraf(pages)
 
-			utils.copy_static_files(assets);
-			utils.copy_client_files(assets);
+			utils.copy_static_files(assets)
+			utils.copy_client_files(assets)
 
 			await utils.prerender({
 				fallback,
 				all: !fallback,
 				dest: pages
 			})
 
-			const indexPage = join(assets, 'index.html')
-			const index = readFileSync(indexPage)
+			const index_page = join(assets, 'index.html')
+			const index = readFileSync(index_page)
+
+			const generated_manifest = generate_manifest(index.toString())
+			const merged_manifest = applyToDefaults(generated_manifest, provided_manifest, { nullOverride: true })
 
-			writeFileSync(join(assets, 'manifest.json'), generate_manifest(index.toString()))
+			writeFileSync(join(assets, manifest_filename), JSON.stringify(merged_manifest))
 			utils.rimraf(join(assets, '_app'))
 		}
 	}

package.json

@@ -9,6 +9,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "@hapi/hoek": "^9.2.1",
     "cheerio": "^1.0.0-rc.10",
     "sjcl": "^1.0.8"
   }