Skip to content

Commit

Permalink
Merge pull request #182 from ghiscoding/pr/JacobSoderblom/168
Browse files Browse the repository at this point in the history
chore(build): add Prettier to the project, expand on #168
  • Loading branch information
ghiscoding committed Jun 7, 2022
2 parents de19859 + 00ce3e0 commit 14802ba
Show file tree
Hide file tree
Showing 32 changed files with 916 additions and 586 deletions.
6 changes: 1 addition & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@ root = true
charset = utf-8
end_of_line = lf
indent_style = space
indent_size = 4
indent_size = 2
insert_final_newline = false
trim_trailing_whitespace = true

[*]
indent_style = space
indent_size = 2

[*.md]
max_line_length = 0
trim_trailing_whitespace = false
8 changes: 6 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"parser": "@typescript-eslint/parser",
"extends": [
"plugin:@typescript-eslint/recommended"
"plugin:@typescript-eslint/recommended",
"plugin:import/recommended",
"plugin:import/typescript",
"prettier"
],
"root": true,
"env": {
Expand All @@ -13,7 +16,8 @@
"sourceType": "module"
},
"plugins": [
"@typescript-eslint"
"@typescript-eslint",
"import"
],
"ignorePatterns": [
"**/dist/**/*.*",
Expand Down
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@
.classpath
.c9/
*.launch
.settings/

# IDE - VSCode
.vscode/*
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.chrome

# misc
Expand Down
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Ignore all HTML files:
*.yml
*.yaml
7 changes: 7 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"useTabs": false,
"tabWidth": 2,
"printWidth": 110,
"singleQuote": true,
"trailingComma": "es5"
}
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.formatOnPaste": false,
"typescript.tsdk": "node_modules\\typescript\\lib"
}
4 changes: 4 additions & 0 deletions __fixtures__/lockfile-pnpm/lerna.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"npmClient": "pnpm",
"version": "2.3.4"
}
5 changes: 5 additions & 0 deletions __fixtures__/lockfile-pnpm/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "my-workspace",
"version": "0.0.0-lerna",
"private": true
}
7 changes: 7 additions & 0 deletions __fixtures__/lockfile-pnpm/packages/package-1/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "@my-workspace/package-1",
"version": "2.3.4",
"dependencies": {
"tiny-tarball": "^1.0.0"
}
}
7 changes: 7 additions & 0 deletions __fixtures__/lockfile-pnpm/packages/package-2/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "@my-workspace/package-2",
"version": "2.3.4",
"dependencies": {
"@my-workspace/package-1": "workspace:^2.3.4"
}
}
8 changes: 8 additions & 0 deletions __fixtures__/lockfile-pnpm/packages/package-3/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "@my-workspace/package-3",
"version": "2.3.4",
"dependencies": {
"@my-workspace/package-1": "workspace:^",
"@my-workspace/package-2": "workspace:*"
}
}
8 changes: 8 additions & 0 deletions __fixtures__/lockfile-pnpm/packages/package-4/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "@my-workspace/package-4",
"version": "2.3.4",
"dependencies": {
"@my-workspace/package-1": "workspace:2.3.4",
"@my-workspace/package-2": "workspace:~"
}
}
40 changes: 40 additions & 0 deletions __fixtures__/lockfile-pnpm/pnpm-lock.yaml

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

2 changes: 2 additions & 0 deletions __fixtures__/lockfile-pnpm/pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
packages:
- "packages/*"

0 comments on commit 14802ba

Please sign in to comment.