Skip to content

Commit cccead6

Browse files
committed
remove daff json create
1 parent d076585 commit cccead6

2 files changed

Lines changed: 3 additions & 40 deletions

File tree

tools/schematics/ng-add/generators/daff-config/daff-config.ts

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,46 +4,13 @@ import {
44
Tree,
55
} from '@angular-devkit/schematics';
66
import { updateWorkspace } from '@schematics/angular/utility/workspace';
7-
import chalk from 'chalk';
87

9-
import {
10-
DAFF_JSON_DEFAULT,
11-
isSupportedPlatform,
12-
} from '../../../versioning/public_api';
8+
import { isSupportedPlatform } from '../../../versioning/public_api';
139
import { NgAddOptions } from '../../schema';
1410

15-
const DAFF_JSON_PATH = 'daff.json';
16-
1711
const shouldScaffoldDaffConfig = (options: NgAddOptions): boolean =>
1812
options.driver === 'magento' || options.driver === 'demo';
1913

20-
export const createDaffJson = (options: NgAddOptions, projectName: string): Rule =>
21-
(tree: Tree, context: SchematicContext) => {
22-
if (!shouldScaffoldDaffConfig(options)) {
23-
return tree;
24-
}
25-
26-
if (tree.exists(DAFF_JSON_PATH)) {
27-
context.logger.warn(
28-
chalk.yellow(`[WARN] daff.json already exists at the workspace root; leaving it unchanged.`),
29-
);
30-
return tree;
31-
}
32-
33-
const body = {
34-
...DAFF_JSON_DEFAULT,
35-
};
36-
37-
if (isSupportedPlatform(options.driver) && options.driverVersion) {
38-
body.drivers = {
39-
[options.driver]: options.driverVersion,
40-
};
41-
}
42-
43-
tree.create(DAFF_JSON_PATH, JSON.stringify(body, null, 2) + '\n');
44-
return tree;
45-
};
46-
4714
export const addBuildCondition = (options: NgAddOptions, projectName_: string): Rule => {
4815
if (!shouldScaffoldDaffConfig(options)) {
4916
return (tree: Tree) => tree;

tools/schematics/ng-add/index.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
88
import { getWorkspace } from '@schematics/angular/utility/workspace';
99
import chalk from 'chalk';
1010

11-
import {
12-
addBuildCondition,
13-
createDaffJson,
14-
} from './generators/daff-config/daff-config';
11+
import { addBuildCondition } from './generators/daff-config/daff-config';
1512
import { addDependenciesToPackageJson } from './generators/dependencies';
1613
import { initAppProviders } from './generators/providers/init';
1714
import { initAppRouting } from './generators/routing/init';
@@ -58,8 +55,7 @@ export function ngAdd(options: NgAddOptions): Rule {
5855
// Add template files for demo components
5956
rules.push(addTemplateFiles(options, project));
6057

61-
// Scaffold daff.json and pre-populate angular.json build conditions (magento only)
62-
rules.push(createDaffJson(options, projectName));
58+
// pre-populate angular.json build conditions (magento only)
6359
rules.push(addBuildCondition(options, projectName));
6460

6561
// Schedule package installation

0 commit comments

Comments
 (0)