Merge branch 'v3.8.x'
# Conflicts: # tests/format/scss/function/__snapshots__/format.test.js.snap
This commit is contained in:
fisker committed
commit
8c7e6d4338
7 files changed
+46
-41
No files matched your search
@@ -26,7 +26,7 @@ Don't fill the form below manually! Let a program create a report for you:
|
||||
|
||||
-->
|
||||
|
||||
**Prettier 3.8.2**
|
||||
**Prettier 3.8.3**
|
||||
[Playground link](https://prettier.io/playground/#.....)
|
||||
|
||||
```sh
|
||||
|
||||
@@ -20,7 +20,7 @@ BEFORE SUBMITTING AN ISSUE:
|
||||
|
||||
**Environments:**
|
||||
|
||||
- Prettier Version: 3.8.2
|
||||
- Prettier Version: 3.8.3
|
||||
- Running Prettier via: <!-- CLI, Node.js API, Browser API, etc. -->
|
||||
- Runtime: <!-- Node.js v14, Chrome v83, etc. -->
|
||||
- Operating System: <!-- Windows, Linux, macOS, etc. -->
|
||||
|
||||
@@ -1,3 +1,23 @@
|
||||
# 3.8.3
|
||||
|
||||
[diff](https://github.com/prettier/prettier/compare/3.8.2...3.8.3)
|
||||
|
||||
#### SCSS: Prevent trailing comma in `if()` function ([#18471](https://github.com/prettier/prettier/pull/18471) by [@kovsu](https://github.com/kovsu))
|
||||
|
||||
<!-- prettier-ignore -->
|
||||
```scss
|
||||
// Input
|
||||
$value: if(sass(false): 1; else: -1);
|
||||
|
||||
// Prettier 3.8.2
|
||||
$value: if(
|
||||
sass(false): 1; else: -1,
|
||||
);
|
||||
|
||||
// Prettier 3.8.3
|
||||
$value: if(sass(false): 1; else: -1);
|
||||
```
|
||||
|
||||
# 3.8.2
|
||||
|
||||
[diff](https://github.com/prettier/prettier/compare/3.8.1...3.8.2)
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
#### Prevent trailing comma in `if()` function (#18471 by @kovsu)
|
||||
|
||||
<!-- prettier-ignore -->
|
||||
```scss
|
||||
// Input
|
||||
$value: if(sass(false): 1; else: -1);
|
||||
|
||||
// Prettier stable
|
||||
$value: if(
|
||||
sass(false): 1; else: -1,
|
||||
);
|
||||
|
||||
// Prettier main
|
||||
$value: if(sass(false): 1; else: -1);
|
||||
```
|
||||
+1
-1
@@ -179,7 +179,7 @@
|
||||
"node-style-text": "2.1.2",
|
||||
"npm-run-all2": "8.0.4",
|
||||
"open-editor": "6.0.0",
|
||||
"prettier": "3.8.2",
|
||||
"prettier": "3.8.3",
|
||||
"pretty-bytes": "7.1.0",
|
||||
"pretty-ms": "9.3.0",
|
||||
"puppeteer": "24.40.0",
|
||||
|
||||
@@ -21,7 +21,7 @@ Required options:
|
||||
|
||||
- **[`parser`](options.md#parser) (or [`filepath`](options.md#file-path))**: One of these options has to be specified for Prettier to know which parser to use.
|
||||
|
||||
- **`plugins`**: Unlike the `format` function from the [Node.js-based API](api.md#prettierformatsource-options), this function doesn’t load plugins automatically. The `plugins` option is required because all the parsers included in the Prettier package come as plugins (for reasons of file size). These plugins are files in [https://unpkg.com/browse/prettier@3.8.2/plugins](https://unpkg.com/browse/prettier@3.8.2/plugins). Note that `estree` plugin should be loaded when printing JavaScript, TypeScript, Flow, or JSON.
|
||||
- **`plugins`**: Unlike the `format` function from the [Node.js-based API](api.md#prettierformatsource-options), this function doesn’t load plugins automatically. The `plugins` option is required because all the parsers included in the Prettier package come as plugins (for reasons of file size). These plugins are files in [https://unpkg.com/browse/prettier@3.8.3/plugins](https://unpkg.com/browse/prettier@3.8.3/plugins). Note that `estree` plugin should be loaded when printing JavaScript, TypeScript, Flow, or JSON.
|
||||
|
||||
You need to load the ones that you’re going to use and pass them to `prettier.format` using the `plugins` option.
|
||||
|
||||
@@ -32,8 +32,8 @@ See below for examples.
|
||||
### Global
|
||||
|
||||
```html
|
||||
<script src="https://unpkg.com/prettier@3.8.2/standalone.js"></script>
|
||||
<script src="https://unpkg.com/prettier@3.8.2/plugins/graphql.js"></script>
|
||||
<script src="https://unpkg.com/prettier@3.8.3/standalone.js"></script>
|
||||
<script src="https://unpkg.com/prettier@3.8.3/plugins/graphql.js"></script>
|
||||
<script>
|
||||
(async () => {
|
||||
const formatted = await prettier.format("type Query { hello: String }", {
|
||||
@@ -50,8 +50,8 @@ Note that the [`unpkg` field](https://unpkg.com/#examples) in Prettier’s `pack
|
||||
|
||||
```html
|
||||
<script type="module">
|
||||
import * as prettier from "https://unpkg.com/prettier@3.8.2/standalone.mjs";
|
||||
import * as prettierPluginGraphql from "https://unpkg.com/prettier@3.8.2/plugins/graphql.mjs";
|
||||
import * as prettier from "https://unpkg.com/prettier@3.8.3/standalone.mjs";
|
||||
import * as prettierPluginGraphql from "https://unpkg.com/prettier@3.8.3/plugins/graphql.mjs";
|
||||
|
||||
const formatted = await prettier.format("type Query { hello: String }", {
|
||||
parser: "graphql",
|
||||
@@ -64,8 +64,8 @@ Note that the [`unpkg` field](https://unpkg.com/#examples) in Prettier’s `pack
|
||||
|
||||
```js
|
||||
define([
|
||||
"https://unpkg.com/prettier@3.8.2/standalone.js",
|
||||
"https://unpkg.com/prettier@3.8.2/plugins/graphql.js",
|
||||
"https://unpkg.com/prettier@3.8.3/standalone.js",
|
||||
"https://unpkg.com/prettier@3.8.3/plugins/graphql.js",
|
||||
], async (prettier, ...plugins) => {
|
||||
const formatted = await prettier.format("type Query { hello: String }", {
|
||||
parser: "graphql",
|
||||
@@ -96,8 +96,8 @@ This syntax doesn’t necessarily work in the browser, but it can be used when b
|
||||
<TabItem value="module" label="Module worker">
|
||||
|
||||
```js
|
||||
import * as prettier from "https://unpkg.com/prettier@3.8.2/standalone.mjs";
|
||||
import * as prettierPluginGraphql from "https://unpkg.com/prettier@3.8.21/plugins/graphql.mjs";
|
||||
import * as prettier from "https://unpkg.com/prettier@3.8.3/standalone.mjs";
|
||||
import * as prettierPluginGraphql from "https://unpkg.com/prettier@3.8.31/plugins/graphql.mjs";
|
||||
|
||||
const formatted = await prettier.format("type Query { hello: String }", {
|
||||
parser: "graphql",
|
||||
@@ -110,8 +110,8 @@ const formatted = await prettier.format("type Query { hello: String }", {
|
||||
|
||||
```js
|
||||
importScripts(
|
||||
"https://unpkg.com/prettier@3.8.2/standalone.js",
|
||||
"https://unpkg.com/prettier@3.8.2/plugins/graphql.js",
|
||||
"https://unpkg.com/prettier@3.8.3/standalone.js",
|
||||
"https://unpkg.com/prettier@3.8.3/plugins/graphql.js",
|
||||
);
|
||||
|
||||
(async () => {
|
||||
@@ -131,9 +131,9 @@ If you want to format [embedded code](options.md#embedded-language-formatting),
|
||||
|
||||
```html
|
||||
<script type="module">
|
||||
import * as prettier from "https://unpkg.com/prettier@3.8.2/standalone.mjs";
|
||||
import * as prettierPluginBabel from "https://unpkg.com/prettier@3.8.2/plugins/babel.mjs";
|
||||
import * as prettierPluginEstree from "https://unpkg.com/prettier@3.8.2/plugins/estree.mjs";
|
||||
import * as prettier from "https://unpkg.com/prettier@3.8.3/standalone.mjs";
|
||||
import * as prettierPluginBabel from "https://unpkg.com/prettier@3.8.3/plugins/babel.mjs";
|
||||
import * as prettierPluginEstree from "https://unpkg.com/prettier@3.8.3/plugins/estree.mjs";
|
||||
|
||||
console.log(
|
||||
await prettier.format("const html=/* HTML */ `<DIV> </DIV>`", {
|
||||
@@ -149,10 +149,10 @@ The HTML code embedded in JavaScript stays unformatted because the `html` parser
|
||||
|
||||
```html
|
||||
<script type="module">
|
||||
import * as prettier from "https://unpkg.com/prettier@3.8.2/standalone.mjs";
|
||||
import * as prettierPluginBabel from "https://unpkg.com/prettier@3.8.2/plugins/babel.mjs";
|
||||
import * as prettierPluginEstree from "https://unpkg.com/prettier@3.8.2/plugins/estree.mjs";
|
||||
import * as prettierPluginHtml from "https://unpkg.com/prettier@3.8.2/plugins/html.mjs";
|
||||
import * as prettier from "https://unpkg.com/prettier@3.8.3/standalone.mjs";
|
||||
import * as prettierPluginBabel from "https://unpkg.com/prettier@3.8.3/plugins/babel.mjs";
|
||||
import * as prettierPluginEstree from "https://unpkg.com/prettier@3.8.3/plugins/estree.mjs";
|
||||
import * as prettierPluginHtml from "https://unpkg.com/prettier@3.8.3/plugins/html.mjs";
|
||||
|
||||
console.log(
|
||||
await prettier.format("const html=/* HTML */ `<DIV> </DIV>`", {
|
||||
|
||||
@@ -8568,12 +8568,12 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"prettier@npm:3.8.2":
|
||||
version: 3.8.2
|
||||
resolution: "prettier@npm:3.8.2"
|
||||
"prettier@npm:3.8.3":
|
||||
version: 3.8.3
|
||||
resolution: "prettier@npm:3.8.3"
|
||||
bin:
|
||||
prettier: bin/prettier.cjs
|
||||
checksum: 10/fd784175bc600c07eb2c44d7ec4ee7133f95f26492adad61b6a15c06f438b858181faf096ab74163d7f49500ad80cff4479c6abb084e161a2e85a9df5974ecd1
|
||||
checksum: 10/4b3b12cbb29e4c96bed936e5d070167552500c18d37676fb3e0caae6199c42860662608e4dc116230698f6e2bb0267ef2548158224c92d40f188d309d72fdd6f
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -8698,7 +8698,7 @@ __metadata:
|
||||
postcss-scss: "npm:4.0.9"
|
||||
postcss-selector-parser: "npm:2.2.3"
|
||||
postcss-values-parser: "npm:2.0.1"
|
||||
prettier: "npm:3.8.2"
|
||||
prettier: "npm:3.8.3"
|
||||
pretty-bytes: "npm:7.1.0"
|
||||
pretty-ms: "npm:9.3.0"
|
||||
puppeteer: "npm:24.40.0"
|
||||
|
||||
Reference in new issue
Block a user