Skip to content

Commit

Permalink
Bump lint-staged from 7.3.0 to 9.4.2 (#1767)
Browse files Browse the repository at this point in the history
* Bump lint-staged from 7.3.0 to 9.4.2

Bumps [lint-staged](https://github.com/okonet/lint-staged) from 7.3.0 to 9.4.2.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](lint-staged/lint-staged@v7.3.0...v9.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* yarn fix with the new lint-staged
  • Loading branch information
dependabot-preview[bot] authored and piglovesyou committed Nov 4, 2019
1 parent c92eb90 commit 0aa90f9
Show file tree
Hide file tree
Showing 7 changed files with 4,082 additions and 2,762 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package.json
29 changes: 12 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"husky": "^1.0.0-rc.15",
"identity-obj-proxy": "^3.0.0",
"jest": "^23.6.0",
"lint-staged": "^7.3.0",
"lint-staged": "^9.4.2",
"markdown-it": "^8.4.2",
"mkdirp": "^0.5.1",
"null-loader": "^0.1.1",
Expand Down Expand Up @@ -111,23 +111,18 @@
"webpack-node-externals": "^1.7.2"
},
"lint-staged": {
"ignore": [
"package.json"
"*.{js,jsx}": [
"eslint --no-ignore --fix",
"git add --force"
],
"linters": {
"*.{js,jsx}": [
"eslint --no-ignore --fix",
"git add --force"
],
"*.{json,md,graphql}": [
"prettier --write",
"git add --force"
],
"*.{css,less,styl,scss,sass,sss}": [
"stylelint --fix",
"git add --force"
]
}
"*.{json,md,graphql}": [
"prettier --write",
"git add --force"
],
"*.{css,less,styl,scss,sass,sss}": [
"stylelint --fix",
"git add --force"
]
},
"scripts": {
"precommit": "lint-staged",
Expand Down
4 changes: 1 addition & 3 deletions src/components/Html.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,7 @@ class Html extends React.Component {
dangerouslySetInnerHTML={{
__html:
'window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;' +
`ga('create','${
config.analytics.googleTrackingId
}','auto');ga('send','pageview')`,
`ga('create','${config.analytics.googleTrackingId}','auto');ga('send','pageview')`,
}}
/>
)}
Expand Down
8 changes: 2 additions & 6 deletions src/passport.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ passport.use(
profile: {
displayName: profile.displayName,
gender: profile._json.gender,
picture: `https://graph.facebook.com/${
profile.id
}/picture?type=large`,
picture: `https://graph.facebook.com/${profile.id}/picture?type=large`,
},
},
{
Expand Down Expand Up @@ -113,9 +111,7 @@ passport.use(
profile: {
displayName: profile.displayName,
gender: profile._json.gender,
picture: `https://graph.facebook.com/${
profile.id
}/picture?type=large`,
picture: `https://graph.facebook.com/${profile.id}/picture?type=large`,
},
},
{
Expand Down
25 changes: 8 additions & 17 deletions tools/lib/fs.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,15 @@ import rimraf from 'rimraf';

export const readFile = file =>
new Promise((resolve, reject) => {
fs.readFile(
file,
'utf8',
(err, data) => (err ? reject(err) : resolve(data)),
fs.readFile(file, 'utf8', (err, data) =>
err ? reject(err) : resolve(data),
);
});

export const writeFile = (file, contents) =>
new Promise((resolve, reject) => {
fs.writeFile(
file,
contents,
'utf8',
err => (err ? reject(err) : resolve()),
fs.writeFile(file, contents, 'utf8', err =>
err ? reject(err) : resolve(),
);
});

Expand Down Expand Up @@ -61,10 +56,8 @@ export const copyFile = (source, target) =>

export const readDir = (pattern, options) =>
new Promise((resolve, reject) =>
glob(
pattern,
options,
(err, result) => (err ? reject(err) : resolve(result)),
glob(pattern, options, (err, result) =>
err ? reject(err) : resolve(result),
),
);

Expand Down Expand Up @@ -107,10 +100,8 @@ export const copyDir = async (source, target) => {

export const cleanDir = (pattern, options) =>
new Promise((resolve, reject) =>
rimraf(
pattern,
{ glob: options },
(err, result) => (err ? reject(err) : resolve(result)),
rimraf(pattern, { glob: options }, (err, result) =>
err ? reject(err) : resolve(result),
),
);

Expand Down
27 changes: 13 additions & 14 deletions tools/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -420,21 +420,20 @@ const serverConfig = {
...rule,
options: {
...rule.options,
presets: rule.options.presets.map(
preset =>
preset[0] !== '@babel/preset-env'
? preset
: [
'@babel/preset-env',
{
targets: {
node: pkg.engines.node.match(/(\d+\.?)+/)[0],
},
modules: false,
useBuiltIns: false,
debug: false,
presets: rule.options.presets.map(preset =>
preset[0] !== '@babel/preset-env'
? preset
: [
'@babel/preset-env',
{
targets: {
node: pkg.engines.node.match(/(\d+\.?)+/)[0],
},
],
modules: false,
useBuiltIns: false,
debug: false,
},
],
),
},
};
Expand Down

0 comments on commit 0aa90f9

Please sign in to comment.