diff --git a/config/webpack.common.js b/config/webpack.common.js index 7286ea7..97fb30c 100644 --- a/config/webpack.common.js +++ b/config/webpack.common.js @@ -2,7 +2,6 @@ const path = require('path'); const webpack = require('webpack'); const HtmlWebpackPlugin = require('html-webpack-plugin'); - module.exports = { entry: './src/app.js', output: { @@ -26,22 +25,22 @@ module.exports = { loaders: [ { test: /\.js$/, loader: 'babel-loader', exclude: /node_modules/ }, { test: /\.css$/, loader: 'style-loader!css-loader' }, - { test: /\.scss$/, loaders: ['style', 'css?sourceMap', 'sass?sourceMap']}, - { test: /\.html$/, loader: 'raw' }, + { test: /\.scss$/, loaders: ['style-loader', 'css-loader?sourceMap', 'sass-loader?sourceMap']}, + { test: /\.html$/, loader: 'raw-loader' }, { test: /\.jade$/, loader: 'jade-loader' }, // inline base64 URLs for <=8k images, direct URLs for the rest { test: /\.(png|jpg)$/, loader: 'url-loader?limit=8192'}, // helps to load bootstrap's css. { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, - loader: 'url?limit=10000&minetype=application/font-woff' }, + loader: 'url-loader?limit=10000&minetype=application/font-woff' }, { test: /\.woff2$/, - loader: 'url?limit=10000&minetype=application/font-woff' }, + loader: 'url-loader?limit=10000&minetype=application/font-woff' }, { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, - loader: 'url?limit=10000&minetype=application/octet-stream' }, + loader: 'url-loader?limit=10000&minetype=application/octet-stream' }, { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, - loader: 'file' }, + loader: 'file-loader' }, { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, - loader: 'url?limit=10000&minetype=image/svg+xml' } + loader: 'url-loader?limit=10000&minetype=image/svg+xml' } ] }, devtool: 'eval-source-map' diff --git a/src/components/contact/contact.form.js b/src/components/contact/contact.form.js index 38c2401..87bbc37 100644 --- a/src/components/contact/contact.form.js +++ b/src/components/contact/contact.form.js @@ -2,10 +2,10 @@ import angular from 'angular'; import uiRouter from 'angular-ui-router'; import contactFormComponent from './contact.form.component'; import 'angular-sanitize'; -require('script!tv4/tv4.js'); -require('script!objectpath/lib/ObjectPath'); -require('script!angular-schema-form/dist/schema-form'); -require('script!angular-schema-form/dist/bootstrap-decorator'); +require('script-loader!tv4/tv4.js'); +require('script-loader!objectpath/lib/ObjectPath'); +require('script-loader!angular-schema-form/dist/schema-form'); +require('script-loader!angular-schema-form/dist/bootstrap-decorator'); // XXX: regular import do not work! // import schemaForm from 'angular-schema-form/dist/schema-form'; // import 'angular-schema-form/dist/bootstrap-decorator'; diff --git a/src/components/forms/forms.js b/src/components/forms/forms.js index f270cda..52673e8 100644 --- a/src/components/forms/forms.js +++ b/src/components/forms/forms.js @@ -5,7 +5,7 @@ import formsComponent from './forms.component'; import 'tv4'; import 'objectpath'; import schemaForm from 'angular-schema-form'; -import 'script!angular-schema-form-bootstrap'; +import 'script-loader!angular-schema-form-bootstrap'; let formsModule = angular.module('forms', [ schemaForm.name,