Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sass/sass-site
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 52d20161a0f27c369ca91841528ab9872d1c4d2f
Choose a base ref
..
head repository: sass/sass-site
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d37196801ea2e46b660b61c8d9fc8dfae2e5734e
Choose a head ref
Showing with 197 additions and 359 deletions.
  1. +184 −352 package-lock.json
  2. +4 −4 package.json
  3. +2 −0 source/assets/js/playground.ts
  4. +6 −2 source/blog/024-the-module-system-is-launched.md
  5. +1 −1 source/documentation/breaking-changes/import.md
536 changes: 184 additions & 352 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@
"@11ty/eleventy": "^3.0.0",
"@11ty/eleventy-plugin-rss": "^2.0.2",
"@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
"@babel/core": "^7.25.8",
"@babel/core": "^7.26.0",
"@babel/preset-env": "^7.25.4",
"@babel/preset-typescript": "^7.24.7",
"@codemirror/autocomplete": "^6.18.1",
@@ -92,7 +92,7 @@
"jquery-ui": "^1.14.0",
"js-yaml": "^4.1.0",
"kleur": "^4.1.5",
"liquidjs": "^10.17.0",
"liquidjs": "^10.18.0",
"lodash": "^4.17.21",
"lorem-ipsum": "^2.0.8",
"markdown-it": "^14.1.0",
@@ -105,13 +105,13 @@
"prettier": "^3.3.3",
"prismjs": "^1.29.0",
"rollup": "^4.24.0",
"sass": "^1.80.3",
"sass": "^1.80.4",
"semver": "^7.6.3",
"stylelint": "^15.11.0",
"stylelint-config-standard-scss": "^11.1.0",
"truncate-html": "^1.1.2",
"ts-node": "^10.9.2",
"typescript": "^5.6.2",
"typescript": "^5.6.3",
"typogr": "^0.6.8"
},
"dependencies": {
2 changes: 2 additions & 0 deletions source/assets/js/playground.ts
Original file line number Diff line number Diff line change
@@ -85,6 +85,7 @@ function setupPlayground(): void {
// Setup input Sass view
const editor = new EditorView({
doc: playgroundState.inputValue,
root: document,
extensions: [
...editorSetup,
EditorView.updateListener.of(v => {
@@ -106,6 +107,7 @@ function setupPlayground(): void {

// Setup CSS view
const viewer = new EditorView({
root: document,
extensions: [...outputSetup],
parent: document.querySelector('.sl-code-is-compiled') || undefined,
});
8 changes: 6 additions & 2 deletions source/blog/024-the-module-system-is-launched.md
Original file line number Diff line number Diff line change
@@ -356,5 +356,9 @@ support for `@import` on the following timeline:
adding support for the new module system, the timeline for deprecating and
removing `@import` has been pushed back. We now intend to wait until 80% of
users are using Dart Sass (measured by npm downloads) before deprecating
`@import`, and wait at least a year after that and likely more before removing
it entirely.
`@import`, and wait at least ~~a year~~ after that and likely more before
removing it entirely.

**October 2024**: We've decided to extend the timeline for removing `@import`
after the deprecation to at least _two_ years, so it will still be available
until October 2026 at the earliest.
2 changes: 1 addition & 1 deletion source/documentation/breaking-changes/import.md
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ $ sass-migrator module --migrate-deps your-entrypoint.scss
```

If you want to migrate away from global built-in functions, but aren't yet
ready to fully migrate your `@import` rules, you can pass the `--builtin-only`
ready to fully migrate your `@import` rules, you can pass the `--built-in-only`
flag to migrate the functions while leaving `@import` rules as-is.

{% render 'silencing_deprecations' %}