Skip to content

fix: lookup default stylesheet extension from angular.json file #315

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
merged 4 commits into from
Apr 22, 2021
Merged

fix: lookup default stylesheet extension from angular.json file #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd6a96b
chore: bump TS v4.1
agonper Apr 22, 2021
ce3024d
fix: properly parsing project object
agonper Apr 22, 2021
f86c547
fix: read style sheet extension from project object
agonper Apr 22, 2021
85d9aa9
docs: update README instruction default scss extension
agonper Apr 22, 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
7 changes: 6 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,12 @@ You need to add an `angular.json` configuration file to your NativeScript projec
"root": "",
"sourceRoot": ".",
"projectType": "application",
"prefix": "app"
"prefix": "app",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
}
}
},
"defaultProject": "project-name"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"jasmine": "^3.5.0",
"jasmine-spec-reporter": "^5.0.2",
"tslint": "~6.1.0",
"typescript": "~4.0.0"
"typescript": "~4.1.0"
},
"repository": {
"type": "git",
Expand Down
20 changes: 8 additions & 12 deletions src/angular-project-parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import * as ts from 'typescript';
import { basename } from 'path';
import { Tree, SchematicsException } from '@angular-devkit/schematics';
import {
findBootstrapModuleCall,
findBootstrapModulePath,
} from '@schematics/angular/utility/ng-ast-utils';
import { SchematicsException, Tree } from '@angular-devkit/schematics';
import { findBootstrapModuleCall, findBootstrapModulePath } from '@schematics/angular/utility/ng-ast-utils';
import { getWorkspace } from '@schematics/angular/utility/workspace';

import { safeGet } from './utils';
import { findNode, findImportPath, getSourceFile } from './ts-utils';
import { findImportPath, findNode, getSourceFile } from './ts-utils';

export interface AngularProjectSettings {
/** default: '' */
Expand Down Expand Up @@ -128,7 +125,7 @@ async function getCoreProjectSettings(tree: Tree, projectName: string): Promise<
);
}

const buildTarget = targets.build;
const buildTarget = targets.get('build');
if (!buildTarget) {
throw new SchematicsException(
`Failed to find build target for project ${projectName}!`,
Expand All @@ -139,7 +136,7 @@ async function getCoreProjectSettings(tree: Tree, projectName: string): Promise<
const sourceRoot = project.sourceRoot || 'src';
const mainPath = safeGet(buildTarget, 'options', 'main');
const mainName = mainPath && basename(mainPath).replace(/\.ts$/, '');
const prefix = project.prefix;
const prefix = project.prefix as string;
const tsConfig = safeGet(buildTarget, 'options', 'tsConfig');

return {
Expand All @@ -154,21 +151,20 @@ async function getCoreProjectSettings(tree: Tree, projectName: string): Promise<

export async function getTsConfigFromProject(tree: Tree, projectName: string) {
const { targets } = await parseAngularConfig(tree, projectName);
const tsConfig = safeGet(targets, 'build', 'options', 'tsConfig');

return tsConfig;
return safeGet(targets, 'build', 'options', 'tsConfig');
}

async function parseAngularConfig(tree, projectName: string) {
const project = await getProjectObject(tree, projectName);
const targets = project.architect;
const targets = project.targets;

return { targets, project };
}

export async function getProjectObject(tree: Tree, projectName: string) {
const workspace = await getWorkspace(tree);
const project = workspace.projects[projectName];
const project = workspace.projects.get(projectName);
if (!project) {
throw new SchematicsException(`Couldn't find project "${projectName}" in the workspace!`);
}
Expand Down
32 changes: 18 additions & 14 deletions src/generate/component/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,25 +45,29 @@ let extensions: Extensions;
export default function(options: ComponentOptions): Rule {
let platformUse: PlatformUse;
let componentInfo: ComponentInfo;

return chain([
(tree: Tree) => {
platformUse = getPlatformUse(tree, options);
async (tree: Tree) => {
const projectObject = await getProjectObject(tree, options.project);

if (platformUse.nsOnly && options.spec !== true) {
options.spec = false;
}
return () => {
platformUse = getPlatformUse(tree, options);

const projectObject: any = getProjectObject(tree, options.project);
const style = (projectObject && projectObject.schematics && projectObject.schematics['@schematics/angular:component']
&& projectObject.schematics['@schematics/angular:component'].style);
if (style) {
options.style = style;
}
if (platformUse.nsOnly && options.spec !== true) {
options.spec = false;
}

validateGenerateOptions(platformUse, options);
validateGenerateComponentOptions(platformUse, options);
const style = (projectObject && projectObject.extensions.schematics && projectObject.extensions.schematics['@schematics/angular:component']
&& projectObject.extensions.schematics['@schematics/angular:component'].style);
if (style) {
options.style = style;
}

return tree;
validateGenerateOptions(platformUse, options);
validateGenerateComponentOptions(platformUse, options);

return tree;
}
},

() => externalSchematic(
Expand Down