Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,16 @@
!/standalone-packages/vscode/src/vs/codesandbox/**/*.ts
!/standalone-packages/vscode/src/vs/codesandbox/**/*.*

dist/
lib/
packages/executors/.rts2_cache_cjs
packages/executors/.rts2_cache_es
packages/executors/.rts2_cache_umd
packages/homepage/.cache
packages/homepage/public
static/
/standalone-packages/*
www/

# Our server side code changes html, we don't want to unintentionally break this by formatting
*.html
Expand Down
2 changes: 0 additions & 2 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
module.exports = {
endOfLine: 'lf',
proseWrap: 'always',
singleQuote: true,
trailingComma: 'es5',
};
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
"test:integrations": "lerna exec --scope app --stream -- yarn test:integrations",
"test:jest-lite": "lerna exec --scope app --stream -- yarn run test jest-lite --watch --coverage",
"chromatic": "lerna run chromatic --scope=@codesandbox/components --stream",
"typecheck": "lerna run typecheck"
"typecheck": "lerna run typecheck",
"prettify": "prettier -w ."
},
"dependencies": {
"@typescript-eslint/eslint-plugin": "^1.13.0",
Expand All @@ -94,8 +95,8 @@
"husky": "^2.2.0",
"lerna": "^3.16.4",
"lint-staged": "^9.2.5",
"prettier": "1.19.1",
"pretty-quick": "^2.0.1",
"prettier": "2.1.1",
"pretty-quick": "^3.0.0",
"typescript": "3.9.2",
"username": "^5.1.0"
},
Expand All @@ -112,7 +113,7 @@
]
},
"engines": {
"node": "^10.0.0"
"node": "^10.13.0"
},
"collective": {
"type": "opencollective",
Expand Down
1 change: 0 additions & 1 deletion packages/template-icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"codecov": "^3.3.0",
"core-js": "3.6.0",
"npm-run-all": "^4.1.5",
"prettier": "^1.19.1",
"typescript": "^3.8.3"
},
"peerDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,6 @@
"lint-staged": "^7.3.0",
"mocha": "^5.2.0",
"npm-run-all": "^4.1.5",
"prettier": "^1.16.4",
"tslint": "^5.8.0",
"typescript": "^3.0.3",
"vscode": "^1.1.29"
Expand Down
31 changes: 18 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12280,7 +12280,7 @@ execa@^1.0.0:
signal-exit "^3.0.0"
strip-eof "^1.0.0"

execa@^2.0.3, execa@^2.1.0:
execa@^2.0.3:
version "2.1.0"
resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99"
integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==
Expand Down Expand Up @@ -20701,10 +20701,10 @@ mozjpeg@^6.0.0:
bin-wrapper "^4.0.0"
logalot "^2.1.0"

mri@^1.1.0, mri@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.4.tgz#7cb1dd1b9b40905f1fac053abe25b6720f44744a"
integrity sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w==
mri@^1.1.0, mri@^1.1.5:
version "1.1.6"
resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.6.tgz#49952e1044db21dbf90f6cd92bc9c9a777d415a6"
integrity sha512-oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ==

[email protected]:
version "2.0.0"
Expand Down Expand Up @@ -23951,7 +23951,12 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"

[email protected], prettier@^1.14.2, prettier@^1.16.4, prettier@^1.17.0, prettier@^1.19.1:
[email protected]:
version "2.1.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz#d9485dd5e499daa6cb547023b87a6cf51bee37d6"
integrity sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==

prettier@^1.14.2, prettier@^1.16.4, prettier@^1.17.0:
version "1.19.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
Expand Down Expand Up @@ -24023,16 +24028,16 @@ pretty-hrtime@^1.0.0, pretty-hrtime@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"

pretty-quick@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-2.0.1.tgz#417ee605ade98ecc686e72f63b5d28a2c35b43e9"
integrity sha512-y7bJt77XadjUr+P1uKqZxFWLddvj3SKY6EU4BuQtMxmmEFSMpbN132pUWdSG1g1mtUfO0noBvn7wBf0BVeomHg==
pretty-quick@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-3.0.0.tgz#cba8597eca7f3821232abe6a93302d362cc30d71"
integrity sha512-oIXlGQUcUxt3XpoNfQECEWvH1Q9PtKfelF2pdp6UvC1CSQ5QcB7gUYKu0kuJGlm3LMBZzJaO/vbRkxA61pWlcg==
dependencies:
chalk "^2.4.2"
execa "^2.1.0"
chalk "^3.0.0"
execa "^4.0.0"
find-up "^4.1.0"
ignore "^5.1.4"
mri "^1.1.4"
mri "^1.1.5"
multimatch "^4.0.0"

pretty-time@^1.1.0:
Expand Down