diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..911b243 --- /dev/null +++ b/.babelrc @@ -0,0 +1,3 @@ +{ + "presets": ["steelbrain"] +} diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..e6a4085 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,6 @@ +{ + "extends": "steelbrain", + "rules": { + "no-duplicate-imports": 0 + } +} diff --git a/.flowconfig b/.flowconfig index 5cc69e8..08d9fed 100644 --- a/.flowconfig +++ b/.flowconfig @@ -1,5 +1,5 @@ [ignore] -.*/lib/* +lib/* [include] diff --git a/.ucompiler b/.ucompiler deleted file mode 100644 index c60e648..0000000 --- a/.ucompiler +++ /dev/null @@ -1,15 +0,0 @@ -{ - "defaultRule": "compile-src", - "rules": [{ - "name": "compile-src", - "plugins": ["babel", "newline"], - "babel": { - "presets": ["steelbrain"] - }, - "include": [{ - "directory": "src", - "extensions": ["js"] - }], - "outputPath": "lib/{relativePath:4}" - }] -} diff --git a/package.json b/package.json index c582431..fb0d4ae 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,11 @@ "description": "Helper module for atom linter providers", "main": "lib/index.js", "scripts": { + "lint": "(flow check) && (eslint .)", "test": "apm test", - "lint": "eslint .", - "watch": "ucompiler watch", - "compile": "ucompiler go" + "clean": "rm -rf lib", + "compile": "npm run clean && babel src --out-dir lib", + "watch": "npm run clean && babel src --out-dir lib --watch" }, "repository": { "type": "git", @@ -26,22 +27,14 @@ "dependencies": { "named-js-regexp": "^1.3.1", "sb-exec": "^3.0.1", - "sb-promisify": "^1.0.0", + "sb-promisify": "^2.0.1", "tmp": "~0.0.28" }, "devDependencies": { - "babel-eslint": "^6.0.0-beta.6", - "babel-preset-steelbrain": "^2.0.1", - "eslint-config-steelbrain": "^1.0.1", - "jasmine-fix": "^1.0.0", - "ucompiler": "^3.0.1", - "ucompiler-plugin-babel": "^3.0.0", - "ucompiler-plugin-newline": "^3.0.0" - }, - "eslintConfig": { - "extends": "steelbrain", - "rules": { - "no-duplicate-imports": 0 - } + "babel-cli": "^6.10.1", + "babel-preset-steelbrain": "^4.0.1", + "eslint-config-steelbrain": "^1.0.4", + "flow-bin": "^0.31.1", + "jasmine-fix": "^1.0.1" } }