Skip to content

Commit 669abae

Browse files
alan-agius4vikerman
authored andcommitted
refactor: remove redundant host parameter in configureI18nBuild
1 parent 8fa93e1 commit 669abae

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

packages/angular_devkit/build_angular/src/server/index.ts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
*/
88
import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
99
import { runWebpack } from '@angular-devkit/build-webpack';
10-
import { json, virtualFs } from '@angular-devkit/core';
11-
import { NodeJsSyncHost } from '@angular-devkit/core/node';
12-
import * as fs from 'fs';
10+
import { json } from '@angular-devkit/core';
1311
import * as path from 'path';
14-
import { Observable, from, of } from 'rxjs';
12+
import { Observable, from } from 'rxjs';
1513
import { concatMap, map } from 'rxjs/operators';
1614
import { ScriptTarget } from 'typescript';
1715
import * as webpack from 'webpack';
@@ -46,17 +44,16 @@ export function execute(
4644
webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
4745
} = {},
4846
): Observable<ServerBuilderOutput> {
49-
const host = new NodeJsSyncHost();
5047
const root = context.workspaceRoot;
5148

5249
// Check Angular version.
53-
assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
50+
assertCompatibleAngularVersion(root, context.logger);
5451

55-
const tsConfig = readTsconfig(options.tsConfig, context.workspaceRoot);
52+
const tsConfig = readTsconfig(options.tsConfig, root);
5653
const target = tsConfig.options.target || ScriptTarget.ES5;
57-
const baseOutputPath = path.resolve(context.workspaceRoot, options.outputPath);
54+
const baseOutputPath = path.resolve(root, options.outputPath);
5855

59-
return from(initialize(options, context, host, transforms.webpackConfiguration)).pipe(
56+
return from(initialize(options, context, transforms.webpackConfiguration)).pipe(
6057
concatMap(({ config, i18n }) => {
6158
return runWebpack(config, context).pipe(
6259
concatMap(async output => {
@@ -108,7 +105,6 @@ export default createBuilder<json.JsonObject & ServerBuilderOptions, ServerBuild
108105
async function initialize(
109106
options: ServerBuilderOptions,
110107
context: BuilderContext,
111-
host: virtualFs.Host<fs.Stats>,
112108
webpackConfigurationTransform?: ExecutionTransformer<webpack.Configuration>,
113109
): Promise<{
114110
config: webpack.Configuration;

packages/angular_devkit/build_angular/src/utils/i18n-options.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ export function createI18nOptions(
9393

9494
export async function configureI18nBuild<T extends BrowserBuilderSchema | ServerBuilderSchema>(
9595
context: BuilderContext,
96-
host: virtualFs.Host<fs.Stats>,
9796
options: T,
9897
): Promise<{
9998
buildOptions: T,

packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export async function generateI18nBrowserWebpackConfigFromContext(
140140
webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[],
141141
host: virtualFs.Host<fs.Stats> = new NodeJsSyncHost(),
142142
): Promise<{ config: webpack.Configuration; projectRoot: string; projectSourceRoot?: string, i18n: I18nOptions }> {
143-
const { buildOptions, i18n } = await configureI18nBuild(context, host, options);
143+
const { buildOptions, i18n } = await configureI18nBuild(context, options);
144144
const result = await generateBrowserWebpackConfigFromContext(buildOptions, context, webpackPartialGenerator, host);
145145
const config = result.config;
146146

0 commit comments

Comments
 (0)