update package

Author: David Narbutovich

CHANGELOG.md

@@ -0,0 +1,6 @@
+# Change Log
+
+## 2.0.0
+* deprecated node@4.x.x
+* deprecated webpack@1.x.x
+* added `sourceMap: true|false` options 

README.md

@@ -8,9 +8,12 @@ A [group-css-media-queries](https://github.com/Se7enSky/group-css-media-queries)
 
 
 ## Install
-`npm i -D group-css-media-queries-loader` or `yarn add --dev group-css-media-queries-loader`
-
+```bash
+yarn add -D group-css-media-queries-loader
 
+# for webpack@1
+yarn add -D group-css-media-queries-loader@1
+```
 
 
 ## Usage
@@ -29,7 +32,15 @@ module.exports = {
         use: [
           'style-loader',
           'css-loader',
-          'group-css-media-queries-loader'
+          
+          'group-css-media-queries-loader',
+          // or with config
+          {
+            loader: 'group-css-media-queries-loader',
+            options: {
+              sourceMap: true
+            }
+          }
         ]
       }
     ]
@@ -43,7 +54,7 @@ module.exports = {
 import css_min from 'style.css';
 ```
 
-### CLI
+#### CLI
 
 ```bash
 webpack --module-bind 'css=style-loader!css-loader!group-css-media-queries-loader'
@@ -54,28 +65,16 @@ webpack --module-bind 'css=style-loader!css-loader!group-css-media-queries-loade
 import css_min from 'style.css';
 ```
 
-### Inline
+#### Inline
 
 **In your application**
 ```js
 import css_min from 'style-loader!css-loader!group-css-media-queries-loader!./style.css';
 ```
 
 
-**Examples (for webpack 1.x):**
-**webpack.config.js**
-```js
-module: {
-  loaders: [{
-    test: /\.css$/,
-    loader: 'css!group-css-media-queries'
-  }]
-}
-```
-**In your application**
-```js
-var css = require('!raw!group-css-media-queries!./file.css'); // Just the CSS
-var css = require('!css!group-css-media-queries!./file.css'); // CSS with processed url(...)s
-```
+## Options
 
+#### __`sourceMap`__ boolean `true` or `false`
 
+Enable CSS source maps.

index.js

@@ -0,0 +1,92 @@
+'use strict';
+
+var indexOf = Array.prototype.indexOf;
+var parseCss = require('css').parse;
+var stringifyCss = require('css').stringify;
+
+module.exports = function (css, options) {
+    var emToPxRatio, i, intervalRules, len, m, media, mediaRules, medias, onlyMaxRules, onlyMinRules, otherRules,
+        parsed, ref, rootRules, rule, rules;
+    parsed = parseCss(css, {source: options.source});
+    medias = {};
+    rootRules = [];
+    ref = parsed.stylesheet.rules;
+    for (i = 0, len = ref.length; i < len; i++) {
+        rule = ref[i];
+        if (rule.type === 'media') {
+            if (!medias[rule.media]) {
+                medias[rule.media] = [];
+            }
+            medias[rule.media] = medias[rule.media].concat(rule.rules);
+        } else {
+            rootRules.push(rule);
+        }
+    }
+    mediaRules = [];
+    for (media in medias) {
+        rules = medias[media];
+        rule = {
+            type: "media",
+            media: media,
+            rules: rules
+        };
+        if (media.indexOf("min-width") !== -1) {
+            m = media.match(/min-width:\s*(\d+)(px|em)?/);
+            if (m && m[1]) {
+                rule.minWidth = parseInt(m[1]);
+            }
+            if (m[2]) {
+                rule.unit = m[2];
+            }
+        }
+        if (media.indexOf("max-width") !== -1) {
+            m = media.match(/max-width:\s*(\d+)(px|em)?/);
+            if (m && m[1]) {
+                rule.maxWidth = parseInt(m[1]);
+            }
+            if (m[2]) {
+                rule.unit = m[2];
+            }
+        }
+        mediaRules.push(rule);
+    }
+    onlyMinRules = mediaRules.filter(function (rule) {
+        return rule.minWidth != null && rule.maxWidth == null;
+    });
+    onlyMaxRules = mediaRules.filter(function (rule) {
+        return rule.maxWidth != null && rule.minWidth == null;
+    });
+    intervalRules = mediaRules.filter(function (rule) {
+        return rule.minWidth != null && rule.maxWidth != null;
+    });
+    otherRules = mediaRules.filter(function (rule) {
+        return indexOf.call(onlyMinRules.concat(onlyMaxRules).concat(intervalRules), rule) < 0;
+    });
+    emToPxRatio = 16;
+    onlyMinRules.sort(function (a, b) {
+        var aPxValue, bPxValue;
+        aPxValue = a.minWidth;
+        bPxValue = b.minWidth;
+        if (a.unit === 'em') {
+            aPxValue *= emToPxRatio;
+        }
+        if (b.unit === 'em') {
+            bPxValue *= emToPxRatio;
+        }
+        return aPxValue - bPxValue;
+    });
+    onlyMaxRules.sort(function (a, b) {
+        var aPxValue, bPxValue;
+        aPxValue = a.maxWidth;
+        bPxValue = b.maxWidth;
+        if (a.unit === 'em') {
+            aPxValue *= emToPxRatio;
+        }
+        if (b.unit === 'em') {
+            bPxValue *= emToPxRatio;
+        }
+        return bPxValue - aPxValue;
+    });
+    parsed.stylesheet.rules = rootRules.concat(onlyMinRules).concat(onlyMaxRules).concat(intervalRules).concat(otherRules);
+    return stringifyCss(parsed, {sourcemap: options.sourceMap});
+};

lib/group-css-media-queries.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var loaderUtils = require("loader-utils");
+
+const getOptions = loaderUtils.getOptions;
+
+const GroupCssMediaQueries = require("./group-css-media-queries");
+
+function GroupCssMediaQueriesLoader(css, ownMap, meta) {
+    var _ref = getOptions(this) || {},
+        _ref$sourceMap = _ref.sourceMap;
+
+    const sourceMap = _ref$sourceMap === undefined ? this.sourceMap : _ref$sourceMap;
+
+    const callback = this.async();
+    const source = this.resourcePath;
+
+    setTimeout(() => {
+        try {
+            const result = GroupCssMediaQueries(css, { source, sourceMap });
+            if (sourceMap) {
+                const code = result.code,
+                    map = result.map;
+
+
+                return callback(null, code, map, meta);
+            }
+            return callback(null, result, ownMap, meta);
+        } catch (error) {
+            callback(error);
+        }
+    }, 0);
+}
+
+module.exports = GroupCssMediaQueriesLoader;

lib/index.js

@@ -1,7 +1,8 @@
 {
   "name": "group-css-media-queries-loader",
-  "version": "1.0.4",
-  "main": "index.js",
+  "version": "2.0.0-alpha-0",
+  "main": "lib/index.js",
+  "files": ["lib"],
   "keywords": [
     "webpack",
     "loader",
@@ -19,8 +20,15 @@
   "bugs": {
     "url": "https://github.com/retyui/group-css-media-queries-loader/issues"
   },
+  "peerDependencies": {
+    "webpack": ">=2.0.0"
+  },
+  "engines": {
+    "node": ">=6.11.0"
+  },
   "homepage": "https://github.com/retyui/group-css-media-queries-loader",
   "dependencies": {
-    "group-css-media-queries": "^1.4.1"
+    "css": "^2.2.3",
+    "loader-utils": "^1.1.0"
   }
 }