cleanup webpack config, remove useless bits, less plugins

This commit is contained in:
Dima Gerasimov 2020-02-14 22:37:12 +00:00
parent 7b637563b5
commit 08d316a1de
5 changed files with 46 additions and 96 deletions

15
build
View file

@ -5,12 +5,11 @@ from subprocess import check_call
from pathlib import Path from pathlib import Path
TARGETS = ['chrome', 'firefox']
# TODO FIXME copypaste from promnesia # TODO FIXME copypaste from promnesia
# TODO FIXME use it in ci script # TODO FIXME use it in ci script
TARGETS = ['chrome', 'firefox']
def main(): def main():
p = argparse.ArgumentParser() p = argparse.ArgumentParser()
# TODO rename to --production??
p.add_argument('--release', action='store_true') p.add_argument('--release', action='store_true')
p.add_argument('--sign', action='store_true') p.add_argument('--sign', action='store_true')
p.add_argument('--lint', action='store_true') p.add_argument('--lint', action='store_true')
@ -22,6 +21,7 @@ def main():
args = p.parse_args() args = p.parse_args()
target = args.target target = args.target
assert target is not None
dist_dir = Path(__file__).absolute().parent / 'dist' dist_dir = Path(__file__).absolute().parent / 'dist'
def webext(*args, **kwargs): def webext(*args, **kwargs):
@ -33,10 +33,9 @@ def main():
*args, *args,
], **kwargs) ], **kwargs)
maybe_release = {'NODE_ENV': 'production'} if args.release else {}
env = { env = {
'TARGET': target, 'TARGET': target,
**maybe_release, 'RELEASE': 'YES' if args.release else 'NO',
**os.environ, **os.environ,
} }
check_call([ check_call([
@ -56,11 +55,12 @@ def main():
if target not in ['firefox', 'firefox-mobile']: if target not in ['firefox', 'firefox-mobile']:
raise RuntimeError("{target} is not supported for signing yet".format(target=target)) raise RuntimeError("{target} is not supported for signing yet".format(target=target))
dist_dir = Path(__file__).absolute().parent / 'dist'
src_dir = dist_dir / target
from firefox_dev_secrets import API_KEY, API_SECRET from firefox_dev_secrets import API_KEY, API_SECRET
webext( webext(
# TODO use UUID? https://addons.mozilla.org/en-GB/developers/addon/grasp/edit '--source-dir' , str(src_dir),
# TODO right, wouldn't work because it's listed..
'--artifacts-dir', str(dist_dir), '--artifacts-dir', str(dist_dir),
'--api-key' , API_KEY, '--api-key' , API_KEY,
'--api-secret', API_SECRET, '--api-secret', API_SECRET,
@ -69,3 +69,6 @@ def main():
if __name__ == '__main__': if __name__ == '__main__':
main() main()
# TODO use UUID? https://addons.mozilla.org/en-GB/developers/addon/grasp/edit
# TODO right, wouldn't work because it's listed..

View file

@ -1,9 +0,0 @@
var webpack = require("webpack"),
config = require("../webpack.config");
delete config.chromeExtensionBoilerplate;
webpack(
config,
function (err) { if (err) throw err; }
);

View file

@ -1,6 +0,0 @@
// tiny wrapper with default env vars
module.exports = {
NODE_ENV: (process.env.NODE_ENV || "development"),
PORT: (process.env.PORT || 3000),
TARGET: (process.env.TARGET || 'chrome'),
};

View file

@ -1,34 +0,0 @@
var WebpackDevServer = require("webpack-dev-server"),
webpack = require("webpack"),
config = require("../webpack.config"),
env = require("./env"),
path = require("path");
var options = (config.chromeExtensionBoilerplate || {});
var excludeEntriesToHotReload = (options.notHotReload || []);
for (var entryName in config.entry) {
if (excludeEntriesToHotReload.indexOf(entryName) === -1) {
config.entry[entryName] =
[
("webpack-dev-server/client?http://localhost:" + env.PORT),
"webpack/hot/dev-server"
].concat(config.entry[entryName]);
}
}
config.plugins =
[new webpack.HotModuleReplacementPlugin()].concat(config.plugins || []);
delete config.chromeExtensionBoilerplate;
var compiler = webpack(config);
var server =
new WebpackDevServer(compiler, {
hot: true,
contentBase: path.join(__dirname, "../build"),
headers: { "Access-Control-Allow-Origin": "*" }
});
server.listen(env.PORT);

View file

@ -1,33 +1,33 @@
var webpack = require("webpack"), const webpack = require('webpack'),
path = require("path"), path = require('path'),
fileSystem = require("fs"), CleanWebpackPlugin = require('clean-webpack-plugin'),
env = require("./utils/env"), CopyWebpackPlugin = require('copy-webpack-plugin'),
CleanWebpackPlugin = require("clean-webpack-plugin"), WebpackExtensionManifestPlugin = require('webpack-extension-manifest-plugin'),
CopyWebpackPlugin = require("copy-webpack-plugin"), HtmlWebpackPlugin = require('html-webpack-plugin');
HtmlWebpackPlugin = require("html-webpack-plugin"), // TODO remove plugins from package.json
WriteFilePlugin = require("write-file-webpack-plugin"),
WebpackExtensionManifestPlugin = require("webpack-extension-manifest-plugin"); const T = {
CHROME : 'chrome',
FIREFOX: 'firefox',
};
const env = {
TARGET : process.env.TARGET, // TODO assert not null?
RELEASE: process.env.RELEASE,
};
const pkg = require('./package.json'); const pkg = require('./package.json');
const baseManifest = require('./src/manifest.json'); const baseManifest = require('./src/manifest.json');
const release = env.RELEASE == 'YES' ? true : false;
const dev = !release; // meh. maybe make up my mind?
const target = env.TARGET; const target = env.TARGET;
const dev = env.NODE_ENV === "development";
const pkg_name = "grasp" + (dev ? ' [dev]' : ''); const name = "grasp" + (dev ? ' [dev]' : '');
// TODO make permissions literate
const permissions = [
"storage",
"notifications",
"activeTab",
"http://localhost/capture",
"https://localhost/capture"
];
// Firefox wouldn't let you rebind its default shortcuts most of which use Shift // Firefox wouldn't let you rebind its default shortcuts most of which use Shift
// On the other hand, Chrome wouldn't let you use Alt // On the other hand, Chrome wouldn't let you use Alt
const modifier = target === 'chrome' ? 'Shift' : 'Alt'; const modifier = target === T.CHROME ? 'Shift' : 'Alt';
// ugh. declarative formats are shit. // ugh. declarative formats are shit.
const commandsExtra = { const commandsExtra = {
@ -45,8 +45,18 @@ const commandsExtra = {
}, },
}; };
// TODO make permissions literate
const permissions = [
"storage",
"notifications",
"activeTab",
"http://localhost/capture",
"https://localhost/capture"
];
const manifestExtra = { const manifestExtra = {
name: pkg_name, name: name,
version: pkg.version, version: pkg.version,
description: pkg.description, description: pkg.description,
permissions: permissions, permissions: permissions,
@ -61,32 +71,23 @@ if (dev) {
manifestExtra.content_security_policy = "script-src 'self' 'unsafe-eval'; object-src 'self'"; manifestExtra.content_security_policy = "script-src 'self' 'unsafe-eval'; object-src 'self'";
} }
if (target === 'chrome') { if (target === T.CHROME) {
manifestExtra.options_ui = {chrome_style: true}; manifestExtra.options_ui = {chrome_style: true};
} }
if (target === 'firefox') { if (target === T.FIREFOX) {
manifestExtra.options_ui = {browser_style: true}; manifestExtra.options_ui = {browser_style: true};
manifestExtra.browser_action = {browser_style: true}; manifestExtra.browser_action = {browser_style: true};
} }
// load the secrets
var alias = {};
var secretsPath = path.join(__dirname, ("secrets." + env.NODE_ENV + ".js"));
var fileExtensions = ["jpg", "jpeg", "png", "gif", "eot", "otf", "svg", "ttf", "woff", "woff2"]; var fileExtensions = ["jpg", "jpeg", "png", "gif", "eot", "otf", "svg", "ttf", "woff", "woff2"];
if (fileSystem.existsSync(secretsPath)) {
alias["secrets"] = secretsPath;
}
const build_path = path.join(__dirname, "dist"); // TODO target?? const build_path = path.join(__dirname, "dist"); // TODO target??
var options = { var options = {
mode: 'production', mode: 'production', // TODO eh??
optimization: { optimization: {
// https://webpack.js.org/configuration/optimization // https://webpack.js.org/configuration/optimization
// don't thing minimize worth it for suck a tiny extension // don't think minimize worth it for such a tiny extension
minimize: false minimize: false
}, },
entry: { entry: {
@ -125,11 +126,7 @@ var options = {
} }
] ]
}, },
resolve: {
alias: alias
},
plugins: [ plugins: [
// clean the build folder
new CleanWebpackPlugin([build_path + "/*"]), new CleanWebpackPlugin([build_path + "/*"]),
new CopyWebpackPlugin([ new CopyWebpackPlugin([
{ from: 'src/img/*.png', flatten: true }, { from: 'src/img/*.png', flatten: true },
@ -159,12 +156,11 @@ var options = {
filename: "background.html", filename: "background.html",
chunks: ["background"] chunks: ["background"]
}), }),
new WriteFilePlugin()
] ]
}; };
// TODO https://webpack.js.org/configuration/devtool // TODO https://webpack.js.org/configuration/devtool
if (env.NODE_ENV === "development") { if (dev) {
options.devtool = "cheap-module-eval-source-map"; options.devtool = "cheap-module-eval-source-map";
} }