Make ready for automatic packaging directly from build script

.gitignore

@@ -7,3 +7,20 @@
 node_modules/
 dist/
 package-lock.json
+build/content.css
+build/content.js
+build/editor.html
+build/editor.js
+build/hide.svg
+build/icon_48.png
+build/icon_96.png
+build/logo.svg
+build/main.css
+build/manifest.json
+build/minimize.svg
+build/options.html
+build/popup.html
+build/service.js
+build/templates.html
+build/ui.css
+build/ui.js

Extension/manifest.firefox.json

@@ -18,7 +18,6 @@
 		"default_popup": "popup.html"
 	},
 	"background": {
-		"service_worker": "service.js",
 		"scripts": [
 			"service.js"
 		]

README.md

@@ -118,9 +118,10 @@ Lastly, if you intend to review or make changes to the code, you can build and i
 git clone https://github.com/cavi-au/Consent-O-Matic.git
 cd Consent-O-Matic
 npm install
-npm run build
 ```
-Then proceed as above for installing release archives but point the browser at the `dist` folder.
+and then run one of ```npm run build-firefox``` or ```npm run build-chromium``` or ```npm run build-safari```
+
+For Firefox or Chromium you can now proceed as above for installing release archives but point the browser at the `build` folder or a folder where you extracted the zip from build/dist/. Safari requires loading the XCode project to further build an app.
 
 We do not recommend installing from source.
 

package.json

@@ -8,13 +8,17 @@
     "url": "https://github.com/cavi-au/Consent-O-Matic"
   },
   "scripts": {
-    "build": "webpack"
+    "build-firefox": "webpack --env target=firefox",
+    "build-chromium": "webpack --env target=chromium",
+    "build-safari": "webpack --env target=safari"
   },
   "dependencies": {
+    "copy-webpack-plugin": "^12.0.2",
     "glob": "^10.3.12",
     "html-minimizer-webpack-plugin": "^5.0.0",
     "sass": "^1.77.0",
     "sass-loader": "^14.2.1",
-    "webpack-cli": "^5.1.4"
+    "webpack-cli": "^5.1.4",
+    "zip-webpack-plugin": "^4.0.1"
   }
 }

webpack.config.js

@@ -1,13 +1,15 @@
 const HtmlMinimizerPlugin = require("html-minimizer-webpack-plugin");
+const PACKAGE = require('./package.json');
+const ZipPlugin = require('zip-webpack-plugin');
+const CopyPlugin = require("copy-webpack-plugin");
 const path = require('path');
 const glob = require("glob");
-module.exports = {
+module.exports = env=>({
   mode: 'production',
   entry: {
     service: ['./Extension/background.js'],
     content: [
       './Extension/contentScript.js',
-      "./Extension/manifest.json",
       "./Extension/content.scss",
       "./Extension/icon_48.png",
       "./Extension/icon_96.png",
@@ -28,7 +30,7 @@ module.exports = {
   output: {
     publicPath: "",
     filename: '[name].js',
-    path: path.resolve(__dirname, 'dist')
+    path: path.resolve(__dirname, 'build')
   },
   module: {
     parser: {
@@ -63,5 +65,13 @@ module.exports = {
       '...',
       new HtmlMinimizerPlugin(),
      ],
-  },  
-}
+  },
+  plugins: [
+    new CopyPlugin({patterns: [{from: "Extension/manifest."+env.target+".json", to: "manifest.json",force:true }]}),
+    new ZipPlugin({
+      path: 'dist/',
+      filename: PACKAGE.name+"-v"+PACKAGE.version+"-unpacked-release-"+env.target+".zip",
+      exclude: [/^dist/]
+    })
+  ]
+});