From 189390434f0d45c97e2efbd76872c406970bda62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Sat, 5 Sep 2020 00:57:22 +0200 Subject: [PATCH 1/3] Upgrade Prettier --- .prettierignore | 7 +++++ .prettierrc.js | 2 -- package.json | 9 +++--- packages/template-icons/package.json | 1 - .../package.json | 3 +- .../package.json | 3 +- .../octref.vetur.0.16.2/package.json | 1 - .../octref.vetur.0.16.2/server/package.json | 1 - .../extensions/sbrink.elm-0.25.0/package.json | 1 - .../vscodevim.vim-1.2.0/package.json | 3 +- yarn.lock | 31 +++++++++++-------- 11 files changed, 33 insertions(+), 29 deletions(-) diff --git a/.prettierignore b/.prettierignore index 93a249359e1..704aeadd2ed 100644 --- a/.prettierignore +++ b/.prettierignore @@ -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 diff --git a/.prettierrc.js b/.prettierrc.js index f0b4ed285e0..4f0abdee162 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,6 +1,4 @@ module.exports = { - endOfLine: 'lf', proseWrap: 'always', singleQuote: true, - trailingComma: 'es5', }; diff --git a/package.json b/package.json index 9c71c34fe81..f17c4b8b0cf 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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" }, @@ -112,7 +113,7 @@ ] }, "engines": { - "node": "^10.0.0" + "node": "^10.13.0" }, "collective": { "type": "opencollective", diff --git a/packages/template-icons/package.json b/packages/template-icons/package.json index 40269b95616..a1afffaa9cc 100644 --- a/packages/template-icons/package.json +++ b/packages/template-icons/package.json @@ -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": { diff --git a/standalone-packages/vscode-extensions/out/extensions/dracula-theme.theme-dracula-2.17.0/package.json b/standalone-packages/vscode-extensions/out/extensions/dracula-theme.theme-dracula-2.17.0/package.json index f21a2bd75b3..5596fc24b3c 100644 --- a/standalone-packages/vscode-extensions/out/extensions/dracula-theme.theme-dracula-2.17.0/package.json +++ b/standalone-packages/vscode-extensions/out/extensions/dracula-theme.theme-dracula-2.17.0/package.json @@ -64,7 +64,6 @@ }, "devDependencies": { "js-yaml": "^3.13.1", - "prettier": "^1.17.0", "tinycolor2": "^1.4.1" }, "__metadata": { @@ -72,4 +71,4 @@ "publisherId": "fbb3d024-f8f2-460c-bdb5-99552f6d8c4b", "publisherDisplayName": "Dracula Theme" } -} \ No newline at end of file +} diff --git a/standalone-packages/vscode-extensions/out/extensions/jpoissonnier.vscode-styled-components-0.0.26/package.json b/standalone-packages/vscode-extensions/out/extensions/jpoissonnier.vscode-styled-components-0.0.26/package.json index 6e42ce93bc5..419d7af700b 100644 --- a/standalone-packages/vscode-extensions/out/extensions/jpoissonnier.vscode-styled-components-0.0.26/package.json +++ b/standalone-packages/vscode-extensions/out/extensions/jpoissonnier.vscode-styled-components-0.0.26/package.json @@ -65,7 +65,6 @@ "typescript-styled-plugin": "0.14.0" }, "devDependencies": { - "prettier": "^1.14.3", "prettier-cli": "^0.1.0", "vscode": "^1.1.26" }, @@ -74,4 +73,4 @@ "publisherId": "dc4b8887-5c2d-49b0-a25f-724384a16ec3", "publisherDisplayName": "Julien Poissonnier" } -} \ No newline at end of file +} diff --git a/standalone-packages/vscode-extensions/out/extensions/octref.vetur.0.16.2/package.json b/standalone-packages/vscode-extensions/out/extensions/octref.vetur.0.16.2/package.json index 0ec6c6e9cdf..23b3b942ab3 100644 --- a/standalone-packages/vscode-extensions/out/extensions/octref.vetur.0.16.2/package.json +++ b/standalone-packages/vscode-extensions/out/extensions/octref.vetur.0.16.2/package.json @@ -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" diff --git a/standalone-packages/vscode-extensions/out/extensions/octref.vetur.0.16.2/server/package.json b/standalone-packages/vscode-extensions/out/extensions/octref.vetur.0.16.2/server/package.json index de033d632be..91a921d7b35 100644 --- a/standalone-packages/vscode-extensions/out/extensions/octref.vetur.0.16.2/server/package.json +++ b/standalone-packages/vscode-extensions/out/extensions/octref.vetur.0.16.2/server/package.json @@ -31,7 +31,6 @@ "lodash": "^4.17.4", "nuxt-helper-json": "^1.0.0", "parse-gitignore": "^1.0.1", - "prettier": "^1.16.4", "prettier-eslint": "^8.8.2", "read-pkg-up": "^4.0.0", "resolve": "^1.8.1", diff --git a/standalone-packages/vscode-extensions/out/extensions/sbrink.elm-0.25.0/package.json b/standalone-packages/vscode-extensions/out/extensions/sbrink.elm-0.25.0/package.json index 111330dc842..5a596302086 100644 --- a/standalone-packages/vscode-extensions/out/extensions/sbrink.elm-0.25.0/package.json +++ b/standalone-packages/vscode-extensions/out/extensions/sbrink.elm-0.25.0/package.json @@ -89,7 +89,6 @@ "@types/mocha": "^2.2.32", "@types/node": "^6.0.50", "mocha": "^2.3.3", - "prettier": "^1.5.3", "typescript": "^2.4.0", "vscode": "1.1.0" }, diff --git a/standalone-packages/vscode-extensions/out/extensions/vscodevim.vim-1.2.0/package.json b/standalone-packages/vscode-extensions/out/extensions/vscodevim.vim-1.2.0/package.json index 03eccb6288b..23e4e92c1be 100644 --- a/standalone-packages/vscode-extensions/out/extensions/vscodevim.vim-1.2.0/package.json +++ b/standalone-packages/vscode-extensions/out/extensions/vscodevim.vim-1.2.0/package.json @@ -742,7 +742,6 @@ "minimist": "1.2.0", "mocha": "6.0.2", "plugin-error": "1.0.1", - "prettier": "1.16.4", "sinon": "7.2.7", "tslint": "5.14.0", "typescript": "3.3.3333", @@ -753,4 +752,4 @@ "publisherId": "5d63889b-1b67-4b1f-8350-4f1dce041a26", "publisherDisplayName": "vscodevim" } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 70ac35b94ed..767fee25047 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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== @@ -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== ms@2.0.0: version "2.0.0" @@ -23951,7 +23951,12 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@1.19.1, prettier@^1.14.2, prettier@^1.16.4, prettier@^1.17.0, prettier@^1.19.1: +prettier@2.1.1: + 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== @@ -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: From 456513fe3c471a2c1970e2d5a697bb35214251b1 Mon Sep 17 00:00:00 2001 From: Sara Vieira Date: Tue, 8 Sep 2020 18:01:10 +0200 Subject: [PATCH 2/3] Delete package.json --- .../package.json | 74 ------------------- 1 file changed, 74 deletions(-) delete mode 100644 standalone-packages/vscode-extensions/out/extensions/dracula-theme.theme-dracula-2.17.0/package.json diff --git a/standalone-packages/vscode-extensions/out/extensions/dracula-theme.theme-dracula-2.17.0/package.json b/standalone-packages/vscode-extensions/out/extensions/dracula-theme.theme-dracula-2.17.0/package.json deleted file mode 100644 index 5596fc24b3c..00000000000 --- a/standalone-packages/vscode-extensions/out/extensions/dracula-theme.theme-dracula-2.17.0/package.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "name": "theme-dracula", - "version": "2.18.0", - "displayName": "Dracula Official", - "homepage": "https://draculatheme.com/", - "description": "Official Dracula Theme. A dark theme for many editors, shells, and more.", - "publisher": "dracula-theme", - "license": "MIT", - "scripts": { - "dev": "node ./scripts/dev.js", - "build": "node ./scripts/build.js", - "lint": "node ./scripts/lint.js", - "package": "vsce package -o ./bin/dracula.vsix", - "vscode:prepublish": "npm run build" - }, - "maintainers": [ - "Derek P Sifford " - ], - "contributors": [ - "Krzysztof Wisznarewski", - "Daniel Ramos", - "Eric Jackson", - "Elliott Pogue", - "Ajit Singh", - "Teddy Bradford" - ], - "repository": { - "type": "git", - "url": "https://github.com/dracula/visual-studio-code.git" - }, - "bugs": { - "url": "https://github.com/dracula/visual-studio-code/issues" - }, - "engines": { - "vscode": "^1.13.0" - }, - "categories": [ - "Themes" - ], - "keywords": [ - "dracula", - "dark", - "theme", - "color-theme" - ], - "icon": "icon.png", - "galleryBanner": { - "color": "#3c4557", - "theme": "dark" - }, - "contributes": { - "themes": [ - { - "label": "Dracula", - "uiTheme": "vs-dark", - "path": "./theme/dracula.json" - }, - { - "label": "Dracula Soft", - "uiTheme": "vs-dark", - "path": "./theme/dracula-soft.json" - } - ] - }, - "devDependencies": { - "js-yaml": "^3.13.1", - "tinycolor2": "^1.4.1" - }, - "__metadata": { - "id": "4e44877c-1c8d-4f9c-ba86-1372d0fbeeb1", - "publisherId": "fbb3d024-f8f2-460c-bdb5-99552f6d8c4b", - "publisherDisplayName": "Dracula Theme" - } -} From f060c860322effcabd6d48a6297e19f0b55657b7 Mon Sep 17 00:00:00 2001 From: Sara Vieira Date: Tue, 8 Sep 2020 18:03:27 +0200 Subject: [PATCH 3/3] do not touch extension files --- .../package.json | 75 +++++++++++++++++++ .../package.json | 3 +- .../octref.vetur.0.16.2/server/package.json | 1 + .../extensions/sbrink.elm-0.25.0/package.json | 1 + .../vscodevim.vim-1.2.0/package.json | 3 +- 5 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 standalone-packages/vscode-extensions/out/extensions/dracula-theme.theme-dracula-2.17.0/package.json diff --git a/standalone-packages/vscode-extensions/out/extensions/dracula-theme.theme-dracula-2.17.0/package.json b/standalone-packages/vscode-extensions/out/extensions/dracula-theme.theme-dracula-2.17.0/package.json new file mode 100644 index 00000000000..f21a2bd75b3 --- /dev/null +++ b/standalone-packages/vscode-extensions/out/extensions/dracula-theme.theme-dracula-2.17.0/package.json @@ -0,0 +1,75 @@ +{ + "name": "theme-dracula", + "version": "2.18.0", + "displayName": "Dracula Official", + "homepage": "https://draculatheme.com/", + "description": "Official Dracula Theme. A dark theme for many editors, shells, and more.", + "publisher": "dracula-theme", + "license": "MIT", + "scripts": { + "dev": "node ./scripts/dev.js", + "build": "node ./scripts/build.js", + "lint": "node ./scripts/lint.js", + "package": "vsce package -o ./bin/dracula.vsix", + "vscode:prepublish": "npm run build" + }, + "maintainers": [ + "Derek P Sifford " + ], + "contributors": [ + "Krzysztof Wisznarewski", + "Daniel Ramos", + "Eric Jackson", + "Elliott Pogue", + "Ajit Singh", + "Teddy Bradford" + ], + "repository": { + "type": "git", + "url": "https://github.com/dracula/visual-studio-code.git" + }, + "bugs": { + "url": "https://github.com/dracula/visual-studio-code/issues" + }, + "engines": { + "vscode": "^1.13.0" + }, + "categories": [ + "Themes" + ], + "keywords": [ + "dracula", + "dark", + "theme", + "color-theme" + ], + "icon": "icon.png", + "galleryBanner": { + "color": "#3c4557", + "theme": "dark" + }, + "contributes": { + "themes": [ + { + "label": "Dracula", + "uiTheme": "vs-dark", + "path": "./theme/dracula.json" + }, + { + "label": "Dracula Soft", + "uiTheme": "vs-dark", + "path": "./theme/dracula-soft.json" + } + ] + }, + "devDependencies": { + "js-yaml": "^3.13.1", + "prettier": "^1.17.0", + "tinycolor2": "^1.4.1" + }, + "__metadata": { + "id": "4e44877c-1c8d-4f9c-ba86-1372d0fbeeb1", + "publisherId": "fbb3d024-f8f2-460c-bdb5-99552f6d8c4b", + "publisherDisplayName": "Dracula Theme" + } +} \ No newline at end of file diff --git a/standalone-packages/vscode-extensions/out/extensions/jpoissonnier.vscode-styled-components-0.0.26/package.json b/standalone-packages/vscode-extensions/out/extensions/jpoissonnier.vscode-styled-components-0.0.26/package.json index 419d7af700b..6e42ce93bc5 100644 --- a/standalone-packages/vscode-extensions/out/extensions/jpoissonnier.vscode-styled-components-0.0.26/package.json +++ b/standalone-packages/vscode-extensions/out/extensions/jpoissonnier.vscode-styled-components-0.0.26/package.json @@ -65,6 +65,7 @@ "typescript-styled-plugin": "0.14.0" }, "devDependencies": { + "prettier": "^1.14.3", "prettier-cli": "^0.1.0", "vscode": "^1.1.26" }, @@ -73,4 +74,4 @@ "publisherId": "dc4b8887-5c2d-49b0-a25f-724384a16ec3", "publisherDisplayName": "Julien Poissonnier" } -} +} \ No newline at end of file diff --git a/standalone-packages/vscode-extensions/out/extensions/octref.vetur.0.16.2/server/package.json b/standalone-packages/vscode-extensions/out/extensions/octref.vetur.0.16.2/server/package.json index 91a921d7b35..de033d632be 100644 --- a/standalone-packages/vscode-extensions/out/extensions/octref.vetur.0.16.2/server/package.json +++ b/standalone-packages/vscode-extensions/out/extensions/octref.vetur.0.16.2/server/package.json @@ -31,6 +31,7 @@ "lodash": "^4.17.4", "nuxt-helper-json": "^1.0.0", "parse-gitignore": "^1.0.1", + "prettier": "^1.16.4", "prettier-eslint": "^8.8.2", "read-pkg-up": "^4.0.0", "resolve": "^1.8.1", diff --git a/standalone-packages/vscode-extensions/out/extensions/sbrink.elm-0.25.0/package.json b/standalone-packages/vscode-extensions/out/extensions/sbrink.elm-0.25.0/package.json index 5a596302086..111330dc842 100644 --- a/standalone-packages/vscode-extensions/out/extensions/sbrink.elm-0.25.0/package.json +++ b/standalone-packages/vscode-extensions/out/extensions/sbrink.elm-0.25.0/package.json @@ -89,6 +89,7 @@ "@types/mocha": "^2.2.32", "@types/node": "^6.0.50", "mocha": "^2.3.3", + "prettier": "^1.5.3", "typescript": "^2.4.0", "vscode": "1.1.0" }, diff --git a/standalone-packages/vscode-extensions/out/extensions/vscodevim.vim-1.2.0/package.json b/standalone-packages/vscode-extensions/out/extensions/vscodevim.vim-1.2.0/package.json index 23e4e92c1be..03eccb6288b 100644 --- a/standalone-packages/vscode-extensions/out/extensions/vscodevim.vim-1.2.0/package.json +++ b/standalone-packages/vscode-extensions/out/extensions/vscodevim.vim-1.2.0/package.json @@ -742,6 +742,7 @@ "minimist": "1.2.0", "mocha": "6.0.2", "plugin-error": "1.0.1", + "prettier": "1.16.4", "sinon": "7.2.7", "tslint": "5.14.0", "typescript": "3.3.3333", @@ -752,4 +753,4 @@ "publisherId": "5d63889b-1b67-4b1f-8350-4f1dce041a26", "publisherDisplayName": "vscodevim" } -} +} \ No newline at end of file