diff --git a/Gruntfile.js b/Gruntfile.js index 282a1dd1..540b4b7c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,7 +1,4 @@ module.exports = function (grunt) { - var webpackConfig = require('./webpack.config.js'); - var webpackDevConfig = require('./webpack.dev.config.js'); - var webpackTestConfig = require('./webpack.test.config.js'); var fs = require('fs'); var path = require('path'); var testDir = 'test'; @@ -112,24 +109,6 @@ module.exports = function (grunt) { clean: ['demos/starter.html'], - 'webpack-dev-server': { - options: { - webpack: webpackDevConfig, - publicPath: '/dist/' - }, - start: { - webpack: { - devtool: 'eval' - } - } - }, - - webpack: { - build: webpackConfig, - dev: webpackDevConfig, - test: webpackTestConfig - }, - watch: { app: { files: ['src/**/*', 'static/style/**/*'], @@ -147,29 +126,22 @@ module.exports = function (grunt) { } }, - babel: { - options: { - sourceMap: true, - modules: 'amd', - compact: false, - presets: ['es2015'] - }, - dist: { - files: [{ - expand: true, - cwd: 'src', - src: ['**/*.js'], - dest: 'dist/tablefilter' - }] - } - }, - + // temporary shell commands while decommissioning grunt shell: { eslint: { command: 'npm run lint' }, esdoc: { command: 'npm run esdoc' + }, + build: { + command: 'npm run build' + }, + dev: { + command: 'npm run dev' + }, + test: { + command: 'npm run build:test' } }, @@ -288,8 +260,6 @@ module.exports = function (grunt) { grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-string-replace'); grunt.loadNpmTasks('grunt-contrib-connect'); - grunt.loadNpmTasks('grunt-webpack'); - grunt.loadNpmTasks('grunt-babel'); grunt.loadNpmTasks('grunt-shell'); grunt.loadNpmTasks('grunt-qunit-istanbul'); grunt.loadNpmTasks('grunt-contrib-stylus'); @@ -300,16 +270,13 @@ module.exports = function (grunt) { grunt.registerTask('default', ['test', 'build', 'build-demos']); - // Development server - grunt.registerTask('server', ['webpack-dev-server:start']); - // Dev dev/build/watch cycle grunt.registerTask('dev', - ['eslint', 'webpack:dev', 'copy:dist', 'stylus:compile', 'watch:app']); + ['eslint', 'shell:dev', 'copy:dist', 'stylus:compile', 'watch:app']); // Production build grunt.registerTask('build', - ['eslint', 'webpack:build', 'copy:dist', 'stylus:compile']); + ['eslint', 'shell:build', 'copy:dist', 'stylus:compile']); // Build demos grunt.registerTask('dev-demos', ['build-demos', 'watch:templates']); @@ -318,10 +285,7 @@ module.exports = function (grunt) { // Build tests grunt.registerTask('build-test', - ['eslint', 'webpack:test', 'copy:dist', 'stylus:compile']); - - // Transpile with Babel - grunt.registerTask('dev-modules', ['babel', 'copy:dist']); + ['eslint', 'shell:test', 'copy:dist', 'stylus:compile']); // Tests with coverage grunt.registerTask('test', ['build-test', 'connect', 'qunit:all']); diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 7399f6b0..fa95fea4 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -11,6 +11,7 @@ Please delete options that are not relevant. - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update +- [ ] Development tool configuration change # Checklist: diff --git a/README.md b/README.md index e3384f7a..5f10ef8e 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ your-page.html ## Development This project requires node.js and Grunt to be installed: -- install [node.js](https://nodejs.org/) +- install [node.js](https://nodejs.org/) v8.9.4 or higher - install [Grunt](http://gruntjs.com/getting-started) from the command line using npm (comes with node.js): ```shell npm install -g grunt-cli diff --git a/dist/starter.html b/dist/starter.html index ded7e433..ad303a66 100644 --- a/dist/starter.html +++ b/dist/starter.html @@ -1,10 +1,10 @@
-