Skip to content

Commit a48e465

Browse files
wip. check ng test
1 parent 1afef47 commit a48e465

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

packages/devextreme-cli/src/applications/application.angular.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ async function runSchematicCommand(schematicCommand, options, evaluatingOptions)
4040
async function runNgCommand(commandArguments, commandOptions, commandConfig) {
4141
const hasNg = await hasSutableNgCli();
4242
const depsVersionTag = extractDepsVersionTag(commandOptions);
43+
console.log('----hasNg && !depsVersionTag------>', [hasNg, !depsVersionTag]);
4344
const npmCommandName = hasNg && !depsVersionTag ? 'ng' : 'npx';
4445
const [minCliLtsVersion] = minNgCliVersion.version.split('.');
4546

@@ -63,6 +64,7 @@ function localPackageExists(packageName) {
6364

6465
const hasSutableNgCli = async() => {
6566
const localVersion = ngVersion.getLocalNgVersion();
67+
console.log('----localNgVersion------>', localVersion);
6668
if(!localVersion) {
6769
return false;
6870
}

packages/devextreme-schematics/src/add-view/index.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,9 @@ export function addViewToRouting(options: any) {
104104
const route = getRoute(options.name);
105105
insertItemToArray(host, routingModulePath, routes, route);
106106

107-
let fileName;
108-
let folderName;
109-
110-
[ folderName, fileName ] = options.name.split('/');
111-
fileName = fileName || folderName;
112-
113-
const componentName = getRouteComponentName(fileName);
114-
const importChanges = insertImport(source, routingModulePath, componentName, `./pages/${fileName}/${fileName}.component`);
107+
const name = options.name.replace(/^pages\//, '');
108+
const componentName = getRouteComponentName(name);
109+
const importChanges = insertImport(source, routingModulePath, componentName, `./pages/${name}/${name}.component`);
115110
applyChanges(host, [importChanges], routingModulePath);
116111
}
117112
return host;

0 commit comments

Comments
 (0)