shakacode
diff --git a/‎npm-shrinkwrap.json‎
Lines changed: 218 additions & 0 deletions b/‎npm-shrinkwrap.json‎
Lines changed: 218 additions & 0 deletions
diff --git a/‎package.json‎
Lines changed: 3 additions & 0 deletions b/‎package.json‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎webpack/index.html‎
Lines changed: 0 additions & 15 deletions b/‎webpack/index.html‎
Lines changed: 0 additions & 15 deletions
diff --git a/‎webpack/scripts/webpack_only.jsx‎
Lines changed: 3 additions & 0 deletions b/‎webpack/scripts/webpack_only.jsx‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎webpack/webpack.hot.config.js‎
Lines changed: 12 additions & 6 deletions b/‎webpack/webpack.hot.config.js‎
Lines changed: 12 additions & 6 deletions
@@ -8,6 +8,7 @@
  },
  "dependencies": {
  "body-parser": "^1.8.2",
+ "bootstrap-webpack": "*",
  "express": "^4.9.0",
  "jquery": "^2.1.1",
  "marked": "^0.3.2",
@@ -20,6 +21,8 @@
  "es6-loader": "^0.2.0",
  "expose-loader": "^0.5.3",
  "extract-text-webpack-plugin": "^0.3.1",
+ "file-loader": "^0.7.2",
+ "url-loader": "^0.5.5",
  "jsx-loader": "^0.11.0",
  "loader-utils": "^0.2.3",
  "react-hot-loader": "^0.4.3",
 
@@ -2,22 +2,7 @@
 <html>
  <head>
  <title>Hello React</title>
- <!-- Not present in the tutorial. Just for basic styling. -->
- <!--<link rel="stylesheet" href="../app/assets/stylesheets/base.css" />-->
-
- <!-- Add twitter bootstrap -->
- <!-- Latest compiled and minified CSS -->
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
-
- <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
- <!--<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>-->
- <!--This contains the app's JS, including jQuery -->
  <script src="express-bundle.js"></script>
-
- <!-- Latest compiled and minified JavaScript -->
- <!--<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>-->
-
  </head>
  <body>
  <div id="content"></div>
 
@@ -6,3 +6,6 @@ require("test-stylesheet.css");
 // Test out sass
 require("test-sass-stylesheet.scss");
 
+require("expose?$!jquery");
+require("expose?jQuery!jquery");
+require("bootstrap-webpack");
@@ -18,11 +18,10 @@ module.exports = {
  plugins: [
  new webpack.HotModuleReplacementPlugin()
  ],
-
- // Let's load jQuery from the CDN
- externals: {
- jquery: "var jQuery"
- },
+ // In case you wanted to load jQuery from the CDN, this is how you would do it:
+ // externals: {
+ // jquery: "var jQuery"
+ // },
  resolve: {
  root: [ path.join(__dirname, "scripts"), path.join(__dirname, "assets/javascripts"),
  path.join(__dirname, "assets/stylesheets") ],
@@ -33,7 +32,14 @@ module.exports = {
  { test: require.resolve("react"), loader: "expose?React" },
  { test: /\.jsx$/, loaders: ["react-hot", "es6", "jsx?harmony"] },
  { test: /\.css$/, loader: "style-loader!css-loader" },
- { test: /\.scss$/, loader: "style!css!sass?outputStyle=expanded&imagePath=/assets/images"}
+ { test: /\.scss$/, loader: "style!css!sass?outputStyle=expanded&imagePath=/assets/images"},
+
+ // the url-loader uses DataUrls.
+ // the file-loader emits files.
+ { test: /\.woff$/, loader: "url-loader?limit=10000&minetype=application/font-woff" },
+ { test: /\.ttf$/, loader: "file-loader" },
+ { test: /\.eot$/, loader: "file-loader" },
+ { test: /\.svg$/, loader: "file-loader" }
  ]
  }
 };