Skip to content

Commit c13f33f

Browse files
author
NaomiFPassarelli
authored
Merge pull request #14 from Wolox/packages
run cra inside the same folder - change eslint rules
2 parents d23afd6 + a419ef3 commit c13f33f

5 files changed

Lines changed: 14 additions & 47 deletions

File tree

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,6 @@
11
module.exports = {
2-
env: {
3-
es6: true,
4-
node: true,
5-
browser: true
6-
},
7-
parser: "babel-eslint",
8-
parserOptions: {
9-
ecmaFeatures: {
10-
experimentalObjectRestSpread: true,
11-
jsx: true
12-
},
13-
sourceType: "module"
14-
},
15-
plugins: ["react", "prettier"],
16-
extends: [
17-
"eslint:recommended",
18-
"airbnb",
19-
"plugin:react/recommended",
20-
"prettier",
21-
"prettier/react"
22-
],
23-
globals: {
24-
__DEV__: true
25-
},
2+
"extends": "react-app",
263
rules: {
27-
"prettier/prettier": ["error", { printWidth: 110, singleQuote: true }],
28-
"no-invalid-this": "off",
29-
"no-return-assign": "off",
30-
"no-param-reassign": "off",
31-
"no-nested-ternary": "off",
32-
"react/require-default-props": "off",
33-
"react/jsx-filename-extension": ["error", { extensions: [".js"] }],
34-
"react/prop-types": [2, { ignore: ["style", "children", "dispatch"] }],
35-
"import/order": ["error", { "newlines-between": "always" }],
36-
"import/prefer-default-export": "off",
37-
"import/no-unresolved": "error",
38-
"import/extensions": ["error", { js: "never" }],
39-
"import/named": "error",
40-
"import/default": "error",
41-
"import/namespace": "error",
42-
"import/no-absolute-path": "error",
43-
"linebreak-style": 0,
444
"jsx-a11y/href-no-hash": "off"
455
}
466
};

generators/app/templates/src/redux/store.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { reducer as form } from 'redux-form';
77
// TODO Add this if you need it
88
// import AnalyticsMiddleware from '../services/AnalyticsService';
99
import { reducer as auth } from './Auth/reducer';
10+
1011
export const history = createHistory();
1112

1213
// Add reducers here

generators/app/templates/src/services/LocalStorageService.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const removeValue = key => {
3232
}
3333
};
3434

35-
const defineProperty = (prop, defaultKey = ', tag = ') => {
35+
const defineProperty = (prop, defaultKey = '', tag = '') => {
3636
const capitalizedKey = `${prop[0].toUpperCase()}${prop.substring(1)}`;
3737
module.exports[`set${capitalizedKey}`] = (val, key = defaultKey) =>
3838
setValue(`@@UTILITY:${prop}${tag}${key}`, val);

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "generator-react-bootstrap",
3-
"version": "0.1.4",
3+
"version": "0.1.6",
44
"description": "wolox-react-bootstrap",
55
"files": [
66
"index.js",
@@ -12,7 +12,10 @@
1212
"build": "./node_modules/react-scripts/bin/react-scripts.js build",
1313
"test": "./node_modules/react-scripts/bin/react-scripts.js test --env=jsdom",
1414
"eject": "./node_modules/react-scripts/bin/react-scripts.js eject",
15-
"deploy": "npm run build"
15+
"deploy": "npm run build",
16+
"lint": "./node_modules/eslint/bin/eslint.js src",
17+
"lint-fix": "./node_modules/eslint/bin/eslint.js src --fix",
18+
"lint-diff": "git diff --name-only --cached --relative | grep \\.js$ | xargs ./node_modules/eslint/bin/eslint.js"
1619
},
1720
"repository": "git+https://github.com/Wolox/react-bootstrap.git",
1821
"keywords": [

run.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,13 @@ elif ! system_has yarn; then
2424
exit 1
2525
fi
2626

27-
yarn global add create-react-app --prefix /usr/local
28-
create-react-app $1 --scripts-version wolox-react-scripts
29-
cd $1/
27+
28+
yarn global add create-react-app --prefix /usr/local > /dev/null 2>&1
29+
PROJECT_NAME=`echo "${PWD##*/}"`
30+
cd ..
31+
create-react-app "${PROJECT_NAME}" --scripts-version wolox-react-scripts
3032
yarn global add yo generator-react-bootstrap > /dev/null 2>&1
33+
cd $PROJECT_NAME
3134
yo react-bootstrap --force
3235
yarn global add package-json-merge > /dev/null 2>&1
3336
package-json-merge package.json packageB.json > packageA.json

0 commit comments

Comments
 (0)