Merge branch 'main' into next
# Conflicts: # .github/workflows/validate-vendor-versions.yml # package.json # src/language-css/printer-postcss.js # src/language-js/print/assignment.js
This commit is contained in:
commit
8118299c67
26 files changed
+527
-103
No files matched your search
@@ -31,7 +31,7 @@ jobs:
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2.4.0
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v3
|
||||
|
||||
@@ -42,7 +42,7 @@ jobs:
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2.4.0
|
||||
uses: actions/checkout@v3
|
||||
# `codecov/codecov-action` require depth to be at least `2`, see #10219
|
||||
with:
|
||||
fetch-depth: 2
|
||||
|
||||
@@ -16,7 +16,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2.4.0
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v3
|
||||
|
||||
@@ -14,7 +14,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2.4.0
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v3
|
||||
|
||||
@@ -14,7 +14,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2.4.0
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v3
|
||||
@@ -49,7 +49,7 @@ jobs:
|
||||
needs: [build]
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2.4.0
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v3
|
||||
@@ -97,7 +97,7 @@ jobs:
|
||||
needs: [build]
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2.4.0
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v3
|
||||
|
||||
@@ -20,12 +20,12 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2.4.0
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
version: "14"
|
||||
node-version: "14"
|
||||
cache: "yarn"
|
||||
|
||||
- name: Install Dependencies
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
#### Fix lowercasing postcss values (#12393 by @niklasvatn)
|
||||
|
||||
PostCSS values can start with digits. Prettier interprets this as a number followed by a unit in the example below.
|
||||
|
||||
<!-- prettier-ignore -->
|
||||
```css
|
||||
// Input
|
||||
@value 4XLarge 28/36px;
|
||||
|
||||
.test {
|
||||
font: 4XLarge Helvetica;
|
||||
}
|
||||
|
||||
// Prettier stable
|
||||
@value 4XLarge 28/36px;
|
||||
|
||||
.test {
|
||||
font: 4xlarge Helvetica;
|
||||
}
|
||||
|
||||
// Prettier main
|
||||
@value 4XLarge 28/36px;
|
||||
|
||||
.test {
|
||||
font: 4XLarge Helvetica;
|
||||
}
|
||||
```
|
||||
@@ -0,0 +1,23 @@
|
||||
#### Fix idempotence issues caused by line comments after `=` in assignments (#12349 by @thorn0)
|
||||
|
||||
<!-- prettier-ignore -->
|
||||
```jsx
|
||||
// Input
|
||||
const kochabCooieGameOnOboleUnweave = // !!!
|
||||
rhubarbRhubarb(annularCooeedSplicesWalksWayWay);
|
||||
|
||||
// Prettier stable, first format
|
||||
const kochabCooieGameOnOboleUnweave = rhubarbRhubarb( // !!!
|
||||
annularCooeedSplicesWalksWayWay
|
||||
);
|
||||
|
||||
// Prettier stable, second format
|
||||
const kochabCooieGameOnOboleUnweave = rhubarbRhubarb(
|
||||
// !!!
|
||||
annularCooeedSplicesWalksWayWay
|
||||
);
|
||||
|
||||
// Prettier main
|
||||
const kochabCooieGameOnOboleUnweave = // !!!
|
||||
rhubarbRhubarb(annularCooeedSplicesWalksWayWay);
|
||||
```
|
||||
@@ -0,0 +1,49 @@
|
||||
#### Allow `lang` attribute of `<template>` to be empty (#12394 by @HallvardMM)
|
||||
|
||||
Template tag should allow empty string lang="" or undefined lang
|
||||
|
||||
<!-- prettier-ignore -->
|
||||
```vue
|
||||
<!-- Input -->
|
||||
<template lang="">
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
<template lang>
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
<!-- Prettier stable -->
|
||||
SyntaxError: Unexpected closing tag "v-menu". It may happen when the tag has already been closed by another tag. For more info see https://www.w3.org/TR/html5/syntax.html#closing-elements-that-have-implied-end-tags (5:5)
|
||||
[error] 3 | <v-menu offset-y>
|
||||
[error] 4 | <template></template>
|
||||
[error] > 5 | </v-menu>
|
||||
[error] | ^^^^^^^^^
|
||||
[error] 6 | </v-app-bar>
|
||||
[error] 7 | </template>
|
||||
|
||||
<!-- Prettier main -->
|
||||
<template lang="">
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
<template lang>
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
```
|
||||
+6
-5
@@ -27,7 +27,7 @@
|
||||
"@babel/parser": "7.17.3",
|
||||
"@glimmer/syntax": "0.84.0",
|
||||
"@iarna/toml": "2.2.5",
|
||||
"@typescript-eslint/typescript-estree": "5.12.1",
|
||||
"@typescript-eslint/typescript-estree": "5.14.0",
|
||||
"acorn": "8.7.0",
|
||||
"acorn-jsx": "5.3.2",
|
||||
"angular-estree-parser": "2.5.0",
|
||||
@@ -38,6 +38,7 @@
|
||||
"ci-info": "3.3.0",
|
||||
"cjk-regex": "2.0.1",
|
||||
"cosmiconfig": "7.0.1",
|
||||
"css-units-list": "0.0.5",
|
||||
"dashify": "2.0.0",
|
||||
"diff": "5.0.0",
|
||||
"editorconfig": "0.15.3",
|
||||
@@ -48,7 +49,7 @@
|
||||
"fast-glob": "3.2.11",
|
||||
"fast-json-stable-stringify": "2.1.0",
|
||||
"find-parent-dir": "0.3.1",
|
||||
"flow-parser": "0.172.0",
|
||||
"flow-parser": "0.173.0",
|
||||
"get-stdin": "8.0.0",
|
||||
"graphql": "15.6.1",
|
||||
"html-element-attributes": "3.1.0",
|
||||
@@ -84,7 +85,7 @@
|
||||
"semver": "7.3.5",
|
||||
"string-width": "5.0.1",
|
||||
"strip-ansi": "7.0.1",
|
||||
"typescript": "4.5.5",
|
||||
"typescript": "4.6.2",
|
||||
"unicode-regex": "3.0.0",
|
||||
"unified": "9.2.1",
|
||||
"vnopts": "1.0.2",
|
||||
@@ -101,7 +102,7 @@
|
||||
"@prettier/jest-light-runner": "file:./tests/config/jest-light-runner",
|
||||
"@types/estree": "0.0.51",
|
||||
"@types/jest": "27.4.1",
|
||||
"@typescript-eslint/eslint-plugin": "5.13.0",
|
||||
"@typescript-eslint/eslint-plugin": "5.14.0",
|
||||
"babel-jest": "27.5.1",
|
||||
"benchmark": "2.1.4",
|
||||
"browserslist-to-esbuild": "1.1.1",
|
||||
@@ -128,7 +129,7 @@
|
||||
"jest-snapshot-serializer-raw": "1.2.0",
|
||||
"jest-watch-typeahead": "1.0.0",
|
||||
"node-actionlint": "1.2.2",
|
||||
"node-fetch": "3.2.1",
|
||||
"node-fetch": "3.2.2",
|
||||
"npm-run-all": "4.1.5",
|
||||
"path-browserify": "1.0.1",
|
||||
"prettier": "2.5.1",
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
"node-fetch": "3.2.1",
|
||||
"outdent": "0.8.0",
|
||||
"semver": "7.3.5",
|
||||
"string-width": "5.1.0"
|
||||
"string-width": "5.1.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@jest/globals": "27.5.1",
|
||||
|
||||
@@ -2555,10 +2555,10 @@ string-length@^4.0.1:
|
||||
char-regex "^1.0.2"
|
||||
strip-ansi "^6.0.0"
|
||||
|
||||
string-width@5.1.0:
|
||||
version "5.1.0"
|
||||
resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.0.tgz#5ab00980cfb29f43e736b113a120a73a0fb569d3"
|
||||
integrity sha512-7x54QnN21P+XL/v8SuNKvfgsUre6PXpN7mc77N3HlZv+f1SBRGmjxtOud2Z6FZ8DmdkD/IdjCaf9XXbnqmTZGQ==
|
||||
string-width@5.1.2:
|
||||
version "5.1.2"
|
||||
resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
|
||||
integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
|
||||
dependencies:
|
||||
eastasianwidth "^0.2.0"
|
||||
emoji-regex "^9.2.2"
|
||||
|
||||
@@ -60,6 +60,7 @@ import {
|
||||
isParenGroupNode,
|
||||
} from "./utils/index.js";
|
||||
import { locStart, locEnd } from "./loc.js";
|
||||
import printUnit from "./utils/print-unit.js";
|
||||
|
||||
const {
|
||||
builders: {
|
||||
@@ -978,7 +979,7 @@ function genericPrint(path, options, print) {
|
||||
return node.value;
|
||||
}
|
||||
case "value-number": {
|
||||
return [printCssNumber(node.value), maybeToLowerCase(node.unit)];
|
||||
return [printCssNumber(node.value), printUnit(node.unit)];
|
||||
}
|
||||
case "value-operator": {
|
||||
return node.value;
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
import cssUnits from "css-units-list";
|
||||
|
||||
const CSS_UNITS = Object.fromEntries(
|
||||
cssUnits.map((unit) => [unit.toLowerCase(), unit])
|
||||
);
|
||||
|
||||
export default CSS_UNITS;
|
||||
@@ -0,0 +1,11 @@
|
||||
import CSS_UNITS from "./css-units.evaluate.js";
|
||||
|
||||
function printUnit(unit) {
|
||||
const lowercased = unit.toLowerCase();
|
||||
|
||||
return Object.prototype.hasOwnProperty.call(CSS_UNITS, lowercased)
|
||||
? CSS_UNITS[lowercased]
|
||||
: unit;
|
||||
}
|
||||
|
||||
export default printUnit;
|
||||
@@ -417,7 +417,11 @@ const parser = {
|
||||
!hasParent &&
|
||||
(tagName !== "template" ||
|
||||
attrs.some(
|
||||
({ name, value }) => name === "lang" && value !== "html"
|
||||
({ name, value }) =>
|
||||
name === "lang" &&
|
||||
value !== "html" &&
|
||||
value !== "" &&
|
||||
value !== undefined
|
||||
))
|
||||
) {
|
||||
return angularHtmlParser.TagContentType.RAW_TEXT;
|
||||
|
||||
@@ -18,7 +18,7 @@ import { shouldInlineLogicalExpression } from "./binaryish.js";
|
||||
import { printCallExpression } from "./call-expression.js";
|
||||
|
||||
const {
|
||||
builders: { line, group, indent, indentIfBreak },
|
||||
builders: { line, group, indent, indentIfBreak, lineSuffixBoundary },
|
||||
utils: { cleanDoc, willBreak, canBreak },
|
||||
} = doc;
|
||||
|
||||
@@ -50,6 +50,7 @@ function printAssignment(
|
||||
group(leftDoc),
|
||||
operator,
|
||||
group(indent(line), { id: groupId }),
|
||||
lineSuffixBoundary,
|
||||
indentIfBreak(rightDoc, { groupId }),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`values.css format 1`] = `
|
||||
====================================options=====================================
|
||||
parsers: ["css"]
|
||||
printWidth: 80
|
||||
| printWidth
|
||||
=====================================input======================================
|
||||
@value 4XLarge 28/36px;
|
||||
|
||||
.postCssLowerCasingValueName {
|
||||
font: 4XLarge Helvetica;
|
||||
}
|
||||
|
||||
.cssUnits {
|
||||
a: 5EM;
|
||||
a: 5REM;
|
||||
a: 5EX;
|
||||
a: 5REX;
|
||||
a: 5CAP;
|
||||
a: 5RCAP;
|
||||
a: 5CH;
|
||||
a: 5RCH;
|
||||
a: 5IC;
|
||||
a: 5RIC;
|
||||
a: 5LH;
|
||||
a: 5RLH;
|
||||
a: 5VH;
|
||||
a: 5VW;
|
||||
a: 5VI;
|
||||
a: 5VB;
|
||||
a: 5VMIN;
|
||||
a: 5VMAX;
|
||||
a: 5CM;
|
||||
a: 5MM;
|
||||
a: 5q;
|
||||
a: 5IN;
|
||||
a: 5PT;
|
||||
a: 5PC;
|
||||
a: 5PX;
|
||||
a: 5DEG;
|
||||
a: 5GRAD;
|
||||
a: 5RAD;
|
||||
a: 5S;
|
||||
a: 5MS;
|
||||
a: 5hZ;
|
||||
a: 5KhZ;
|
||||
a: 5DPI;
|
||||
a: 5DPCM;
|
||||
a: 5DPPX;
|
||||
a: 5X;
|
||||
|
||||
a: 5PROTOTYPE;
|
||||
a: 5constructoR;
|
||||
}
|
||||
|
||||
=====================================output=====================================
|
||||
@value 4XLarge 28/36px;
|
||||
|
||||
.postCssLowerCasingValueName {
|
||||
font: 4XLarge Helvetica;
|
||||
}
|
||||
|
||||
.cssUnits {
|
||||
a: 5em;
|
||||
a: 5rem;
|
||||
a: 5ex;
|
||||
a: 5rex;
|
||||
a: 5cap;
|
||||
a: 5rcap;
|
||||
a: 5ch;
|
||||
a: 5rch;
|
||||
a: 5ic;
|
||||
a: 5ric;
|
||||
a: 5lh;
|
||||
a: 5rlh;
|
||||
a: 5vh;
|
||||
a: 5vw;
|
||||
a: 5vi;
|
||||
a: 5vb;
|
||||
a: 5vmin;
|
||||
a: 5vmax;
|
||||
a: 5cm;
|
||||
a: 5mm;
|
||||
a: 5Q;
|
||||
a: 5in;
|
||||
a: 5pt;
|
||||
a: 5pc;
|
||||
a: 5px;
|
||||
a: 5deg;
|
||||
a: 5grad;
|
||||
a: 5rad;
|
||||
a: 5s;
|
||||
a: 5ms;
|
||||
a: 5Hz;
|
||||
a: 5kHz;
|
||||
a: 5dpi;
|
||||
a: 5dpcm;
|
||||
a: 5dppx;
|
||||
a: 5x;
|
||||
|
||||
a: 5PROTOTYPE;
|
||||
a: 5constructoR;
|
||||
}
|
||||
|
||||
================================================================================
|
||||
`;
|
||||
@@ -0,0 +1 @@
|
||||
run_spec(__dirname, ["css"]);
|
||||
@@ -0,0 +1,47 @@
|
||||
@value 4XLarge 28/36px;
|
||||
|
||||
.postCssLowerCasingValueName {
|
||||
font: 4XLarge Helvetica;
|
||||
}
|
||||
|
||||
.cssUnits {
|
||||
a: 5EM;
|
||||
a: 5REM;
|
||||
a: 5EX;
|
||||
a: 5REX;
|
||||
a: 5CAP;
|
||||
a: 5RCAP;
|
||||
a: 5CH;
|
||||
a: 5RCH;
|
||||
a: 5IC;
|
||||
a: 5RIC;
|
||||
a: 5LH;
|
||||
a: 5RLH;
|
||||
a: 5VH;
|
||||
a: 5VW;
|
||||
a: 5VI;
|
||||
a: 5VB;
|
||||
a: 5VMIN;
|
||||
a: 5VMAX;
|
||||
a: 5CM;
|
||||
a: 5MM;
|
||||
a: 5q;
|
||||
a: 5IN;
|
||||
a: 5PT;
|
||||
a: 5PC;
|
||||
a: 5PX;
|
||||
a: 5DEG;
|
||||
a: 5GRAD;
|
||||
a: 5RAD;
|
||||
a: 5S;
|
||||
a: 5MS;
|
||||
a: 5hZ;
|
||||
a: 5KhZ;
|
||||
a: 5DPI;
|
||||
a: 5DPCM;
|
||||
a: 5DPPX;
|
||||
a: 5X;
|
||||
|
||||
a: 5PROTOTYPE;
|
||||
a: 5constructoR;
|
||||
}
|
||||
@@ -1,5 +1,47 @@
|
||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`call.js format 1`] = `
|
||||
====================================options=====================================
|
||||
parsers: ["babel", "flow", "typescript"]
|
||||
printWidth: 80
|
||||
| printWidth
|
||||
=====================================input======================================
|
||||
if (true)
|
||||
if (true)
|
||||
if (true)
|
||||
if (true)
|
||||
if (true)
|
||||
longVariableName1 = // @ts-ignore
|
||||
(variable01 + veryLongVariableNameNumber2).method();
|
||||
|
||||
=====================================output=====================================
|
||||
if (true)
|
||||
if (true)
|
||||
if (true)
|
||||
if (true)
|
||||
if (true)
|
||||
longVariableName1 = // @ts-ignore
|
||||
(variable01 + veryLongVariableNameNumber2).method();
|
||||
|
||||
================================================================================
|
||||
`;
|
||||
|
||||
exports[`call2.js format 1`] = `
|
||||
====================================options=====================================
|
||||
parsers: ["babel", "flow", "typescript"]
|
||||
printWidth: 80
|
||||
| printWidth
|
||||
=====================================input======================================
|
||||
const kochabCooieGameOnOboleUnweave = // ???
|
||||
rhubarbRhubarb(annularCooeedSplicesWalksWayWay);
|
||||
|
||||
=====================================output=====================================
|
||||
const kochabCooieGameOnOboleUnweave = // ???
|
||||
rhubarbRhubarb(annularCooeedSplicesWalksWayWay);
|
||||
|
||||
================================================================================
|
||||
`;
|
||||
|
||||
exports[`function.js format 1`] = `
|
||||
====================================options=====================================
|
||||
parsers: ["babel", "flow", "typescript"]
|
||||
@@ -82,7 +124,8 @@ f3 = (
|
||||
a = b //comment
|
||||
) => {};
|
||||
|
||||
f4 = () => {}; // Comment
|
||||
f4 = // Comment
|
||||
() => {};
|
||||
|
||||
f5 =
|
||||
// Comment
|
||||
@@ -109,7 +152,8 @@ let f3 = (
|
||||
a = b //comment
|
||||
) => {};
|
||||
|
||||
let f4 = () => {}; // Comment
|
||||
let f4 = // Comment
|
||||
() => {};
|
||||
|
||||
let f5 =
|
||||
// Comment
|
||||
@@ -141,7 +185,8 @@ const bifornCringerMoshedPerplexSawder = // !!!
|
||||
anodyneCondosMalateOverateRetinol;
|
||||
|
||||
=====================================output=====================================
|
||||
const kochabCooieGameOnOboleUnweave = annularCooeedSplicesWalksWayWay; // ???
|
||||
const kochabCooieGameOnOboleUnweave = // ???
|
||||
annularCooeedSplicesWalksWayWay;
|
||||
|
||||
const bifornCringerMoshedPerplexSawder = // !!!
|
||||
glimseGlyphsHazardNoopsTieTie +
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
if (true)
|
||||
if (true)
|
||||
if (true)
|
||||
if (true)
|
||||
if (true)
|
||||
longVariableName1 = // @ts-ignore
|
||||
(variable01 + veryLongVariableNameNumber2).method();
|
||||
@@ -0,0 +1,2 @@
|
||||
const kochabCooieGameOnOboleUnweave = // ???
|
||||
rhubarbRhubarb(annularCooeedSplicesWalksWayWay);
|
||||
@@ -4154,6 +4154,22 @@ semi: false
|
||||
some-component(tag='<some-tag>')
|
||||
</template>
|
||||
|
||||
<template lang="">
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
<template lang>
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
=====================================output=====================================
|
||||
<template lang="pug">
|
||||
.test
|
||||
@@ -4172,6 +4188,22 @@ semi: false
|
||||
some-component(tag='<some-tag>')
|
||||
</template>
|
||||
|
||||
<template lang="">
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
<template lang>
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
================================================================================
|
||||
`;
|
||||
|
||||
@@ -4203,6 +4235,22 @@ trailingComma: "none"
|
||||
some-component(tag='<some-tag>')
|
||||
</template>
|
||||
|
||||
<template lang="">
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
<template lang>
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
=====================================output=====================================
|
||||
<template lang="pug">
|
||||
.test
|
||||
@@ -4221,6 +4269,22 @@ trailingComma: "none"
|
||||
some-component(tag='<some-tag>')
|
||||
</template>
|
||||
|
||||
<template lang="">
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
<template lang>
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
================================================================================
|
||||
`;
|
||||
|
||||
@@ -4251,6 +4315,22 @@ printWidth: 80
|
||||
some-component(tag='<some-tag>')
|
||||
</template>
|
||||
|
||||
<template lang="">
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
<template lang>
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
=====================================output=====================================
|
||||
<template lang="pug">
|
||||
.test
|
||||
@@ -4269,6 +4349,22 @@ printWidth: 80
|
||||
some-component(tag='<some-tag>')
|
||||
</template>
|
||||
|
||||
<template lang="">
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
<template lang>
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
================================================================================
|
||||
`;
|
||||
|
||||
|
||||
@@ -18,3 +18,19 @@
|
||||
#container
|
||||
some-component(tag='<some-tag>')
|
||||
</template>
|
||||
|
||||
<template lang="">
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
|
||||
<template lang>
|
||||
<v-app-bar>
|
||||
<v-menu offset-y>
|
||||
<template></template>
|
||||
</v-menu>
|
||||
</v-app-bar>
|
||||
</template>
|
||||
@@ -1696,14 +1696,14 @@
|
||||
dependencies:
|
||||
"@types/yargs-parser" "*"
|
||||
|
||||
"@typescript-eslint/eslint-plugin@5.13.0":
|
||||
version "5.13.0"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.13.0.tgz#2809052b85911ced9c54a60dac10e515e9114497"
|
||||
integrity sha512-vLktb2Uec81fxm/cfz2Hd6QaWOs8qdmVAZXLdOBX6JFJDhf6oDZpMzZ4/LZ6SFM/5DgDcxIMIvy3F+O9yZBuiQ==
|
||||
"@typescript-eslint/eslint-plugin@5.14.0":
|
||||
version "5.14.0"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.14.0.tgz#5119b67152356231a0e24b998035288a9cd21335"
|
||||
integrity sha512-ir0wYI4FfFUDfLcuwKzIH7sMVA+db7WYen47iRSaCGl+HMAZI9fpBwfDo45ZALD3A45ZGyHWDNLhbg8tZrMX4w==
|
||||
dependencies:
|
||||
"@typescript-eslint/scope-manager" "5.13.0"
|
||||
"@typescript-eslint/type-utils" "5.13.0"
|
||||
"@typescript-eslint/utils" "5.13.0"
|
||||
"@typescript-eslint/scope-manager" "5.14.0"
|
||||
"@typescript-eslint/type-utils" "5.14.0"
|
||||
"@typescript-eslint/utils" "5.14.0"
|
||||
debug "^4.3.2"
|
||||
functional-red-black-tree "^1.0.1"
|
||||
ignore "^5.1.8"
|
||||
@@ -1711,85 +1711,59 @@
|
||||
semver "^7.3.5"
|
||||
tsutils "^3.21.0"
|
||||
|
||||
"@typescript-eslint/scope-manager@5.13.0":
|
||||
version "5.13.0"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.13.0.tgz#cf6aff61ca497cb19f0397eea8444a58f46156b6"
|
||||
integrity sha512-T4N8UvKYDSfVYdmJq7g2IPJYCRzwtp74KyDZytkR4OL3NRupvswvmJQJ4CX5tDSurW2cvCc1Ia1qM7d0jpa7IA==
|
||||
"@typescript-eslint/scope-manager@5.14.0":
|
||||
version "5.14.0"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.14.0.tgz#ea518962b42db8ed0a55152ea959c218cb53ca7b"
|
||||
integrity sha512-LazdcMlGnv+xUc5R4qIlqH0OWARyl2kaP8pVCS39qSL3Pd1F7mI10DbdXeARcE62sVQE4fHNvEqMWsypWO+yEw==
|
||||
dependencies:
|
||||
"@typescript-eslint/types" "5.13.0"
|
||||
"@typescript-eslint/visitor-keys" "5.13.0"
|
||||
"@typescript-eslint/types" "5.14.0"
|
||||
"@typescript-eslint/visitor-keys" "5.14.0"
|
||||
|
||||
"@typescript-eslint/type-utils@5.13.0":
|
||||
version "5.13.0"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.13.0.tgz#b0efd45c85b7bab1125c97b752cab3a86c7b615d"
|
||||
integrity sha512-/nz7qFizaBM1SuqAKb7GLkcNn2buRdDgZraXlkhz+vUGiN1NZ9LzkA595tHHeduAiS2MsHqMNhE2zNzGdw43Yg==
|
||||
"@typescript-eslint/type-utils@5.14.0":
|
||||
version "5.14.0"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.14.0.tgz#711f08105860b12988454e91df433567205a8f0b"
|
||||
integrity sha512-d4PTJxsqaUpv8iERTDSQBKUCV7Q5yyXjqXUl3XF7Sd9ogNLuKLkxz82qxokqQ4jXdTPZudWpmNtr/JjbbvUixw==
|
||||
dependencies:
|
||||
"@typescript-eslint/utils" "5.13.0"
|
||||
"@typescript-eslint/utils" "5.14.0"
|
||||
debug "^4.3.2"
|
||||
tsutils "^3.21.0"
|
||||
|
||||
"@typescript-eslint/types@5.12.1":
|
||||
version "5.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.12.1.tgz#46a36a28ff4d946821b58fe5a73c81dc2e12aa89"
|
||||
integrity sha512-hfcbq4qVOHV1YRdhkDldhV9NpmmAu2vp6wuFODL71Y0Ixak+FLeEU4rnPxgmZMnGreGEghlEucs9UZn5KOfHJA==
|
||||
"@typescript-eslint/types@5.14.0":
|
||||
version "5.14.0"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.14.0.tgz#96317cf116cea4befabc0defef371a1013f8ab11"
|
||||
integrity sha512-BR6Y9eE9360LNnW3eEUqAg6HxS9Q35kSIs4rp4vNHRdfg0s+/PgHgskvu5DFTM7G5VKAVjuyaN476LCPrdA7Mw==
|
||||
|
||||
"@typescript-eslint/types@5.13.0":
|
||||
version "5.13.0"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.13.0.tgz#da1de4ae905b1b9ff682cab0bed6b2e3be9c04e5"
|
||||
integrity sha512-LmE/KO6DUy0nFY/OoQU0XelnmDt+V8lPQhh8MOVa7Y5k2gGRd6U9Kp3wAjhB4OHg57tUO0nOnwYQhRRyEAyOyg==
|
||||
|
||||
"@typescript-eslint/typescript-estree@5.12.1":
|
||||
version "5.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.1.tgz#6a9425b9c305bcbc38e2d1d9a24c08e15e02b722"
|
||||
integrity sha512-ahOdkIY9Mgbza7L9sIi205Pe1inCkZWAHE1TV1bpxlU4RZNPtXaDZfiiFWcL9jdxvW1hDYZJXrFm+vlMkXRbBw==
|
||||
"@typescript-eslint/typescript-estree@5.14.0":
|
||||
version "5.14.0"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.14.0.tgz#78b7f7385d5b6f2748aacea5c9b7f6ae62058314"
|
||||
integrity sha512-QGnxvROrCVtLQ1724GLTHBTR0lZVu13izOp9njRvMkCBgWX26PKvmMP8k82nmXBRD3DQcFFq2oj3cKDwr0FaUA==
|
||||
dependencies:
|
||||
"@typescript-eslint/types" "5.12.1"
|
||||
"@typescript-eslint/visitor-keys" "5.12.1"
|
||||
"@typescript-eslint/types" "5.14.0"
|
||||
"@typescript-eslint/visitor-keys" "5.14.0"
|
||||
debug "^4.3.2"
|
||||
globby "^11.0.4"
|
||||
is-glob "^4.0.3"
|
||||
semver "^7.3.5"
|
||||
tsutils "^3.21.0"
|
||||
|
||||
"@typescript-eslint/typescript-estree@5.13.0":
|
||||
version "5.13.0"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.13.0.tgz#b37c07b748ff030a3e93d87c842714e020b78141"
|
||||
integrity sha512-Q9cQow0DeLjnp5DuEDjLZ6JIkwGx3oYZe+BfcNuw/POhtpcxMTy18Icl6BJqTSd+3ftsrfuVb7mNHRZf7xiaNA==
|
||||
dependencies:
|
||||
"@typescript-eslint/types" "5.13.0"
|
||||
"@typescript-eslint/visitor-keys" "5.13.0"
|
||||
debug "^4.3.2"
|
||||
globby "^11.0.4"
|
||||
is-glob "^4.0.3"
|
||||
semver "^7.3.5"
|
||||
tsutils "^3.21.0"
|
||||
|
||||
"@typescript-eslint/utils@5.13.0", "@typescript-eslint/utils@^5.10.0":
|
||||
version "5.13.0"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.13.0.tgz#2328feca700eb02837298339a2e49c46b41bd0af"
|
||||
integrity sha512-+9oHlPWYNl6AwwoEt5TQryEHwiKRVjz7Vk6kaBeD3/kwHE5YqTGHtm/JZY8Bo9ITOeKutFaXnBlMgSATMJALUQ==
|
||||
"@typescript-eslint/utils@5.14.0", "@typescript-eslint/utils@^5.10.0":
|
||||
version "5.14.0"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.14.0.tgz#6c8bc4f384298cbbb32b3629ba7415f9f80dc8c4"
|
||||
integrity sha512-EHwlII5mvUA0UsKYnVzySb/5EE/t03duUTweVy8Zqt3UQXBrpEVY144OTceFKaOe4xQXZJrkptCf7PjEBeGK4w==
|
||||
dependencies:
|
||||
"@types/json-schema" "^7.0.9"
|
||||
"@typescript-eslint/scope-manager" "5.13.0"
|
||||
"@typescript-eslint/types" "5.13.0"
|
||||
"@typescript-eslint/typescript-estree" "5.13.0"
|
||||
"@typescript-eslint/scope-manager" "5.14.0"
|
||||
"@typescript-eslint/types" "5.14.0"
|
||||
"@typescript-eslint/typescript-estree" "5.14.0"
|
||||
eslint-scope "^5.1.1"
|
||||
eslint-utils "^3.0.0"
|
||||
|
||||
"@typescript-eslint/visitor-keys@5.12.1":
|
||||
version "5.12.1"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.1.tgz#f722da106c8f9695ae5640574225e45af3e52ec3"
|
||||
integrity sha512-l1KSLfupuwrXx6wc0AuOmC7Ko5g14ZOQ86wJJqRbdLbXLK02pK/DPiDDqCc7BqqiiA04/eAA6ayL0bgOrAkH7A==
|
||||
"@typescript-eslint/visitor-keys@5.14.0":
|
||||
version "5.14.0"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.14.0.tgz#1927005b3434ccd0d3ae1b2ecf60e65943c36986"
|
||||
integrity sha512-yL0XxfzR94UEkjBqyymMLgCBdojzEuy/eim7N9/RIcTNxpJudAcqsU8eRyfzBbcEzGoPWfdM3AGak3cN08WOIw==
|
||||
dependencies:
|
||||
"@typescript-eslint/types" "5.12.1"
|
||||
eslint-visitor-keys "^3.0.0"
|
||||
|
||||
"@typescript-eslint/visitor-keys@5.13.0":
|
||||
version "5.13.0"
|
||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.13.0.tgz#f45ff55bcce16403b221ac9240fbeeae4764f0fd"
|
||||
integrity sha512-HLKEAS/qA1V7d9EzcpLFykTePmOQqOFim8oCvhY3pZgQ8Hi38hYpHd9e5GN6nQBFQNecNhws5wkS9Y5XIO0s/g==
|
||||
dependencies:
|
||||
"@typescript-eslint/types" "5.13.0"
|
||||
"@typescript-eslint/types" "5.14.0"
|
||||
eslint-visitor-keys "^3.0.0"
|
||||
|
||||
abab@^2.0.3, abab@^2.0.5:
|
||||
@@ -2555,6 +2529,11 @@ cspell@5.18.5:
|
||||
strip-ansi "^6.0.1"
|
||||
vscode-uri "^3.0.3"
|
||||
|
||||
css-units-list@0.0.5:
|
||||
version "0.0.5"
|
||||
resolved "https://registry.yarnpkg.com/css-units-list/-/css-units-list-0.0.5.tgz#a1aa9318ccd2f64dcda5c3336c5261d1f729cade"
|
||||
integrity sha512-CDr8YQugedUsousq/G3ZSrod3XH0qGKk09MwahvDhwg72p+bBi068B2EJxuOhhePQdypxCFcbmMIyhQleUxq4A==
|
||||
|
||||
cssom@^0.4.4:
|
||||
version "0.4.4"
|
||||
resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
|
||||
@@ -3429,10 +3408,10 @@ flatten@^1.0.2:
|
||||
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
|
||||
integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
|
||||
|
||||
flow-parser@0.172.0:
|
||||
version "0.172.0"
|
||||
resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.172.0.tgz#9f5ee62ebf6bad689d5de0b6b98445d8cf030a2f"
|
||||
integrity sha512-WWqgvuJgD9Y1n2su9D73m0g5kQ4XVl8Dwk6DeW5V6bjt4XMtVLzSHg35s3iiZOvShY+7w7l8FzlK81PGXRcIYQ==
|
||||
flow-parser@0.173.0:
|
||||
version "0.173.0"
|
||||
resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.173.0.tgz#992539fe87b4448a660ac1c54ffa358301e7110b"
|
||||
integrity sha512-gikomjo+jzdehhOCHP2Ca5y1HGK3jkODhUdTxk4a3SdyLAMBsEwb7KJETHzB4KQs7HhHcqhyT7mGmd9iT8B5Hg==
|
||||
|
||||
foreground-child@^2.0.0:
|
||||
version "2.0.0"
|
||||
@@ -5057,10 +5036,10 @@ node-domexception@^1.0.0:
|
||||
resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
|
||||
integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
|
||||
|
||||
node-fetch@3.2.1:
|
||||
version "3.2.1"
|
||||
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.2.1.tgz#002177382810cfb77858857f69a3621a86c45f26"
|
||||
integrity sha512-Ef3SPFtRWFCDyhvcwCSvacLpkwmYZcD57mmZzAsMiks9TpHpIghe32U9H06tMICnr+X7YCpzH7WvUlUoml2urA==
|
||||
node-fetch@3.2.2:
|
||||
version "3.2.2"
|
||||
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.2.2.tgz#16d33fbe32ca7c6ca1ca8ba5dfea1dd885c59f04"
|
||||
integrity sha512-Cwhq1JFIoon15wcIkFzubVNFE5GvXGV82pKf4knXXjvGmn7RJKcypeuqcVNZMGDZsAFWyIRya/anwAJr7TWJ7w==
|
||||
dependencies:
|
||||
data-uri-to-buffer "^4.0.0"
|
||||
fetch-blob "^3.1.4"
|
||||
@@ -6523,10 +6502,10 @@ typedarray-to-buffer@^3.1.5:
|
||||
dependencies:
|
||||
is-typedarray "^1.0.0"
|
||||
|
||||
typescript@4.5.5:
|
||||
version "4.5.5"
|
||||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
|
||||
integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
|
||||
typescript@4.6.2:
|
||||
version "4.6.2"
|
||||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
|
||||
integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
|
||||
|
||||
unbox-primitive@^1.0.1:
|
||||
version "1.0.1"
|
||||
|
||||
Reference in new issue
Block a user