miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

fix(angular): handle ngrx imports for apps that do not migrate to config file (#16812)

Browse Source
This commit is contained in:
Colum Ferry 2023-05-09 09:31:03 +01:00 committed by GitHub
parent 7d42d887e3
commit 6728bbbc98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/angular/src/generators/ngrx/lib/add-imports-to-module.ts
View File

@ -6,6 +6,7 @@ import type { SourceFile } from 'typescript';
import { import {
addImportToModule, addImportToModule,
addProviderToAppConfig, addProviderToAppConfig,
addProviderToBootstrapApplication,
addProviderToModule, addProviderToModule,
} from '../../../utils/nx-devkit/ast-utils'; } from '../../../utils/nx-devkit/ast-utils';
import type { NormalizedNgRxGeneratorOptions } from './normalize-options'; import type { NormalizedNgRxGeneratorOptions } from './normalize-options';
@ -23,8 +24,11 @@ function addRootStoreImport(
storeForRoot: string storeForRoot: string
) { ) {
if (isParentStandalone) { if (isParentStandalone) {
if (tree.read(parentPath, 'utf-8').includes('ApplicationConfig')) { const parentContents = tree.read(parentPath, 'utf-8');
if (parentContents.includes('ApplicationConfig')) {
addProviderToAppConfig(tree, parentPath, provideRootStore); addProviderToAppConfig(tree, parentPath, provideRootStore);
} else if (parentContents.includes('bootstrapApplication')) {
addProviderToBootstrapApplication(tree, parentPath, provideRootStore);
} else { } else {
addProviderToRoute(tree, parentPath, route, provideRootStore); addProviderToRoute(tree, parentPath, route, provideRootStore);
} }
@ -44,8 +48,11 @@ function addRootEffectsImport(
effectsForEmptyRoot: string effectsForEmptyRoot: string
) { ) {
if (isParentStandalone) { if (isParentStandalone) {
if (tree.read(parentPath, 'utf-8').includes('ApplicationConfig')) { const parentContents = tree.read(parentPath, 'utf-8');
if (parentContents.includes('ApplicationConfig')) {
addProviderToAppConfig(tree, parentPath, provideRootEffects); addProviderToAppConfig(tree, parentPath, provideRootEffects);
} else if (parentContents.includes('bootstrapApplication')) {
addProviderToBootstrapApplication(tree, parentPath, provideRootEffects);
} else { } else {
addProviderToRoute(tree, parentPath, route, provideRootEffects); addProviderToRoute(tree, parentPath, route, provideRootEffects);
} }
@ -91,8 +98,15 @@ function addStoreForFeatureImport(
storeForFeature: string storeForFeature: string
) { ) {
if (isParentStandalone) { if (isParentStandalone) {
if (tree.read(parentPath, 'utf-8').includes('ApplicationConfig')) { const parentContents = tree.read(parentPath, 'utf-8');
if (parentContents.includes('ApplicationConfig')) {
addProviderToAppConfig(tree, parentPath, provideStoreForFeature); addProviderToAppConfig(tree, parentPath, provideStoreForFeature);
} else if (parentContents.includes('bootstrapApplication')) {
addProviderToBootstrapApplication(
tree,
parentPath,
provideStoreForFeature
);
} else { } else {
addProviderToRoute(tree, parentPath, route, provideStoreForFeature); addProviderToRoute(tree, parentPath, route, provideStoreForFeature);
} }
@ -117,8 +131,15 @@ function addEffectsForFeatureImport(
effectsForFeature: string effectsForFeature: string
) { ) {
if (isParentStandalone) { if (isParentStandalone) {
if (tree.read(parentPath, 'utf-8').includes('ApplicationConfig')) { const parentContents = tree.read(parentPath, 'utf-8');
if (parentContents.includes('ApplicationConfig')) {
addProviderToAppConfig(tree, parentPath, provideEffectsForFeature); addProviderToAppConfig(tree, parentPath, provideEffectsForFeature);
} else if (parentContents.includes('bootstrapApplication')) {
addProviderToBootstrapApplication(
tree,
parentPath,
provideEffectsForFeature
);
} else { } else {
addProviderToRoute(tree, parentPath, route, provideEffectsForFeature); addProviderToRoute(tree, parentPath, route, provideEffectsForFeature);
} }