mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-05-20 23:36:39 +02:00
Fixed Qunit task with connect task
This commit is contained in:
parent
b4d71c575e
commit
d46cacb71c
15
Gruntfile.js
15
Gruntfile.js
|
@ -34,6 +34,15 @@ module.exports = function (grunt) {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
connect: {
|
||||||
|
server: {
|
||||||
|
options: {
|
||||||
|
port: 8080,
|
||||||
|
base: '.'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
copy: {
|
copy: {
|
||||||
dist: {
|
dist: {
|
||||||
src: ['**'],
|
src: ['**'],
|
||||||
|
@ -137,11 +146,12 @@ module.exports = function (grunt) {
|
||||||
grunt.loadNpmTasks('grunt-contrib-copy');
|
grunt.loadNpmTasks('grunt-contrib-copy');
|
||||||
grunt.loadNpmTasks('grunt-contrib-watch');
|
grunt.loadNpmTasks('grunt-contrib-watch');
|
||||||
grunt.loadNpmTasks('grunt-string-replace');
|
grunt.loadNpmTasks('grunt-string-replace');
|
||||||
|
grunt.loadNpmTasks('grunt-contrib-connect');
|
||||||
grunt.loadNpmTasks('grunt-webpack');
|
grunt.loadNpmTasks('grunt-webpack');
|
||||||
grunt.loadNpmTasks('grunt-babel');
|
grunt.loadNpmTasks('grunt-babel');
|
||||||
|
|
||||||
grunt.registerTask('default',
|
grunt.registerTask('default',
|
||||||
['jshint', 'webpack:build', 'copy:dist', 'test']);
|
['jshint', 'webpack:build', 'copy:dist', 'test', 'build-demos']);
|
||||||
|
|
||||||
// Development server
|
// Development server
|
||||||
grunt.registerTask('server', ['webpack-dev-server:start']);
|
grunt.registerTask('server', ['webpack-dev-server:start']);
|
||||||
|
@ -163,7 +173,7 @@ module.exports = function (grunt) {
|
||||||
grunt.registerTask('dev-modules', ['babel', 'copy:dist']);
|
grunt.registerTask('dev-modules', ['babel', 'copy:dist']);
|
||||||
|
|
||||||
// Tests
|
// Tests
|
||||||
grunt.registerTask('test', ['qunit:all']);
|
grunt.registerTask('test', ['connect', 'qunit:all']);
|
||||||
|
|
||||||
// Custom task running QUnit tests for specified files.
|
// Custom task running QUnit tests for specified files.
|
||||||
// Usage example: grunt test-only:test.html,test-help.html
|
// Usage example: grunt test-only:test.html,test-help.html
|
||||||
|
@ -182,6 +192,7 @@ module.exports = function (grunt) {
|
||||||
res.push(buildTestUrl(testHost, testDir, parts));
|
res.push(buildTestUrl(testHost, testDir, parts));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
grunt.task.run('connect');
|
||||||
grunt.config('qunit.only.options.urls', res);
|
grunt.config('qunit.only.options.urls', res);
|
||||||
grunt.task.run('qunit:only');
|
grunt.task.run('qunit:only');
|
||||||
});
|
});
|
||||||
|
|
4
dist/tablefilter/tablefilter.js
vendored
4
dist/tablefilter/tablefilter.js
vendored
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
||||||
/**
|
/**
|
||||||
* TableFilter v0.0.0 by Max Guglielmi
|
* TableFilter v0.0.0 by Max Guglielmi
|
||||||
* build date: 2015-06-29T08:20:58.589Z
|
* build date: 2015-06-30T07:30:28.549Z
|
||||||
* MIT License
|
* MIT License
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
"clean-webpack-plugin": "^0.1.3",
|
"clean-webpack-plugin": "^0.1.3",
|
||||||
"grunt": "^0.4.5",
|
"grunt": "^0.4.5",
|
||||||
"grunt-babel": "^5.0.0",
|
"grunt-babel": "^5.0.0",
|
||||||
|
"grunt-contrib-connect": "^0.10.1",
|
||||||
"grunt-contrib-copy": "^0.8.0",
|
"grunt-contrib-copy": "^0.8.0",
|
||||||
"grunt-contrib-jshint": "^0.11.2",
|
"grunt-contrib-jshint": "^0.11.2",
|
||||||
"grunt-contrib-qunit": "^0.7.0",
|
"grunt-contrib-qunit": "^0.7.0",
|
||||||
|
|
|
@ -13,7 +13,7 @@ module.exports = {
|
||||||
path: path.join(__dirname, '/dist/tablefilter'),
|
path: path.join(__dirname, '/dist/tablefilter'),
|
||||||
filename: 'tablefilter.js',
|
filename: 'tablefilter.js',
|
||||||
// chunkFilename: '[name]-[chunkhash].js',
|
// chunkFilename: '[name]-[chunkhash].js',
|
||||||
chunkFilename: 'tf[name].js',
|
chunkFilename: 'tf-[chunkhash].js',
|
||||||
libraryTarget: 'umd'
|
libraryTarget: 'umd'
|
||||||
},
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
|
|
Loading…
Reference in a new issue