Skip to content

7.1.0-rc.1 fixes #2954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamesdaniels merged 10 commits into from
Sep 14, 2021
Merged

7.1.0-rc.1 fixes #2954

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d3b55c2
Missing deps, fixed ng add bug
jamesdaniels Sep 14, 2021
6ed3e82
findModuleFromOptions wasn't working for me
jamesdaniels Sep 14, 2021
83808a7
Add note on logged in user
jamesdaniels Sep 14, 2021
0bfd285
Merge branch 'master' into 710-rc0-fixes
jamesdaniels Sep 14, 2021
b82af64
Ditch the console.log
jamesdaniels Sep 14, 2021
6962b28
Merge remote-tracking branch 'origin/710-rc0-fixes' into 710-rc0-fixes
jamesdaniels Sep 14, 2021
f68e799
Fix the spec
jamesdaniels Sep 14, 2021
a7b0177
Apply fixes to server.ts
jamesdaniels Sep 14, 2021
da48efb
Apply fixes to server.ts
jamesdaniels Sep 14, 2021
27cc2ea
File-loader, functions deps
jamesdaniels Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
findModuleFromOptions wasn't working for me
  • Loading branch information
@jamesdaniels
jamesdaniels committed Sep 14, 2021
commit 6ed3e822d207fa584ec805e5de942432f35fa465
8 changes: 3 additions & 5 deletions src/schematics/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { SchematicsException, Tree } from '@angular-devkit/schematics';
import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
import { findNode, addImportToModule, insertImport } from '@schematics/angular/utility/ast-utils';
import { InsertChange, ReplaceChange, applyToUpdateRecorder, Change } from '@schematics/angular/utility/change';
import { findModuleFromOptions, buildRelativePath } from '@schematics/angular/utility/find-module';
import { buildRelativePath } from '@schematics/angular/utility/find-module';
import { overwriteIfExists } from './common';

// We consider a project to be a universal project if it has a `server` architect
Expand Down Expand Up @@ -153,10 +153,8 @@ export function addEnvironmentEntry(

export function addToNgModule(host: Tree, options: { sourcePath: string, features: FEATURES[]}) {

const modulePath = findModuleFromOptions(host, {
name: 'app',
path: options.sourcePath,
});
const modulePath = `/${options.sourcePath}/app/app.module.ts`;
console.log(modulePath);

if (!modulePath) {
return host;
Expand Down