Skip to content

Commit

Permalink
Update archetype component eslint (#251)
Browse files Browse the repository at this point in the history
* Update archetype component eslint

* wip

* Update oss electrode archetype component Eslint

* Remove changes in archetype app

* Migrating to v3: The ecmaFeatures property is now under a top-level parserOptions property.
  • Loading branch information
didi0613 authored and jchip committed Mar 22, 2017
1 parent 0524d40 commit 5e76437
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 21 deletions.
11 changes: 6 additions & 5 deletions packages/electrode-archetype-react-component-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"dependencies": {
"babel-cli": "^6.6.5",
"babel-core": "^6.7.2",
"babel-eslint": "^5.0.0",
"babel-eslint": "^7.0.0",
"babel-loader": "^6.2.4",
"babel-plugin-lodash": "^3.1.3",
"babel-plugin-react-intl": "^2.1.2",
Expand All @@ -41,10 +41,10 @@
"electrode-docgen": "^1.0.0",
"electrode-gulp-helper": "^1.0.0",
"enzyme": "^2.3.0",
"eslint": "^1.7.0",
"eslint-config-defaults": "^9.0.0",
"eslint-plugin-filenames": "^0.1.2",
"eslint-plugin-react": "^3.6.3",
"eslint": "^3.18.0",
"eslint-config-walmart": "^1.1.0",
"eslint-plugin-filenames": "^1.1.0",
"eslint-plugin-react": "^6.5.0",
"file-loader": "^0.8.4",
"fs-extra": "^0.26.4",
"glob": "^7.0.6",
Expand All @@ -70,6 +70,7 @@
"lodash-webpack-plugin": "^0.3.0",
"mocha": "^2.4.5",
"nodemon": "^1.8.1",
"optional-require": "^1.0.0",
"phantomjs-prebuilt": "^2.1.13",
"postcss-cssnext": "^2.7.0",
"postcss-import": "^8.1.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
extends:
- "eslint-config-defaults/configurations/eslint.js"
- "eslint-config-walmart/configurations/es6.js"
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
---
extends:
- "eslint-config-defaults/configurations/walmart/es5-node"

# Our subset of Node ES features.
# Switch to `es6-node` config when ready for Node.js + ES specifically.
# https://github.com/walmartlabs/eslint-config-defaults/issues/58
ecmaFeatures:
blockBindings: true
arrowFunctions: true
templateStrings: true
- "eslint-config-walmart/configurations/es5-node"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
extends:
- "eslint-config-defaults/configurations/walmart/es6-react"
- "eslint-config-walmart/configurations/es6-react"
globals:
window: false
ReactElement: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
extends:
- "eslint-config-defaults/configurations/walmart/es6-test"
- "eslint-config-walmart/configurations/es6-test"
- ".eslintrc-react"
globals:
document: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ const cssLoader = archDevRequire.resolve("css-loader");
const postcssLoader = archDevRequire.resolve("postcss-loader");
const stylusLoader = archDevRequire.resolve("stylus-relative-loader");

const optionalRequire = require("optional-require")(require);
const configPath = Path.resolve("archetype", "config.js");
const config = require(configPath);
const config = optionalRequire(configPath);
const cssModuleStylusSupport = config.cssModuleStylusSupport;

/**
Expand Down
7 changes: 4 additions & 3 deletions packages/electrode-archetype-react-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@
"dependencies": {},
"devDependencies": {
"electrode-gulp-helper": "^1.0.4",
"eslint": "^1.10.1",
"eslint-config-defaults": "^9.0.0",
"eslint-plugin-filenames": "^0.1.2",
"eslint": "^3.18.0",
"eslint-config-walmart": "^1.1.0",
"eslint-plugin-filenames": "^1.1.0",
"gulp": "^3.9.1",
"opener": "^1.4.1",
"optional-require": "^1.0.0",
"package-json-validator": "^0.6.1",
"shelljs": "^0.7.0"
},
Expand Down

0 comments on commit 5e76437

Please sign in to comment.