Skip to content

Commit

Permalink
chore(deps-dev): bump prettier from 1.17.0 to 2.1.2
Browse files Browse the repository at this point in the history
Merge pull request #218 from itgalaxy/dependabot/npm_and_yarn/prettier-2.1.2
  • Loading branch information
jimmyandrade authored Sep 29, 2020
2 parents feed158 + 5bb55f9 commit 3f58020
Show file tree
Hide file tree
Showing 9 changed files with 156 additions and 177 deletions.
44 changes: 44 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parserOptions": {
"sourceType": "script"
},
"extends": [
"plugin:itgalaxy/node",
"plugin:itgalaxy/esnext",
"plugin:itgalaxy/jest",
"plugin:itgalaxy/markdown"
],
"overrides": [
{
"files": ["src/**/*"],
"parserOptions": {
"sourceType": "module"
},
"rules": {
"node/no-unsupported-features/es-syntax": "off"
}
},
{
"files": ["**/*.md"],
"parserOptions": {
"sourceType": "module",
"ecmaFeatures": {
"impliedStrict": true
}
},
"rules": {
"strict": "off",
"no-undef": "off",
"no-unused-vars": "off",
"no-process-env": "off",
"no-process-exit": "off",
"no-console": "off",
"import/no-unresolved": "off",
"import/extensions": "off",
"node/no-unpublished-require": "off",
"node/no-unsupported-features/es-syntax": "off"
}
}
],
"root": true
}
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ const webfont = require("webfont").default;

webfont({
files: "src/svg-icons/**/*.svg",
fontName: "my-font-name"
fontName: "my-font-name",
})
.then(result => {
.then((result) => {
console.log(result);

return result;
})
.catch(error => {
.catch((error) => {
throw error;
});
```
Expand All @@ -70,14 +70,14 @@ import webfont from "webfont";

webfont({
files: "src/svg-icons/**/*.svg",
fontName: "my-font-name"
fontName: "my-font-name",
})
.then(result => {
.then((result) => {
console.log(result);

return result;
})
.catch(error => {
.catch((error) => {
throw error;
});
```
Expand Down Expand Up @@ -122,23 +122,23 @@ webfont({

```js
webfont({
template: "./path/to/my-template.css"
template: "./path/to/my-template.css",
});
```

Or

```js
webfont({
template: path.resolve(__dirname, "./my-template.css")
template: path.resolve(__dirname, "./my-template.css"),
});
```

Or

```js
webfont({
template: path.resolve(__dirname, "./my-template.styl")
template: path.resolve(__dirname, "./my-template.styl"),
});
```

Expand Down Expand Up @@ -172,18 +172,18 @@ webfont({

webfont({
files: "src/svg-icons/**/*.svg",
glyphTransformFn: obj => {
glyphTransformFn: (obj) => {
obj.name += "_transform";

return obj;
}
},
})
.then(result => {
.then((result) => {
console.log(result);

return result;
})
.catch(error => {
.catch((error) => {
throw error;
});
```
Expand Down
4 changes: 2 additions & 2 deletions husky.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module.exports = {
hooks: {
"pre-commit": "lint-staged"
}
"pre-commit": "lint-staged",
},
};
6 changes: 3 additions & 3 deletions lint-staged.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ module.exports = {
"*.{js,jsx}": [
"prettier --list-different",
"eslint --report-unused-disable-directives",
"git add"
"git add",
],
"*.{md,markdown,mdown,mkdn,mkd,mdwn,mkdown,ron}": [
"prettier --list-different",
"remark -f -q",
"git add"
"git add",
],
"*.{yml,yaml}": ["prettier --list-different", "git add"]
"*.{yml,yaml}": ["prettier --list-different", "git add"],
};
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 1 addition & 49 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"lint-staged": "^8.0.4",
"npm-run-all": "^4.0.0",
"nyc": "^14.0.0",
"prettier": "^1.17.0",
"prettier": "^2.1.2",
"remark-cli": "^8.0.1",
"remark-preset-lint-itgalaxy": "^15.0.0",
"rimraf": "^3.0.2",
Expand Down Expand Up @@ -133,54 +133,6 @@
]
]
},
"eslintConfig": {
"parserOptions": {
"sourceType": "script"
},
"extends": [
"plugin:itgalaxy/node",
"plugin:itgalaxy/esnext",
"plugin:itgalaxy/jest",
"plugin:itgalaxy/markdown"
],
"overrides": [
{
"files": [
"src/**/*"
],
"parserOptions": {
"sourceType": "module"
},
"rules": {
"node/no-unsupported-features/es-syntax": "off"
}
},
{
"files": [
"**/*.md"
],
"parserOptions": {
"sourceType": "module",
"ecmaFeatures": {
"impliedStrict": true
}
},
"rules": {
"strict": "off",
"no-undef": "off",
"no-unused-vars": "off",
"no-process-env": "off",
"no-process-exit": "off",
"no-console": "off",
"import/no-unresolved": "off",
"import/extensions": "off",
"node/no-unpublished-require": "off",
"node/no-unsupported-features/es-syntax": "off"
}
}
],
"root": true
},
"remarkConfig": {
"plugins": [
"remark-preset-lint-itgalaxy"
Expand Down
Loading

0 comments on commit 3f58020

Please sign in to comment.