yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 18:29:17 +02:00
Code Issues Releases Wiki Activity

Update dependencies. Fix npm 3 flattened paths for our webpack middleware.

Browse source
This commit is contained in:
Gunther Brunner 2015-10-09 16:31:59 +09:00
parent 58e25c0f65
commit b95ec55e3e
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bower.json
View file

@ -25,12 +25,12 @@
"angular-elastic": "~2.5.1", "angular-elastic": "~2.5.1",
"angular-hotkeys": "chieffancypants/angular-hotkeys#~1.6.0", "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.6.0",
"angular-borderlayout": "git://github.com/filearts/angular-borderlayout.git#7c9716aebd9260763f798561ca49d6fbfd4a5c67", "angular-borderlayout": "git://github.com/filearts/angular-borderlayout.git#7c9716aebd9260763f798561ca49d6fbfd4a5c67",
"angular-ui-bootstrap": "~0.13.4", "angular-ui-bootstrap": "~0.14.0",
"ng-context-menu": "~1.0.2", "ng-context-menu": "~1.0.2",
"components-font-awesome": "~4.4.0", "components-font-awesome": "~4.4.0",
"epoch": "~0.6.0", "epoch": "~0.6.0",
"ng-epoch": "~1.0.7", "ng-epoch": "~1.0.7",
"eventEmitter": "~4.2.11", "eventEmitter": "~4.3.0",
"angular-ladda": "~0.3.1", "angular-ladda": "~0.3.1",
"d3": "~3.5.6", "d3": "~3.5.6",
"spin.js": "~2.3.2" "spin.js": "~2.3.2"
@ -42,8 +42,6 @@
"resolutions": { "resolutions": {
"angular": "~1.5.0", "angular": "~1.5.0",
"d3": "~3.5.5", "d3": "~3.5.5",
"spin.js": "~2.3.2", "spin.js": "~2.3.2"
"angular-bootstrap": "~0.13.4",
"angular-cookies": "~1.5.0"
} }
} }

2
lib/units/app/middleware/webpack.js
View file

@ -5,7 +5,7 @@ var webpack = require('webpack')
var mime = require('mime') var mime = require('mime')
var Promise = require('bluebird') var Promise = require('bluebird')
var _ = require('lodash') var _ = require('lodash')
var MemoryFileSystem = require('webpack/node_modules/memory-fs') var MemoryFileSystem = require('memory-fs')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
var lifecycle = require('../../../util/lifecycle') var lifecycle = require('../../../util/lifecycle')

7
package.json
View file

@ -86,7 +86,7 @@
"bower": "^1.5.2", "bower": "^1.5.2",
"chai": "^3.2.0", "chai": "^3.2.0",
"css-loader": "^0.19.0", "css-loader": "^0.19.0",
"del": "^1.2.1", "del": "^2.0.1",
"event-stream": "^3.3.0", "event-stream": "^3.3.0",
"exports-loader": "^0.6.2", "exports-loader": "^0.6.2",
"extract-text-webpack-plugin": "^0.8.2", "extract-text-webpack-plugin": "^0.8.2",
@ -121,10 +121,11 @@
"karma-webpack": "^1.6.0", "karma-webpack": "^1.6.0",
"less": "^2.4.0", "less": "^2.4.0",
"less-loader": "^2.1.0", "less-loader": "^2.1.0",
"memory-fs": "^0.2.0",
"node-libs-browser": "^0.5.2", "node-libs-browser": "^0.5.2",
"node-sass": "^3.3.3", "node-sass": "^3.3.3",
"phantomjs": "^1.9.18", "phantomjs": "^1.9.18",
"protractor": "^2.2.0", "protractor": "^2.5.1",
"protractor-html-screenshot-reporter": "0.0.21", "protractor-html-screenshot-reporter": "0.0.21",
"raw-loader": "^0.5.1", "raw-loader": "^0.5.1",
"run-sequence": "^1.1.2", "run-sequence": "^1.1.2",
@ -136,7 +137,7 @@
"style-loader": "^0.12.3", "style-loader": "^0.12.3",
"template-html-loader": "^0.0.3", "template-html-loader": "^0.0.3",
"url-loader": "^0.5.5", "url-loader": "^0.5.5",
"webpack": "^1.12.0", "webpack": "^1.12.2",
"webpack-dev-server": "^1.7.0" "webpack-dev-server": "^1.7.0"
}, },
"engines": { "engines": {