Skip to content

Commit 90908be

Browse files
committed
refactor(nf*): remove useless check builder
1 parent 2b1130b commit 90908be

File tree

4 files changed

+28
-58
lines changed

4 files changed

+28
-58
lines changed

libs/native-federation/src/builders/build/builder.ts

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import { createSharedMappingsPlugin } from '../../utils/shared-mappings-plugin';
4545
// import { NextHandleFunction } from 'vite';
4646
import { FederationInfo } from '@softarc/native-federation-runtime';
4747
import { PluginBuild } from 'esbuild';
48-
import { checkAngularBuildApplicationBuilder } from '../../utils/check-builder';
4948
import { getI18nConfig, translateFederationArtefacts } from '../../utils/i18n';
5049

5150
function _buildApplication(options, context, pluginsOrExtensions) {
@@ -75,7 +74,7 @@ export async function* runBuilder(
7574
if (builder === '@angular-devkit/build-angular:browser-esbuild') {
7675
logger.info('.: NATIVE FEDERATION - UPDATE NEEDED :.');
7776
logger.info('');
78-
logger.info("Since version 17.1, Native Federation uses Angular's");
77+
logger.info('Since version 17.1, Native Federation uses Angular\'s');
7978
logger.info('Application-Builder and its Dev-Server.');
8079
logger.info('');
8180
logger.info('If you are sill on Angular 17.0.x, please update to');
@@ -143,7 +142,7 @@ export async function* runBuilder(
143142
server: 'server',
144143
media: 'media',
145144
...(typeof outputPath === 'string' ? undefined : outputPath),
146-
base: typeof outputPath === 'string' ? outputPath : outputPath.base,
145+
base: typeof outputPath === 'string' ? outputPath : outputPath.base
147146
};
148147

149148
const i18n = await getI18nConfig(context);
@@ -169,7 +168,7 @@ export async function* runBuilder(
169168
tsConfig: options.tsConfig,
170169
verbose: options.verbose,
171170
watch: false, // options.watch,
172-
dev: !!nfOptions.dev,
171+
dev: !!nfOptions.dev
173172
};
174173

175174
const activateSsr = nfOptions.ssr && !nfOptions.dev;
@@ -186,8 +185,8 @@ export async function* runBuilder(
186185
(e) => e !== 'tslib'
187186
);
188187
}
189-
},
190-
},
188+
}
189+
}
191190
];
192191

193192
// SSR build fails when externals are provided via the plugin
@@ -220,13 +219,13 @@ export async function* runBuilder(
220219
'Content-Type': mimeType,
221220
'Access-Control-Allow-Origin': '*',
222221
'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE',
223-
'Access-Control-Allow-Headers': 'Content-Type',
222+
'Access-Control-Allow-Headers': 'Content-Type'
224223
});
225224
res.end(body);
226225
} else {
227226
next();
228227
}
229-
},
228+
}
230229
];
231230

232231
const memResults = new MemResults();
@@ -270,28 +269,27 @@ export async function* runBuilder(
270269

271270
options.deleteOutputPath = false;
272271

273-
const appBuilderName = checkAngularBuildApplicationBuilder()
274-
? '@angular/build:application'
275-
: '@angular-devkit/build-angular:application';
272+
const appBuilderName = '@angular/build:application';
273+
276274

277275
const builderRun = runServer
278276
? serveWithVite(
279-
normOuterOptions,
280-
appBuilderName,
281-
_buildApplication,
282-
context,
283-
nfOptions.skipHtmlTransform
284-
? {}
285-
: { indexHtml: transformIndexHtml(nfOptions) },
286-
{
287-
buildPlugins: plugins as any,
288-
middleware,
289-
}
290-
)
277+
normOuterOptions,
278+
appBuilderName,
279+
_buildApplication,
280+
context,
281+
nfOptions.skipHtmlTransform
282+
? {}
283+
: { indexHtml: transformIndexHtml(nfOptions) },
284+
{
285+
buildPlugins: plugins as any,
286+
middleware
287+
}
288+
)
291289
: buildApplication(options, context, {
292-
codePlugins: plugins as any,
293-
indexHtmlTransformer: transformIndexHtml(nfOptions),
294-
});
290+
codePlugins: plugins as any,
291+
indexHtmlTransformer: transformIndexHtml(nfOptions)
292+
});
295293

296294
// builderRun.output.subscribe(async (output) => {
297295
for await (const output of builderRun) {
@@ -410,7 +408,7 @@ function addDebugInformation(fileName: string, rawBody: string): string {
410408

411409
const sharedForVite = shared.map((s) => ({
412410
...s,
413-
packageName: `/@id/${s.packageName}`,
411+
packageName: `/@id/${s.packageName}`
414412
}));
415413

416414
remoteEntry.shared = [...shared, ...sharedForVite];

libs/native-federation/src/schematics/appbuilder/schematic.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { Rule, Tree } from '@angular-devkit/schematics';
33
import { MfSchematicSchema } from './schema';
44

55
import * as path from 'path';
6-
import { checkAngularBuildApplicationBuilder } from '../../utils/check-builder';
76

87
type NormalizedOptions = {
98
polyfills: string;
@@ -41,10 +40,8 @@ function updateWorkspaceConfig(
4140
}
4241

4342
if (projectConfig.architect.esbuild) {
44-
projectConfig.architect.esbuild.builder =
45-
checkAngularBuildApplicationBuilder()
46-
? '@angular/build:application'
47-
: '@angular-devkit/build-angular:application';
43+
projectConfig.architect.esbuild.builder = '@angular/build:application';
44+
4845
projectConfig.architect.esbuild.options.browser =
4946
projectConfig.architect.esbuild.options.main;
5047
delete projectConfig.architect.esbuild.options.main;

libs/native-federation/src/schematics/init/schematic.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
} from '@schematics/angular/utility/dependencies';
2727

2828
import * as path from 'path';
29-
import { checkAngularBuildApplicationBuilder } from '../../utils/check-builder';
3029

3130
const SSR_VERSION = '^2.0.10';
3231

@@ -238,9 +237,7 @@ function updateWorkspaceConfig(
238237
console.log(
239238
'Switching project to the application builder using esbuild ...'
240239
);
241-
originalBuild.builder = checkAngularBuildApplicationBuilder()
242-
? '@angular/build:application'
243-
: '@angular-devkit/build-angular:application';
240+
originalBuild.builder = '@angular/build:application';
244241
delete originalBuild.configurations?.development?.buildOptimizer;
245242
delete originalBuild.configurations?.development?.vendorChunk;
246243
}

libs/native-federation/src/utils/check-builder.ts

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)