Merge pull request #13 from edx/djoy/favicon_and_project_root

Process favicon.ico and a PROJECT_ROOT fix
openedx · Oct 11, 2019 · 914fe0b · 914fe0b
2 parents a15b795 + 285ab47
commit 914fe0b
Show file tree

Hide file tree

Showing 4 changed files with 399 additions and 9 deletions.
diff --git a/config/webpack.dev.config.js b/config/webpack.dev.config.js
@@ -93,6 +93,10 @@ module.exports = Merge.smart(commonConfig, {
         test: /\.(woff2?|ttf|svg|eot)(\?v=\d+\.\d+\.\d+)?$/,
         loader: 'file-loader',
       },
+      {
+        test: /favicon.ico$/,
+        loader: 'file-loader?name=[name].[ext]', // <-- retain original file name
+      },
       {
         test: /\.(jpe?g|png|gif|ico)(\?v=\d+\.\d+\.\d+)?$/,
         use: [

diff --git a/config/webpack.prod.config.js b/config/webpack.prod.config.js
@@ -103,6 +103,10 @@ module.exports = Merge.smart(commonConfig, {
         test: /\.(woff2?|ttf|svg|eot)(\?v=\d+\.\d+\.\d+)?$/,
         loader: 'file-loader',
       },
+      {
+        test: /favicon.ico$/,
+        loader: 'file-loader?name=[name].[ext]', // <-- retain original file name
+      },
       {
         test: /\.(jpe?g|png|gif|ico)(\?v=\d+\.\d+\.\d+)?$/,
         use: [

diff --git a/lib/paths.js b/lib/paths.js
@@ -1,6 +1,6 @@
 const path = require('path');
 
 module.exports = {
-  PROJECT_ROOT: process.env.PROJECT_ROOT,
+  PROJECT_ROOT: process.env.PROJECT_ROOT ? process.env.PROJECT_ROOT : process.cwd(),
   BASE_CONFIG_DIR: path.resolve(__dirname, '..', 'config'),
 };