Remove usage of json-server and clean gruntfile

marmelab · Aug 27, 2015 · 63cfbe4 · 63cfbe4
1 parent bf8a3e3
commit 63cfbe4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -46,16 +46,6 @@ module.exports = function (grunt) {
                 }
             }
         },
-        json_server: {
-            stub: {
-                options: {
-                    port: 3000,
-                    db: 'examples/blog/stub-server.json',
-                    keepalive: false,
-                    logger: false
-                }
-            }
-        },
         karma: {
             unit: {
                 configFile: 'src/javascripts/test/karma.conf.js',
@@ -70,25 +60,21 @@ module.exports = function (grunt) {
             }
         },
         exec: {
-            webpack: './node_modules/webpack/bin/webpack.js',
-            webpack_watch: './node_modules/webpack-dev-server/bin/webpack-dev-server.js --colors --devtool cheap-module-inline-source-map'
+            webpack: './node_modules/webpack/bin/webpack.js'
         }
     });
 
     grunt.loadNpmTasks('grunt-contrib-connect');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-exec');
     grunt.loadNpmTasks('grunt-protractor-runner');
-    grunt.loadNpmTasks('grunt-json-server');
     grunt.loadNpmTasks('grunt-karma');
     grunt.loadNpmTasks('grunt-mocha-test');
 
     grunt.registerTask('test', ['karma', 'test:e2e']);
-    grunt.registerTask('test:e2e', ['test:e2e:prepare', 'json_server', 'connect:test', 'protractor']);
+    grunt.registerTask('test:e2e', ['test:e2e:prepare', 'connect:test', 'protractor']);
     grunt.registerTask('test:e2e:prepare', ['exec:webpack', 'copy:test_sample_app', 'copy:test_build', 'copy:test_fakerest', 'copy:test_sinon_server']);
 
     grunt.registerTask('test:local', ['karma', 'test:local:e2e']);
     grunt.registerTask('test:local:e2e', ['test:e2e:prepare', 'connect:test', 'protractor']);
-
-    grunt.registerTask('default', ['json_server', 'connect:dev', 'exec:webpack_watch']);
 };
diff --git a/package.json b/package.json
@@ -45,7 +45,6 @@
     "grunt-contrib-uglify": "~0.6.0",
     "grunt-contrib-watch": "~0.5.2",
     "grunt-exec": "^0.4.6",
-    "grunt-json-server": "git://github.com/fzaninotto/grunt-json-server.git",
     "grunt-karma": "^0.8.3",
     "grunt-mocha-test": "^0.12.7",
     "grunt-ng-annotate": "^0.10.0",