Skip to content
Open
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
4 changes: 3 additions & 1 deletion scripts/draft-blog-post.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ const version = require("../package.json").version.replace(/-.+/, "");
const postGlob = path.join(blogDir, `????-??-??-${version}.md`);
const postFile = path.join(
blogDir,
`${new Date().toISOString().replace(/T.+/, "")}-${version}.md`
`${new Date()
.toISOString()
.replace(/T.+/, "")}-${version}.md`
);

const categories = [
Expand Down
22 changes: 12 additions & 10 deletions scripts/release/steps/update-dependents-count.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,18 @@ async function update() {
);
}

processFile("website/pages/en/index.js", (content) =>
content
.replace(
/(<strong data-placeholder="dependent-npm">)(.*?)(<\/strong>)/,
`$1${formatNumber(dependentsCountNpm)}$3`
)
.replace(
/(<strong data-placeholder="dependent-github">)(.*?)(<\/strong>)/,
`$1${formatNumber(dependentsCountGithub)}$3`
)
processFile(
"website/pages/en/index.js",
(content) =>
content
.replace(
/(<strong data-placeholder="dependent-npm">)(.*?)(<\/strong>)/,
`$1${formatNumber(dependentsCountNpm)}$3`
)
.replace(
/(<strong data-placeholder="dependent-github">)(.*?)(<\/strong>)/,
`$1${formatNumber(dependentsCountGithub)}$3`
)
);
}

