Merge pull request #231 from muffinresearch/remove-rewire
Remove all traces of rewire packages
This commit is contained in:
Коммит
f749c999b8
|
@ -1,25 +1,19 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
/* This is the shared karma config */
|
/* This is the shared karma config */
|
||||||
|
|
||||||
var merge = require('lodash.merge');
|
var merge = require('lodash.merge');
|
||||||
var RewirePlugin = require('rewire-webpack');
|
|
||||||
var webpackConfig = require('./webpack.config');
|
var webpackConfig = require('./webpack.config');
|
||||||
|
|
||||||
|
|
||||||
var newWebpackConfig = merge({}, webpackConfig);
|
var newWebpackConfig = merge({}, webpackConfig);
|
||||||
// Remove the bits from the shared config
|
// Remove the bits from the shared config
|
||||||
// that we don't want for tests.
|
// that we don't want for tests.
|
||||||
delete newWebpackConfig.output;
|
delete newWebpackConfig.output;
|
||||||
delete newWebpackConfig.entry;
|
delete newWebpackConfig.entry;
|
||||||
|
|
||||||
// Add this just for testing:
|
newWebpackConfig.plugins = [];
|
||||||
newWebpackConfig.plugins = [
|
|
||||||
new RewirePlugin(),
|
|
||||||
];
|
|
||||||
|
|
||||||
// Expose the right kind of source map for test-loader.js
|
// Expose the right kind of source map for test-loader.js
|
||||||
newWebpackConfig.devtool= 'inline-source-map';
|
newWebpackConfig.devtool = 'inline-source-map';
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
basePath: '',
|
basePath: '',
|
||||||
|
|
|
@ -20,10 +20,11 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"babel-core": "5.8.3",
|
"babel-core": "5.8.3",
|
||||||
"babel-eslint": "3.1.26",
|
"babel-eslint": "4.0.5",
|
||||||
"babel-loader": "5.3.2",
|
"babel-loader": "5.3.2",
|
||||||
"chai": "3.0.0",
|
"chai": "3.0.0",
|
||||||
"cog": "git://github.com/muffinresearch/cog.git#87e7c4f3",
|
"cog": "git://github.com/muffinresearch/cog.git#87e7c4f3",
|
||||||
|
"eslint": "0.24.1",
|
||||||
"eslint-plugin-react": "3.0.0",
|
"eslint-plugin-react": "3.0.0",
|
||||||
"grunt": "0.4.5",
|
"grunt": "0.4.5",
|
||||||
"grunt-concurrent": "2.0.0",
|
"grunt-concurrent": "2.0.0",
|
||||||
|
@ -59,8 +60,6 @@
|
||||||
"node-libs-browser": "0.5.0",
|
"node-libs-browser": "0.5.0",
|
||||||
"payment-icons": "0.0.6",
|
"payment-icons": "0.0.6",
|
||||||
"react-hot-loader": "1.2.8",
|
"react-hot-loader": "1.2.8",
|
||||||
"rewire": "2.3.4",
|
|
||||||
"rewire-webpack": "1.0.0",
|
|
||||||
"sinon": "1.15.4",
|
"sinon": "1.15.4",
|
||||||
"webpack": "1.10.0",
|
"webpack": "1.10.0",
|
||||||
"webpack-dev-server": "1.10.1"
|
"webpack-dev-server": "1.10.1"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"env": {
|
"env": {
|
||||||
"browser": true,
|
"browser": true,
|
||||||
"es6": "true",
|
"es6": true,
|
||||||
},
|
},
|
||||||
"rules": {
|
"rules": {
|
||||||
"global-strict": 0,
|
"global-strict": 0,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче