Skip to content

webpack: parameterize build sources #7570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pjonsson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

webpack: parameterize build sources #7570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions buildprocess/configureWebpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ const webpack = require("webpack");
* Supplements the given webpack config with options required to build TerriaJS
*
* @param [options.terriaJSBasePath] The TerriaJS source directory
* @param [options.jsExtraPaths] Additional include paths for js/ts files.
* @param [options.config] Base webpack configuration
* @param [options.devMode] Set to `true` to generate for development build, default is `false`.
* @param [options.MiniCssExtractPlugin]
* @param [options.babelLoader] Optional babelLoader config, defaults to ./defaultBabelLoader.js
*/
function configureWebpack({
terriaJSBasePath,
jsExtraPaths,
config,
devMode,
MiniCssExtractPlugin,
Expand Down Expand Up @@ -64,10 +66,10 @@ function configureWebpack({
include: [
path.resolve(terriaJSBasePath, "node_modules", "commander"),
path.resolve(terriaJSBasePath, "lib"),
path.resolve(terriaJSBasePath, "test"),
path.resolve(terriaJSBasePath, "buildprocess", "generateDocs.ts"),
path.resolve(terriaJSBasePath, "buildprocess", "generateCatalogIndex.ts"),
path.resolve(terriaJSBasePath, "buildprocess", "patchNetworkRequests.ts")
path.resolve(terriaJSBasePath, "buildprocess", "patchNetworkRequests.ts"),
...jsExtraPaths
],
use: [babelLoader]
});
Expand Down
5 changes: 4 additions & 1 deletion buildprocess/webpack-tools.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ module.exports = function () {
}
};

const terriaJSBasePath = path.dirname(require.resolve("../package.json"));
const jsExtraPaths = [path.resolve(terriaJSBasePath, "test")];
return configureWebpackForTerriaJS({
terriaJSBasePath: path.dirname(require.resolve("../package.json")),
terriaJSBasePath,
jsExtraPaths,
config,
devMode,
MiniCssExtractPlugin,
Expand Down
2 changes: 2 additions & 0 deletions buildprocess/webpack.config.make.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ module.exports = function (devMode) {
}
};

const jsExtraPaths = [path.resolve(terriaJSBasePath, "test")];
return configureWebpack({
terriaJSBasePath,
jsExtraPaths,
config,
devMode,
MiniCssExtractPlugin
Expand Down