Updating dependencies and blacklisting strict from babelify for now.

Also updating .eslintrc for new version of ESLint.
Этот коммит содержится в:
Christopher Speller
2015-07-28 10:49:08 -04:00
родитель 44464f8f3c
Коммит ecefbab04d
2 изменённых файлов: 167 добавлений и 147 удалений

Просмотреть файл

@@ -1,8 +1,10 @@
{ {
"extends": "eslint:recommended",
"ecmaFeatures": { "ecmaFeatures": {
"jsx": true, "jsx": true,
"blockBindings": true, "blockBindings": true,
"modules": true "modules": true,
"classes": true
}, },
"plugins": [ "plugins": [
"react" "react"
@@ -45,18 +47,31 @@
"eqeqeq": [2, "smart"], "eqeqeq": [2, "smart"],
"guard-for-in": 1, "guard-for-in": 1,
"no-alert": 1, "no-alert": 1,
"no-array-constructor": 2,
"no-caller": 2, "no-caller": 2,
"no-div-regex": 1, "no-div-regex": 1,
"no-else-return": 1, "no-else-return": 1,
"no-eval": 2, "no-eval": 2,
"no-extend-native": 2, "no-extend-native": 2,
"no-extra-bind": 2,
"no-floating-decimal": 2, "no-floating-decimal": 2,
"no-implied-eval": 2,
"no-iterator": 2,
"no-labels": 2, "no-labels": 2,
"no-lone-blocks": 1, "no-lone-blocks": 1,
"no-loop-func": 2,
"no-multi-spaces": [2, { "exceptions": { "Property": false } }], "no-multi-spaces": [2, { "exceptions": { "Property": false } }],
"no-multi-str": 0, "no-multi-str": 0,
"no-native-reassign": 2,
"no-new": 2,
"no-new-func": 2,
"no-new-object": 2,
"no-new-wrappers": 2,
"no-octal-escape": 2,
"no-param-reassign": 2, "no-param-reassign": 2,
"no-process-env": 2, "no-process-env": 2,
"no-process-exit": 2,
"no-proto": 2,
"no-redeclare": 2, "no-redeclare": 2,
"no-return-assign": [2, "always"], "no-return-assign": [2, "always"],
"no-script-url": 2, "no-script-url": 2,
@@ -64,6 +79,7 @@
"no-sequences": 2, "no-sequences": 2,
"no-throw-literal": 2, "no-throw-literal": 2,
"no-unused-expressions": 2, "no-unused-expressions": 2,
"no-undef-init": 2,
"no-void": 2, "no-void": 2,
"no-warning-comments": 0, "no-warning-comments": 0,
"no-with": 2, "no-with": 2,
@@ -74,7 +90,8 @@
"no-undefined": 2, "no-undefined": 2,
"no-shadow": [2, {"hoist": "functions"}], "no-shadow": [2, {"hoist": "functions"}],
"no-unused-vars": [2, {"vars": "all", "args": "all"}], "no-shadow-restricted-names": 2,
"no-unused-vars": [2, {"vars": "all", "args": "after-used"}],
"no-use-before-define": [2, "nofunc"], "no-use-before-define": [2, "nofunc"],
// Style // Style
@@ -87,7 +104,7 @@
"consistent-this": [2, "self"], "consistent-this": [2, "self"],
"func-names": 2, "func-names": 2,
"func-style": [2, "declaration"], "func-style": [2, "declaration"],
"indent": [2, 4, {"indentSwitchCase": false}], "indent": [2, 4, {"SwitchCase": 0}],
"key-spacing": [2, {"beforeColon": false, "afterColon": true}], "key-spacing": [2, {"beforeColon": false, "afterColon": true}],
"lines-around-comment": [2, { "beforeBlockComment": true, "beforeLineComment": true, "allowBlockStart": true, "allowBlockEnd": true }], "lines-around-comment": [2, { "beforeBlockComment": true, "beforeLineComment": true, "allowBlockStart": true, "allowBlockEnd": true }],
"linebreak-style": 2, "linebreak-style": 2,
@@ -122,7 +139,10 @@
"react/display-name": [2, { "acceptTranspilerName": true }], "react/display-name": [2, { "acceptTranspilerName": true }],
"react/jsx-boolean-value": [2, "always"], "react/jsx-boolean-value": [2, "always"],
"react/jsx-curly-spacing": [2, "never"], "react/jsx-curly-spacing": [2, "never"],
"react/jsx-max-props-per-line": [2, { "maximum": 1 }],
// SOON "react/jsx-indent-props": [2, 4],
"react/jsx-no-duplicate-props": [2, { "ignoreCase": false }], "react/jsx-no-duplicate-props": [2, { "ignoreCase": false }],
"react/jsx-no-literals": 0,
"react/jsx-no-undef": 2, "react/jsx-no-undef": 2,
"react/jsx-quotes": [2, "single", "avoid-escape"], "react/jsx-quotes": [2, "single", "avoid-escape"],
"react/jsx-uses-react": 2, "react/jsx-uses-react": 2,
@@ -134,6 +154,7 @@
"react/no-unknown-property": 2, "react/no-unknown-property": 2,
"react/prop-types": 2, "react/prop-types": 2,
"react/sort-comp": 0, "react/sort-comp": 0,
"react/self-closing-comp": 2,
"react/wrap-multilines": 2 "react/wrap-multilines": 2
} }
} }

Просмотреть файл

@@ -3,22 +3,21 @@
"version": "0.0.1", "version": "0.0.1",
"private": true, "private": true,
"dependencies": { "dependencies": {
"flux": "^2.0.0", "autolinker": "^0.18.1",
"keymirror": "~0.1.0", "flux": "^2.1.1",
"object-assign": "^1.0.0", "keymirror": "^0.1.1",
"react": "^0.12.0", "object-assign": "^3.0.0",
"autolinker": "^0.15.2", "react": "^0.13.3",
"react-zeroclipboard-mixin": "^0.1.0" "react-zeroclipboard-mixin": "^0.1.0"
}, },
"devDependencies": { "devDependencies": {
"browserify": "^6.2.0", "browserify": "^11.0.1",
"envify": "^3.0.0", "envify": "^3.4.0",
"jest-cli": "~0.1.17", "babelify": "^6.1.3",
"reactify": "^0.15.2", "uglify-js": "^2.4.24",
"uglify-js": "~2.4.15", "watchify": "^3.3.1",
"watchify": "^2.1.1", "eslint": "^1.1.0",
"eslint": "^0.24.1", "eslint-plugin-react": "^3.2.3"
"eslint-plugin-react": "^3.0.0"
}, },
"scripts": { "scripts": {
"start": "watchify --extension=jsx -o ../static/js/bundle.js -v -d ./**/*.jsx", "start": "watchify --extension=jsx -o ../static/js/bundle.js -v -d ./**/*.jsx",
@@ -28,7 +27,7 @@
}, },
"browserify": { "browserify": {
"transform": [ "transform": [
"reactify", ["babelify", {"blacklist": ["strict"]}],
"envify" "envify"
] ]
}, },