diff --git a/package.json b/package.json index 15f4493..9ea1586 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "repository": "git@bitbucket.org:ErickSkrauch/ely.by-account.git", "scripts": { "start": "rm -rf dist/ && webpack-dev-server --progress --colors", - "up": "npm update && cd ./webpack && npm update && cd ../scripts && npm update", + "up": "npm update", "test": "karma start ./karma.conf.js", "lint": "eslint ./src", "i18n": "cd ./scripts && ./node_modules/.bin/babel-node i18n-collect.js", @@ -84,10 +84,12 @@ "redux-devtools-dock-monitor": "^1.1.1", "redux-devtools-log-monitor": "^1.0.11", "sass-loader": "^4.0.0", + "scripts": "file:scripts", "sinon": "^1.15.3", "style-loader": "^0.13.0", "url-loader": "^0.5.7", "webpack": "^1.12.9", - "webpack-dev-server": "^1.14.0" + "webpack-dev-server": "^1.14.0", + "webpack-utils": "file:webpack-utils" } } diff --git a/webpack/cssUrl.js b/webpack-utils/cssUrl.js similarity index 100% rename from webpack/cssUrl.js rename to webpack-utils/cssUrl.js diff --git a/webpack/intl-loader.js b/webpack-utils/intl-loader.js similarity index 100% rename from webpack/intl-loader.js rename to webpack-utils/intl-loader.js diff --git a/webpack/node-sass-iconfont-importer.js b/webpack-utils/node-sass-iconfont-importer.js similarity index 100% rename from webpack/node-sass-iconfont-importer.js rename to webpack-utils/node-sass-iconfont-importer.js diff --git a/webpack/package.json b/webpack-utils/package.json similarity index 83% rename from webpack/package.json rename to webpack-utils/package.json index f7af96d..fe35d66 100644 --- a/webpack/package.json +++ b/webpack-utils/package.json @@ -1,5 +1,5 @@ { - "name": "webpack", + "name": "webpack-utils", "version": "1.0.0", "description": "", "keywords": [], diff --git a/webpack.config.js b/webpack.config.js index ddf4803..494663b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -6,9 +6,9 @@ var webpack = require('webpack'); var loaderUtils = require('loader-utils'); var ExtractTextPlugin = require('extract-text-webpack-plugin'); var HtmlWebpackPlugin = require('html-webpack-plugin'); -var cssUrl = require('./webpack/cssUrl'); +var cssUrl = require('webpack-utils/cssUrl'); var cssImport = require('postcss-import'); -var iconfontImporter = require('./webpack/node-sass-iconfont-importer'); +var iconfontImporter = require('webpack-utils/node-sass-iconfont-importer'); var vendor = Object.keys(require('./package.json').dependencies); @@ -196,7 +196,7 @@ var webpackConfig = { resolveLoader: { alias: { - intl: path.resolve('./webpack/intl-loader') + intl: path.resolve('webpack-utils/intl-loader') } },