Skip to content

Commit 7d0811f

Browse files
committed
fix(nf): adjust schematics
1 parent aab1e6e commit 7d0811f

File tree

6 files changed

+26
-244
lines changed

6 files changed

+26
-244
lines changed

libs/native-federation-core/src/lib/core/bundle-exposed.ts.bak

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

libs/native-federation-core/src/lib/core/bundle-shared-mappings.ts.bak

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

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,11 @@ export async function* runBuilder(
113113
{
114114
name: 'externals',
115115
setup(build: PluginBuild) {
116-
build.initialOptions.external = externals.filter((e) => e !== 'tslib');
116+
if (build.initialOptions.platform !== 'node') {
117+
build.initialOptions.external = externals.filter(
118+
(e) => e !== 'tslib'
119+
);
120+
}
117121
},
118122
},
119123
];
@@ -136,7 +140,7 @@ export async function* runBuilder(
136140
'Content-Type': mimeType,
137141
'Access-Control-Allow-Origin': '*',
138142
'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE',
139-
'Access-Control-Allow-Headers': 'Content-Type'
143+
'Access-Control-Allow-Headers': 'Content-Type',
140144
});
141145
res.end(body);
142146
} else {
@@ -175,17 +179,17 @@ export async function* runBuilder(
175179

176180
const builderRun = nfOptions.dev
177181
? serveWithVite(
178-
normOuterOptions,
179-
appBuilderName,
180-
context,
181-
{
182-
indexHtml: transformIndexHtml,
183-
},
184-
{
185-
buildPlugins: plugins,
186-
middleware,
187-
}
188-
)
182+
normOuterOptions,
183+
appBuilderName,
184+
context,
185+
{
186+
indexHtml: transformIndexHtml,
187+
},
188+
{
189+
buildPlugins: plugins,
190+
middleware,
191+
}
192+
)
189193
: buildApplication(options, context, plugins);
190194

191195
// builderRun.output.subscribe(async (output) => {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ function updateWorkspaceConfig(
100100

101101
const originalBuild = projectConfig.architect.build;
102102

103-
if (
104-
originalBuild.builder !== '@angular-devkit/build-angular:application'
105-
) {
106-
console.log('Switching project to the application builder using esbuild ...');
103+
if (originalBuild.builder !== '@angular-devkit/build-angular:application') {
104+
console.log(
105+
'Switching project to the application builder using esbuild ...'
106+
);
107107
originalBuild.builder = '@angular-devkit/build-angular:application';
108108
delete originalBuild.configurations?.development?.buildOptimizer;
109109
delete originalBuild.configurations?.development?.vendorChunk;
@@ -139,13 +139,13 @@ function updateWorkspaceConfig(
139139
};
140140

141141
const serveProd = projectConfig.architect.serve.configurations?.production;
142-
if(serveProd) {
142+
if (serveProd) {
143143
serveProd.buildTarget = `${projectName}:esbuild:production`;
144144
delete serveProd.browserTarget;
145145
}
146146

147147
const serveDev = projectConfig.architect.serve.configurations?.development;
148-
if(serveDev) {
148+
if (serveDev) {
149149
serveDev.buildTarget = `${projectName}:esbuild:development`;
150150
delete serveDev.browserTarget;
151151
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ function updateWorkspaceConfig(
6565

6666
if (projectConfig.architect.serve) {
6767
const conf = projectConfig.architect.serve.configurations;
68-
conf.production.browserTarget = conf.production.browserTarget.replace(
68+
conf.production.buildTarget = conf.production.buildTarget.replace(
6969
':esbuild:',
7070
':build:'
7171
);
72-
conf.development.browserTarget = conf.development.browserTarget.replace(
72+
conf.development.buildTarget = conf.development.buildTarget.replace(
7373
':esbuild:',
7474
':build:'
7575
);

update-local.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
call npm unpublish @softarc/native-federation@2.0.7 --registry http://localhost:4873
22
call npm unpublish @softarc/native-federation-runtime@2.0.7 --registry http://localhost:4873
33
call npm unpublish @softarc/native-federation-esbuild@2.0.7 --registry http://localhost:4873
4-
call npm unpublish @angular-architects/native-federation@17.0.7 --registry http://localhost:4873
4+
call npm unpublish @angular-architects/native-federation@17.1.0-beta.1 --registry http://localhost:4873
55

66
call npx nx build native-federation
77
call npx nx build native-federation-core

0 commit comments

Comments
 (0)