Skip to content

Commit 0875a26

Browse files
committed
WIP! use official private api in @angular/build
1 parent 2fe3dc8 commit 0875a26

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

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

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,18 @@ import * as path from 'path';
22
import * as fs from 'fs';
33
import * as mrmime from 'mrmime';
44

5-
import { ApplicationBuilderOptions } from '@angular/build/src/builders/application';
6-
import { Schema } from '@angular/build/src/builders/application/schema';
5+
import { buildApplication, ApplicationBuilderOptions } from '@angular/build';
6+
import {
7+
serveWithVite,
8+
buildApplicationInternal,
9+
} from '@angular/build/private';
710

811
import {
912
BuilderContext,
1013
BuilderOutput,
1114
createBuilder,
1215
} from '@angular-devkit/architect';
1316

14-
import {
15-
buildApplication,
16-
buildApplicationInternal,
17-
} from '@angular/build/src/builders/application';
18-
import { serveWithVite } from '@angular/build/src/builders/dev-server/vite-server';
19-
2017
import { DevServerBuilderOptions } from '@angular-devkit/build-angular';
2118
import { normalizeOptions } from '@angular-devkit/build-angular/src/builders/dev-server/options';
2219

@@ -50,7 +47,7 @@ import {
5047
} from '../../utils/mem-resuts';
5148
import { JsonObject } from '@angular-devkit/core';
5249
import { createSharedMappingsPlugin } from '../../utils/shared-mappings-plugin';
53-
import { Connect } from 'vite';
50+
// import { NextHandleFunction } from 'vite';
5451
import { PluginBuild } from 'esbuild';
5552
import { FederationInfo } from '@softarc/native-federation-runtime';
5653

@@ -79,7 +76,7 @@ export async function* runBuilder(
7976

8077
let _options = (await context.getTargetOptions(
8178
target
82-
)) as unknown as JsonObject & Schema;
79+
)) as unknown as JsonObject & ApplicationBuilderOptions;
8380

8481
let builder = await context.getBuilderNameForTarget(target);
8582

@@ -107,7 +104,7 @@ export async function* runBuilder(
107104
let options = (await context.validateOptions(
108105
_options,
109106
builder
110-
)) as JsonObject & Schema;
107+
)) as JsonObject & ApplicationBuilderOptions;
111108

112109
const outerOptions = options as DevServerBuilderOptions;
113110
const normOuterOptions = nfOptions.dev
@@ -118,11 +115,11 @@ export async function* runBuilder(
118115
target = targetFromTargetString(outerOptions.buildTarget);
119116
_options = (await context.getTargetOptions(
120117
target
121-
)) as unknown as JsonObject & Schema;
118+
)) as unknown as JsonObject & ApplicationBuilderOptions;
122119

123120
builder = await context.getBuilderNameForTarget(target);
124121
options = (await context.validateOptions(_options, builder)) as JsonObject &
125-
Schema;
122+
ApplicationBuilderOptions;
126123
}
127124

128125
const runServer = !!nfOptions.port;
@@ -180,7 +177,7 @@ export async function* runBuilder(
180177
},
181178
];
182179

183-
const middleware: Connect.NextHandleFunction[] = [
180+
const middleware = [
184181
(req, res, next) => {
185182
const fileName = path.join(
186183
fedOptions.workspaceRoot,

libs/native-federation/src/utils/angular-esbuild-adapter.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import {
66

77
import * as esbuild from 'esbuild';
88

9+
import {} from '@angular/build';
10+
11+
import {} from '@angular/build/private';
12+
913
import { createCompilerPlugin } from '@angular/build/src/tools/esbuild/angular/compiler-plugin';
1014
import { createCompilerPluginOptions } from '@angular/build/src/tools/esbuild/compiler-plugin-options';
1115
import { transformSupportedBrowsersToTargets } from '@angular/build/src/tools/esbuild/utils';

libs/native-federation/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
4-
"module": "commonjs",
4+
"module": "NodeNext",
5+
"moduleResolution": "NodeNext",
56
"forceConsistentCasingInFileNames": true,
67
// "strict": true,
78
"noImplicitOverride": true,

libs/native-federation/tsconfig.lib.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
4+
"composite": true,
45
"outDir": "../../dist/out-tsc",
56
"declaration": true,
67
"types": []

libs/native-federation/tsconfig.spec.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
4+
"composite": true,
45
"outDir": "../../dist/out-tsc",
56
"module": "commonjs",
67
"types": ["jest", "node"]

0 commit comments

Comments
 (0)