build: don't move pkg/lib/ to src/lib/

Keep pkg/lib in the same location as it is in the cockpit repository,
and adjust the include path accordingly.

This makes the production of the .pot file somewhat more deterministic:
previously, it would either include or not include the strings from
pkg/lib depending on if it had been checked out or not.  Now it never
includes them.

Cherry-picked from cockpit-podman commit a70630be2139a.
This commit is contained in:
Martin Pitt 2022-06-30 06:57:10 +02:00 committed by Martin Pitt
parent adc3643052
commit b3a9565668
5 changed files with 13 additions and 14 deletions

View file

@ -7,8 +7,8 @@ const TerserJSPlugin = require('terser-webpack-plugin');
const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
const CompressionPlugin = require("compression-webpack-plugin");
const ESLintPlugin = require('eslint-webpack-plugin');
const CockpitPoPlugin = require("./src/lib/cockpit-po-plugin");
const CockpitRsyncPlugin = require("./src/lib/cockpit-rsync-plugin");
const CockpitPoPlugin = require("./pkg/lib/cockpit-po-plugin");
const CockpitRsyncPlugin = require("./pkg/lib/cockpit-rsync-plugin");
/* A standard nodejs and webpack pattern */
const production = process.env.NODE_ENV === 'production';
@ -47,11 +47,11 @@ if (production) {
module.exports = {
mode: production ? 'production' : 'development',
resolve: {
modules: [ "node_modules", path.resolve(__dirname, 'src/lib') ],
modules: [ "node_modules", path.resolve(__dirname, 'pkg/lib') ],
alias: { 'font-awesome': 'font-awesome-sass/assets/stylesheets' },
},
resolveLoader: {
modules: [ "node_modules", path.resolve(__dirname, 'src/lib') ],
modules: [ "node_modules", path.resolve(__dirname, 'pkg/lib') ],
},
watchOptions: {
ignored: /node_modules/,