Skip to content

update loaders to webpack 2.x specifics #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update loaders to webpack 2.x specifics #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions config/webpack.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions src/components/contact/contact.form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/components/forms/forms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down