Skip to content

Bump most deps greenkeeper has brought up #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 7 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 8 additions & 1 deletion lib/hard-source.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
2 changes: 1 addition & 1 deletion tests/fixtures/base-context-move/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
};
Expand Down
2 changes: 1 addition & 1 deletion tests/util/webpack-if.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down