devextreme-schematics 1.6.9 → 1.7.1
Sign up to get free protection for your applications and to get access to all the features.
- package/package.json +7 -7
- package/src/add-app-template/index_spec.js +8 -8
- package/src/add-app-template/index_spec.js.map +1 -1
- package/src/add-app-template/index_spec.ts +8 -8
- package/src/add-app-template/schema.json +3 -3
- package/src/add-layout/index.js +1 -8
- package/src/add-layout/index.js.map +1 -1
- package/src/add-layout/index.ts +1 -10
- package/src/add-layout/index_spec.js +24 -37
- package/src/add-layout/index_spec.js.map +1 -1
- package/src/add-layout/index_spec.ts +34 -57
- package/src/add-layout/schema.json +1 -1
- package/src/add-sample-views/index_spec.js +4 -4
- package/src/add-sample-views/index_spec.js.map +1 -1
- package/src/add-sample-views/index_spec.ts +4 -4
- package/src/add-view/index_spec.js +17 -17
- package/src/add-view/index_spec.js.map +1 -1
- package/src/add-view/index_spec.ts +17 -17
- package/src/install/index_spec.js +10 -11
- package/src/install/index_spec.js.map +1 -1
- package/src/install/index_spec.ts +10 -11
- package/src/install/schema.json +1 -1
- package/src/utility/latest-versions.js +2 -2
- package/src/utility/latest-versions.ts +2 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "devextreme-schematics",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.7.1",
|
|
4
4
|
"description": "DevExtreme schematics",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "tsc -p tsconfig.json",
|
|
@@ -22,18 +22,18 @@
|
|
|
22
22
|
],
|
|
23
23
|
"schematics": "./src/collection.json",
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@angular-devkit/core": "^
|
|
26
|
-
"@angular-devkit/schematics": "^
|
|
27
|
-
"@schematics/angular": "^
|
|
25
|
+
"@angular-devkit/core": "^16.2.10",
|
|
26
|
+
"@angular-devkit/schematics": "^16.2.10",
|
|
27
|
+
"@schematics/angular": "^16.2.10"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@types/jasmine": "~3.10.18",
|
|
31
|
-
"@types/node": "ts4.
|
|
31
|
+
"@types/node": "ts4.9",
|
|
32
32
|
"@types/semver": "^7.5.7",
|
|
33
33
|
"jasmine": "^2.99.0",
|
|
34
34
|
"rxjs": "^6.6.7",
|
|
35
35
|
"tslint": "^5.20.1",
|
|
36
|
-
"typescript": "^4.3
|
|
36
|
+
"typescript": "^4.9.3"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "faa2afd612b7677412d18ca0b8330b1076f4ccd8"
|
|
39
39
|
}
|
|
@@ -30,29 +30,29 @@ const angularSchematicsCollection = require.resolve('../../node_modules/@schemat
|
|
|
30
30
|
const schematicRunner = new testing_1.SchematicTestRunner('@schematics/angular', angularSchematicsCollection);
|
|
31
31
|
let appTree;
|
|
32
32
|
beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
33
|
-
appTree = yield schematicRunner.
|
|
34
|
-
appTree = yield schematicRunner.
|
|
33
|
+
appTree = yield schematicRunner.runSchematic('workspace', workspaceOptions);
|
|
34
|
+
appTree = yield schematicRunner.runSchematic('application', appOptions, appTree);
|
|
35
35
|
}));
|
|
36
36
|
describe('add-app-template', () => {
|
|
37
37
|
it('should add DevExtreme', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
38
38
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
39
|
-
const tree = yield runner.
|
|
39
|
+
const tree = yield runner.runSchematic('add-app-template', {}, appTree);
|
|
40
40
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
41
41
|
expect('devextreme' in packageConfig.dependencies).toBe(true);
|
|
42
42
|
}));
|
|
43
43
|
it('should consider the `project` option', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
44
|
-
appTree = yield schematicRunner.
|
|
44
|
+
appTree = yield schematicRunner.runSchematic('application', {
|
|
45
45
|
name: 'testApp2',
|
|
46
46
|
inlineStyle: false,
|
|
47
47
|
inlineTemplate: false,
|
|
48
48
|
routing: true,
|
|
49
49
|
style: 'scss',
|
|
50
50
|
projectRoot: 'projects/testApp2'
|
|
51
|
-
}, appTree)
|
|
51
|
+
}, appTree);
|
|
52
52
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
53
|
-
const tree = yield runner.
|
|
53
|
+
const tree = yield runner.runSchematic('add-app-template', {
|
|
54
54
|
project: 'testApp2'
|
|
55
|
-
}, appTree)
|
|
55
|
+
}, appTree);
|
|
56
56
|
expect(tree.files)
|
|
57
57
|
.toContain('/devextreme.json');
|
|
58
58
|
expect(tree.files)
|
|
@@ -62,7 +62,7 @@ describe('add-app-template', () => {
|
|
|
62
62
|
}));
|
|
63
63
|
it('should consider the `updateBudgets` option', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
64
64
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
65
|
-
const tree = yield runner.
|
|
65
|
+
const tree = yield runner.runSchematic('add-app-template', { updateBudgets: true }, appTree);
|
|
66
66
|
const angularContent = JSON.parse(tree.readContent('/angular.json'));
|
|
67
67
|
const budgets = angularContent.projects.testApp.architect.build.configurations.production.budgets;
|
|
68
68
|
expect(budgets[0].maximumWarning).toEqual('4mb');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,gEAAuF;AAEvF,6BAA6B;AAE7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAElE,MAAM,UAAU,GAAQ;IACtB,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,EAAE;IACf,WAAW,EAAE,KAAK;IAClB,cAAc,EAAE,KAAK;IACrB,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,KAAK;IACZ,SAAS,EAAE,KAAK;IAChB,eAAe,EAAE,KAAK;CACvB,CAAC;AAEF,MAAM,gBAAgB,GAAqB;IACzC,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,OAAO;CACjB,CAAC;AAEF,MAAM,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC;AAC9G,MAAM,eAAe,GAAG,IAAI,6BAAmB,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;AACpG,IAAI,OAAqB,CAAC;AAE1B,UAAU,CAAC,GAAS,EAAE;IACpB,OAAO,GAAG,MAAM,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,33 +25,33 @@ const schematicRunner = new SchematicTestRunner('@schematics/angular', angularSc
|
|
|
25
25
|
let appTree: UnitTestTree;
|
|
26
26
|
|
|
27
27
|
beforeEach(async () => {
|
|
28
|
-
appTree = await schematicRunner.
|
|
29
|
-
appTree = await schematicRunner.
|
|
28
|
+
appTree = await schematicRunner.runSchematic('workspace', workspaceOptions);
|
|
29
|
+
appTree = await schematicRunner.runSchematic('application', appOptions, appTree);
|
|
30
30
|
});
|
|
31
31
|
|
|
32
32
|
describe('add-app-template', () => {
|
|
33
33
|
it('should add DevExtreme', async () => {
|
|
34
34
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
35
|
-
const tree = await runner.
|
|
35
|
+
const tree = await runner.runSchematic('add-app-template', { }, appTree);
|
|
36
36
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
37
37
|
|
|
38
38
|
expect('devextreme' in packageConfig.dependencies).toBe(true);
|
|
39
39
|
});
|
|
40
40
|
|
|
41
41
|
it('should consider the `project` option', async () => {
|
|
42
|
-
appTree = await schematicRunner.
|
|
42
|
+
appTree = await schematicRunner.runSchematic('application', {
|
|
43
43
|
name: 'testApp2',
|
|
44
44
|
inlineStyle: false,
|
|
45
45
|
inlineTemplate: false,
|
|
46
46
|
routing: true,
|
|
47
47
|
style: 'scss',
|
|
48
48
|
projectRoot: 'projects/testApp2'
|
|
49
|
-
}, appTree)
|
|
49
|
+
}, appTree);
|
|
50
50
|
|
|
51
51
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
52
|
-
const tree = await runner.
|
|
52
|
+
const tree = await runner.runSchematic('add-app-template', {
|
|
53
53
|
project: 'testApp2'
|
|
54
|
-
}, appTree)
|
|
54
|
+
}, appTree);
|
|
55
55
|
|
|
56
56
|
expect(tree.files)
|
|
57
57
|
.toContain('/devextreme.json');
|
|
@@ -63,7 +63,7 @@ describe('add-app-template', () => {
|
|
|
63
63
|
|
|
64
64
|
it('should consider the `updateBudgets` option', async () => {
|
|
65
65
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
66
|
-
const tree = await runner.
|
|
66
|
+
const tree = await runner.runSchematic('add-app-template', { updateBudgets: true }, appTree);
|
|
67
67
|
|
|
68
68
|
const angularContent = JSON.parse(tree.readContent('/angular.json'));
|
|
69
69
|
const budgets = angularContent.projects.testApp.architect.build.configurations.production.budgets;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "http://json-schema.org/schema",
|
|
3
3
|
"$id": "SchematicsDevextremeAddAppTemplate",
|
|
4
|
-
"title": "Add a DevExtreme layout template to an
|
|
4
|
+
"title": "Add a DevExtreme layout template to an Angular application",
|
|
5
5
|
"type": "object",
|
|
6
6
|
"properties": {
|
|
7
7
|
"layout": {
|
|
@@ -39,11 +39,11 @@
|
|
|
39
39
|
"dxversion": {
|
|
40
40
|
"type": "string",
|
|
41
41
|
"description": "The DevExtreme version",
|
|
42
|
-
"default": "
|
|
42
|
+
"default": "24.1.4"
|
|
43
43
|
},
|
|
44
44
|
"globalNgCliVersion": {
|
|
45
45
|
"type":"string",
|
|
46
|
-
"default": "^
|
|
46
|
+
"default": "^16.2.0"
|
|
47
47
|
},
|
|
48
48
|
"empty": {
|
|
49
49
|
"type": "boolean",
|
package/src/add-layout/index.js
CHANGED
|
@@ -113,6 +113,7 @@ function updateAppModule(host, sourcePath) {
|
|
|
113
113
|
};
|
|
114
114
|
};
|
|
115
115
|
const rules = [
|
|
116
|
+
modifyFileRule(appModulePath, importSetter('DxHttpModule', 'devextreme-angular/http')),
|
|
116
117
|
modifyFileRule(appModulePath, importSetter('SideNavOuterToolbarModule', './layouts')),
|
|
117
118
|
modifyFileRule(appModulePath, importSetter('SideNavInnerToolbarModule', './layouts')),
|
|
118
119
|
modifyFileRule(appModulePath, importSetter('SingleCardModule', './layouts')),
|
|
@@ -219,8 +220,6 @@ const modifyRoutingModule = (host, routingModulePath) => {
|
|
|
219
220
|
};
|
|
220
221
|
function default_1(options) {
|
|
221
222
|
return (host) => __awaiter(this, void 0, void 0, function* () {
|
|
222
|
-
const ngConfig = host.read('./angular.json').toString();
|
|
223
|
-
const defaultProjectName = (0, modify_json_file_1.parseJson)(ngConfig).defaultProject;
|
|
224
223
|
const project = yield (0, project_1.getProjectName)(host, options.project);
|
|
225
224
|
const workspace = yield (0, workspace_1.getWorkspace)(host);
|
|
226
225
|
const ngProject = workspace.projects.get(project);
|
|
@@ -267,12 +266,6 @@ function default_1(options) {
|
|
|
267
266
|
context.addTask(new patch_1.PatchNodePackageInstallTask());
|
|
268
267
|
});
|
|
269
268
|
}
|
|
270
|
-
if (override) {
|
|
271
|
-
if (project === defaultProjectName) {
|
|
272
|
-
rules.push(modifyContentByTemplate('./', workspaceFilesSource, 'e2e/src/app.e2e-spec.ts', { title }));
|
|
273
|
-
rules.push(modifyContentByTemplate('./', workspaceFilesSource, 'e2e/src/app.po.ts'));
|
|
274
|
-
}
|
|
275
|
-
}
|
|
276
269
|
return (0, schematics_1.chain)(rules);
|
|
277
270
|
});
|
|
278
271
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAcoC;AAMpC,+CAA+C;AAE/C,+BAAsC;AAEtC,mCAAgC;AAEhC,gDAI6B;AAE7B,8CAE2B;AAE3B,8CAE4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
package/src/add-layout/index.ts
CHANGED
|
@@ -40,7 +40,6 @@ import {
|
|
|
40
40
|
|
|
41
41
|
import {
|
|
42
42
|
modifyJSONFile,
|
|
43
|
-
parseJson
|
|
44
43
|
} from '../utility/modify-json-file';
|
|
45
44
|
|
|
46
45
|
import {
|
|
@@ -182,6 +181,7 @@ function updateAppModule(host: Tree, sourcePath: string) {
|
|
|
182
181
|
};
|
|
183
182
|
|
|
184
183
|
const rules = [
|
|
184
|
+
modifyFileRule(appModulePath, importSetter('DxHttpModule', 'devextreme-angular/http')),
|
|
185
185
|
modifyFileRule(appModulePath, importSetter('SideNavOuterToolbarModule', './layouts')),
|
|
186
186
|
modifyFileRule(appModulePath, importSetter('SideNavInnerToolbarModule', './layouts')),
|
|
187
187
|
modifyFileRule(appModulePath, importSetter('SingleCardModule', './layouts')),
|
|
@@ -318,8 +318,6 @@ const modifyRoutingModule = (host: Tree, routingModulePath: string) => {
|
|
|
318
318
|
|
|
319
319
|
export default function(options: any): Rule {
|
|
320
320
|
return async (host: Tree) => {
|
|
321
|
-
const ngConfig = host.read('./angular.json')!.toString();
|
|
322
|
-
const defaultProjectName = parseJson(ngConfig).defaultProject;
|
|
323
321
|
const project = await getProjectName(host, options.project);
|
|
324
322
|
const workspace = await getWorkspace(host);
|
|
325
323
|
const ngProject = workspace.projects.get(project);
|
|
@@ -373,13 +371,6 @@ export default function(options: any): Rule {
|
|
|
373
371
|
});
|
|
374
372
|
}
|
|
375
373
|
|
|
376
|
-
if (override) {
|
|
377
|
-
if (project === defaultProjectName) {
|
|
378
|
-
rules.push(modifyContentByTemplate('./', workspaceFilesSource, 'e2e/src/app.e2e-spec.ts', { title }));
|
|
379
|
-
rules.push(modifyContentByTemplate('./', workspaceFilesSource, 'e2e/src/app.po.ts'));
|
|
380
|
-
}
|
|
381
|
-
}
|
|
382
|
-
|
|
383
374
|
return chain(rules);
|
|
384
375
|
};
|
|
385
376
|
}
|
|
@@ -27,23 +27,23 @@ describe('layout', () => {
|
|
|
27
27
|
};
|
|
28
28
|
const workspaceOptions = {
|
|
29
29
|
name: 'workspace',
|
|
30
|
-
version: '
|
|
30
|
+
version: '16.0.0'
|
|
31
31
|
};
|
|
32
32
|
const options = {
|
|
33
33
|
layout: 'side-nav-outer-toolbar',
|
|
34
34
|
resolveConflicts: 'override',
|
|
35
|
-
globalNgCliVersion: '^
|
|
35
|
+
globalNgCliVersion: '^16.2.0'
|
|
36
36
|
};
|
|
37
37
|
const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
|
|
38
38
|
const schematicRunner = new testing_1.SchematicTestRunner('@schematics/angular', angularSchematicsCollection);
|
|
39
39
|
let appTree;
|
|
40
40
|
beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
41
|
-
appTree = yield schematicRunner.
|
|
42
|
-
appTree = yield schematicRunner.
|
|
41
|
+
appTree = yield schematicRunner.runSchematic('workspace', workspaceOptions);
|
|
42
|
+
appTree = yield schematicRunner.runSchematic('application', appOptions, appTree);
|
|
43
43
|
}));
|
|
44
44
|
it('should add layout with override', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
45
45
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
46
|
-
const tree = yield runner.
|
|
46
|
+
const tree = yield runner.runSchematic('add-layout', options, appTree);
|
|
47
47
|
expect(tree.files)
|
|
48
48
|
.toContain('/devextreme.json');
|
|
49
49
|
expect(tree.files)
|
|
@@ -86,6 +86,7 @@ describe('layout', () => {
|
|
|
86
86
|
expect(styles[1]).toBe('src/themes/generated/theme.base.css');
|
|
87
87
|
expect(styles[2]).toBe('src/themes/generated/theme.additional.css');
|
|
88
88
|
const moduleContent = tree.readContent('/src/app/app.module.ts');
|
|
89
|
+
expect(moduleContent).toContain('import { DxHttpModule }');
|
|
89
90
|
expect(moduleContent)
|
|
90
91
|
.toContain('import { SideNavOuterToolbarModule, SideNavInnerToolbarModule, SingleCardModule }');
|
|
91
92
|
expect(moduleContent)
|
|
@@ -97,10 +98,6 @@ describe('layout', () => {
|
|
|
97
98
|
'CreateAccountFormModule, ' +
|
|
98
99
|
'ChangePasswordFormModule, ' +
|
|
99
100
|
'LoginFormModule }');
|
|
100
|
-
const testContent = tree.readContent('/e2e/src/app.e2e-spec.ts');
|
|
101
|
-
expect(testContent).toMatch(/'Welcome to TestApp!'/);
|
|
102
|
-
const testUtilsContent = tree.readContent('/e2e/src/app.po.ts');
|
|
103
|
-
expect(testUtilsContent).toMatch(/'app-root .dx-drawer-content .dx-card p:nth-child\(2\)'/);
|
|
104
101
|
const appContent = tree.readContent('/src/app/app.component.ts');
|
|
105
102
|
expect(appContent).toContain('templateUrl: \'./app.component.html\',');
|
|
106
103
|
expect(appContent).toContain('styleUrls: [\'./app.component.scss\']');
|
|
@@ -111,7 +108,7 @@ describe('layout', () => {
|
|
|
111
108
|
}));
|
|
112
109
|
it('should add npm scripts', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
113
110
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
114
|
-
const tree = yield runner.
|
|
111
|
+
const tree = yield runner.runSchematic('add-layout', options, appTree);
|
|
115
112
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
116
113
|
expect(packageConfig.scripts['build-themes']).toBe('devextreme build');
|
|
117
114
|
expect(packageConfig.scripts['postinstall']).toBe('npm run build-themes');
|
|
@@ -124,7 +121,7 @@ describe('layout', () => {
|
|
|
124
121
|
version: '7.0.0'
|
|
125
122
|
});
|
|
126
123
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
127
|
-
const tree = yield runner.
|
|
124
|
+
const tree = yield runner.runSchematic('add-layout', options, appTree);
|
|
128
125
|
const navigationMenu = tree.readContent('/src/app/shared/components/side-navigation-menu/side-navigation-menu.component.ts');
|
|
129
126
|
expect(navigationMenu).toContain('@ViewChild(DxTreeViewComponent, { static: true })');
|
|
130
127
|
}));
|
|
@@ -136,7 +133,7 @@ describe('layout', () => {
|
|
|
136
133
|
return config;
|
|
137
134
|
});
|
|
138
135
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
139
|
-
const tree = yield runner.
|
|
136
|
+
const tree = yield runner.runSchematic('add-layout', options, appTree);
|
|
140
137
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
141
138
|
expect(packageConfig.scripts['origin-build-themes']).toBe('prev value 1');
|
|
142
139
|
expect(packageConfig.scripts['origin-postinstall']).toBe('prev value 2');
|
|
@@ -145,19 +142,19 @@ describe('layout', () => {
|
|
|
145
142
|
}));
|
|
146
143
|
it('should add angular/cdk dependency', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
147
144
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
148
|
-
const tree = yield runner.
|
|
145
|
+
const tree = yield runner.runSchematic('add-layout', options, appTree);
|
|
149
146
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
150
147
|
expect(packageConfig.dependencies['@angular/cdk']).toBeDefined();
|
|
151
148
|
}));
|
|
152
149
|
it('should choose angular/cdk version such as angular/cli', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
153
150
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
154
|
-
const tree = yield runner.
|
|
151
|
+
const tree = yield runner.runSchematic('add-layout', options, appTree);
|
|
155
152
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
156
|
-
expect(packageConfig.dependencies['@angular/cdk']).toBe('~
|
|
153
|
+
expect(packageConfig.dependencies['@angular/cdk']).toBe('~16.2.0');
|
|
157
154
|
}));
|
|
158
155
|
it('should update budgets if updateBudgets option is true', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
159
156
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
160
|
-
const tree = yield runner.
|
|
157
|
+
const tree = yield runner.runSchematic('add-layout', Object.assign(Object.assign({}, options), { updateBudgets: true }), appTree);
|
|
161
158
|
const angularContent = JSON.parse(tree.readContent('/angular.json'));
|
|
162
159
|
const budgets = angularContent.projects.testApp.architect.build.configurations.production.budgets;
|
|
163
160
|
expect(budgets.length).toBe(2);
|
|
@@ -169,7 +166,7 @@ describe('layout', () => {
|
|
|
169
166
|
}));
|
|
170
167
|
it('should not update budgets if updateBudgets option is not defined or false', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
171
168
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
172
|
-
const tree = yield runner.
|
|
169
|
+
const tree = yield runner.runSchematic('add-layout', options, appTree);
|
|
173
170
|
const angularContent = JSON.parse(tree.readContent('/angular.json'));
|
|
174
171
|
const budgets = angularContent.projects.testApp.architect.build.configurations.production.budgets;
|
|
175
172
|
const defaultBudget = {
|
|
@@ -183,7 +180,7 @@ describe('layout', () => {
|
|
|
183
180
|
it('should add layout without override', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
184
181
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
185
182
|
options.resolveConflicts = 'createNew';
|
|
186
|
-
const tree = yield runner.
|
|
183
|
+
const tree = yield runner.runSchematic('add-layout', options, appTree);
|
|
187
184
|
expect(tree.files).toContain('/src/app/app1.component.ts');
|
|
188
185
|
const componentContent = tree.readContent('/src/app/app1.component.html');
|
|
189
186
|
expect(componentContent).toContain('app-side-nav-outer-toolbar title="{{appInfo.title}}"');
|
|
@@ -198,11 +195,11 @@ describe('layout', () => {
|
|
|
198
195
|
expect(appInfo).toContain(`return 'TestApp';`);
|
|
199
196
|
}));
|
|
200
197
|
it('should add routing to layout', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
201
|
-
let newAppTree = yield schematicRunner.
|
|
198
|
+
let newAppTree = yield schematicRunner.runSchematic('workspace', workspaceOptions);
|
|
202
199
|
appOptions.routing = false;
|
|
203
|
-
newAppTree = yield schematicRunner.
|
|
200
|
+
newAppTree = yield schematicRunner.runSchematic('application', appOptions, newAppTree);
|
|
204
201
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
205
|
-
const tree = yield runner.
|
|
202
|
+
const tree = yield runner.runSchematic('add-layout', options, appTree);
|
|
206
203
|
expect(tree.files).toContain('/src/app/app-routing.module.ts');
|
|
207
204
|
const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
|
|
208
205
|
expect(moduleContent)
|
|
@@ -218,39 +215,29 @@ describe('layout', () => {
|
|
|
218
215
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
219
216
|
options.layout = 'side-nav-inner-toolbar';
|
|
220
217
|
options.resolveConflicts = 'override';
|
|
221
|
-
const tree = yield runner.
|
|
218
|
+
const tree = yield runner.runSchematic('add-layout', options, appTree);
|
|
222
219
|
const content = tree.readContent('/src/app/app.component.html');
|
|
223
220
|
expect(content).toContain('app-side-nav-inner-toolbar title="{{appInfo.title}}"');
|
|
224
221
|
}));
|
|
225
222
|
it('should consider the `project` option', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
226
|
-
appTree = yield schematicRunner.
|
|
223
|
+
appTree = yield schematicRunner.runSchematic('application', Object.assign(Object.assign({}, appOptions), { name: 'testApp2', projectRoot: 'projects/testApp2' }), appTree);
|
|
227
224
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
228
|
-
const tree = yield runner.
|
|
225
|
+
const tree = yield runner.runSchematic('add-layout', Object.assign(Object.assign({}, options), { project: 'testApp2' }), appTree);
|
|
229
226
|
expect(tree.files)
|
|
230
227
|
.toContain('/devextreme.json');
|
|
231
228
|
expect(tree.files)
|
|
232
229
|
.toContain('/projects/testApp2/src/themes/metadata.base.json');
|
|
233
230
|
}));
|
|
234
231
|
it('should merge build commands in devextreme.json file', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
235
|
-
appTree = yield schematicRunner.
|
|
232
|
+
appTree = yield schematicRunner.runSchematic('application', Object.assign(Object.assign({}, appOptions), { name: 'testApp2', prefix: 'app2', projectRoot: 'projects/testApp2' }), appTree);
|
|
236
233
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
237
|
-
let tree = yield runner.
|
|
238
|
-
tree = yield runner.
|
|
234
|
+
let tree = yield runner.runSchematic('add-layout', options, appTree);
|
|
235
|
+
tree = yield runner.runSchematic('add-layout', Object.assign(Object.assign({}, options), { project: 'testApp2' }), appTree);
|
|
239
236
|
const appContent = tree.readContent('projects/testApp2/src/app/app.component.ts');
|
|
240
237
|
expect(appContent).toContain('selector: \'app2-root\',');
|
|
241
238
|
const content = tree.readContent('/devextreme.json');
|
|
242
239
|
expect(content).toContain('"inputFile": "src/themes/metadata.base.json",');
|
|
243
240
|
expect(content).toContain('"inputFile": "projects/testApp2/src/themes/metadata.base.json",');
|
|
244
241
|
}));
|
|
245
|
-
it('should add e2e tests only for default project', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
246
|
-
appTree = yield schematicRunner.runSchematicAsync('application', Object.assign(Object.assign({}, appOptions), { name: 'testApp2', projectRoot: 'projects/testApp2' }), appTree).toPromise();
|
|
247
|
-
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
248
|
-
let tree = yield runner.runSchematicAsync('add-layout', options, appTree).toPromise();
|
|
249
|
-
tree = yield runner.runSchematicAsync('add-layout', Object.assign(Object.assign({}, options), { project: 'testApp2' }), appTree).toPromise();
|
|
250
|
-
const testContent = tree.readContent('/e2e/src/app.e2e-spec.ts');
|
|
251
|
-
expect(testContent).toContain('Welcome to TestApp!');
|
|
252
|
-
const testUtilsContent = tree.readContent('/e2e/src/app.po.ts');
|
|
253
|
-
expect(testUtilsContent).toMatch(/'app-root .dx-drawer-content .dx-card p:nth-child\(2\)'/);
|
|
254
|
-
}));
|
|
255
242
|
});
|
|
256
243
|
//# sourceMappingURL=index_spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,27 +25,30 @@ describe('layout', () => {
|
|
|
25
25
|
|
|
26
26
|
const workspaceOptions: WorkspaceOptions = {
|
|
27
27
|
name: 'workspace',
|
|
28
|
-
version: '
|
|
28
|
+
version: '16.0.0'
|
|
29
29
|
};
|
|
30
30
|
|
|
31
31
|
const options: any = {
|
|
32
32
|
layout: 'side-nav-outer-toolbar',
|
|
33
33
|
resolveConflicts: 'override',
|
|
34
|
-
globalNgCliVersion: '^
|
|
34
|
+
globalNgCliVersion: '^16.2.0'
|
|
35
35
|
};
|
|
36
36
|
|
|
37
37
|
const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
|
|
38
|
-
const schematicRunner = new SchematicTestRunner(
|
|
38
|
+
const schematicRunner = new SchematicTestRunner(
|
|
39
|
+
'@schematics/angular',
|
|
40
|
+
angularSchematicsCollection,
|
|
41
|
+
);
|
|
39
42
|
let appTree: UnitTestTree;
|
|
40
43
|
|
|
41
44
|
beforeEach(async () => {
|
|
42
|
-
appTree = await schematicRunner.
|
|
43
|
-
appTree = await schematicRunner.
|
|
45
|
+
appTree = await schematicRunner.runSchematic('workspace', workspaceOptions);
|
|
46
|
+
appTree = await schematicRunner.runSchematic('application', appOptions, appTree);
|
|
44
47
|
});
|
|
45
48
|
|
|
46
49
|
it('should add layout with override', async () => {
|
|
47
50
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
48
|
-
const tree = await runner.
|
|
51
|
+
const tree = await runner.runSchematic('add-layout', options, appTree);
|
|
49
52
|
|
|
50
53
|
expect(tree.files)
|
|
51
54
|
.toContain('/devextreme.json');
|
|
@@ -96,6 +99,7 @@ describe('layout', () => {
|
|
|
96
99
|
expect(styles[2]).toBe('src/themes/generated/theme.additional.css');
|
|
97
100
|
|
|
98
101
|
const moduleContent = tree.readContent('/src/app/app.module.ts');
|
|
102
|
+
expect(moduleContent).toContain('import { DxHttpModule }');
|
|
99
103
|
expect(moduleContent)
|
|
100
104
|
.toContain('import { SideNavOuterToolbarModule, SideNavInnerToolbarModule, SingleCardModule }');
|
|
101
105
|
expect(moduleContent)
|
|
@@ -108,12 +112,6 @@ describe('layout', () => {
|
|
|
108
112
|
'ChangePasswordFormModule, ' +
|
|
109
113
|
'LoginFormModule }');
|
|
110
114
|
|
|
111
|
-
const testContent = tree.readContent('/e2e/src/app.e2e-spec.ts');
|
|
112
|
-
expect(testContent).toMatch(/'Welcome to TestApp!'/);
|
|
113
|
-
|
|
114
|
-
const testUtilsContent = tree.readContent('/e2e/src/app.po.ts');
|
|
115
|
-
expect(testUtilsContent).toMatch(/'app-root .dx-drawer-content .dx-card p:nth-child\(2\)'/);
|
|
116
|
-
|
|
117
115
|
const appContent = tree.readContent('/src/app/app.component.ts');
|
|
118
116
|
expect(appContent).toContain('templateUrl: \'./app.component.html\',');
|
|
119
117
|
expect(appContent).toContain('styleUrls: [\'./app.component.scss\']');
|
|
@@ -127,7 +125,7 @@ describe('layout', () => {
|
|
|
127
125
|
|
|
128
126
|
it('should add npm scripts', async () => {
|
|
129
127
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
130
|
-
const tree = await runner.
|
|
128
|
+
const tree = await runner.runSchematic('add-layout', options, appTree);
|
|
131
129
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
132
130
|
expect(packageConfig.scripts['build-themes']).toBe('devextreme build');
|
|
133
131
|
expect(packageConfig.scripts['postinstall']).toBe('npm run build-themes');
|
|
@@ -142,7 +140,7 @@ describe('layout', () => {
|
|
|
142
140
|
});
|
|
143
141
|
|
|
144
142
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
145
|
-
const tree = await runner.
|
|
143
|
+
const tree = await runner.runSchematic('add-layout', options, appTree);
|
|
146
144
|
const navigationMenu = tree.readContent(
|
|
147
145
|
'/src/app/shared/components/side-navigation-menu/side-navigation-menu.component.ts');
|
|
148
146
|
|
|
@@ -160,7 +158,7 @@ describe('layout', () => {
|
|
|
160
158
|
});
|
|
161
159
|
|
|
162
160
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
163
|
-
const tree = await runner.
|
|
161
|
+
const tree = await runner.runSchematic('add-layout', options, appTree);
|
|
164
162
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
165
163
|
expect(packageConfig.scripts['origin-build-themes']).toBe('prev value 1');
|
|
166
164
|
expect(packageConfig.scripts['origin-postinstall']).toBe('prev value 2');
|
|
@@ -170,7 +168,7 @@ describe('layout', () => {
|
|
|
170
168
|
|
|
171
169
|
it('should add angular/cdk dependency', async () => {
|
|
172
170
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
173
|
-
const tree = await runner.
|
|
171
|
+
const tree = await runner.runSchematic('add-layout', options, appTree);
|
|
174
172
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
175
173
|
|
|
176
174
|
expect(packageConfig.dependencies['@angular/cdk']).toBeDefined();
|
|
@@ -178,18 +176,18 @@ describe('layout', () => {
|
|
|
178
176
|
|
|
179
177
|
it('should choose angular/cdk version such as angular/cli', async () => {
|
|
180
178
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
181
|
-
const tree = await runner.
|
|
179
|
+
const tree = await runner.runSchematic('add-layout', options, appTree);
|
|
182
180
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
183
181
|
|
|
184
|
-
expect(packageConfig.dependencies['@angular/cdk']).toBe('~
|
|
182
|
+
expect(packageConfig.dependencies['@angular/cdk']).toBe('~16.2.0');
|
|
185
183
|
});
|
|
186
184
|
|
|
187
185
|
it('should update budgets if updateBudgets option is true', async () => {
|
|
188
186
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
189
|
-
const tree = await runner.
|
|
187
|
+
const tree = await runner.runSchematic('add-layout', {
|
|
190
188
|
...options,
|
|
191
189
|
updateBudgets: true
|
|
192
|
-
}, appTree)
|
|
190
|
+
}, appTree);
|
|
193
191
|
|
|
194
192
|
const angularContent = JSON.parse(tree.readContent('/angular.json'));
|
|
195
193
|
const budgets = angularContent.projects.testApp.architect.build.configurations.production.budgets;
|
|
@@ -204,7 +202,7 @@ describe('layout', () => {
|
|
|
204
202
|
|
|
205
203
|
it('should not update budgets if updateBudgets option is not defined or false', async () => {
|
|
206
204
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
207
|
-
const tree = await runner.
|
|
205
|
+
const tree = await runner.runSchematic('add-layout', options, appTree);
|
|
208
206
|
|
|
209
207
|
const angularContent = JSON.parse(tree.readContent('/angular.json'));
|
|
210
208
|
const budgets = angularContent.projects.testApp.architect.build.configurations.production.budgets;
|
|
@@ -222,7 +220,7 @@ describe('layout', () => {
|
|
|
222
220
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
223
221
|
|
|
224
222
|
options.resolveConflicts = 'createNew';
|
|
225
|
-
const tree = await runner.
|
|
223
|
+
const tree = await runner.runSchematic('add-layout', options, appTree);
|
|
226
224
|
|
|
227
225
|
expect(tree.files).toContain('/src/app/app1.component.ts');
|
|
228
226
|
|
|
@@ -243,14 +241,14 @@ describe('layout', () => {
|
|
|
243
241
|
});
|
|
244
242
|
|
|
245
243
|
it('should add routing to layout', async () => {
|
|
246
|
-
let newAppTree = await schematicRunner.
|
|
244
|
+
let newAppTree = await schematicRunner.runSchematic('workspace', workspaceOptions);
|
|
247
245
|
|
|
248
246
|
appOptions.routing = false;
|
|
249
|
-
newAppTree = await schematicRunner.
|
|
250
|
-
'application', appOptions, newAppTree)
|
|
247
|
+
newAppTree = await schematicRunner.runSchematic(
|
|
248
|
+
'application', appOptions, newAppTree);
|
|
251
249
|
|
|
252
250
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
253
|
-
const tree = await runner.
|
|
251
|
+
const tree = await runner.runSchematic('add-layout', options, appTree);
|
|
254
252
|
|
|
255
253
|
expect(tree.files).toContain('/src/app/app-routing.module.ts');
|
|
256
254
|
const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
|
|
@@ -269,24 +267,24 @@ describe('layout', () => {
|
|
|
269
267
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
270
268
|
options.layout = 'side-nav-inner-toolbar';
|
|
271
269
|
options.resolveConflicts = 'override';
|
|
272
|
-
const tree = await runner.
|
|
270
|
+
const tree = await runner.runSchematic('add-layout', options, appTree);
|
|
273
271
|
const content = tree.readContent('/src/app/app.component.html');
|
|
274
272
|
|
|
275
273
|
expect(content).toContain('app-side-nav-inner-toolbar title="{{appInfo.title}}"');
|
|
276
274
|
});
|
|
277
275
|
|
|
278
276
|
it('should consider the `project` option', async () => {
|
|
279
|
-
appTree = await schematicRunner.
|
|
277
|
+
appTree = await schematicRunner.runSchematic('application', {
|
|
280
278
|
...appOptions,
|
|
281
279
|
name: 'testApp2',
|
|
282
280
|
projectRoot: 'projects/testApp2'
|
|
283
|
-
}, appTree)
|
|
281
|
+
}, appTree);
|
|
284
282
|
|
|
285
283
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
286
|
-
const tree = await runner.
|
|
284
|
+
const tree = await runner.runSchematic('add-layout', {
|
|
287
285
|
...options,
|
|
288
286
|
project: 'testApp2'
|
|
289
|
-
}, appTree)
|
|
287
|
+
}, appTree);
|
|
290
288
|
|
|
291
289
|
expect(tree.files)
|
|
292
290
|
.toContain('/devextreme.json');
|
|
@@ -295,19 +293,19 @@ describe('layout', () => {
|
|
|
295
293
|
});
|
|
296
294
|
|
|
297
295
|
it('should merge build commands in devextreme.json file', async () => {
|
|
298
|
-
appTree = await schematicRunner.
|
|
296
|
+
appTree = await schematicRunner.runSchematic('application', {
|
|
299
297
|
...appOptions,
|
|
300
298
|
name: 'testApp2',
|
|
301
299
|
prefix: 'app2',
|
|
302
300
|
projectRoot: 'projects/testApp2'
|
|
303
|
-
}, appTree)
|
|
301
|
+
}, appTree);
|
|
304
302
|
|
|
305
303
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
306
|
-
let tree = await runner.
|
|
307
|
-
tree = await runner.
|
|
304
|
+
let tree = await runner.runSchematic('add-layout', options, appTree);
|
|
305
|
+
tree = await runner.runSchematic('add-layout', {
|
|
308
306
|
...options,
|
|
309
307
|
project: 'testApp2'
|
|
310
|
-
}, appTree)
|
|
308
|
+
}, appTree);
|
|
311
309
|
|
|
312
310
|
const appContent = tree.readContent('projects/testApp2/src/app/app.component.ts');
|
|
313
311
|
expect(appContent).toContain('selector: \'app2-root\',');
|
|
@@ -316,25 +314,4 @@ describe('layout', () => {
|
|
|
316
314
|
expect(content).toContain('"inputFile": "src/themes/metadata.base.json",');
|
|
317
315
|
expect(content).toContain('"inputFile": "projects/testApp2/src/themes/metadata.base.json",');
|
|
318
316
|
});
|
|
319
|
-
|
|
320
|
-
it('should add e2e tests only for default project', async () => {
|
|
321
|
-
appTree = await schematicRunner.runSchematicAsync('application', {
|
|
322
|
-
...appOptions,
|
|
323
|
-
name: 'testApp2',
|
|
324
|
-
projectRoot: 'projects/testApp2'
|
|
325
|
-
}, appTree).toPromise();
|
|
326
|
-
|
|
327
|
-
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
328
|
-
let tree = await runner.runSchematicAsync('add-layout', options, appTree).toPromise();
|
|
329
|
-
tree = await runner.runSchematicAsync('add-layout', {
|
|
330
|
-
...options,
|
|
331
|
-
project: 'testApp2'
|
|
332
|
-
}, appTree).toPromise();
|
|
333
|
-
|
|
334
|
-
const testContent = tree.readContent('/e2e/src/app.e2e-spec.ts');
|
|
335
|
-
expect(testContent).toContain('Welcome to TestApp!');
|
|
336
|
-
|
|
337
|
-
const testUtilsContent = tree.readContent('/e2e/src/app.po.ts');
|
|
338
|
-
expect(testUtilsContent).toMatch(/'app-root .dx-drawer-content .dx-card p:nth-child\(2\)'/);
|
|
339
|
-
});
|
|
340
317
|
});
|
|
@@ -34,13 +34,13 @@ describe('sample views', () => {
|
|
|
34
34
|
const schematicRunner = new testing_1.SchematicTestRunner('@schematics/angular', angularSchematicsCollection);
|
|
35
35
|
let appTree;
|
|
36
36
|
beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
37
|
-
appTree = yield schematicRunner.
|
|
38
|
-
appTree = yield schematicRunner.
|
|
37
|
+
appTree = yield schematicRunner.runSchematic('workspace', workspaceOptions);
|
|
38
|
+
appTree = yield schematicRunner.runSchematic('application', appOptions, appTree);
|
|
39
39
|
}));
|
|
40
40
|
it('should add sample views', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
41
41
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
42
|
-
let tree = yield runner.
|
|
43
|
-
tree = yield runner.
|
|
42
|
+
let tree = yield runner.runSchematic('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree);
|
|
43
|
+
tree = yield runner.runSchematic('add-sample-views', sampleViewsOptions, tree);
|
|
44
44
|
const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
|
|
45
45
|
expect(moduleContent).toMatch(/component: HomeComponent/);
|
|
46
46
|
expect(moduleContent).toMatch(/path: 'home'/);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,gEAAuF;AAEvF,6BAA6B;AAE7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAElE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,MAAM,UAAU,GAAQ;QACtB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,KAAK;QACrB,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,KAAK;QAChB,eAAe,EAAE,KAAK;KACvB,CAAC;IAEF,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,OAAO;KACjB,CAAC;IAEF,MAAM,kBAAkB,GAAQ;QAC9B,OAAO,EAAE,SAAS;KACnB,CAAC;IAEF,MAAM,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC;IAC9G,MAAM,eAAe,GAAG,IAAI,6BAAmB,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;IACpG,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,GAAS,EAAE;QACpB,OAAO,GAAI,MAAM,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,gEAAuF;AAEvF,6BAA6B;AAE7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAElE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,MAAM,UAAU,GAAQ;QACtB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,KAAK;QACrB,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,KAAK;QAChB,eAAe,EAAE,KAAK;KACvB,CAAC;IAEF,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,OAAO;KACjB,CAAC;IAEF,MAAM,kBAAkB,GAAQ;QAC9B,OAAO,EAAE,SAAS;KACnB,CAAC;IAEF,MAAM,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC;IAC9G,MAAM,eAAe,GAAG,IAAI,6BAAmB,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;IACpG,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,GAAS,EAAE;QACpB,OAAO,GAAI,MAAM,eAAe,CAAC,YAAY,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAC7E,OAAO,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,aAAa,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACnF,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAS,EAAE;QACvC,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,IAAI,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,wBAAwB,EAAE,EAAE,OAAO,CAAC,CAAC;QAClG,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAE/E,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,gCAAgC,CAAC,CAAC;QAEzE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC1D,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAE9C,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;QAChE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAC;QAEtE,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,4BAA4B,CAAC,CAAC;QACzE,MAAM,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAClD,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;GAoBrC,CAAC,CAAC;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -30,14 +30,14 @@ describe('sample views', () => {
|
|
|
30
30
|
let appTree: UnitTestTree;
|
|
31
31
|
|
|
32
32
|
beforeEach(async () => {
|
|
33
|
-
appTree = await schematicRunner.
|
|
34
|
-
appTree = await schematicRunner.
|
|
33
|
+
appTree = await schematicRunner.runSchematic('workspace', workspaceOptions);
|
|
34
|
+
appTree = await schematicRunner.runSchematic('application', appOptions, appTree);
|
|
35
35
|
});
|
|
36
36
|
|
|
37
37
|
it('should add sample views', async () => {
|
|
38
38
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
39
|
-
let tree = await runner.
|
|
40
|
-
tree = await runner.
|
|
39
|
+
let tree = await runner.runSchematic('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree);
|
|
40
|
+
tree = await runner.runSchematic('add-sample-views', sampleViewsOptions, tree);
|
|
41
41
|
|
|
42
42
|
const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
|
|
43
43
|
|
|
@@ -42,13 +42,13 @@ describe('view', () => {
|
|
|
42
42
|
const schematicRunner = new testing_1.SchematicTestRunner('@schematics/angular', angularSchematicsCollection);
|
|
43
43
|
let appTree;
|
|
44
44
|
beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
45
|
-
appTree = yield schematicRunner.
|
|
46
|
-
appTree = yield schematicRunner.
|
|
45
|
+
appTree = yield schematicRunner.runSchematic('workspace', workspaceOptions);
|
|
46
|
+
appTree = yield schematicRunner.runSchematic('application', appOptions, appTree);
|
|
47
47
|
}));
|
|
48
48
|
it('should create new view', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
49
49
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
50
|
-
let tree = yield runner.
|
|
51
|
-
tree = yield runner.
|
|
50
|
+
let tree = yield runner.runSchematic('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree);
|
|
51
|
+
tree = yield runner.runSchematic('add-view', componentOptions, appTree);
|
|
52
52
|
expect(tree.files).toContain('/src/app/pages/test/test.component.ts');
|
|
53
53
|
expect(tree.files).toContain('/src/app/pages/test/test.component.html');
|
|
54
54
|
const content = tree.readContent('/src/app/pages/test/test.component.html');
|
|
@@ -57,9 +57,9 @@ describe('view', () => {
|
|
|
57
57
|
it('should add view to default routing module', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
58
58
|
const options = Object.assign(Object.assign({}, componentOptions), { addRoute: true });
|
|
59
59
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
60
|
-
let tree = yield runner.
|
|
61
|
-
tree = yield runner.
|
|
62
|
-
tree = yield runner.
|
|
60
|
+
let tree = yield runner.runSchematic('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree);
|
|
61
|
+
tree = yield runner.runSchematic('add-view', options, tree);
|
|
62
|
+
tree = yield runner.runSchematic('add-view', Object.assign(Object.assign({}, options), { name: 'test2' }), tree);
|
|
63
63
|
const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
|
|
64
64
|
expect(moduleContent).toContain(`const routes: Routes = [
|
|
65
65
|
{
|
|
@@ -86,17 +86,17 @@ describe('view', () => {
|
|
|
86
86
|
it('should add view to other routing module', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
87
87
|
const options = Object.assign(Object.assign({}, componentOptions), { addRoute: true, module: 'test/test-routing' });
|
|
88
88
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
89
|
-
let tree = yield runner.
|
|
89
|
+
let tree = yield runner.runExternalSchematic('@schematics/angular', 'module', {
|
|
90
90
|
name: 'test',
|
|
91
91
|
routing: true,
|
|
92
92
|
project: 'testApp'
|
|
93
|
-
}, appTree)
|
|
94
|
-
tree = yield runner.
|
|
93
|
+
}, appTree);
|
|
94
|
+
tree = yield runner.runSchematic('add-layout', {
|
|
95
95
|
layout: 'side-nav-outer-toolbar',
|
|
96
96
|
project: 'testApp',
|
|
97
97
|
name: 'test'
|
|
98
|
-
}, tree)
|
|
99
|
-
tree = yield runner.
|
|
98
|
+
}, tree);
|
|
99
|
+
tree = yield runner.runSchematic('add-view', options, tree);
|
|
100
100
|
const moduleContent = tree.readContent('/src/app/test/test-routing.module.ts');
|
|
101
101
|
expect(moduleContent).toMatch(/component: TestComponent/);
|
|
102
102
|
expect(moduleContent).toMatch(/path: 'pages\/test'/);
|
|
@@ -104,11 +104,11 @@ describe('view', () => {
|
|
|
104
104
|
}));
|
|
105
105
|
it('should add view to navigation', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
106
106
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
107
|
-
let tree = yield runner.
|
|
108
|
-
tree = yield runner.
|
|
107
|
+
let tree = yield runner.runSchematic('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree);
|
|
108
|
+
tree = yield runner.runSchematic('add-view', componentOptions, tree);
|
|
109
109
|
componentOptions.name = 'some test';
|
|
110
110
|
componentOptions.icon = 'home';
|
|
111
|
-
tree = yield runner.
|
|
111
|
+
tree = yield runner.runSchematic('add-view', componentOptions, tree);
|
|
112
112
|
const moduleContent = tree.readContent('/src/app/app-navigation.ts');
|
|
113
113
|
expect(moduleContent).toMatch(/text: 'Some Test'/);
|
|
114
114
|
expect(moduleContent).toMatch(/icon: 'home'/);
|
|
@@ -132,8 +132,8 @@ describe('view', () => {
|
|
|
132
132
|
it('should create new view with path', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
133
133
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
134
134
|
componentOptions.name = 'folder/test';
|
|
135
|
-
let tree = yield runner.
|
|
136
|
-
tree = yield runner.
|
|
135
|
+
let tree = yield runner.runSchematic('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree);
|
|
136
|
+
tree = yield runner.runSchematic('add-view', componentOptions, appTree);
|
|
137
137
|
expect(tree.files).toContain('/src/app/folder/test/test.component.ts');
|
|
138
138
|
expect(tree.files).toContain('/src/app/folder/test/test.component.html');
|
|
139
139
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,gEAAuF;AAEvF,6BAA6B;AAE7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAElE,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACpB,MAAM,UAAU,GAAQ;QACtB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,KAAK;QACrB,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,KAAK;QAChB,eAAe,EAAE,KAAK;KACvB,CAAC;IAEF,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,OAAO;KACjB,CAAC;IAEF,MAAM,gBAAgB,GAAQ;QAC5B,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,KAAK;QACrB,eAAe,EAAE,SAAS;QAC1B,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,SAAS;KACnB,CAAC;IAEF,MAAM,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC;IAC9G,MAAM,eAAe,GAAG,IAAI,6BAAmB,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;IACpG,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,GAAS,EAAE;QACpB,OAAO,GAAG,MAAM,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,14 +38,14 @@ describe('view', () => {
|
|
|
38
38
|
let appTree: UnitTestTree;
|
|
39
39
|
|
|
40
40
|
beforeEach(async () => {
|
|
41
|
-
appTree = await schematicRunner.
|
|
42
|
-
appTree = await schematicRunner.
|
|
41
|
+
appTree = await schematicRunner.runSchematic('workspace', workspaceOptions);
|
|
42
|
+
appTree = await schematicRunner.runSchematic('application', appOptions, appTree);
|
|
43
43
|
});
|
|
44
44
|
|
|
45
45
|
it('should create new view', async () => {
|
|
46
46
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
47
|
-
let tree = await runner.
|
|
48
|
-
tree = await runner.
|
|
47
|
+
let tree = await runner.runSchematic('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree);
|
|
48
|
+
tree = await runner.runSchematic('add-view', componentOptions, appTree);
|
|
49
49
|
|
|
50
50
|
expect(tree.files).toContain('/src/app/pages/test/test.component.ts');
|
|
51
51
|
expect(tree.files).toContain('/src/app/pages/test/test.component.html');
|
|
@@ -59,9 +59,9 @@ describe('view', () => {
|
|
|
59
59
|
const options = { ...componentOptions, addRoute: true };
|
|
60
60
|
|
|
61
61
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
62
|
-
let tree = await runner.
|
|
63
|
-
tree = await runner.
|
|
64
|
-
tree = await runner.
|
|
62
|
+
let tree = await runner.runSchematic('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree);
|
|
63
|
+
tree = await runner.runSchematic('add-view', options, tree);
|
|
64
|
+
tree = await runner.runSchematic('add-view', { ...options, name: 'test2' }, tree);
|
|
65
65
|
const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
|
|
66
66
|
|
|
67
67
|
expect(moduleContent).toContain(`const routes: Routes = [
|
|
@@ -91,18 +91,18 @@ describe('view', () => {
|
|
|
91
91
|
const options = { ...componentOptions, addRoute: true, module: 'test/test-routing' };
|
|
92
92
|
|
|
93
93
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
94
|
-
let tree = await runner.
|
|
94
|
+
let tree = await runner.runExternalSchematic('@schematics/angular', 'module', {
|
|
95
95
|
name: 'test',
|
|
96
96
|
routing: true,
|
|
97
97
|
project: 'testApp'
|
|
98
|
-
}, appTree)
|
|
98
|
+
}, appTree);
|
|
99
99
|
|
|
100
|
-
tree = await runner.
|
|
100
|
+
tree = await runner.runSchematic('add-layout', {
|
|
101
101
|
layout: 'side-nav-outer-toolbar',
|
|
102
102
|
project: 'testApp',
|
|
103
103
|
name: 'test'
|
|
104
|
-
}, tree)
|
|
105
|
-
tree = await runner.
|
|
104
|
+
}, tree);
|
|
105
|
+
tree = await runner.runSchematic('add-view', options, tree);
|
|
106
106
|
|
|
107
107
|
const moduleContent = tree.readContent('/src/app/test/test-routing.module.ts');
|
|
108
108
|
|
|
@@ -113,12 +113,12 @@ describe('view', () => {
|
|
|
113
113
|
|
|
114
114
|
it('should add view to navigation', async () => {
|
|
115
115
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
116
|
-
let tree = await runner.
|
|
117
|
-
tree = await runner.
|
|
116
|
+
let tree = await runner.runSchematic('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree);
|
|
117
|
+
tree = await runner.runSchematic('add-view', componentOptions, tree);
|
|
118
118
|
|
|
119
119
|
componentOptions.name = 'some test';
|
|
120
120
|
componentOptions.icon = 'home';
|
|
121
|
-
tree = await runner.
|
|
121
|
+
tree = await runner.runSchematic('add-view', componentOptions, tree);
|
|
122
122
|
|
|
123
123
|
const moduleContent = tree.readContent('/src/app/app-navigation.ts');
|
|
124
124
|
|
|
@@ -146,8 +146,8 @@ describe('view', () => {
|
|
|
146
146
|
it('should create new view with path', async () => {
|
|
147
147
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
148
148
|
componentOptions.name = 'folder/test';
|
|
149
|
-
let tree = await runner.
|
|
150
|
-
tree = await runner.
|
|
149
|
+
let tree = await runner.runSchematic('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree);
|
|
150
|
+
tree = await runner.runSchematic('add-view', componentOptions, appTree);
|
|
151
151
|
|
|
152
152
|
expect(tree.files).toContain('/src/app/folder/test/test.component.ts');
|
|
153
153
|
expect(tree.files).toContain('/src/app/folder/test/test.component.html');
|
|
@@ -27,19 +27,18 @@ describe('install', () => {
|
|
|
27
27
|
};
|
|
28
28
|
const workspaceOptions = {
|
|
29
29
|
name: 'workspace',
|
|
30
|
-
|
|
31
|
-
version: '12.0.0'
|
|
30
|
+
version: '16.0.0'
|
|
32
31
|
};
|
|
33
32
|
const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
|
|
34
33
|
const schematicRunner = new testing_1.SchematicTestRunner('@schematics/angular', angularSchematicsCollection);
|
|
35
34
|
let appTree;
|
|
36
35
|
beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
37
|
-
appTree = yield schematicRunner.
|
|
38
|
-
appTree = yield schematicRunner.
|
|
36
|
+
appTree = yield schematicRunner.runSchematic('workspace', workspaceOptions);
|
|
37
|
+
appTree = yield schematicRunner.runSchematic('application', appOptions, appTree);
|
|
39
38
|
}));
|
|
40
39
|
it('should add devextreme dependency (default)', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
41
40
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
42
|
-
const tree = yield runner.
|
|
41
|
+
const tree = yield runner.runSchematic('install', {}, appTree);
|
|
43
42
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
44
43
|
expect(packageConfig.dependencies['devextreme']).toBe(latest_versions_1.latestVersions['devextreme']);
|
|
45
44
|
expect(packageConfig.dependencies['devextreme-angular']).toBe(latest_versions_1.latestVersions['devextreme-angular']);
|
|
@@ -47,27 +46,27 @@ describe('install', () => {
|
|
|
47
46
|
}));
|
|
48
47
|
it('should add devextreme dependency (custom)', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
49
48
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
50
|
-
const tree = yield runner.
|
|
49
|
+
const tree = yield runner.runSchematic('install', { dxversion: '18.2.5' }, appTree);
|
|
51
50
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
52
51
|
expect(packageConfig.dependencies.devextreme).toBe('18.2.5');
|
|
53
52
|
expect(packageConfig.devDependencies['devextreme-themebuilder']).toBe('18.2.5');
|
|
54
53
|
}));
|
|
55
54
|
it('should add devextreme cli devDependency', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
56
55
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
57
|
-
const tree = yield runner.
|
|
56
|
+
const tree = yield runner.runSchematic('install', { dxversion: '18.2.5' }, appTree);
|
|
58
57
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
59
58
|
expect(packageConfig.devDependencies['devextreme-cli']).toBeDefined();
|
|
60
59
|
}));
|
|
61
60
|
it('should add devextreme styles', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
62
61
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
63
|
-
const tree = yield runner.
|
|
62
|
+
const tree = yield runner.runSchematic('install', {}, appTree);
|
|
64
63
|
const angularConfig = JSON.parse(tree.readContent('angular.json'));
|
|
65
64
|
const styles = angularConfig['projects']['testApp']['architect']['build']['options']['styles'];
|
|
66
65
|
expect(styles[0]).toBe('node_modules/devextreme/dist/css/dx.light.css');
|
|
67
66
|
}));
|
|
68
67
|
it('should register jszip', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
69
68
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
70
|
-
const tree = yield runner.
|
|
69
|
+
const tree = yield runner.runSchematic('install', {}, appTree);
|
|
71
70
|
const tsconfig = JSON.parse(tree.readContent('tsconfig.app.json'));
|
|
72
71
|
const jszip = tsconfig['compilerOptions']['paths']['jszip'];
|
|
73
72
|
expect(jszip[0]).toBe('./node_modules/jszip/dist/jszip.min.js');
|
|
@@ -83,9 +82,9 @@ describe('install', () => {
|
|
|
83
82
|
skipTests: false,
|
|
84
83
|
skipPackageJson: false
|
|
85
84
|
};
|
|
86
|
-
appTree = yield schematicRunner.
|
|
85
|
+
appTree = yield schematicRunner.runSchematic('application', secondAppOptions, appTree);
|
|
87
86
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
88
|
-
const tree = yield runner.
|
|
87
|
+
const tree = yield runner.runSchematic('install', { project: 'testApp2' }, appTree);
|
|
89
88
|
const angularConfig = JSON.parse(tree.readContent('angular.json'));
|
|
90
89
|
const styles = angularConfig['projects']['testApp2']['architect']['build']['options']['styles'];
|
|
91
90
|
expect(styles[0]).toBe('node_modules/devextreme/dist/css/dx.light.css');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,gEAAuF;AAEvF,6BAA6B;AAC7B,gEAA4D;AAE5D,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAElE,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,8CAA8C;IAC9C,MAAM,UAAU,GAAQ;QACtB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,KAAK;QACrB,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,KAAK;QAChB,eAAe,EAAE,KAAK;KACvB,CAAC;IAEF,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,
|
|
1
|
+
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,8 +20,7 @@ describe('install', () => {
|
|
|
20
20
|
|
|
21
21
|
const workspaceOptions: WorkspaceOptions = {
|
|
22
22
|
name: 'workspace',
|
|
23
|
-
|
|
24
|
-
version: '12.0.0'
|
|
23
|
+
version: '16.0.0'
|
|
25
24
|
};
|
|
26
25
|
|
|
27
26
|
const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
|
|
@@ -29,13 +28,13 @@ describe('install', () => {
|
|
|
29
28
|
let appTree: UnitTestTree;
|
|
30
29
|
|
|
31
30
|
beforeEach(async () => {
|
|
32
|
-
appTree = await schematicRunner.
|
|
33
|
-
appTree = await schematicRunner.
|
|
31
|
+
appTree = await schematicRunner.runSchematic('workspace', workspaceOptions);
|
|
32
|
+
appTree = await schematicRunner.runSchematic('application', appOptions, appTree);
|
|
34
33
|
});
|
|
35
34
|
|
|
36
35
|
it('should add devextreme dependency (default)', async () => {
|
|
37
36
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
38
|
-
const tree = await runner.
|
|
37
|
+
const tree = await runner.runSchematic('install', {}, appTree);
|
|
39
38
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
40
39
|
|
|
41
40
|
expect(packageConfig.dependencies['devextreme']).toBe(latestVersions['devextreme']);
|
|
@@ -45,7 +44,7 @@ describe('install', () => {
|
|
|
45
44
|
|
|
46
45
|
it('should add devextreme dependency (custom)', async () => {
|
|
47
46
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
48
|
-
const tree = await runner.
|
|
47
|
+
const tree = await runner.runSchematic('install', { dxversion: '18.2.5' }, appTree);
|
|
49
48
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
50
49
|
|
|
51
50
|
expect(packageConfig.dependencies.devextreme).toBe('18.2.5');
|
|
@@ -54,7 +53,7 @@ describe('install', () => {
|
|
|
54
53
|
|
|
55
54
|
it('should add devextreme cli devDependency', async () => {
|
|
56
55
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
57
|
-
const tree = await runner.
|
|
56
|
+
const tree = await runner.runSchematic('install', { dxversion: '18.2.5' }, appTree);
|
|
58
57
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
59
58
|
|
|
60
59
|
expect(packageConfig.devDependencies['devextreme-cli']).toBeDefined();
|
|
@@ -62,7 +61,7 @@ describe('install', () => {
|
|
|
62
61
|
|
|
63
62
|
it('should add devextreme styles', async () => {
|
|
64
63
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
65
|
-
const tree = await runner.
|
|
64
|
+
const tree = await runner.runSchematic('install', {}, appTree);
|
|
66
65
|
const angularConfig = JSON.parse(tree.readContent('angular.json'));
|
|
67
66
|
const styles = angularConfig['projects']['testApp']['architect']['build']['options']['styles'];
|
|
68
67
|
|
|
@@ -71,7 +70,7 @@ describe('install', () => {
|
|
|
71
70
|
|
|
72
71
|
it('should register jszip', async () => {
|
|
73
72
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
74
|
-
const tree = await runner.
|
|
73
|
+
const tree = await runner.runSchematic('install', {}, appTree);
|
|
75
74
|
const tsconfig = JSON.parse(tree.readContent('tsconfig.app.json'));
|
|
76
75
|
const jszip = tsconfig['compilerOptions']['paths']['jszip'];
|
|
77
76
|
|
|
@@ -90,10 +89,10 @@ describe('install', () => {
|
|
|
90
89
|
skipPackageJson: false
|
|
91
90
|
};
|
|
92
91
|
|
|
93
|
-
appTree = await schematicRunner.
|
|
92
|
+
appTree = await schematicRunner.runSchematic('application', secondAppOptions, appTree);
|
|
94
93
|
|
|
95
94
|
const runner = new SchematicTestRunner('schematics', collectionPath);
|
|
96
|
-
const tree = await runner.
|
|
95
|
+
const tree = await runner.runSchematic('install', { project: 'testApp2' }, appTree);
|
|
97
96
|
const angularConfig = JSON.parse(tree.readContent('angular.json'));
|
|
98
97
|
const styles = angularConfig['projects']['testApp2']['architect']['build']['options']['styles'];
|
|
99
98
|
|
package/src/install/schema.json
CHANGED
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.latestVersions = void 0;
|
|
4
4
|
// TODO: implement
|
|
5
5
|
exports.latestVersions = {
|
|
6
|
-
'devextreme': '
|
|
7
|
-
'devextreme-angular': '
|
|
6
|
+
'devextreme': '24.1.4',
|
|
7
|
+
'devextreme-angular': '24.1.4',
|
|
8
8
|
'devextreme-cli': 'latest'
|
|
9
9
|
};
|
|
10
10
|
//# sourceMappingURL=latest-versions.js.map
|