Skip to content

Commit c7b0bb9

Browse files
authored
Use templates dev servers for testing (#105)
1 parent cac9406 commit c7b0bb9

File tree

55 files changed

+178
-154
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+178
-154
lines changed

commands/application.react.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ const addTemplate = (appPath, appName, templateOptions) => {
9393
const manifestPath = path.join(appPath, 'public', 'manifest.json');
9494
const indexPath = path.join(appPath, 'src', 'index.js');
9595
const styles = [
96-
'devextreme/dist/css/dx.common.css',
9796
'./themes/generated/theme.additional.css',
98-
'./themes/generated/theme.base.css'];
97+
'./themes/generated/theme.base.css',
98+
'devextreme/dist/css/dx.common.css'
99+
];
99100

100101
templateCreator.moveTemplateFilesToProject(templateSourcePath, appPath, templateOptions);
101102
if(!templateOptions.empty) {

commands/application.vue.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,10 @@ const modifyIndexHtml = (appPath, appName) => {
8282
const addTemplate = (appPath, appName, templateOptions) => {
8383
const templateSourcePath = path.join(__dirname, '..', 'templates', 'vue', 'application');
8484
const styles = [
85-
'devextreme/dist/css/dx.common.css',
8685
'./themes/generated/theme.additional.css',
87-
'./themes/generated/theme.base.css'];
86+
'./themes/generated/theme.base.css',
87+
'devextreme/dist/css/dx.common.css'
88+
];
8889

8990
templateCreator.moveTemplateFilesToProject(templateSourcePath, appPath, templateOptions);
9091
if(!templateOptions.empty) {

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,11 @@
4040
"cross-env": "^5.2.0",
4141
"eslint": "^5.10.0",
4242
"eslint-plugin-jest": "^22.5.1",
43-
"http-server": "^0.11.1",
44-
"ip": "^1.1.5",
4543
"jest": "^24.8.0",
4644
"jest-image-snapshot": "^2.8.2",
4745
"puppeteer": "^1.16.0",
4846
"rimraf": "^2.6.3",
49-
"simple-git": "^1.113.0"
47+
"simple-git": "^1.113.0",
48+
"tree-kill": "^1.2.1"
5049
}
5150
}
3 Bytes
104 Bytes
12 Bytes
-281 Bytes
-156 Bytes
-214 Bytes
104 Bytes

0 commit comments

Comments
 (0)