Merge pull request #14 from metalabdesign/move-raw-source-out

Further updates for `webpack@2`.

Author: izaakschroeder

.travis.yml

@@ -1,33 +1,20 @@
 sudo: false
 language: node_js
+node_js:
+  - 4
+  - 5
+  - 6
+env:
+  - USE_WEBPACK2=false
+  - USE_WEBPACK2=true
 matrix:
-  include:
-    # Run tests in Node.js 0.12
-    - node_js: '0.12'
-
-    # Run tests in Node.js 4.x
-    - node_js: '4'
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - gcc-4.8
-            - g++-4.8
-
-    # Run tests in Node.js 5.x
-    - node_js: '5'
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - gcc-4.8
-            - g++-4.8
+  exclude:
+    # TODO: Fix barf on peer dependencies with npm@2.
+    - env: USE_WEBPACK2=true
+      node_js: 4
 
 before_install:
-  # Use GCC 4.8 if it's available
-  - 'if [ ! `which gcc-4.8` == "" ]; then export CXX=g++-4.8 && export CC=gcc-4.8; fi'
+  - 'if [ "${USE_WEBPACK2}" == "true" ]; then npm install --save-dev webpack@2.1.0-beta.19 extract-text-webpack-plugin@2.0.0-beta.4; fi'
 
 after_script:
   - npm install coveralls

example/basic/webpack.config.js

@@ -12,7 +12,12 @@ module.exports = {
   module: {
     loaders: [{
       test: /\.css$/,
-      loader: ExtractTextPlugin.extract('style-loader', 'css-loader'),
+      loader: ExtractTextPlugin.extract.length !== 1 ?
+        ExtractTextPlugin.extract('style-loader', 'css-loader') :
+        ExtractTextPlugin.extract({
+          fallbackLoader: 'style-loader',
+          loader: 'css-loader',
+        }),
     }],
   },
   devtool: 'source-map',

src/index.js

@@ -1,7 +1,6 @@
 import postcss from 'postcss';
 import chunk from './chunk';
-import {SourceMapSource} from 'webpack-sources';
-import RawSource from 'webpack/lib/RawSource';
+import {SourceMapSource, RawSource} from 'webpack-sources';
 import {interpolateName} from 'loader-utils';
 
 /**

test/spec/index.spec.js

@@ -8,6 +8,15 @@ import {expect} from 'chai';
 const basic = path.join('.', 'basic', 'index.js');
 const less = path.join('.', 'less', 'index.js');
 
+const extract = ExtractTextPlugin.extract.length !== 1 ?
+  (a, b) => ExtractTextPlugin.extract(a, b) :
+  (fallbackLoader, loader) => loader ? ExtractTextPlugin.extract({
+    fallbackLoader,
+    loader,
+  }) : ExtractTextPlugin.extract({
+    loader: fallbackLoader,
+  });
+
 const config = (options, entry = basic, extra) => {
   return {
     entry: path.join(__dirname, '..', '..', 'example', entry),
@@ -20,13 +29,13 @@ const config = (options, entry = basic, extra) => {
     module: {
       loaders: [{
         test: /\.css$/,
-        loader: ExtractTextPlugin.extract(
+        loader: extract(
           'style-loader',
           'css-loader?sourceMap'
         ),
       }, {
         test: /\.less$/,
-        loader: ExtractTextPlugin.extract(
+        loader: extract(
           'css?-url&-autoprefixer&sourceMap!less?sourceMap'
         ),
       }],