Merge branch 'main' into highlight-styles

.eslintignore

@@ -6,8 +6,6 @@
 .yarnrc.yml
 /.language/
 /_site/
-/old_data/
-/old_source/
 /source/_data/versionCache.json
 /source/assets/dist/
 /source/assets/js/vendor/**

.prettierignore

@@ -7,8 +7,6 @@
 /**/*.md
 /.language/
 /_site/
-/old_data/
-/old_source/
 /source/_data/versionCache.json
 /source/assets/dist/
 /source/assets/js/vendor/**

.stylelintignore

@@ -6,8 +6,6 @@
 .yarnrc.yml
 /.language/
 /_site/
-/old_data/
-/old_source/
 /source/_data/versionCache.json
 /source/assets/dist/
 /source/assets/js/vendor/**

.yarnrc.yml

@@ -1,7 +1,3 @@
 nodeLinker: node-modules
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
-
 yarnPath: .yarn/releases/yarn-3.6.0.cjs

CONTRIBUTING.md

@@ -30,9 +30,11 @@ in these places and then run `nvm install` to upgrade:
 
 - `package.json` (`engines.node` field)
 - `.nvmrc`
+- `netlify.toml`
 
 To upgrade the yarn version, run `yarn set version latest`, then update the
-version number in `package.json` (`engines.yarn` field) if necessary.
+version number in `netlify.toml` and `package.json` (`engines.yarn` field) if
+necessary.
 
 ### Install dependencies
 
@@ -82,16 +84,20 @@ yarn lint
       while `render` always parses the partial as a LiquidJS template.
 - `.md` files are parsed both as Markdown _and_ as LiquidJS templates.
 - When using Markdown, remember that _indentation and whitespace (e.g newlines)
-  matter_.
+  matter_. Use Markdown selectively, especially in files that include other
+  non-Markdown partials.
+    - For example, the `{% codeExample %}` tag renders whitespace that results
+      in unwanted `<p>` tags when parsed as Markdown.
 
 ## Deploying
 
 Every time a new commit is pushed to `main`, it will automatically be deployed
-to sass-lang.com. Easy as that!
+to sass-lang.com via [Netlify][]. Easy as that!
 
 Thanks!
 
 &mdash; Sass Core Team
 
 [ig]: https://sass-lang.com/implementation
 [sg]: https://sass-lang.com/styleguide
+[Netlify]: https://www.netlify.com/

package.json

@@ -42,11 +42,11 @@
     "@11ty/eleventy": "^2.0.1",
     "@11ty/eleventy-plugin-rss": "^1.2.0",
     "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
-    "@babel/core": "^7.22.1",
-    "@babel/preset-env": "^7.22.4",
-    "@babel/preset-typescript": "^7.21.5",
+    "@babel/core": "^7.22.5",
+    "@babel/preset-env": "^7.22.5",
+    "@babel/preset-typescript": "^7.22.5",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-commonjs": "^25.0.0",
+    "@rollup/plugin-commonjs": "^25.0.1",
     "@rollup/plugin-inject": "^5.0.3",
     "@rollup/plugin-node-resolve": "^15.1.0",
     "@rollup/plugin-terser": "^0.4.3",
@@ -82,8 +82,8 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.8",
     "prismjs": "^1.29.0",
-    "rollup": "^3.23.1",
-    "sass": "^1.62.1",
+    "rollup": "^3.25.1",
+    "sass": "^1.63.3",
     "semver-parser": "^4.1.4",
     "strip-indent": "^3.0.0",
     "stylelint": "^15.7.0",

source/documentation/at-rules/import.liquid

@@ -29,7 +29,7 @@ introduction: >
   only Dart Sass currently supports `@use`. Users of other implementations must
   use the `@import` rule instead.)
 
-  [gradually phase it out]: https://github.com/sass/sass/blob/master/accepted/module-system.md#timeline
+  [gradually phase it out]: https://github.com/sass/sass/blob/main/accepted/module-system.md#timeline
   [`@use` rule]: /documentation/at-rules/use
 
   <h4>{{ "What's Wrong With `@import`?" | markdown }}</h4>

source/helpers/components/codeExample.ts

@@ -46,6 +46,10 @@ import { liquidEngine } from '../engines';
  * If `syntax` is either `sass` or `scss`, the first section will be
  * interpreted as that syntax and the second will be interpreted (or
  * auto-generated) as the CSS output.
+ *
+ * Note that this template includes whitespace that renders unwanted extra `<p>`
+ * tags when parsed as Markdown. To avoid this, ensure that any usage of
+ * `{% codeExample %}` is *not* within a Markdown file or block.
  */
 export default async function codeExample(
   contents: string,

source/helpers/components/compatibility.ts

@@ -54,6 +54,9 @@ const extend = <
 /**
  * Take a list of string `args` and converts it into an object of all arguments
  * suitable for the `compatibility.liquid` template.
+ *
+ * This can be removed once 11ty adds support for named Liquid arguments.
+ * @see https://github.com/11ty/eleventy/issues/2679
  */
 const parseCompatibilityOpts = (...args: string[]): CompatibilityOptions => {
   const opts = {