@@ -2,21 +2,18 @@ import * as path from 'path';
2
2
import * as fs from 'fs' ;
3
3
import * as mrmime from 'mrmime' ;
4
4
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' ;
7
10
8
11
import {
9
12
BuilderContext ,
10
13
BuilderOutput ,
11
14
createBuilder ,
12
15
} from '@angular-devkit/architect' ;
13
16
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
-
20
17
import { DevServerBuilderOptions } from '@angular-devkit/build-angular' ;
21
18
import { normalizeOptions } from '@angular-devkit/build-angular/src/builders/dev-server/options' ;
22
19
@@ -50,7 +47,7 @@ import {
50
47
} from '../../utils/mem-resuts' ;
51
48
import { JsonObject } from '@angular-devkit/core' ;
52
49
import { createSharedMappingsPlugin } from '../../utils/shared-mappings-plugin' ;
53
- import { Connect } from 'vite' ;
50
+ // import { NextHandleFunction } from 'vite';
54
51
import { PluginBuild } from 'esbuild' ;
55
52
import { FederationInfo } from '@softarc/native-federation-runtime' ;
56
53
@@ -79,7 +76,7 @@ export async function* runBuilder(
79
76
80
77
let _options = ( await context . getTargetOptions (
81
78
target
82
- ) ) as unknown as JsonObject & Schema ;
79
+ ) ) as unknown as JsonObject & ApplicationBuilderOptions ;
83
80
84
81
let builder = await context . getBuilderNameForTarget ( target ) ;
85
82
@@ -107,7 +104,7 @@ export async function* runBuilder(
107
104
let options = ( await context . validateOptions (
108
105
_options ,
109
106
builder
110
- ) ) as JsonObject & Schema ;
107
+ ) ) as JsonObject & ApplicationBuilderOptions ;
111
108
112
109
const outerOptions = options as DevServerBuilderOptions ;
113
110
const normOuterOptions = nfOptions . dev
@@ -118,11 +115,11 @@ export async function* runBuilder(
118
115
target = targetFromTargetString ( outerOptions . buildTarget ) ;
119
116
_options = ( await context . getTargetOptions (
120
117
target
121
- ) ) as unknown as JsonObject & Schema ;
118
+ ) ) as unknown as JsonObject & ApplicationBuilderOptions ;
122
119
123
120
builder = await context . getBuilderNameForTarget ( target ) ;
124
121
options = ( await context . validateOptions ( _options , builder ) ) as JsonObject &
125
- Schema ;
122
+ ApplicationBuilderOptions ;
126
123
}
127
124
128
125
const runServer = ! ! nfOptions . port ;
@@ -180,7 +177,7 @@ export async function* runBuilder(
180
177
} ,
181
178
] ;
182
179
183
- const middleware : Connect . NextHandleFunction [ ] = [
180
+ const middleware = [
184
181
( req , res , next ) => {
185
182
const fileName = path . join (
186
183
fedOptions . workspaceRoot ,
0 commit comments