Merge pull request #134 from mzgoddard/bump-deps

Bump most deps greenkeeper has brought up

Author: mzgoddard

.travis.yml

@@ -1,20 +1,17 @@
 language: node_js
-node_js:
-  - "7"
-  - "4"
 
-env:
-  matrix:
-    - WEBPACK_VERSION=1 EXTRACT_TEXT_VERSION=1
-    - WEBPACK_VERSION=2 EXTRACT_TEXT_VERSION=2
 matrix:
   fast_finish: true
-  allow_failures:
-    - node_js: "4"
-      env: WEBPACK_VERSION=2 EXTRACT_TEXT_VERSION=2
+  include:
+    - node_js: 7
+      env: WEBPACK_VERSION=1 EXTRACT_TEXT_VERSION=1 BABEL_LOADER=6 FILE_LOADER=0.10
+    - node_js: 7
+      env: WEBPACK_VERSION=2 EXTRACT_TEXT_VERSION=2 BABEL_LOADER=7 FILE_LOADER=0.11
+    - node_js: 4
+      env: WEBPACK_VERSION=1 EXTRACT_TEXT_VERSION=1 BABEL_LOADER=6 FILE_LOADER=0.10
+
 before_script:
-  - npm rm webpack extract-text-webpack-plugin
-  - npm install webpack@$WEBPACK_VERSION extract-text-webpack-plugin@$EXTRACT_TEXT_VERSION
+  - npm install webpack@$WEBPACK_VERSION extract-text-webpack-plugin@$EXTRACT_TEXT_VERSION file-loader@$FILE_LOADER
 cache:
   directories:
     - node_modules

appveyor.yml

@@ -4,20 +4,26 @@ environment:
     - nodejs_version: "4"
       webpack_version: "1"
       extract_text_version: "1"
+      babel_loader_version: "6"
+      file_loader_version: "0.10"
     - nodejs_version: "6"
       webpack_version: "2"
       extract_text_version: "2"
+      babel_loader_version: "7"
+      file_loader_version: "0.11"
     - nodejs_version: "7"
       webpack_version: "2"
       extract_text_version: "2"
+      babel_loader_version: "7"
+      file_loader_version: "0.10"
 
 # Install scripts. (runs after repo cloning)
 install:
   # Get the latest stable version of Node.js or io.js
   - ps: Install-Product node $env:nodejs_version
   # install modules
   - npm install
-  - npm install webpack@%webpack_version% extract-text-webpack-plugin@%extract_text_version%
+  - npm install webpack@%webpack_version% extract-text-webpack-plugin@%extract_text_version% babel-loader@%babel_loader_version% file-loader@%file_loader_version%
 
 # Post-install test scripts.
 test_script:

lib/hard-source.js

@@ -10,7 +10,14 @@ var fromStringWithSourceMap = require('source-list-map').fromStringWithSourceMap
 module.exports = HardSource;
 
 function HardSource(cacheItem) {
-  RawSource.call(this, cacheItem.source);
+  Object.setPrototypeOf(this,
+    Object.setPrototypeOf(
+      new RawSource(cacheItem.source),
+      HardSource.prototype
+    )
+  );
+
+  // RawSource.call(this, cacheItem.source);
   this.cacheItem = cacheItem;
 }
 HardSource.prototype = Object.create(RawSource.prototype);

package.json

@@ -25,19 +25,19 @@
   "license": "ISC",
   "devDependencies": {
     "chai": "^3.5.0",
-    "css-loader": "^0.26.1",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.10.1",
+    "css-loader": "^0.27.0",
+    "extract-text-webpack-plugin": "^2.0.0 || ^1.0.1",
+    "file-loader": "^0.11.0 || ^0.10.1",
     "html-webpack-plugin": "^2.22.0",
     "memory-fs": "^0.4.1",
     "mocha": "^3.0.2",
     "rimraf": "^2.5.4",
-    "style-loader": "^0.13.1",
-    "webpack": "^1.13.1",
+    "style-loader": "^0.14.0",
+    "webpack": "^3.0.0 || ^3.0.0-rc.0 || ^2.1.0 || ^1.13.1",
     "webpack-isomorphic-tools": "^3.0.0"
   },
   "peerDependencies": {
-    "webpack": ">=1.13.1 || ^2.1.0-beta || ^2.2.0-rc || ^2.2.0"
+    "webpack": "*"
   },
   "dependencies": {
     "bluebird": "^3.0.0",
@@ -48,6 +48,6 @@
     "source-list-map": "^0.1.6",
     "source-map": "^0.5.6",
     "webpack-core": "~0.6.0",
-    "webpack-sources": "^0.1.2"
+    "webpack-sources": "^1.0.1"
   }
 }

tests/fixtures/base-context-move/webpack.config.js

@@ -7,7 +7,7 @@ var ifWebpack1 = function(obj) {
 };
 
 var ifWebpack2 = function(obj) {
-  if (require('webpack/package.json').version[0] === '2') {
+  if (require('webpack/package.json').version[0] !== '1') {
     return obj;
   }
 };

tests/util/webpack-if.js

@@ -8,7 +8,7 @@ exports.webpack1 = function(obj, elseObj) {
 };
 
 exports.webpack2 = function(obj, elseObj) {
-  if (require('webpack/package.json').version[0] === '2') {
+  if (require('webpack/package.json').version[0] !== '1') {
     return obj;
   }
   else {