Commit fc2a0d07 authored by JC Brand's avatar JC Brand

Build improvemnets

* Remove CleanWebpackPlugin
    This pugin would wipe the non-minified files every time `make dist` was called,
    and generally made it more difficult to build only particular files.
* Use order-only prerequisites for the `dist` Make recipe
    This allows more efficient building because order-only prerequisites
    don't force a rebuild of the main recipe.
    https://www.gnu.org/software/make/manual/make.html#Prerequisite-Types
parent 5162f3f6
...@@ -175,8 +175,8 @@ logo/conversejs-filled%.png:: logo/conversejs-filled.svg ...@@ -175,8 +175,8 @@ logo/conversejs-filled%.png:: logo/conversejs-filled.svg
src/headless/dist/converse-headless.min.js: src webpack.common.js node_modules @converse/headless src/headless/dist/converse-headless.min.js: src webpack.common.js node_modules @converse/headless
npm run headless npm run headless
dist:: node_modules src/* dist:: node_modules src/* | dist/converse.js dist/converse.css dist/website.css dist/website.min.css
npm run dev && npm run build && make dist/website.css && make dist/website.min.css npm run prod
.PHONY: install .PHONY: install
install:: dist install:: dist
......
...@@ -5,36 +5,34 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); ...@@ -5,36 +5,34 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const common = require("./webpack.common.js"); const common = require("./webpack.common.js");
const path = require('path'); const path = require('path');
const webpack = require('webpack'); const webpack = require('webpack');
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const { merge} = require("webpack-merge"); const { merge} = require("webpack-merge");
const plugins = [
new MiniCssExtractPlugin({filename: '../dist/converse.min.css'}),
new CopyWebpackPlugin({
patterns: [
{from: 'src/headless/node_modules/strophe.js/src/shared-connection-worker.js', to: 'shared-connection-worker.js'},
{from: 'sounds', to: 'sounds'},
{from: 'images/favicon.ico', to: 'images/favicon.ico'},
{from: 'images/custom_emojis', to: 'images/custom_emojis'},
{from: 'logo/conversejs-filled-192.png', to: 'images/logo'},
{from: 'logo/conversejs-filled-512.png', to: 'images/logo'},
{from: 'logo/conversejs-filled-192.svg', to: 'images/logo'},
{from: 'logo/conversejs-filled-512.svg', to: 'images/logo'},
{from: 'sass/webfonts', to: 'webfonts'}
]
}),
new webpack.DefinePlugin({ // This makes it possible for us to safely use env vars on our code
'process.env.ASSET_PATH': JSON.stringify(ASSET_PATH)
})
];
module.exports = merge(common, { module.exports = merge(common, {
plugins,
output: { output: {
publicPath: ASSET_PATH, publicPath: ASSET_PATH,
filename: 'converse.min.js', filename: 'converse.min.js',
}, },
plugins: [
new CleanWebpackPlugin({
cleanStaleWebpackAssets: false // resolves conflict with CopyWebpackPlugin
}),
new MiniCssExtractPlugin({filename: '../dist/converse.min.css'}),
new CopyWebpackPlugin({
patterns: [
{from: 'src/headless/node_modules/strophe.js/src/shared-connection-worker.js', to: 'shared-connection-worker.js'},
{from: 'sounds', to: 'sounds'},
{from: 'images/favicon.ico', to: 'images/favicon.ico'},
{from: 'images/custom_emojis', to: 'images/custom_emojis'},
{from: 'logo/conversejs-filled-192.png', to: 'images/logo'},
{from: 'logo/conversejs-filled-512.png', to: 'images/logo'},
{from: 'logo/conversejs-filled-192.svg', to: 'images/logo'},
{from: 'logo/conversejs-filled-512.svg', to: 'images/logo'},
{from: 'sass/webfonts', to: 'webfonts'}
]
}),
new webpack.DefinePlugin({ // This makes it possible for us to safely use env vars on our code
'process.env.ASSET_PATH': JSON.stringify(ASSET_PATH)
})
],
mode: "production", mode: "production",
devtool: "source-map", devtool: "source-map",
module: { module: {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment