add public folder to contain static assets

Foxandxss · Foxandxss · commit e5e74a6f0e38 · 2016-02-12T15:21:21.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 node_modules
-public
+public/
 build
diff --git a/package.json b/package.json
@@ -28,6 +28,7 @@
     "babel-core": "^6.2.1",
     "babel-loader": "^6.2.0",
     "babel-preset-es2015": "^6.1.18",
+    "copy-webpack-plugin": "^1.1.1",
     "css-loader": "^0.23.0",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.8.4",
diff --git a/src/public/img/favicon.ico b/src/public/img/favicon.ico
diff --git a/src/public/index.html b/src/public/index.html
@@ -3,6 +3,8 @@
 <head>
   <meta charset="UTF-8">
   <title>Angular App</title>
+  <link rel="icon" type="image/x-icon" href="/img/favicon.ico">
+
   <base href="/">
 </head>
 <body>
diff --git a/webpack.config.js b/webpack.config.js
@@ -5,6 +5,7 @@ var webpack = require('webpack');
 var autoprefixer = require('autoprefixer');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = function makeWebpackConfig (ENV) {
   /**
@@ -149,9 +150,10 @@ module.exports = function makeWebpackConfig (ENV) {
     // Render index.html
     config.plugins.push(
       new HtmlWebpackPlugin({
-        template: './src/index.html',
+        template: './src/public/index.html',
         inject: 'body'
       }),
+
       // Reference: https://github.com/webpack/extract-text-webpack-plugin
       // Extract css files
       // Disabled when in test mode or not in build mode
@@ -172,7 +174,13 @@ module.exports = function makeWebpackConfig (ENV) {
 
       // Reference: http://webpack.github.io/docs/list-of-plugins.html#uglifyjsplugin
       // Minify all javascript, switch loaders to minimizing mode
-      new webpack.optimize.UglifyJsPlugin()
+      new webpack.optimize.UglifyJsPlugin(),
+
+      // Copy assets from the public folder
+      // Reference: https://github.com/kevlened/copy-webpack-plugin
+      new CopyWebpackPlugin([{
+        from: __dirname + '/src/public'
+      }])
     )
   }
 
@@ -182,7 +190,7 @@ module.exports = function makeWebpackConfig (ENV) {
    * Reference: http://webpack.github.io/docs/webpack-dev-server.html
    */
   config.devServer = {
-    contentBase: './public',
+    contentBase: './src/public',
     stats: {
       modules: false,
       cached: false,

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 node_modules
 -public
 +public/
 build