Skip to content

Commit

Permalink
v1.2.13
Browse files Browse the repository at this point in the history
  • Loading branch information
zack9433 committed Aug 26, 2016
2 parents 6a06385 + b9f1886 commit 300cc19
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion dist/sanji-utils-ui.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "sanji-utils-ui",
"author": "Zack Yang <zack9433@gmail.com> (https://github.com/zack9433)",
"description": "sanji-utils-ui",
"version": "1.2.12",
"version": "1.2.13",
"main": "dist/sanji-utils-ui.js",
"config": {
"commitizen": {
Expand All @@ -18,40 +18,41 @@
"semantic-release": "semantic-release pre && npm publish && npm run publish-latest && semantic-release post"
},
"devDependencies": {
"autoprefixer": "^6.4.0",
"angular-animate": "~1.5.7",
"angular-aria": "~1.5.7",
"angular-material": "~1.0.2",
"angular-material": "~1.1.0",
"angular-sanji-window": "~2.1.0",
"autoprefixer-loader": "~3.2.0",
"babel-core": "^6.0.0",
"babel-eslint": "^6.0.4",
"babel-loader": "^6.0.0",
"babel-preset-es2015": "^6.0.0",
"commitizen": "^2.8.0",
"css-loader": "~0.23.1",
"css-loader": "~0.24.0",
"cz-conventional-changelog": "^1.1.5",
"eslint": "^2.0.0",
"eslint": "^3.3.0",
"eslint-loader": "^1.3.0",
"extract-text-webpack-plugin": "2.0.0-beta.2",
"extract-text-webpack-plugin": "^2.0.0-beta.2",
"file-loader": "~0.9.0",
"html-webpack-plugin": "~2.22.0",
"jquery": "~2.2.0",
"ng-cache-loader": "~0.0.15",
"node-bourbon": "~4.2.3",
"node-sass": "~3.8.0",
"postcss-loader": "~0.10.0",
"progress-bar-webpack-plugin": "^1.9.0",
"publish-latest": "~1.1.2",
"raw-loader": "~0.5.1",
"sass-loader": "~4.0.0",
"semantic-release": "^4.3.5",
"style-loader": "~0.13.0",
"url-loader": "~0.5.7",
"webpack": "2.1.0-beta.19",
"webpack-dev-server": "2.1.0-beta.0",
"webpack-notifier": "~1.3.0"
"webpack": "^2.1.0-beta.19",
"webpack-dev-server": "^2.1.0-beta.0"
},
"peerDependencies": {
"angular": "~1.5.0",
"angular-ui-router": "~0.2.15",
"angular-ui-router": "1.0.0-beta.1",
"angular-socket-io": "~0.7.0",
"angular-http-auth": "~1.3.0",
"angular-local-storage": "~0.2.7",
Expand Down
2 changes: 2 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

var path = require('path');
var webpack = require('webpack');
var ProgressBarPlugin = require('progress-bar-webpack-plugin');
var NODE_ENV = process.env.NODE_ENV;
var nodeRoot = path.join(__dirname, 'node_modules');
var appRoot = path.join(__dirname, 'app');
Expand Down Expand Up @@ -32,6 +33,7 @@ var config = {
noParse: []
},
plugins: [
new ProgressBarPlugin(),
new webpack.DefinePlugin({
__TEST__: 'test' === NODE_ENV,
__DEV__: 'development' === NODE_ENV,
Expand Down
8 changes: 3 additions & 5 deletions webpack.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

var webpack = require('webpack');
var autoprefixer = require('autoprefixer');
var WebpackNotifierPlugin = require('webpack-notifier');
var HtmlWebpackPlugin = require('html-webpack-plugin');
var bourbon = require('node-bourbon').includePaths;
var config = require('./webpack.config.js');
Expand All @@ -19,9 +18,9 @@ config.entry = {
]
};
config.module.loaders = [
{test: /\.scss/, loader: 'style!css!autoprefixer?browsers=last 2 versions!sass?includePaths[]=' + bourbon},
{test: /\.css$/, loader: 'style!css!autoprefixer?browsers=last 2 versions'},
{test: /\.(png|jpg|gif|jpeg)$/, loader: 'url-loader?limit=8192', exclude: /node_modules/},
{test: /\.scss/, loader: 'style!css!postcss!sass?includePaths[]=' + bourbon},
{test: /\.css$/, loader: 'style!css!postcss'},
{test: /\.(png|jpg|gif|jpeg)$/, loader: 'url?limit=8192', exclude: /node_modules/},
{test: /\.(woff|woff2)$/, loader: 'url?limit=10000&minetype=application/font-woff', exclude: /(node_modules)/},
{test: /\.(ttf|eot|svg)$/, loader: 'file', exclude: /(node_modules)/}
].concat(config.module.loaders);
Expand All @@ -30,7 +29,6 @@ config.postcss = [ autoprefixer({ browsers: ['last 2 versions'] }) ];

config.plugins.push(
new webpack.HotModuleReplacementPlugin(),
new WebpackNotifierPlugin({title: 'Webpack'}),
new HtmlWebpackPlugin({
template: 'index.html',
hash: true
Expand Down

0 comments on commit 300cc19

Please sign in to comment.