Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix lint-staged for multi package #117

Merged
merged 3 commits into from
Mar 11, 2021
Merged

fix lint-staged for multi package #117

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
311158d
fix: lint-staged for multi packages
AdriSolid Mar 11, 2021
ba50700
chore: remove unnecessary git add option in lint-staged
AdriSolid Mar 11, 2021
24f7f8f
doc: add note to changelog
AdriSolid Mar 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,15 @@
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
"pre-commit": "lerna run --concurrency 1 --stream precommit --since HEAD --exclude-dependents"
}
},
"lint-staged": {
"*.+(js|jsx)": [
"yarn lint:fix",
"git add"
"yarn lint:fix"
],
"*.+(js|jsx|json|css|md)": [
"prettier --write",
"git add"
"prettier --write"
]
}
}
3 changes: 2 additions & 1 deletion packages/react-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"lint:fix": "eslint 'src/**/*.{js,jsx}' --fix",
"test": "jest",
"test:watch": "jest --watch",
"test:coverage": "jest --collectCoverage"
"test:coverage": "jest --collectCoverage",
"precommit": "lint-staged"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have to remember to apply this to the current PR with the new workers package @AdriSolid @padawannn

},
"devDependencies": {
"@babel/core": "^7.13.8",
Expand Down
3 changes: 2 additions & 1 deletion packages/react-auth/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"lint:fix": "eslint 'src/**/*.{js,jsx}' --fix",
"test": "jest --passWithNoTests",
"test:watch": "jest --watch",
"test:coverage": "jest --collectCoverage --passWithNoTests"
"test:coverage": "jest --collectCoverage --passWithNoTests",
"precommit": "lint-staged"
},
"devDependencies": {
"@babel/core": "^7.13.8",
Expand Down
3 changes: 2 additions & 1 deletion packages/react-basemaps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"lint:fix": "eslint 'src/**/*.{js,jsx}' --fix",
"test": "jest",
"test:watch": "jest --watch",
"test:coverage": "jest --collectCoverage"
"test:coverage": "jest --collectCoverage",
"precommit": "lint-staged"
},
"devDependencies": {
"@babel/core": "^7.13.8",
Expand Down
3 changes: 2 additions & 1 deletion packages/react-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"lint:fix": "eslint 'src/**/*.{js,jsx}' --fix",
"test": "jest",
"test:watch": "jest --watch",
"test:coverage": "jest --collectCoverage"
"test:coverage": "jest --collectCoverage",
"precommit": "lint-staged"
},
"devDependencies": {
"@babel/core": "^7.13.8",
Expand Down
3 changes: 2 additions & 1 deletion packages/react-redux/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"lint:fix": "eslint 'src/**/*.{js,jsx}' --fix",
"test": "jest",
"test:watch": "jest --watch",
"test:coverage": "jest --collectCoverage"
"test:coverage": "jest --collectCoverage",
"precommit": "lint-staged"
},
"devDependencies": {
"@babel/core": "^7.13.8",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-ui/__tests__/widgets/utils/chartUtils.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ describe('chart utils', () => {
expect(serie.data.every((d) => !d.disabled)).toBe(true);
});
});
});
});
3 changes: 2 additions & 1 deletion packages/react-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"test:coverage": "jest --collectCoverage",
"storybook:start": "start-storybook -c ./storybook/.storybook -p 6006",
"storybook:build": "build-storybook -c ./storybook/.storybook",
"storybook:publish": "yarn storybook:build && yarn firebase deploy --project cartodb-fb-storybook-react"
"storybook:publish": "yarn storybook:build && yarn firebase deploy --project cartodb-fb-storybook-react",
"precommit": "lint-staged"
},
"devDependencies": {
"@babel/core": "^7.13.8",
Expand Down
3 changes: 2 additions & 1 deletion packages/react-widgets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"lint:fix": "eslint 'src/**/*.{js,jsx}' --fix",
"test": "jest",
"test:watch": "jest --watch",
"test:coverage": "jest --collectCoverage"
"test:coverage": "jest --collectCoverage",
"precommit": "lint-staged"
},
"devDependencies": {
"@babel/core": "^7.13.8",
Expand Down
8 changes: 4 additions & 4 deletions packages/react-widgets/src/models/CategoryModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { minify } from 'pgsql-minify';
import {
_buildFeatureFilter as buildFeatureFilter,
_filtersToSQL as filtersToSQL,
import {
_buildFeatureFilter as buildFeatureFilter,
_filtersToSQL as filtersToSQL,
groupValuesByColumn
} from '@carto/react-core';

import { executeSQL, SourceTypes } from '@carto/react-api'
import { executeSQL, SourceTypes } from '@carto/react-api';

export const getCategories = async (props) => {
const {
Expand Down