From deb012afccf2642a2a2544a25c9fe55fc1d96e99 Mon Sep 17 00:00:00 2001 From: notgne2 Date: Thu, 12 Dec 2019 18:45:57 -0700 Subject: [PATCH] fix issues with deep routes, general cleanup --- default.nix | 5 ++--- webpack.config.js | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/default.nix b/default.nix index 53ad719..58c1024 100644 --- a/default.nix +++ b/default.nix @@ -55,7 +55,7 @@ let name = "${name}-node-sources"; paths = [ builderPkg.lib - ] ++ (if nodePackages != null then [ nodePackages ] else [ ]); + ] ++ (if nodePackages != null then [ nodePackages ] else [ ]); }; baseWebpackConfig = builtins.readFile ./webpack.config.js; @@ -100,8 +100,7 @@ let installPhase = '' mkdir -p $out ${nodeSource}/node_modules/webpack-cli/bin/cli.js --mode production - ls dist - cp -r dist/* $out + mv dist/* $out ''; }; in diff --git a/webpack.config.js b/webpack.config.js index 7eef785..f296749 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -29,11 +29,19 @@ const jsMin = { module.exports = { + output: { + filename: "main.js", + path: path.join(__dirname, "dist"), + publicPath: "/" + }, module: { rules: [{ test: /\.elm$/, exclude: [/elm-stuff/, /node_modules/], - loader: 'elm-webpack-loader' + loader: 'elm-webpack-loader', + options: { + optimize: true + } }], }, plugins: [ @@ -56,18 +64,20 @@ module.exports = level: 2 }, minifyJS: jsMin, - removeComments: true, + collapseBooleanAttributes: true, collapseWhitespace: true, collapseInlineTagWhitespace: true, removeRedundantAttributes: true, removeScriptTypeAttributes: true, removeStyleLinkTypeAttributes: true, + + removeComments: true, sortAttributes: true, sortClassName: true, }, renderer: new Renderer({ - renderAfterTime: 3000, + renderAfterTime: 500, }), postProcess(renderedRoute) { const dom = new JSDOM(renderedRoute.html, { runScripts: 'outside-only' })