prettier · lydell · Nov 9, 2019 · Nov 2, 2019 · Nov 2, 2019 · Nov 4, 2019
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,7 +5,7 @@
 
 - [ ] I’ve added tests to confirm my change works.
 - [ ] (If changing the API or CLI) I’ve documented the changes I’ve made (in the `docs/` directory)
-- [ ] (If the change is user-facing) I’ve added my changes to the `CHANGELOG.unreleased.md` file following the template.
+- [ ] (If the change is user-facing) I’ve added my changes to `changelog_unreleased/*/pr-XXXX.md` file following `changelog_unreleased/TEMPLATE.md`.
 - [ ] I’ve read the [contributing guidelines](https://github.com/prettier/prettier/blob/master/CONTRIBUTING.md).
 
 **✨[Try the playground for this PR](https://prettier.io/playground-redirect)✨**
diff --git a/changelog_unreleased/TEMPLATE.md b/changelog_unreleased/TEMPLATE.md
@@ -0,0 +1,39 @@
+<!--
+
+1. Choose a folder based on which language your PR is for.
+
+   - For JavaScript, choose `javascript/` etc.
+   - For TypeScript specific syntax, choose `typescript/`.
+   - If your PR applies to multiple languages, such as TypeScript/Flow, choose one folder and mention which languages it applies to.
+
+2. In your chosen folder, create a file with your PR number: `pr-XXXX.md`. For example: `typescript/pr-6728.md`.
+
+3. Copy the content below and paste it in your new file.
+
+4. Fill in a title, the PR number and your user name.
+
+5. Optionally write a description. Many times it’s enough with just sample code.
+
+6. Change ```jsx to your language. For example, ```yaml.
+
+7. Change the `// Input` and `// Output` comments to the comment syntax of your language. For example, `# Input`.
+
+8. Choose some nice input example code. Paste it along with the output before and after your PR.
+
+-->
+
+#### Title ([#XXXX](https://github.com/prettier/prettier/pull/XXXX) by [@user](https://github.com/user))
+
+Optional description if it makes sense.
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+(foo ?? baz) || baz;
+
+// Prettier stable
+foo ?? baz || baz;
+
+// Prettier master
+(foo ?? baz) || baz;
+```
diff --git a/changelog_unreleased/angular/.gitkeep b/changelog_unreleased/angular/.gitkeep
diff --git a/changelog_unreleased/api/.gitkeep b/changelog_unreleased/api/.gitkeep
diff --git a/changelog_unreleased/cli/.gitkeep b/changelog_unreleased/cli/.gitkeep
diff --git a/changelog_unreleased/css/.gitkeep b/changelog_unreleased/css/.gitkeep
diff --git a/changelog_unreleased/flow/.gitkeep b/changelog_unreleased/flow/.gitkeep
diff --git a/changelog_unreleased/graphql/.gitkeep b/changelog_unreleased/graphql/.gitkeep
diff --git a/changelog_unreleased/handlebars/.gitkeep b/changelog_unreleased/handlebars/.gitkeep
diff --git a/changelog_unreleased/html/.gitkeep b/changelog_unreleased/html/.gitkeep
diff --git a/changelog_unreleased/javascript/.gitkeep b/changelog_unreleased/javascript/.gitkeep
diff --git a/changelog_unreleased/json/.gitkeep b/changelog_unreleased/json/.gitkeep
diff --git a/changelog_unreleased/less/.gitkeep b/changelog_unreleased/less/.gitkeep
diff --git a/changelog_unreleased/lwc/.gitkeep b/changelog_unreleased/lwc/.gitkeep
diff --git a/changelog_unreleased/markdown/.gitkeep b/changelog_unreleased/markdown/.gitkeep
diff --git a/changelog_unreleased/mdx/.gitkeep b/changelog_unreleased/mdx/.gitkeep
diff --git a/changelog_unreleased/scss/.gitkeep b/changelog_unreleased/scss/.gitkeep
diff --git a/changelog_unreleased/typescript/.gitkeep b/changelog_unreleased/typescript/.gitkeep
diff --git a/changelog_unreleased/vue/.gitkeep b/changelog_unreleased/vue/.gitkeep
diff --git a/changelog_unreleased/yaml/.gitkeep b/changelog_unreleased/yaml/.gitkeep
diff --git a/cspell.json b/cspell.json
@@ -337,6 +337,7 @@
         "superset",
         "supertypes",
         "swac",
+        "systemjs",
         "tdeekens",
         "templating",
         "tempy",

diff --git a/package.json b/package.json
@@ -130,6 +130,6 @@
     "build": "node --max-old-space-size=3072 ./scripts/build/build.js",
     "build-docs": "node ./scripts/build-docs.js",
     "check-deps": "node ./scripts/check-deps.js",
-    "spellcheck": "npx -p cspell@4.0.31 cspell {bin,scripts,src}/**/*.js {docs,website/blog}/**/*.md CHANGELOG.unreleased.md"
+    "spellcheck": "npx -p cspell@4.0.31 cspell {bin,scripts,src}/**/*.js {docs,website/blog,changelog_unreleased}/**/*.md"
   }
 }
diff --git a/scripts/release/steps/update-changelog.js b/scripts/release/steps/update-changelog.js
@@ -57,7 +57,7 @@ module.exports = async function({ version, previousVersion }) {
       dedent(chalk`
         {yellow.bold A manual step is necessary.}
 
-        You can copy the entries from {bold CHANGELOG.unreleased.md} to {bold CHANGELOG.md}
+        You can copy the entries from {bold changelog_unreleased/*/pr-*.md} to {bold CHANGELOG.md}
         and update it accordingly.
 
         You don't need to commit the file, the script will take care of that.