Merge pull request kristerkari#34 from kristerkari/feat/deps-update

Update dependencies and fix Node11 sorting bug

Author: kristerkari

.babelrc

@@ -1,3 +1,3 @@
 {
-  "presets": ["es2015"]
+  "presets": ["@babel/preset-env"]
 }

.travis.yml

@@ -8,16 +8,19 @@ cache:
     - node_modules
 matrix:
   include:
-    - node_js: '9'
+    - node_js: "11"
       script: npm test
-      env: CI=test 9
-    - node_js: '9'
+      env: CI=test 11
+    - node_js: "10"
+      script: npm test
+      env: CI=test 10
+    - node_js: "10"
       script: npm test -- --runInBand --coverage
       env: CI=coverage
-    - node_js: '8'
+    - node_js: "8"
       script: npm test
       env: CI=test
-    - node_js: '6'
+    - node_js: "6"
       script: npm test
       env: CI=tests 6
 before_install:

appveyor.yml

@@ -2,6 +2,9 @@
 
 environment:
   matrix:
+    - nodejs_version: 11
+    - nodejs_version: 10
+    - nodejs_version: 8
     - nodejs_version: 6
 
 version: "{build}"

package.json

@@ -9,21 +9,21 @@
     "prettify": "prettier --write '**/*.@(js|json|md)'",
     "precommit": "lint-staged",
     "build": "babel src --ignore *.spec.js --out-dir dist",
-    "test": "jest",
+    "test": "jest --coverage",
     "prepublish": "npm run build",
     "release": "npmpub"
   },
   "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.3",
-    "babel-jest": "^23.6.0",
-    "babel-preset-es2015": "^6.24.1",
+    "@babel/cli": "^7.2.3",
+    "@babel/core": "^7.3.3",
+    "@babel/preset-env": "^7.3.1",
+    "babel-jest": "^24.1.0",
     "coveralls": "^3.0.2",
-    "husky": "^1.1.4",
-    "jest": "^23.6.0",
-    "lint-staged": "^8.0.5",
+    "husky": "^1.3.1",
+    "jest": "^24.1.0",
+    "lint-staged": "^8.1.4",
     "npmpub": "^4.1.0",
-    "prettier": "^1.15.2"
+    "prettier": "^1.16.4"
   },
   "jest": {
     "transform": {
@@ -41,7 +41,11 @@
         "lines": 75,
         "statements": 75
       }
-    }
+    },
+    "testPathIgnorePatterns": [
+      "<rootDir>/dist",
+      "<rootDir>/node_modules"
+    ]
   },
   "lint-staged": {
     "*.{js,json,md}": [
@@ -55,7 +59,7 @@
   "dependencies": {
     "css": "^2.2.4",
     "css-mediaquery": "^0.1.2",
-    "css-to-react-native": "^2.2.2"
+    "css-to-react-native": "^2.3.0"
   },
   "repository": {
     "type": "git",

src/index.spec.js

@@ -1687,7 +1687,7 @@ describe("flex-box", () => {
       }
     `),
     ).toEqual({
-      test: { flexGrow: 0, flexShrink: 1 },
+      test: { flexBasis: "auto", flexGrow: 0, flexShrink: 1 },
     });
   });
 
@@ -1699,7 +1699,7 @@ describe("flex-box", () => {
       }
     `),
     ).toEqual({
-      test: { flexGrow: 0, flexShrink: 1 },
+      test: { flexBasis: "auto", flexGrow: 0, flexShrink: 1 },
     });
   });
 
@@ -1711,7 +1711,7 @@ describe("flex-box", () => {
       }
     `),
     ).toEqual({
-      test: { flexGrow: 1, flexShrink: 1 },
+      test: { flexBasis: "auto", flexGrow: 1, flexShrink: 1 },
     });
   });
 
@@ -1723,7 +1723,7 @@ describe("flex-box", () => {
       }
     `),
     ).toEqual({
-      test: { flexGrow: 0, flexShrink: 0 },
+      test: { flexBasis: "auto", flexGrow: 0, flexShrink: 0 },
     });
   });
 

src/utils/sortRules.js

@@ -3,16 +3,23 @@ function isExport(n) {
 }
 
 function byExport(a, b) {
-  return isExport(a.selectors);
+  if (!isExport(a.selectors) && isExport(b.selectors)) {
+    return -1;
+  }
+  if (isExport(a.selectors) && !isExport(b.selectors)) {
+    return 1;
+  }
+  return 0;
 }
 
 function byLine(a, b) {
-  if (
-    isExport(a.selectors) &&
-    isExport(b.selectors) &&
-    a.position.start.line > b.position.start.line
-  ) {
-    return 1;
+  if (isExport(a.selectors) && isExport(b.selectors)) {
+    if (a.position.start.line > b.position.start.line) {
+      return 1;
+    }
+    if (a.position.start.line < b.position.start.line) {
+      return -1;
+    }
   }
   return 0;
 }

src/utils/sortRules.spec.js

@@ -215,16 +215,25 @@ describe("sortRules", () => {
             {
               type: "declaration",
               property: "bar",
-              value: "3",
+              value: "1",
               position: {
-                start: { line: 3, column: 3 },
-                end: { line: 3, column: 9 },
+                start: { line: 11, column: 3 },
+                end: { line: 11, column: 9 },
+              },
+            },
+            {
+              type: "declaration",
+              property: "bar",
+              value: "2",
+              position: {
+                start: { line: 12, column: 3 },
+                end: { line: 12, column: 9 },
               },
             },
           ],
           position: {
-            start: { line: 2, column: 1 },
-            end: { line: 4, column: 2 },
+            start: { line: 10, column: 1 },
+            end: { line: 13, column: 2 },
           },
         },
         {
@@ -253,25 +262,16 @@ describe("sortRules", () => {
             {
               type: "declaration",
               property: "bar",
-              value: "1",
-              position: {
-                start: { line: 11, column: 3 },
-                end: { line: 11, column: 9 },
-              },
-            },
-            {
-              type: "declaration",
-              property: "bar",
-              value: "2",
+              value: "3",
               position: {
-                start: { line: 12, column: 3 },
-                end: { line: 12, column: 9 },
+                start: { line: 3, column: 3 },
+                end: { line: 3, column: 9 },
               },
             },
           ],
           position: {
-            start: { line: 10, column: 1 },
-            end: { line: 13, column: 2 },
+            start: { line: 2, column: 1 },
+            end: { line: 4, column: 2 },
           },
         },
       ]),