Skip to content

Commit b651f99

Browse files
committed
fix: respect new package names in nx 16
1 parent 189f9f1 commit b651f99

File tree

4 files changed

+9
-44
lines changed

4 files changed

+9
-44
lines changed

libs/mf-runtime/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@angular-architects/module-federation-runtime",
33
"license": "MIT",
4-
"version": "16.0.1",
4+
"version": "16.0.3",
55
"peerDependencies": {
66
"@angular/common": ">=16.0.0",
77
"@angular/core": ">=16.0.0"

libs/mf-tools/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular-architects/module-federation-tools",
3-
"version": "16.0.1",
3+
"version": "16.0.3",
44
"license": "MIT",
55
"peerDependencies": {
66
"@angular/common": ">=16.0.0",

libs/mf/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular-architects/module-federation",
3-
"version": "16.0.1",
3+
"version": "16.0.3",
44
"license": "MIT",
55
"repository": {
66
"type": "GitHub",
@@ -17,7 +17,7 @@
1717
"schematics": "./collection.json",
1818
"builders": "./builders.json",
1919
"dependencies": {
20-
"@angular-architects/module-federation-runtime": "16.0.1",
20+
"@angular-architects/module-federation-runtime": "16.0.3",
2121
"word-wrap": "^1.2.3",
2222
"callsite": "^1.0.0",
2323
"node-fetch": "^2.6.7",

libs/mf/src/schematics/mf/schematic.ts

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -144,51 +144,16 @@ function getWebpackConfigValue(nx: boolean, path: string) {
144144

145145
function nxBuildersAvailable(tree: Tree): boolean {
146146
if (!tree.exists('nx.json')) return false;
147-
148-
const packageJson = JSON.parse(tree.read('package.json').toString('utf-8'));
149-
150-
const version =
151-
packageJson?.devDependencies?.['@nrwl/workspace'] ??
152-
packageJson?.dependencies?.['@nrwl/workspace'];
153-
154-
if (!version) return false;
155-
156-
const minVersion = semver.minVersion(version).raw;
157-
158-
return semver.satisfies(minVersion, '>=12.9.0');
147+
return true;
159148
}
160149

161-
function infereNxBuilderNames(
162-
tree: Tree
163-
): { dev: string; prod: string } {
164-
150+
function infereNxBuilderNames(tree: Tree): { dev: string; prod: string } {
165151
const defaultResult = {
166-
dev: '@nrwl/angular:webpack-dev-server',
167-
prod: '@nrwl/angular:webpack-browser',
168-
};
169-
170-
const fallbackResult = {
171-
dev: '@nrwl/angular:webpack-server',
172-
prod: '@nrwl/angular:webpack-browser',
152+
dev: '@nx/angular:webpack-dev-server',
153+
prod: '@nx/angular:webpack-browser',
173154
};
174155

175-
if (!tree.exists('nx.json')) return defaultResult;
176-
177-
const packageJson = JSON.parse(tree.read('package.json').toString('utf-8'));
178-
179-
const version =
180-
packageJson?.devDependencies?.['@nrwl/angular'] ??
181-
packageJson?.dependencies?.['@nrwl/angular'];
182-
183-
if (!version) defaultResult;
184-
185-
const minVersion = semver.minVersion(version).raw;
186-
187-
if (semver.satisfies(minVersion, '>=15.0.0')) {
188-
return defaultResult;
189-
} else {
190-
return fallbackResult;
191-
}
156+
return defaultResult;
192157
}
193158

194159
async function generateWebpackConfig(

0 commit comments

Comments
 (0)