Merge pull request #1 from whimsicaldreamer/next

Tiny fixes
whimsicaldreamer · Aug 17, 2018 · de6a4da · de6a4da
2 parents 8fd40b6 + 36d8baa
commit de6a4da
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Html5-template",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Basic HTML5 starter template with webpack",
   "main": "app.js",
   "scripts": {
@@ -41,6 +41,10 @@
     "webpack-dev-server": "^3.1.4"
   },
   "dependencies": {
+    "@fortawesome/fontawesome": "^1.1.8",
+    "@fortawesome/fontawesome-free-brands": "^5.0.13",
+    "@fortawesome/fontawesome-free-regular": "^5.0.13",
+    "@fortawesome/fontawesome-free-solid": "^5.0.13",
     "jquery": "^3.3.1",
     "modernizr": "^3.6.0",
     "normalize.css": "^8.0.0"

diff --git a/src/js/index.js b/src/js/index.js
@@ -1,3 +1 @@
 console.log("This is the index page");
-
-const $ = require("jquery");
diff --git a/webpack.config.js b/webpack.config.js
@@ -2,6 +2,7 @@ const devMode = ((process.env.NODE_ENV).trim() === "development");
 
 const path = require("path");
 const glob = require("glob-all");
+const webpack = require("webpack");
 
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const PurifyCSSPlugin = require("purifycss-webpack");
@@ -123,6 +124,11 @@ module.exports = {
             template: "src/index.html",
             chunks: [ "vendor", "index"]
         }),
+        new webpack.ProvidePlugin({
+            $: "jquery",
+            jQuery: "jquery",
+            fontawesome: "@fortawesome/fontawesome"
+        }),
         new CleanWebpackPlugin(["dist"])
     ].concat(
         devMode ? [