Flatten built extension, improve build script

deansheather · deansheather · commit f84b707da37e · 2019-09-17T13:32:51.000Z
diff --git a/extension/.gitignore b/extension/.gitignore
@@ -1,3 +1,6 @@
-node_modules
-out
-*.zip
+*.xpi
+*.zip
+node_modules/
+out/
+packed-extensions/
+web-ext-artifacts/
diff --git a/extension/manifest.json b/extension/manifest.json
@@ -15,7 +15,7 @@
 
 	"background": {
 		"scripts": [
-			"out/background.js"
+			"background.js"
 		],
 		"persistent": false
 	},
@@ -25,7 +25,7 @@
 				"https://*/*"
 			],
 			"js": [
-				"out/content.js"
+				"content.js"
 			]
 		}
 	],
@@ -38,7 +38,7 @@
 	"icons": {
 		"128": "logo128.png"
 	},
-	"options_page": "out/config.html",
+	"options_page": "config.html",
 	"icons": {
 		"128": "logo128.png"
 	},
diff --git a/extension/pack.sh b/extension/pack.sh
@@ -1,13 +1,25 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
+cd $(dirname "$0")
+
+VERSION=$(jq -r ".version" ./manifest.json)
+SRC_DIR="./out"
+OUTPUT_DIR="./packed-extensions"
+
+mkdir -p "$OUTPUT_DIR"
+
 # Firefox extension (done first because web-ext verifies manifest)
-if [ -z "$AMO_JWT_ISSUER" ]; then
-	web-ext build -i "node_modules/**/*" -i "src/**/*" -i "package.json" -i "tsconfig.json" -i "webpack.config.js" -i "yarn.lock"
+if [ -z "$WEB_EXT_API_KEY" ]; then
+	web-ext build --source-dir="$SRC_DIR" --artifacts-dir="$OUTPUT_DIR" --overwrite-dest
+	mv "$OUTPUT_DIR/sail-$VERSION.zip" "$OUTPUT_DIR/sail-$VERSION.firefox.zip"
 else
-	web-ext sign --api-key="$AMO_JWT_ISSUER" --api-secret="$AMO_JWT_SECRET" -i "node_modules/**/*" -i "src/**/*" -i "package.json" -i "tsconfig.json" -i "webpack.config.js" -i "yarn.lock"
+	# Requires $WEB_EXT_API_KEY and $WEB_EXT_API_SECRET from addons.mozilla.org.
+	web-ext sign --source-dir="$SRC_DIR" --artifacts-dir="$OUTPUT_DIR" --overwrite-dest
+	mv "$OUTPUT_DIR/sail-$VERSION.xpi" "$OUTPUT_DIR/sail-$VERSION.firefox.xpi"
 fi
 
 # Chrome extension
-zip -R chrome-extension.zip manifest.json out/* logo128.png logo.svg
+rm "$OUTPUT_DIR/sail-$VERSION.chrome.zip" || true
+zip -R "$OUTPUT_DIR/sail-$VERSION.chrome.zip" "$SRC_DIR/*"
diff --git a/extension/src/background.ts b/extension/src/background.ts
@@ -186,6 +186,6 @@ chrome.runtime.onConnect.addListener((port: chrome.runtime.Port): void => {
 
 // Open the config page when the browser action is clicked.
 chrome.browserAction.onClicked.addListener(() => {
-	const url = chrome.runtime.getURL("/out/config.html");
+	const url = chrome.runtime.getURL("/config.html");
 	chrome.tabs.create({ url });
 });
diff --git a/extension/src/config.html b/extension/src/config.html
@@ -90,6 +90,6 @@ <h3 style="margin-bottom: 8px;">Add an approved host:</h3>
 		</div>
 	</section>
 
-	<script src="/out/config.js"></script>
+	<script src="/config.js"></script>
 </body>
 </html>
diff --git a/extension/webpack.config.js b/extension/webpack.config.js
@@ -2,6 +2,8 @@ const path = require("path");
 const HappyPack = require("happypack");
 const os = require("os");
 const CopyPlugin = require("copy-webpack-plugin");
+
+const srcDir = path.join(__dirname, "src");
 const outDir = path.join(__dirname, "out");
 
 const mainConfig = (plugins = []) => ({
@@ -55,33 +57,34 @@ module.exports = [
 		...mainConfig([
 			new CopyPlugin(
 				[
-					{
-						from: path.resolve(__dirname, "src/config.html"),
-						to: path.resolve(process.cwd(), "out/config.html"),
-					}
+					{ from: path.join(srcDir, "config.html"), },
+					{ from: path.join(__dirname, "logo128.png") },
+					{ from: path.join(__dirname, "logo.svg") },
+					{ from: path.join(__dirname, "manifest.json") },
+					{ from: path.join(__dirname, "logo128.png") },
 				],
 				{
 					copyUnmodified: true,
 				}
 			),
 		]),
-		entry: path.join(__dirname, "src", "background.ts"),
+		entry: path.join(srcDir, "background.ts"),
 		output: {
 			path: outDir,
 			filename: "background.js",
 		},
 	},
 	{
 		...mainConfig(),
-		entry: path.join(__dirname, "src", "content.ts"),
+		entry: path.join(srcDir, "content.ts"),
 		output: {
 			path: outDir,
 			filename: "content.js",
 		},
 	},
 	{
 		...mainConfig(),
-		entry: path.join(__dirname, "src", "config.ts"),
+		entry: path.join(srcDir, "config.ts"),
 		output: {
 			path: outDir,
 			filename: "config.js",
