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

fix(angular): fix angular projects not being standalone when all other projects are standalone (#6641)

Browse Source
This commit is contained in:
Jason Jean 2021-08-06 20:48:35 -04:00 committed by GitHub
parent 3e3794c52c
commit c13c02d27e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/angular/src/generators/application/application.ts
View File

@ -101,10 +101,7 @@ export async function applicationGenerator(
setApplicationStrictDefault(host, false);
}
if (
options.standaloneConfig ||
getWorkspaceLayout(host).standaloneAsDefault
) {
if (options.standaloneConfig) {
await convertToNxProjectGenerator(host, {
project: options.name,
all: false,

4
packages/angular/src/generators/application/lib/normalize-options.ts
View File

@ -10,7 +10,7 @@ export function normalizeOptions(
host: Tree,
options: Partial<Schema>
): NormalizedSchema {
const { appsDir, npmScope } = getWorkspaceLayout(host);
const { appsDir, npmScope, standaloneAsDefault } = getWorkspaceLayout(host);
const appDirectory = options.directory
? `${names(options.directory).fileName}/${names(options.name).fileName}`
@ -31,6 +31,8 @@ export function normalizeOptions(
const defaultPrefix = npmScope;
options.standaloneConfig = options.standaloneConfig || standaloneAsDefault;
// Set defaults and then overwrite with user options
return {
style: 'css',

4
packages/angular/src/generators/library/lib/normalize-options.ts
View File

@ -27,7 +27,7 @@ export function normalizeOptions(
? `${names(options.directory).fileName}/${name}`
: name;
const { libsDir, npmScope } = getWorkspaceLayout(host);
const { libsDir, npmScope, standaloneAsDefault } = getWorkspaceLayout(host);
const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
const fileName = options.simpleModuleName ? name : projectName;
@ -40,6 +40,8 @@ export function normalizeOptions(
const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
const defaultPrefix = npmScope;
options.standaloneConfig = options.standaloneConfig || standaloneAsDefault;
const importPath =
options.importPath || `@${defaultPrefix}/${projectDirectory}`;

5
packages/angular/src/generators/library/library.ts
View File

@ -69,10 +69,7 @@ export async function libraryGenerator(host: Tree, schema: Partial<Schema>) {
setStrictMode(host, options);
await addLinting(host, options);
if (
options.standaloneConfig ||
getWorkspaceLayout(host).standaloneAsDefault
) {
if (options.standaloneConfig) {
await convertToNxProjectGenerator(host, {
project: options.name,
all: false,