Merge pull request #6 from retyui/next

Next

Author: David Narbutovich

.babelrc

@@ -4,7 +4,7 @@
       "@babel/preset-env",
       {
         "targets": {
-          "node": ["6.11.0"]
+          "node": "6.11.0"
         }
       }
     ]

.gitignore

@@ -1,5 +1,4 @@
 node_modules/
 lib/
 test/b.css
-.idea/
 yarn-error.log

.travis.yml

@@ -0,0 +1,9 @@
+sudo: false
+language: node_js
+node_js:
+  - "10"
+  - "8"
+install:
+  - yarn
+script:
+  - yarn test

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 
+## 3.0.0
+- Update babel
+- Update dependencies
+- Add test
+- Add CI
+
 ## 2.0.0
-* deprecated node@4.x.x
-* deprecated webpack@1.x.x
-* added `sourceMap: true|false` options (based on postcss)
+
+- deprecated node@4.x.x
+- deprecated webpack@1.x.x
+- added `sourceMap: true|false` options (based on postcss)

README.md

@@ -2,56 +2,56 @@
 
 A [group-css-media-queries](https://github.com/Se7enSky/group-css-media-queries) loader for [webpack](https://github.com/webpack/webpack).
 
-
 [![Open in npm](https://img.shields.io/npm/v/group-css-media-queries-loader.svg)](https://www.npmjs.com/package/group-css-media-queries-loader)
 [![Dependencies](https://img.shields.io/david/retyui/group-css-media-queries-loader.svg)](https://david-dm.org/retyui/group-css-media-queries-loader)
+[![AppVeyor](https://img.shields.io/appveyor/ci/retyui/group-css-media-queries-loader.svg?label=windows)](https://ci.appveyor.com/project/retyui/group-css-media-queries-loader)
+[![Travis](https://img.shields.io/travis/retyui/group-css-media-queries-loader.svg?label=unix)](https://travis-ci.org/retyui/group-css-media-queries-loader)
 [![count downloads group-css-media-queries-loader](https://img.shields.io/npm/dm/group-css-media-queries-loader.svg)](https://www.npmjs.com/package/group-css-media-queries-loader)
 
-
 ## Install
+
 ```bash
 yarn add -D group-css-media-queries-loader
 ```
 
-
-
 ## Usage
 
 Use the loader either via your webpack config, CLI or inline.
 
 ### Via webpack config (recommended)
 
 **webpack.config.js**
+
 ```js
 const sourceMap = true;
 
 module.exports = {
-  devtool: sourceMap && 'source-map',
+  devtool: sourceMap && "source-map",
   module: {
     rules: [
       {
         test: /\.css$/,
         use: [
-          'style-loader',
+          "style-loader",
           {
-            loader: 'css-loader',
+            loader: "css-loader",
             options: { sourceMap }
           },
           // 'group-css-media-queries-loader',
           // or with config
           {
-            loader: 'group-css-media-queries-loader',
+            loader: "group-css-media-queries-loader",
             options: { sourceMap }
           }
         ]
       }
     ]
   }
-}
+};
 ```
 
 ## Options
 
-#### __`sourceMap`__ boolean `true` or `false`
+#### **`sourceMap`** boolean `true` or `false`
 
 Enable CSS source maps.

appveyor.yml

@@ -0,0 +1,18 @@
+os: Visual Studio 2015
+platform: x64
+environment:
+  matrix:
+    - nodejs_version: "10"
+    - nodejs_version: "8"
+
+install:
+  - ps: Install-Product node $env:nodejs_version x64
+  - yarn install
+
+test_script:
+  - node --version
+  - yarn --version
+  - yarn test
+
+build: off
+deploy: off

package.json

@@ -1,24 +1,28 @@
 {
   "name": "group-css-media-queries-loader",
-  "version": "2.0.2",
+  "version": "3.0.0",
   "main": "lib/index.js",
   "files": [
     "lib"
   ],
   "dependencies": {
-    "loader-utils": "^1.1.0",
-    "postcss": "^6.0.0"
+    "loader-utils": "^1.1.0"
   },
   "peerDependencies": {
+    "postcss": ">=6.0.0",
     "webpack": ">=2.0.0"
   },
   "scripts": {
-    "build": "babel src --out-dir lib"
+    "prebuild": "rimraf ./lib",
+    "build": "babel src --out-dir lib",
+    "test": "npm run build && node ./test/test.js"
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0-beta.46",
-    "@babel/core": "^7.0.0-beta.46",
-    "@babel/preset-env": "^7.0.0-beta.46"
+    "@babel/cli": "^7.0.0",
+    "@babel/core": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "postcss": "^7.0.0",
+    "rimraf": "^2.6.2"
   },
   "engines": {
     "node": ">=6.11.0"

test/test.js

@@ -1,17 +1,27 @@
-const fs = require("fs");
+const { readFileSync, writeFileSync } = require("fs");
+const { resolve } = require("path");
+const { equal } = require("assert");
+
 const postcss = require("postcss");
+
 const { groupCssMediaQueries } = require("../lib/group-css-media-queries");
 
+const expectedResult = `.foo{width:240px;}.bar{width:160px;}.header-main{background-image:url("/images/branding/logo.main.png");}.footer-main{background-image:url("/images/branding/logo.main.png");}@mediascreenand(min-width:768px){.foo{width:576px;}.bar{width:384px;}}@mediaalland(-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx){.header-main{background-image:url("/images/branding/logo.main@2x.png");-webkit-background-size:autoauto;-moz-background-size:autoauto;background-size:autoauto;}.footer-main{background-image:url("/images/branding/logo.main@2x.png");-webkit-background-size:autoauto;-moz-background-size:autoauto;background-size:autoauto;}}`;
+
 (async () => {
-  try {
-    const result = await postcss(groupCssMediaQueries).process(
-      fs.readFileSync("a.css"),
-      {
-        from: "a.css"
-      }
-    );
-    fs.writeFileSync("b.css", result.css);
-  } catch (err) {
-    console.log(err);
-  }
+  const [from, to] = [resolve(__dirname, "a.css"), resolve(__dirname, "b.css")];
+
+  const result = await postcss(groupCssMediaQueries).process(
+    readFileSync(from),
+    {
+      from,
+      to
+    }
+  );
+
+  writeFileSync(to, result.css);
+
+  equal(result.css.replace(/\s+/g, ""), expectedResult);
+
+  console.log(" --- Test successful");
 })();