diff --git a/Makefile b/Makefile index 43bf9a5..38ed13f 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ COCKPIT_REPO_FILES = \ $(NULL) COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git -COCKPIT_REPO_COMMIT = 54f2fd58a3645c4a222e2b1b9b5f1b9321bed998 # 285 + Move to a webpack module +COCKPIT_REPO_COMMIT = 6073b2703acd68e216bd9dbc116c30d2d7a9701c # 288.1 + esbuild plugin updates $(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP) COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}' diff --git a/webpack.config.js b/webpack.config.js index bdf5394..8a003ae 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,8 +8,8 @@ import CompressionPlugin from "compression-webpack-plugin"; import ESLintPlugin from 'eslint-webpack-plugin'; import StylelintPlugin from 'stylelint-webpack-plugin'; -import CockpitPoPlugin from "./pkg/lib/cockpit-po-plugin.js"; -import CockpitRsyncPlugin from "./pkg/lib/cockpit-rsync-plugin.js"; +import { CockpitPoWebpackPlugin } from './pkg/lib/cockpit-po-plugin.js'; +import { CockpitRsyncWebpackPlugin } from "./pkg/lib/cockpit-rsync-plugin.js"; /* A standard nodejs and webpack pattern */ const production = process.env.NODE_ENV === 'production'; @@ -32,8 +32,8 @@ const copy_files = [ const plugins = [ new copy({ patterns: copy_files }), new extract({ filename: "[name].css" }), - new CockpitPoPlugin(), - new CockpitRsyncPlugin({ dest: packageJson.name }), + new CockpitPoWebpackPlugin(), + new CockpitRsyncWebpackPlugin({ dest: packageJson.name }), ]; if (eslint) {