Skip to content

refactor(@angular-devkit/build-angular): move dev-server webpack config in a separate file #19088

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

Merged
alan-agius4 merged 3 commits into from
Oct 16, 2020
Merged

refactor(@angular-devkit/build-angular): move dev-server webpack config in a separate file #19088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
868e223
refactor(@angular-devkit/build-angular): move dev-server webpack conf…
alan-agius4 Oct 16, 2020
22d836f
fix(@angular-devkit/build-angular): disable dev-server live-reload wh…
alan-agius4 Oct 16, 2020
19df39a
fix(@angular-devkit/build-angular): don't set watchOptions in webpack…
alan-agius4 Oct 16, 2020
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
51 changes: 19 additions & 32 deletions packages/angular_devkit/build_angular/src/browser/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import * as webpack from 'webpack';
import { ExecutionTransformer } from '../transforms';
import {
BuildBrowserFeatures,
NormalizedBrowserBuilderSchema,
deleteOutputDir,
normalizeAssetPatterns,
normalizeOptimization,
Expand Down Expand Up @@ -51,7 +50,6 @@ import { readTsconfig } from '../utils/read-tsconfig';
import { augmentAppWithServiceWorker } from '../utils/service-worker';
import { assertCompatibleAngularVersion } from '../utils/version';
import {
BrowserWebpackConfigOptions,
generateI18nBrowserWebpackConfigFromContext,
getIndexInputFile,
getIndexOutputFile,
Expand Down Expand Up @@ -102,32 +100,7 @@ interface ConfigFromContextReturn {
i18n: I18nOptions;
}

export async function buildBrowserWebpackConfigFromContext(
options: BrowserBuilderSchema,
context: BuilderContext,
host: virtualFs.Host<fs.Stats> = new NodeJsSyncHost(),
extraBuildOptions: Partial<NormalizedBrowserBuilderSchema> = {},
): Promise<ConfigFromContextReturn> {
const webpackPartialGenerator = (wco: BrowserWebpackConfigOptions) => [
getCommonConfig(wco),
getBrowserConfig(wco),
getStylesConfig(wco),
getStatsConfig(wco),
getAnalyticsConfig(wco, context),
getCompilerConfig(wco),
wco.buildOptions.webWorkerTsConfig ? getWorkerConfig(wco) : {},
];

return generateI18nBrowserWebpackConfigFromContext(
options,
context,
webpackPartialGenerator,
host,
extraBuildOptions,
);
}

function getAnalyticsConfig(
export function getAnalyticsConfig(
wco: WebpackConfigOptions,
context: BuilderContext,
): webpack.Configuration {
Expand All @@ -154,7 +127,7 @@ function getAnalyticsConfig(
return {};
}

function getCompilerConfig(wco: WebpackConfigOptions): webpack.Configuration {
export function getCompilerConfig(wco: WebpackConfigOptions): webpack.Configuration {
if (wco.buildOptions.main || wco.buildOptions.polyfills) {
return wco.buildOptions.aot ? getAotConfig(wco) : getNonAotConfig(wco);
}
Expand Down Expand Up @@ -193,7 +166,21 @@ async function initialize(
projectRoot,
projectSourceRoot,
i18n,
} = await buildBrowserWebpackConfigFromContext(adjustedOptions, context, host, { differentialLoadingMode });
} = await generateI18nBrowserWebpackConfigFromContext(
adjustedOptions,
context,
wco => [
getCommonConfig(wco),
getBrowserConfig(wco),
getStylesConfig(wco),
getStatsConfig(wco),
getAnalyticsConfig(wco, context),
getCompilerConfig(wco),
wco.buildOptions.webWorkerTsConfig ? getWorkerConfig(wco) : {},
],
host,
{ differentialLoadingMode },
);

// Validate asset option values if processed directly
if (options.assets?.length && !adjustedOptions.assets?.length) {
Expand Down Expand Up @@ -746,8 +733,8 @@ export function buildWebpackBrowser(
if (options.index) {
await writeIndexHtml({
host,
outputPath: path.join(outputPath, getIndexOutputFile(options)),
indexPath: path.join(context.workspaceRoot, getIndexInputFile(options)),
outputPath: path.join(outputPath, getIndexOutputFile(options.index)),
indexPath: path.join(context.workspaceRoot, getIndexInputFile(options.index)),
files,
noModuleFiles,
moduleFiles,
Expand Down
Loading