Skip to content

Commit

Permalink
fix(webpack): upgrade to beta.25
Browse files Browse the repository at this point in the history
  • Loading branch information
dignifiedquire committed Sep 22, 2016
1 parent 2a515f4 commit 01ae928
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 34 deletions.
5 changes: 5 additions & 0 deletions config/custom.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict'

module.exports = {
timeout: 80 * 1000
}
2 changes: 1 addition & 1 deletion config/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const path = require('path')
const webpackConfig = require('./webpack')
const timeout = webpackConfig.timeout
const timeout = require('./custom').timeout

const browsers = []

Expand Down
10 changes: 4 additions & 6 deletions config/webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ const shared = {
}, {
test: /\.json$/,
loader: 'json'
}],
preLoaders: [{
}, {
test: /\.js$/,
loader: 'transform?brfs'
loader: 'transform?brfs',
enforce: 'pre'
}]
},
externals: {
Expand All @@ -115,15 +115,13 @@ const shared = {
node: {
Buffer: true
},
timeout: 80000,
plugins: [
new webpack.DefinePlugin({'fs.writeSync': false})
]
}

const dev = merge(shared, {
devtool: 'inline-source-map',
debug: true
devtool: 'inline-source-map'
}, specific)

module.exports = dev
44 changes: 22 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,57 +25,57 @@
"license": "MIT",
"dependencies": {
"args-parser": "^1.0.2",
"babel-core": "^6.11.4",
"babel-loader": "^6.2.4",
"babel-polyfill": "^6.9.1",
"babel-preset-es2015": "^6.9.0",
"babel-core": "^6.14.0",
"babel-loader": "^6.2.5",
"babel-polyfill": "^6.13.0",
"babel-preset-es2015": "^6.14.0",
"brfs": "^1.4.3",
"chalk": "^1.1.3",
"conventional-github-releaser": "^1.1.3",
"coveralls": "^2.11.12",
"eslint": "^3.2.0",
"eslint-config-standard": "^6.0.0",
"eslint-plugin-promise": "^2.0.0",
"coveralls": "^2.11.14",
"eslint": "^3.5.0",
"eslint-config-standard": "^6.0.1",
"eslint-plugin-promise": "^2.0.1",
"eslint-plugin-standard": "^2.0.0",
"gulp": "^3.9.1",
"gulp-babel": "^6.1.2",
"gulp-bump": "^2.2.0",
"gulp-bump": "^2.4.0",
"gulp-conventional-changelog": "^1.1.0",
"gulp-eslint": "^3.0.1",
"gulp-filter": "^4.0.0",
"gulp-git": "^1.10.0",
"gulp-git": "^1.11.3",
"gulp-load-plugins": "1.3.0",
"gulp-load-tasks": "^0.8.4",
"gulp-rename": "^1.2.2",
"gulp-require-tasks": "^1.0.3",
"gulp-require-tasks": "^1.0.5",
"gulp-size": "^2.1.0",
"gulp-spawn-mocha": "^3.0.0",
"gulp-spawn-mocha": "^3.1.0",
"gulp-tag-version": "^1.3.0",
"gulp-uglify": "^2.0.0",
"gulp-util": "^3.0.7",
"https-browserify": "0.0.1",
"istanbul": "^0.4.4",
"istanbul": "^0.4.5",
"json-loader": "^0.5.4",
"karma": "^1.1.2",
"karma": "^1.3.0",
"karma-chrome-launcher": "^2.0.0",
"karma-firefox-launcher": "^1.0.0",
"karma-mocha": "^1.1.1",
"karma-mocha-own-reporter": "^1.1.2",
"karma-phantomjs-launcher": "^1.0.1",
"karma-phantomjs-launcher": "^1.0.2",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^1.7.0",
"lodash": "^4.14.1",
"mocha": "^3.0.0",
"phantomjs-prebuilt": "^2.1.10",
"karma-webpack": "^1.8.0",
"lodash": "^4.16.1",
"mocha": "^3.0.2",
"phantomjs-prebuilt": "^2.1.12",
"pretty-hrtime": "^1.0.2",
"require-dir": "^0.3.0",
"rimraf": "^2.5.4",
"run-sequence": "^1.2.2",
"semver": "^5.3.0",
"signal-exit": "^3.0.0",
"stream-http": "^2.3.1",
"signal-exit": "^3.0.1",
"stream-http": "^2.4.0",
"transform-loader": "^0.2.3",
"webpack": "^2.1.0-beta.20",
"webpack": "^2.1.0-beta.25",
"webpack-merge": "^0.14.1"
},
"repository": {
Expand Down
1 change: 0 additions & 1 deletion tasks/build/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ module.exports = {
c.output.filename = 'index.js'
c.output.path = path.resolve('dist')
c.devtool = 'source-map'
c.debug = false
c.plugins.push(
new webpack.optimize.DedupePlugin()
)
Expand Down
4 changes: 2 additions & 2 deletions tasks/coverage.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const $ = require('gulp-load-plugins')()

const utils = require('../src/utils')
const config = require('../config/webpack')
const timeout = require('../config/custom').timeout

module.exports = {
fn (gulp, done) {
Expand All @@ -14,7 +14,7 @@ module.exports = {
], {read: false})
.pipe($.spawnMocha({
istanbul: true,
timeout: config.timeout
timeout: timeout
}))
})

Expand Down
4 changes: 2 additions & 2 deletions tasks/test/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const $ = require('gulp-load-plugins')()

const utils = require('../../src/utils')
const config = require('../../config/webpack')
const timeout = require('../../config/custom').timeout

module.exports = {
fn (gulp, done) {
Expand All @@ -14,7 +14,7 @@ module.exports = {
], {read: false})
.pipe($.spawnMocha({
R: 'spec',
timeout: config.timeout
timeout: timeout
}))
})

Expand Down

0 comments on commit 01ae928

Please sign in to comment.