Skip to content

Commit 222e321

Browse files
committed
development server works over ./demo
1 parent 65b6792 commit 222e321

File tree

5 files changed

+22
-34
lines changed

5 files changed

+22
-34
lines changed

.npmignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/node_modules/
2-
/server
32
/src
43
/temp
54
/test

Gruntfile.js

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,20 @@ module.exports = function (grunt) {
1313
connect: {
1414
app: {
1515
options: {
16-
base: './',
17-
middleware: require('./server/middleware'),
18-
port: 5001
16+
port: 5005,
17+
base: './demo',
18+
middleware: function (connect, options, middlewares) {
19+
middlewares.unshift(function (req, res, next) {
20+
var files = ['ui-scroll.js', 'ui-scroll-grid.js', 'ui-scroll.js.map', 'ui-scroll-grid.js.map'];
21+
for (var i = 0; i < files.length; i++) {
22+
if (req.url === '/dist/' + files[i]) {
23+
res.end(grunt.file.read('./temp/' + files[i]));
24+
}
25+
}
26+
next();
27+
});
28+
return middlewares;
29+
}
1930
}
2031
}
2132
},
@@ -28,7 +39,7 @@ module.exports = function (grunt) {
2839
files: [
2940
'src/**/*.js'
3041
],
31-
tasks: 'buildWatcher'
42+
tasks: 'webpack:default'
3243
}
3344
},
3445
karma: {
@@ -69,9 +80,11 @@ module.exports = function (grunt) {
6980
jqLiteExtrasFake: {
7081
files: [
7182
{expand: true, src: ['ui-scroll-jqlite.js'], cwd: 'src', dest: 'dist/'},
72-
{expand: true, src: ['ui-scroll-jqlite.js'], cwd: 'src', dest: 'dist/', rename: function(dest, src) {
83+
{
84+
expand: true, src: ['ui-scroll-jqlite.js'], cwd: 'src', dest: 'dist/', rename: function (dest, src) {
7385
return dest + src.replace(/\.js$/, ".min.js");
74-
}}
86+
}
87+
}
7588
]
7689
}
7790
},
@@ -113,6 +126,7 @@ module.exports = function (grunt) {
113126
});
114127

115128
grunt.registerTask('server', [
129+
'webpack:default',
116130
'connect',
117131
'watch'
118132
]);
@@ -125,12 +139,6 @@ module.exports = function (grunt) {
125139
'karma:default'
126140
]);
127141

128-
grunt.registerTask('buildWatcher', [
129-
'jshint:sources',
130-
'clean:temp',
131-
'webpack:default'
132-
]);
133-
134142
grunt.registerTask('build', [
135143
'jshint:tests',
136144
'jshint:sources',

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
},
2020
"license": "MIT",
2121
"scripts": {
22+
"start": "grunt server",
23+
"build": "grunt build",
2224
"test": "grunt test"
2325
},
2426
"devDependencies": {

server/middleware.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

server/server.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)