Skip to content

Commit

Permalink
Merge pull request #14 from Wolox/packages
Browse files Browse the repository at this point in the history
run cra inside the same folder - change eslint rules
  • Loading branch information
NaomiFPassarelli authored Jan 2, 2018
2 parents d23afd6 + a419ef3 commit c13f33f
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 47 deletions.
42 changes: 1 addition & 41 deletions generators/app/templates/eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,46 +1,6 @@
module.exports = {
env: {
es6: true,
node: true,
browser: true
},
parser: "babel-eslint",
parserOptions: {
ecmaFeatures: {
experimentalObjectRestSpread: true,
jsx: true
},
sourceType: "module"
},
plugins: ["react", "prettier"],
extends: [
"eslint:recommended",
"airbnb",
"plugin:react/recommended",
"prettier",
"prettier/react"
],
globals: {
__DEV__: true
},
"extends": "react-app",
rules: {
"prettier/prettier": ["error", { printWidth: 110, singleQuote: true }],
"no-invalid-this": "off",
"no-return-assign": "off",
"no-param-reassign": "off",
"no-nested-ternary": "off",
"react/require-default-props": "off",
"react/jsx-filename-extension": ["error", { extensions: [".js"] }],
"react/prop-types": [2, { ignore: ["style", "children", "dispatch"] }],
"import/order": ["error", { "newlines-between": "always" }],
"import/prefer-default-export": "off",
"import/no-unresolved": "error",
"import/extensions": ["error", { js: "never" }],
"import/named": "error",
"import/default": "error",
"import/namespace": "error",
"import/no-absolute-path": "error",
"linebreak-style": 0,
"jsx-a11y/href-no-hash": "off"
}
};
1 change: 1 addition & 0 deletions generators/app/templates/src/redux/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { reducer as form } from 'redux-form';
// TODO Add this if you need it
// import AnalyticsMiddleware from '../services/AnalyticsService';
import { reducer as auth } from './Auth/reducer';

export const history = createHistory();

// Add reducers here
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const removeValue = key => {
}
};

const defineProperty = (prop, defaultKey = ', tag = ') => {
const defineProperty = (prop, defaultKey = '', tag = '') => {
const capitalizedKey = `${prop[0].toUpperCase()}${prop.substring(1)}`;
module.exports[`set${capitalizedKey}`] = (val, key = defaultKey) =>
setValue(`@@UTILITY:${prop}${tag}${key}`, val);
Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "generator-react-bootstrap",
"version": "0.1.4",
"version": "0.1.6",
"description": "wolox-react-bootstrap",
"files": [
"index.js",
Expand All @@ -12,7 +12,10 @@
"build": "./node_modules/react-scripts/bin/react-scripts.js build",
"test": "./node_modules/react-scripts/bin/react-scripts.js test --env=jsdom",
"eject": "./node_modules/react-scripts/bin/react-scripts.js eject",
"deploy": "npm run build"
"deploy": "npm run build",
"lint": "./node_modules/eslint/bin/eslint.js src",
"lint-fix": "./node_modules/eslint/bin/eslint.js src --fix",
"lint-diff": "git diff --name-only --cached --relative | grep \\.js$ | xargs ./node_modules/eslint/bin/eslint.js"
},
"repository": "git+https://github.com/Wolox/react-bootstrap.git",
"keywords": [
Expand Down
9 changes: 6 additions & 3 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,13 @@ elif ! system_has yarn; then
exit 1
fi

yarn global add create-react-app --prefix /usr/local
create-react-app $1 --scripts-version wolox-react-scripts
cd $1/

yarn global add create-react-app --prefix /usr/local > /dev/null 2>&1
PROJECT_NAME=`echo "${PWD##*/}"`
cd ..
create-react-app "${PROJECT_NAME}" --scripts-version wolox-react-scripts
yarn global add yo generator-react-bootstrap > /dev/null 2>&1
cd $PROJECT_NAME
yo react-bootstrap --force
yarn global add package-json-merge > /dev/null 2>&1
package-json-merge package.json packageB.json > packageA.json
Expand Down

0 comments on commit c13f33f

Please sign in to comment.