Update eslint

- Update JS files to pass eslint-config-i-am-meticulous

Author: jonathantneal

index.js

@@ -1,6 +1,11 @@
+// builtin tooling
 var path = require("path")
+
+// external tooling
 var assign = require("object-assign")
 var postcss = require("postcss")
+
+// internal tooling
 var joinMedia = require("./lib/join-media")
 var resolveId = require("./lib/resolve-id")
 var loadContent = require("./lib/load-content")

lib/parse-statements.js

@@ -1,4 +1,7 @@
+// external tooling
 var valueParser = require("postcss-value-parser")
+
+// extended tooling
 var stringify = valueParser.stringify
 
 function split(params, start) {

lib/process-content.js

@@ -1,5 +1,10 @@
+// builtin tooling
 var path = require("path")
+
+// external tooling
 var postcss = require("postcss")
+
+// placeholder tooling
 var sugarss
 
 module.exports = function processContent(

lib/resolve-id.js

@@ -1,12 +1,5 @@
+// external tooling
 var resolve = require("resolve")
-var jspmResolve
-// Works around https://github.com/jspm/jspm-cli/pull/1779 is released
-try {
-  jspmResolve = require("pkg-resolve")
-}
-catch (ex) {
-  // pass
-}
 
 var moduleDirectories = [
   "web_modules",
@@ -47,12 +40,6 @@ module.exports = function(id, base, options) {
   .catch(function() {
     return resolveModule(id, resolveOpts)
   })
-  .catch(function() {
-    return jspmResolve.default(id, {
-      basedir: resolveOpts.basedir,
-      extensions : resolveOpts.extensions,
-    })
-  })
   .catch(function() {
     if (paths.indexOf(base) === -1) {
       paths.unshift(base)

package.json

@@ -26,8 +26,9 @@
   },
   "devDependencies": {
     "ava": "^0.16.0",
-    "eslint": "^1.10.3",
-    "eslint-config-i-am-meticulous": "^2.0.0",
+    "eslint": "^3.19.0",
+    "eslint-config-i-am-meticulous": "^6.0.1",
+    "eslint-plugin-import": "^2.2.0",
     "npmpub": "^3.0.1",
     "postcss-scss": "^1.0.0",
     "sugarss": "^0.2.0"

test/custom-load.js

@@ -1,4 +1,7 @@
+// external tooling
 import test from "ava"
+
+// internal tooling
 import compareFixtures from "./helpers/compare-fixtures"
 
 test.serial("should accept content", t => {

test/custom-resolve.js

@@ -1,8 +1,15 @@
+// builtin tooling
+import path from "path"
+
+// external tooling
 import test from "ava"
-import compareFixtures from "./helpers/compare-fixtures"
 import postcss from "postcss"
+
+// internal tooling
+import compareFixtures from "./helpers/compare-fixtures"
+
+// plugin
 import atImport from ".."
-import path from "path"
 
 test.serial("should accept file", t => {
   return compareFixtures(t, "custom-resolve-file", {

test/custom-syntax-parser.js

@@ -1,6 +1,9 @@
+// external tooling
 import test from "ava"
 import scss from "postcss-scss"
 import sugarss from "sugarss"
+
+// internal tooling
 import compareFixtures from "./helpers/compare-fixtures"
 import compareFixturesExt from "./helpers/compare-fixtures-ext"
 

test/helpers/compare-fixtures-ext.js

@@ -1,6 +1,11 @@
+// builtin tooling
 var fs = require("fs")
-var postcss = require("postcss")
+
+// external tooling
 var assign = require("object-assign")
+var postcss = require("postcss")
+
+// plugin
 var atImport = require("../..")
 
 function read(name, ext) {

test/helpers/compare-fixtures.js

@@ -1,6 +1,11 @@
+// builtin tooling
 var fs = require("fs")
-var postcss = require("postcss")
+
+// external tooling
 var assign = require("object-assign")
+var postcss = require("postcss")
+
+// plugin
 var atImport = require("../..")
 
 function read(name) {

test/import-events.js

@@ -1,8 +1,13 @@
+// builtin tooling
+import { readFileSync } from "fs"
+import { resolve } from "path"
+
+// external tooling
 import test from "ava"
 import postcss from "postcss"
+
+// plugin
 import atImport from ".."
-import { resolve } from "path"
-import { readFileSync } from "fs"
 
 test("should have a callback that returns an object" +
   " containing imported files", t => {

test/import.js

@@ -1,10 +1,17 @@
-import test from "ava"
-import path from "path"
+// builtin tooling
 import { readFileSync } from "fs"
+import path from "path"
+
+// external tooling
+import test from "ava"
 import postcss from "postcss"
-import atImport from ".."
+
+// internal tooling
 import compareFixtures from "./helpers/compare-fixtures"
 
+// plugin
+import atImport from ".."
+
 test("should import stylsheets", t => {
   return compareFixtures(t, "simple")
 })

test/lint.js

@@ -1,5 +1,8 @@
+// external tooling
 import test from "ava"
 import postcss from "postcss"
+
+// plugin
 import atImport from ".."
 
 const processor = postcss().use(atImport())

test/media.js

@@ -1,4 +1,7 @@
+// external tooling
 import test from "ava"
+
+// internal tooling
 import compareFixtures from "./helpers/compare-fixtures"
 
 test("should resolve media queries of import statements", t => {

test/order.js

@@ -1,4 +1,7 @@
+// external tooling
 import test from "ava"
+
+// internal tooling
 import compareFixtures from "./helpers/compare-fixtures"
 
 test(`should order nested imports correctly`, t => {

test/plugins.js

@@ -1,8 +1,13 @@
+// external tooling
 import test from "ava"
 import postcss from "postcss"
-import atImport from ".."
+
+// internal tooling
 import compareFixtures from "./helpers/compare-fixtures"
 
+// plugin
+import atImport from ".."
+
 test("should apply plugins to root", t => {
   const atRules = []
   const rules = []

test/resolve.js

@@ -1,4 +1,7 @@
+// external tooling
 import test from "ava"
+
+// internal tooling
 import compareFixtures from "./helpers/compare-fixtures"
 
 test("should resolve relative to cwd", t => {