Preparations for extension/website merge.

Author: sebadoom

Gruntfile.js

@@ -1,13 +1,16 @@
-const websiteWebpackConfig = require('./website.webpack.config.js');
+const websiteWebpackConfigDev = require('./webpack.website-dev.js');
+const websiteWebpackConfigProd = require('./webpack.website-prod.js');
 
 module.exports = grunt => {
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-stylus');
   grunt.loadNpmTasks('grunt-contrib-pug');
   grunt.loadNpmTasks('grunt-webpack');
   grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-contrib-clean');
 
   grunt.initConfig({
+    clean: [ 'dist' ],
     copy: {
       main: {
         files: [{
@@ -37,19 +40,20 @@ module.exports = grunt => {
     pug: {
       compile: {
         files: {
-          'dist/website/index.html': 'views/index.pug',
-          'dist/website/introduction/index.html': 'views/introduction.pug'
+          'dist/website/index.html': 'views/website/index.pug',
+          'dist/website/introduction/index.html': 
+            'views/website/introduction.pug'
         }
       }
     },
     webpack: {
-      prod: websiteWebpackConfig,
-      dev: websiteWebpackConfig
+      prod: websiteWebpackConfigProd,
+      dev: websiteWebpackConfigDev
     },
     watch: {
       js: {
         files: 'src/**',
-        tasks: 'webpack'
+        tasks: 'webpack:dev'
       },
       assets: {
         files: [
@@ -66,11 +70,14 @@ module.exports = grunt => {
       },
       views: {
         files: ['stylus/**', 'views/**'],
-        tasks: ['stylus', 'pug']
+        tasks: ['build-views']
       }
     }
   });
 
-  grunt.registerTask('build', ['copy', 'stylus', 'pug', 'webpack']);
-  grunt.registerTask('default', ['build', 'watch']);
+  grunt.registerTask('build-views', ['stylus', 'pug']);
+  grunt.registerTask('build', ['clean', 'copy', 'build-views', 'webpack:prod']);
+  grunt.registerTask('build-dev', 
+                     ['clean', 'copy', 'build-views', 'webpack:dev']);
+  grunt.registerTask('default', ['build-dev', 'watch']);
 };

package.json

@@ -16,6 +16,7 @@
     "flipclock": "^0.7.8",
     "grunt": "^1.0.1",
     "grunt-cli": "^1.2.0",
+    "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-pug": "^1.0.0",
     "grunt-contrib-stylus": "^1.2.0",
@@ -28,7 +29,9 @@
     "jstransformer-markdown-it": "^2.0.0",
     "pug": "^2.0.0-rc.4",
     "stylus": "^0.54.5",
-    "webpack": "^3.10.0"
+    "uglifyjs-webpack-plugin": "^1.1.6",
+    "webpack": "^3.10.0",
+    "webpack-merge": "^4.1.1"
   },
   "scripts": {
     "test": "echo UNIMPLEMENTED",