bootstrap 4.0.0-alpha.4 updates

Author: borysn

frontend/config/.bootstraprc frontend/.bootstraprcfrontend/config/.bootstraprc renamed to frontend/.bootstraprc

@@ -1,6 +1,6 @@
 ---
 # Output debugging info
-loglevel: debug
+#loglevel: debug
 
 # Major version of Bootstrap: 3 or 4
 bootstrapVersion: 4
@@ -79,15 +79,14 @@ styles:
   card: true
   breadcrumb: true
   pagination: true
-  pager: true
-  labels: true
   jumbotron: true
   alert: true
   progress: true
   media: true
   list-group: true
   responsive-embed: true
   close: true
+  tags: true
 
   # Components w/ JavaScript
   modal: true
@@ -97,9 +96,6 @@ styles:
 
   # Utility classes
   utilities: true
-  utilities-background: true
-  utilities-spacing: true
-  utilities-responsive: true
 
 ### Bootstrap scripts
 scripts:
@@ -109,8 +105,8 @@ scripts:
   collapse: true
   dropdown: true
   modal: true
+  tooltip: true
   popover: true
   scrollspy: true
   tab: true
-  tooltip: true
-  util: true
+  util: true

frontend/config/webpack.common.js

@@ -42,7 +42,7 @@ module.exports = {
 
             {
                 test: /\.css$/,
-                loader: 'raw-loader'
+                loader: 'raw-loader!style-loader!css-loader!postcss-loader'
             },
 
             {
@@ -106,8 +106,19 @@ module.exports = {
             jquery: 'jquery',
             "window.moment": "moment",
             'Tether': 'tether',
-            'window.Tether': 'tether'
-        }),
+            'window.Tether': 'tether',
+            Tooltip: "exports?Tooltip!bootstrap/js/dist/tooltip",
+            Alert: "exports?Alert!bootstrap/js/dist/alert",
+            Button: "exports?Button!bootstrap/js/dist/button",
+            Carousel: "exports?Carousel!bootstrap/js/dist/carousel",
+            Collapse: "exports?Collapse!bootstrap/js/dist/collapse",
+            Dropdown: "exports?Dropdown!bootstrap/js/dist/dropdown",
+            Modal: "exports?Modal!bootstrap/js/dist/modal",
+            Popover: "exports?Popover!bootstrap/js/dist/popover",
+            Scrollspy: "exports?Scrollspy!bootstrap/js/dist/scrollspy",
+            Tab: "exports?Tab!bootstrap/js/dist/tab",
+            Util: "exports?Util!bootstrap/js/dist/util"
+        })
     ],
 
     node: {

frontend/config/webpack.dev.js

@@ -1,5 +1,4 @@
 const webpackMerge = require('webpack-merge');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const DefinePlugin = require('webpack/lib/DefinePlugin');
 const commonConfig = require('./webpack.common.js');
 const helpers = require('./helpers');
@@ -13,19 +12,11 @@ const METADATA = webpackMerge(commonConfig.metadata, {
     HMR: HMR
 });
 
-const bootstraploader = 'bootstrap-loader/lib/bootstrap.loader?' +
-          `configFilePath=${__dirname}/.bootstraprc` +
-          '!bootstrap-loader/no-op.js';
-
 module.exports = webpackMerge(commonConfig, {
     metadata: METADATA,
     debug: true,
     devtool: 'cheap-module-eval-source-map',
 
-    entry: {
-        bootstraploader
-    },
-
     output: {
         path: helpers.root('dist'),
         filename: '[name].js',

frontend/package.json

@@ -44,32 +44,33 @@
     "@angular/platform-browser-dynamic": "2.0.0-rc.6",
     "@angular/platform-server": "2.0.0-rc.6",
     "@angular/router": "3.0.0-rc.2",
-    "bootstrap": "4.0.0-alpha.2",
+    "bootstrap": "4.0.0-alpha.4",
     "core-js": "^2.4.1",
     "font-awesome": "^4.6.3",
     "jquery": "^3.1.0",
     "lodash": "^4.15.0",
-    "moment": "^2.14.1",
-    "ng2-bootstrap": "^1.1.1",
-    "rxjs": "5.0.0-beta.11",
+    "moment": "^2.15.0",
+    "ng2-bootstrap": "^1.1.2",
+    "rxjs": "5.0.0-beta.12",
     "tether": "^1.3.7",
-    "zone.js": "^0.6.17"
+    "zone.js": "^0.6.21"
   },
   "devDependencies": {
     "@types/jasmine": "^2.2.33",
     "@types/jquery": "^1.10.31",
     "@types/lodash": "4.14.34",
     "@types/node": "^6.0.38",
     "@types/source-map": "^0.1.26",
-    "@types/webpack": "^1.12.33",
+    "@types/webpack": "^1.12.34",
     "angular2-hmr": "~0.8.1",
     "angular2-template-loader": "^0.5.0",
     "autoprefixer": "^6.4.1",
     "awesome-typescript-loader": "2.2.4",
-    "bootstrap-loader": "2.0.0-beta.10",
+    "bootstrap-loader": "2.0.0-beta.11",
     "codelyzer": "^0.0.28",
     "copy-webpack-plugin": "^3.0.1",
     "css-loader": "^0.25.0",
+    "exports-loader": "^0.6.3",
     "extract-text-webpack-plugin": "^2.0.0-beta.3",
     "file-loader": "^0.9.0",
     "font-awesome-sass-loader": "^1.0.2",
@@ -80,15 +81,15 @@
     "istanbul-instrumenter-loader": "^0.2.0",
     "jasmine-core": "^2.5.1",
     "json-loader": "^0.5.4",
-    "karma": "^1.2.0",
+    "karma": "^1.3.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-coverage": "^1.1.1",
     "karma-jasmine": "^1.0.2",
     "karma-mocha-reporter": "^2.1.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.8.0",
     "node-sass": "^3.9.3",
-    "postcss-loader": "^0.11.1",
+    "postcss-loader": "^0.13.0",
     "raw-loader": "^0.5.1",
     "remap-istanbul": "^0.6.4",
     "resolve": "^1.1.7",

frontend/src/vendor.ts

@@ -7,11 +7,9 @@ import '@angular/forms';
 import '@angular/http';
 import '@angular/router';
 
-// rxjs
 import 'rxjs';
-
 import 'jquery';
-//import 'bootstrap-loader';
+import 'bootstrap-loader';
 import 'font-awesome-sass-loader';
 import 'lodash';