Skip to content
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.

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

refactor(@angular-devkit/build-angular): unify webpack configurations #22025

Merged
merged 1 commit into from
Oct 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ import {
} from '../../utils/webpack-browser-config';
import {
getAnalyticsConfig,
getBrowserConfig,
getCommonConfig,
getStatsConfig,
getStylesConfig,
getTypeScriptConfig,
getWorkerConfig,
Expand Down Expand Up @@ -96,9 +94,7 @@ async function initialize(
const { config, projectRoot, projectSourceRoot, i18n, target } =
await generateI18nBrowserWebpackConfigFromContext(adjustedOptions, context, (wco) => [
getCommonConfig(wco),
getBrowserConfig(wco),
getStylesConfig(wco),
getStatsConfig(wco),
getAnalyticsConfig(wco, context),
getTypeScriptConfig(wco),
wco.buildOptions.webWorkerTsConfig ? getWorkerConfig(wco) : {},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@ import {
} from '../../utils/webpack-browser-config';
import {
getAnalyticsConfig,
getBrowserConfig,
getCommonConfig,
getDevServerConfig,
getStatsConfig,
getStylesConfig,
getTypeScriptConfig,
getWorkerConfig,
Expand Down Expand Up @@ -167,9 +165,7 @@ export function serveWebpackBrowser(
(wco) => [
getDevServerConfig(wco),
getCommonConfig(wco),
getBrowserConfig(wco),
getStylesConfig(wco),
getStatsConfig(wco),
getAnalyticsConfig(wco, context),
getTypeScriptConfig(wco),
browserOptions.webWorkerTsConfig ? getWorkerConfig(wco) : {},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,7 @@ import { createI18nOptions } from '../../utils/i18n-options';
import { loadEsmModule } from '../../utils/load-esm';
import { assertCompatibleAngularVersion } from '../../utils/version';
import { generateBrowserWebpackConfigFromContext } from '../../utils/webpack-browser-config';
import {
getBrowserConfig,
getCommonConfig,
getStatsConfig,
getTypeScriptConfig,
getWorkerConfig,
} from '../../webpack/configs';
import { getCommonConfig, getTypeScriptConfig, getWorkerConfig } from '../../webpack/configs';
import { createWebpackLoggingCallback } from '../../webpack/utils/stats';
import { Schema as BrowserBuilderOptions, OutputHashing } from '../browser/schema';
import { Format, Schema } from './schema';
Expand Down Expand Up @@ -182,6 +176,7 @@ export async function execute(
subresourceIntegrity: false,
outputHashing: OutputHashing.None,
namedChunks: true,
allowedCommonJsDependencies: undefined,
};
const { config, projectRoot } = await generateBrowserWebpackConfigFromContext(
builderOptions,
Expand All @@ -193,10 +188,8 @@ export async function execute(
const partials = [
{ plugins: [new NoEmitPlugin()] },
getCommonConfig(wco),
getBrowserConfig(wco),
getTypeScriptConfig(wco),
getWorkerConfig(wco),
getStatsConfig(wco),
];

// Add Ivy application file extractor support
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { generateBrowserWebpackConfigFromContext } from '../../utils/webpack-bro
import {
getCommonConfig,
getStylesConfig,
getTestConfig,
getTypeScriptConfig,
getWorkerConfig,
} from '../../webpack/configs';
Expand Down Expand Up @@ -64,7 +63,6 @@ async function initialize(
getCommonConfig(wco),
getStylesConfig(wco),
getTypeScriptConfig(wco),
getTestConfig(wco),
getWorkerConfig(wco),
],
);
Expand Down
16 changes: 2 additions & 14 deletions packages/angular_devkit/build_angular/src/builders/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,7 @@ import { I18nOptions } from '../../utils/i18n-options';
import { ensureOutputPaths } from '../../utils/output-paths';
import { assertCompatibleAngularVersion } from '../../utils/version';
import { generateI18nBrowserWebpackConfigFromContext } from '../../utils/webpack-browser-config';
import {
getCommonConfig,
getServerConfig,
getStatsConfig,
getStylesConfig,
getTypeScriptConfig,
} from '../../webpack/configs';
import { getCommonConfig, getStylesConfig, getTypeScriptConfig } from '../../webpack/configs';
import { webpackStatsLogger } from '../../webpack/utils/stats';
import { Schema as ServerBuilderOptions } from './schema';

Expand Down Expand Up @@ -161,13 +155,7 @@ async function initialize(
platform: 'server',
} as NormalizedBrowserBuilderSchema,
context,
(wco) => [
getCommonConfig(wco),
getServerConfig(wco),
getStylesConfig(wco),
getStatsConfig(wco),
getTypeScriptConfig(wco),
],
(wco) => [getCommonConfig(wco), getStylesConfig(wco), getTypeScriptConfig(wco)],
);

let transformedConfig;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ export interface BuildOptions {
inlineStyleLanguage?: InlineStyleLanguage;
allowedCommonJsDependencies?: string[];
cache: NormalizedCachedOptions;
}

export interface WebpackTestOptions extends BuildOptions {
codeCoverage?: boolean;
codeCoverageExclude?: string[];
}
Expand Down
100 changes: 0 additions & 100 deletions packages/angular_devkit/build_angular/src/webpack/configs/browser.ts

This file was deleted.