Expand Down
22 changes: 14 additions & 8 deletions scripts/release/steps/update-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,25 @@ async function bump({ version }) {
await writeJson("package.json", pkg, { spaces: 2 });

// Update github issue templates
processFile(".github/ISSUE_TEMPLATE/formatting.md", (content) =>
content.replace(/^(\*\*Prettier ).*?(\*\*)$/m, `$1${version}$2`)
processFile(
".github/ISSUE_TEMPLATE/formatting.md",
(content) =>
content.replace(/^(\*\*Prettier ).*?(\*\*)$/m, `$1${version}$2`)
);
processFile(".github/ISSUE_TEMPLATE/integration.md", (content) =>
content.replace(/^(- Prettier Version: ).*?$/m, `$1${version}`)
processFile(
".github/ISSUE_TEMPLATE/integration.md",
(content) => content.replace(/^(- Prettier Version: ).*?$/m, `$1${version}`)
);
processFile("docs/install.md", (content) =>
content.replace(/^(npx prettier@)\S+/m, `$1${version}`)
processFile(
"docs/install.md",
(content) => content.replace(/^(npx prettier@)\S+/m, `$1${version}`)
);

// Update unpkg link in docs
processFile("docs/browser.md", (content) =>
content.replace(/(\/\/unpkg\.com\/prettier@).*?\//g, `$1${version}/`)
processFile(
"docs/browser.md",
(content) =>
content.replace(/(\/\/unpkg\.com\/prettier@).*?\//g, `$1${version}/`)
);

await execa("yarn", ["update-stable-docs"], {
Expand Down
18 changes: 10 additions & 8 deletions src/language-css/embed.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,16 @@ function embed(path, print, textToDoc /*, options */) {
return null;

function replaceNewlinesWithLiterallines(doc) {
return mapDoc(doc, (currentDoc) =>
typeof currentDoc === "string" && currentDoc.includes("\n")
? concat(
currentDoc
.split(/(\n)/g)
.map((v, i) => (i % 2 === 0 ? v : literalline))
)
: currentDoc
return mapDoc(
doc,
(currentDoc) =>
typeof currentDoc === "string" && currentDoc.includes("\n")
? concat(
currentDoc
.split(/(\n)/g)
.map((v, i) => (i % 2 === 0 ? v : literalline))
)
: currentDoc
);
}
}
Expand Down
52 changes: 32 additions & 20 deletions src/language-css/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,38 @@ const options = require("./options");
const createLanguage = require("../utils/create-language");

const languages = [
createLanguage(require("linguist-languages/data/CSS"), () => ({
since: "1.4.0",
parsers: ["css"],
vscodeLanguageIds: ["css"],
})),
createLanguage(require("linguist-languages/data/PostCSS"), () => ({
since: "1.4.0",
parsers: ["css"],
vscodeLanguageIds: ["postcss"],
})),
createLanguage(require("linguist-languages/data/Less"), () => ({
since: "1.4.0",
parsers: ["less"],
vscodeLanguageIds: ["less"],
})),
createLanguage(require("linguist-languages/data/SCSS"), () => ({
since: "1.4.0",
parsers: ["scss"],
vscodeLanguageIds: ["scss"],
})),
createLanguage(
require("linguist-languages/data/CSS"),
() => ({
since: "1.4.0",
parsers: ["css"],
vscodeLanguageIds: ["css"],
})
),
createLanguage(
require("linguist-languages/data/PostCSS"),
() => ({
since: "1.4.0",
parsers: ["css"],
vscodeLanguageIds: ["postcss"],
})
),
createLanguage(
require("linguist-languages/data/Less"),
() => ({
since: "1.4.0",
parsers: ["less"],
vscodeLanguageIds: ["less"],
})
),
createLanguage(
require("linguist-languages/data/SCSS"),
() => ({
since: "1.4.0",
parsers: ["scss"],
vscodeLanguageIds: ["scss"],
})
),
];

const printers = {
Expand Down
13 changes: 8 additions & 5 deletions src/language-graphql/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@ const options = require("./options");
const createLanguage = require("../utils/create-language");

const languages = [
createLanguage(require("linguist-languages/data/GraphQL"), () => ({
since: "1.5.0",
parsers: ["graphql"],
vscodeLanguageIds: ["graphql"],
})),
createLanguage(
require("linguist-languages/data/GraphQL"),
() => ({
since: "1.5.0",
parsers: ["graphql"],
vscodeLanguageIds: ["graphql"],
})
),
];

const printers = {
Expand Down
13 changes: 8 additions & 5 deletions src/language-handlebars/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ const printer = require("./printer-glimmer");
const createLanguage = require("../utils/create-language");

const languages = [
createLanguage(require("linguist-languages/data/Handlebars"), () => ({
since: null, // unreleased
parsers: ["glimmer"],
vscodeLanguageIds: ["handlebars"],
})),
createLanguage(
require("linguist-languages/data/Handlebars"),
() => ({
since: null, // unreleased
parsers: ["glimmer"],
vscodeLanguageIds: ["handlebars"],
})
),
];

const printers = {
Expand Down
70 changes: 41 additions & 29 deletions src/language-html/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,47 @@ const createLanguage = require("../utils/create-language");
const options = require("./options");

const languages = [
createLanguage(require("linguist-languages/data/HTML"), () => ({
name: "Angular",
since: "1.15.0",
parsers: ["angular"],
vscodeLanguageIds: ["html"],
extensions: [".component.html"],
filenames: [],
})),
createLanguage(require("linguist-languages/data/HTML"), (data) => ({
since: "1.15.0",
parsers: ["html"],
vscodeLanguageIds: ["html"],
extensions: data.extensions.concat([
".mjml", // MJML is considered XML in Linguist but it should be formatted as HTML
]),
})),
createLanguage(require("linguist-languages/data/HTML"), () => ({
name: "Lightning Web Components",
since: "1.17.0",
parsers: ["lwc"],
vscodeLanguageIds: ["html"],
extensions: [],
filenames: [],
})),
createLanguage(require("linguist-languages/data/Vue"), () => ({
since: "1.10.0",
parsers: ["vue"],
vscodeLanguageIds: ["vue"],
})),
createLanguage(
require("linguist-languages/data/HTML"),
() => ({
name: "Angular",
since: "1.15.0",
parsers: ["angular"],
vscodeLanguageIds: ["html"],
extensions: [".component.html"],
filenames: [],
})
),
createLanguage(
require("linguist-languages/data/HTML"),
(data) => ({
since: "1.15.0",
parsers: ["html"],
vscodeLanguageIds: ["html"],
extensions: data.extensions.concat([
".mjml", // MJML is considered XML in Linguist but it should be formatted as HTML
]),
})
),
createLanguage(
require("linguist-languages/data/HTML"),
() => ({
name: "Lightning Web Components",
since: "1.17.0",
parsers: ["lwc"],
vscodeLanguageIds: ["html"],
extensions: [],
filenames: [],
})
),
createLanguage(
require("linguist-languages/data/Vue"),
() => ({
since: "1.10.0",
parsers: ["vue"],
vscodeLanguageIds: ["vue"],
})
),
];

const printers = {
Expand Down
6 changes: 4 additions & 2 deletions src/language-html/printer-html.js
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,10 @@ function embed(path, print, textToDoc, options) {
node.rawName,
'="',
group(
mapDoc(embeddedAttributeValueDoc, (doc) =>
typeof doc === "string" ? doc.replace(/"/g, "&quot;") : doc
mapDoc(
embeddedAttributeValueDoc,
(doc) =>
typeof doc === "string" ? doc.replace(/"/g, "&quot;") : doc
)
),
'"',
Expand Down
Loading