Merge branch 'main' into next

# Conflicts:
#	changelog_unreleased/typescript/13764.md
#	package.json
#	scripts/release/yarn.lock
#	src/language-js/parse/postprocess/typescript.js
#	yarn.lock
This commit is contained in:
fisker Cheung committed 2022-11-18 14:27:23 +08:00
commit 9411aa2e47
6 files changed
+42 -13

No files matched your search

+29
View File
@@ -0,0 +1,29 @@
#### Fix `--cache` set only if with `--write` or `--no-different` (#13016 by @Milly)
Do not save formatted cache if without `--write` option and the file is modifies by prettier.
Before fixed, always save formatted cache if with `--cache` option.
Therefore, unformatted files will never be formatted.
**2.7:**
```
> prettier --cache foo.js
# Show formatted contents of `foo.js`.
# Then the cache is created and `foo.js` is flagged as already formatted.
> prettier --cache --write foo.js
foo.js 2ms (cached)
# "... (cached)" means that the file is already formatted and do nothing this time.
```
**2.8:**
```
> prettier --cache foo.js
# Show formatted contents of `foo.js`.
> prettier --cache --write foo.js
foo.js 2ms
# `foo.js` has
```
+1 -1
View File
@@ -1,4 +1,4 @@
#### Support TypeScript 4.9 (#13764 by @sosukesuzuki)
#### Support TypeScript 4.9 (#13764, #13783 by @sosukesuzuki)
Support [TypeScript 4.9](https://devblogs.microsoft.com/typescript/announcing-typescript-4-9) features!
+1 -1
View File
@@ -385,7 +385,7 @@ Valid options:
_First available in v1.19.0_
Whether or not to indent the code inside `<script>` and `<style>` tags in Vue files. Some people (like [the creator of Vue](https://github.com/prettier/prettier/issues/3888#issuecomment-459521863)) don’t indent to save an indentation level, but this might break code folding in your editor.
Whether or not to indent the code inside `<script>` and `<style>` tags in Vue files.
Valid options:
+1 -1
View File
@@ -96,7 +96,7 @@
"string-width": "5.0.1",
"strip-ansi": "7.0.1",
"to-fast-properties": "4.0.0",
"typescript": "4.8.4",
"typescript": "4.9.3",
"unicode-regex": "3.0.0",
"unified": "9.2.2",
"vnopts": "1.0.2",
@@ -386,7 +386,7 @@ Valid options:
_First available in v1.19.0_
Whether or not to indent the code inside `<script>` and `<style>` tags in Vue files. Some people (like [the creator of Vue](https://github.com/prettier/prettier/issues/3888#issuecomment-459521863)) don’t indent to save an indentation level, but this might break code folding in your editor.
Whether or not to indent the code inside `<script>` and `<style>` tags in Vue files.
Valid options:
+9 -9
View File
@@ -6751,7 +6751,7 @@ __metadata:
strip-ansi: 7.0.1
tempy: 3.0.0
to-fast-properties: 4.0.0
typescript: 4.8.4
typescript: 4.9.3
unicode-regex: 3.0.0
unified: 9.2.2
vnopts: 1.0.2
@@ -8010,23 +8010,23 @@ __metadata:
languageName: node
linkType: hard
"typescript@npm:4.8.4":
version: 4.8.4
resolution: "typescript@npm:4.8.4"
"typescript@npm:4.9.3":
version: 4.9.3
resolution: "typescript@npm:4.9.3"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 3e4f061658e0c8f36c820802fa809e0fd812b85687a9a2f5430bc3d0368e37d1c9605c3ce9b39df9a05af2ece67b1d844f9f6ea8ff42819f13bcb80f85629af0
checksum: 17b8f816050b412403e38d48eef0e893deb6be522d6dc7caf105e54a72e34daf6835c447735fd2b28b66784e72bfbf87f627abb4818a8e43d1fa8106396128dc
languageName: node
linkType: hard
"typescript@patch:typescript@4.8.4#~builtin<compat/typescript>":
version: 4.8.4
resolution: "typescript@patch:typescript@npm%3A4.8.4#~builtin<compat/typescript>::version=4.8.4&hash=701156"
"typescript@patch:typescript@4.9.3#~builtin<compat/typescript>":
version: 4.9.3
resolution: "typescript@patch:typescript@npm%3A4.9.3#~builtin<compat/typescript>::version=4.9.3&hash=701156"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 301459fc3eb3b1a38fe91bf96d98eb55da88a9cb17b4ef80b4d105d620f4d547ba776cc27b44cc2ef58b66eda23fe0a74142feb5e79a6fb99f54fc018a696afa
checksum: ef65c22622d864497d0a0c5db693523329b3284c15fe632e93ad9aa059e8dc38ef3bd767d6f26b1e5ecf9446f49bd0f6c4e5714a2eeaf352805dc002479843d1
languageName: node
linkType: hard