Skip to content
This repository was archived by the owner on Sep 28, 2020. It is now read-only.

Commit fd40172

Browse files
committed
Fix test for webpack@1
1 parent 966157c commit fd40172

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

test/utils/conf.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var path = require("path")
22

33
var webpack = require("webpack")
4+
var webpackVersion = require("./version.js")
45
var assign = require("object-assign")
56

67
var DEFAULT_CONFIG = {
@@ -40,7 +41,7 @@ module.exports = function conf(webpackConf, loaderConf) {
4041
// config object
4142
// webpack v2 requires them to be added via the LoaderOptionsPlugin
4243
return assign(DEFAULT_CONFIG, webpackConf,
43-
process.env.WEBPACK_VERSION === "1" ?
44+
webpackVersion === "1" ?
4445
loaderConf : {
4546
plugins: [
4647
new webpack.LoaderOptionsPlugin({

test/utils/version.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
var webpack = require("webpack/package.json").version
2+
module.exports = webpack[0]

test/utils/weird-prefix.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
module.exports = "(Emitted value instead of an instance of Error) "
1+
var webpackVersion = require("./version.js")
2+
3+
module.exports = (
4+
webpackVersion === "2"
5+
? "(Emitted value instead of an instance of Error) "
6+
: ""
7+
)

0 commit comments

Comments
 (0)