Skip to content

Chore: use modern api sass #10070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 12, 2025
Merged

Chore: use modern api sass #10070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fdc6791
Chore: use modern api sass
lexiv0re Oct 11, 2025
8479464
Chore: more sass-related adjustments
lexiv0re Oct 11, 2025
23c8c39
Chore: fix package template
lexiv0re Oct 11, 2025
ca658b0
Chore: pkg lock
lexiv0re Oct 12, 2025
96a0005
Chore: fix mismatching deps
lexiv0re Oct 12, 2025
2ad4976
Chore: fix pkg lock
lexiv0re Oct 12, 2025
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,4 @@ dev/tool/history.json
/combined_dependencies
.tmp
ws-tests/docker-compose.override.yml
.github/copilot-instructions.md
28 changes: 26 additions & 2 deletions common/config/rush/pnpm-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,32 @@
* PNPM documentation: https://pnpm.io/package_json#pnpmoverrides
*/
"globalOverrides": {
// "example1": "^1.0.0",
// "@hcengineering/platform-rig": "file:/Users/haiodo/Develop/private/hardware/huly.utils/packages/platform-rig"
// DEV: Uncomment the lines below to use local huly.core packages
// Then "rush update --full" to update the dependencies.
// NOTE: It's configured to work if huly.core is placed adjacent to the platform. If you have it in a different location, you need to change the paths below.

// "@hcengineering/account-client": "file:../../../huly.core/packages/account-client",
// "@hcengineering/analytics": "file:../../../huly.core/packages/analytics",
// "@hcengineering/analytics-service": "file:../../../huly.core/packages/analytics-service",
// "@hcengineering/api-client": "file:../../../huly.core/packages/api-client",
// "@hcengineering/client": "file:../../../huly.core/packages/client",
// "@hcengineering/client-resources": "file:../../../huly.core/packages/client-resources",
// "@hcengineering/collaborator-client": "file:../../../huly.core/packages/collaborator-client",
// "@hcengineering/core": "file:../../../huly.core/packages/core",
// "@hcengineering/hulylake-client": "file:../../../huly.core/packages/hulylake-client",
// "@hcengineering/model": "file:../../../huly.core/packages/model",
// "@hcengineering/platform": "file:../../../huly.core/packages/platform",
// "@hcengineering/query": "file:../../../huly.core/packages/query",
// "@hcengineering/rank": "file:../../../huly.core/packages/rank",
// "@hcengineering/retry": "file:../../../huly.core/packages/retry",
// "@hcengineering/rpc": "file:../../../huly.core/packages/rpc",
// "@hcengineering/storage": "file:../../../huly.core/packages/storage",
// "@hcengineering/text": "file:../../../huly.core/packages/text",
// "@hcengineering/text-core": "file:../../../huly.core/packages/text-core",
// "@hcengineering/text-html": "file:../../../huly.core/packages/text-html",
// "@hcengineering/text-markdown": "file:../../../huly.core/packages/text-markdown",
// "@hcengineering/text-ydoc": "file:../../../huly.core/packages/text-ydoc",
// "@hcengineering/token": "file:../../../huly.core/packages/token"
},

/**
Expand Down
820 changes: 490 additions & 330 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions common/scripts/sass-quiet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Wrapper around sass to suppress legacy-js-api deprecation warnings
// Should be removed when sass-preprocessor is upgraded to the version that works with modern sass api
const sass = require('sass');

// Capture original stderr.write
const originalStderrWrite = process.stderr.write.bind(process.stderr);

// Override stderr.write to filter out sass deprecation warnings
process.stderr.write = (chunk, encoding, callback) => {
if (typeof chunk === 'string' && chunk.includes('DEPRECATION WARNING [legacy-js-api]')) {
// Suppress the warning
if (typeof encoding === 'function') {
encoding();
} else if (typeof callback === 'function') {
callback();
}
return true;
}
return originalStderrWrite(chunk, encoding, callback);
};

module.exports = sass;
5 changes: 3 additions & 2 deletions desktop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@
"dotenv-webpack": "^8.0.1",
"ts-loader": "^9.2.5",
"svelte-loader": "^3.2.0",
"svelte-preprocess": "^5.1.4",
"css-loader": "^5.2.1",
"webpack-dev-server": "^4.11.1",
"style-loader": "^3.3.1",
"file-loader": "^6.2.0",
"sass-loader": "^13.2.0",
"sass": "^1.80.0",
"sass-loader": "^14.0.0",
"webpack-bundle-analyzer": "^4.10.2",
"svgo-loader": "^3.0.0",
"autoprefixer": "^10.4.14",
Expand Down Expand Up @@ -63,7 +65,6 @@
"prettier": "^3.6.2",
"esbuild": "^0.25.9",
"esbuild-loader": "^4.3.0",
"svelte-preprocess": "^5.1.3",
"@types/ws": "^8.5.11",
"jest": "^29.7.0",
"ts-jest": "^29.1.1",
Expand Down
14 changes: 11 additions & 3 deletions desktop/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
const DefinePlugin = require('webpack').DefinePlugin
const HtmlWebpackPlugin = require('html-webpack-plugin')
const CopyPlugin = require('copy-webpack-plugin')
const sass = require('../common/scripts/sass-quiet.js')

const mode = process.env.NODE_ENV || 'development'
const prod = mode === 'production'
Expand Down Expand Up @@ -144,6 +145,7 @@ module.exports = [
fs: false
},
extensions: ['.mjs', '.js', '.svelte', '.ts'],
mainFields: ['svelte', 'browser', 'module', 'main'],
conditionNames: ['svelte', 'browser', 'import']
},
output: {
Expand Down Expand Up @@ -221,8 +223,8 @@ module.exports = [
},

{
// required to prevent errors from Svelte on Webpack 5+, omit on Webpack 4
test: /node_modules\/svelte\/.*\.mjs$/,
// Fix for packages with "type": "module" that use extensionless imports
test: /\.m?js$/,
resolve: {
fullySpecified: false
}
Expand All @@ -245,7 +247,13 @@ module.exports = [
'style-loader',
'css-loader',
'postcss-loader',
'sass-loader'
{
loader: "sass-loader",
options: {
api: "modern",
implementation: sass
}
}
]
},

Expand Down
14 changes: 4 additions & 10 deletions dev/prod/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,25 +40,19 @@
"postcss": "^8.4.20",
"postcss-load-config": "^4.0.1",
"postcss-loader": "^7.0.2",
"sass-loader": "^13.2.0",
"sass": "^1.80.0",
"sass-loader": "^14.0.0",
"style-loader": "^3.3.1",
"svelte-loader": "^3.2.0",
"svelte-preprocess": "^5.1.3",
"svelte-preprocess": "^5.1.4",
"svgo-loader": "^3.0.0",
"ts-loader": "^9.2.5",
"typescript": "^5.9.3",
"update-browserslist-db": "^1.1.3",
"webpack": "^5.97.1",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.11.1",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-n": "^15.4.0",
"eslint": "^8.54.0",
"@typescript-eslint/parser": "^6.21.0",
"eslint-config-standard-with-typescript": "^40.0.0"
"webpack-dev-server": "^4.11.1"
},
"dependencies": {
"@hcengineering/achievement": "^0.7.0",
Expand Down
15 changes: 14 additions & 1 deletion dev/prod/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
const DefinePlugin = require('webpack').DefinePlugin
const HtmlWebpackPlugin = require('html-webpack-plugin')
const { Configuration } = require('webpack')
const sass = require('../../common/scripts/sass-quiet.js')

const mode = process.env.NODE_ENV || 'development'
const prod = mode === 'production'
Expand Down Expand Up @@ -283,6 +284,12 @@ module.exports = [
},
module: {
rules: [
{
test: /\.m?js$/,
resolve: {
fullySpecified: false
}
},
{
test: /\.ts?$/,
loader: 'esbuild-loader',
Expand Down Expand Up @@ -356,7 +363,13 @@ module.exports = [
'style-loader',
'css-loader',
'postcss-loader',
'sass-loader'
{
loader: "sass-loader",
options: {
api: "modern",
implementation: sass
}
}
]
},

Expand Down
2 changes: 1 addition & 1 deletion dev/storybook/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
"sass-loader": "^13.2.0",
"storybook": "^7.0.6",
"storybook-addon-themes": "^6.1.0",
"svelte-preprocess": "^5.1.3"
"svelte-preprocess": "^5.1.4"
}
}
4 changes: 2 additions & 2 deletions packages/highlight/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
},
"devDependencies": {
"svelte-loader": "^3.2.0",
"sass": "^1.53.0",
"svelte-preprocess": "^5.1.3",
"@hcengineering/platform-rig": "^0.7.15",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"sass": "^1.80.0",
"svelte-preprocess": "^5.1.4",
"eslint-config-standard-with-typescript": "^40.0.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-n": "^15.4.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/hls/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
"jest": "^29.7.0",
"prettier": "^3.6.2",
"prettier-plugin-svelte": "^3.4.0",
"sass": "^1.53.0",
"sass": "^1.80.0",
"svelte-check": "^3.6.9",
"svelte-eslint-parser": "^0.33.1",
"svelte-loader": "^3.2.0",
"svelte-preprocess": "^5.1.3",
"svelte-preprocess": "^5.1.4",
"ts-jest": "^29.1.1",
"typescript": "^5.9.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/kanban/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
},
"devDependencies": {
"svelte-loader": "^3.2.0",
"sass": "^1.53.0",
"svelte-preprocess": "^5.1.3",
"sass": "^1.80.0",
"svelte-preprocess": "^5.1.4",
"svelte-check": "^3.6.9",
"@hcengineering/platform-rig": "^0.7.15",
"@typescript-eslint/eslint-plugin": "^6.21.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/panel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
},
"devDependencies": {
"svelte-loader": "^3.2.0",
"sass": "^1.53.0",
"svelte-preprocess": "^5.1.3",
"sass": "^1.80.0",
"svelte-preprocess": "^5.1.4",
"svelte-check": "^3.6.9",
"@hcengineering/platform-rig": "^0.7.15",
"@typescript-eslint/eslint-plugin": "^6.21.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/presentation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
},
"devDependencies": {
"svelte-loader": "^3.2.0",
"sass": "^1.53.0",
"svelte-preprocess": "^5.1.3",
"sass": "^1.80.0",
"svelte-preprocess": "^5.1.4",
"@hcengineering/platform-rig": "^0.7.15",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/theme/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
},
"devDependencies": {
"svelte-loader": "^3.2.0",
"sass": "^1.53.0",
"svelte-preprocess": "^5.1.3",
"sass": "^1.80.0",
"svelte-preprocess": "^5.1.4",
"@hcengineering/platform-rig": "^0.7.15",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
Expand Down
6 changes: 4 additions & 2 deletions packages/theme/styles/_text-editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'sass:meta';

.ProseMirror {
outline: none;

Expand Down Expand Up @@ -436,11 +438,11 @@
}

.theme-dark {
@import './github-dark.scss';
@include meta.load-css('./github-dark.scss');
}

.theme-light {
@import './github-light.scss';
@include meta.load-css('./github-light.scss');
}

.theme-dark .text-editor-note-marker {
Expand Down
42 changes: 21 additions & 21 deletions packages/theme/styles/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,27 @@
// limitations under the License.
//

@import "./_vars.scss";
@import "./_colors.scss";
@import "./_lumia-colors.scss";
@import "./_layouts.scss";
@import "./_print.scss";
@import "./common.scss";
@import "./button.scss";
@import "./editors.scss";
@import "./components.scss";
@import "./dialogs.scss";
@import "./popups.scss";
@import "./mixins.scss";
@import "./panel.scss";
@import "./prose.scss";
@import "./tables.scss";
@import "./_text-editor.scss";

@import "./love.scss";

@import "./mono.scss";
@import "./noto-color.scss";
@use "./_vars.scss" as *;
@use "./_colors.scss" as *;
@use "./_lumia-colors.scss" as *;
@use "./_layouts.scss" as *;
@use "./_print.scss" as *;
@use "./common.scss" as *;
@use "./button.scss" as *;
@use "./editors.scss" as *;
@use "./components.scss" as *;
@use "./dialogs.scss" as *;
@use "./popups.scss" as *;
@use "./mixins.scss" as *;
@use "./panel.scss" as *;
@use "./prose.scss" as *;
@use "./tables.scss" as *;
@use "./_text-editor.scss" as *;

@use "./love.scss" as *;

@use "./mono.scss" as *;
@use "./noto-color.scss" as *;

@font-face {
font-family: 'IBM Plex Sans';
Expand Down
2 changes: 2 additions & 0 deletions packages/theme/styles/panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
// limitations under the License.
//

@use './_print.scss' as *;

/* Huly Panels */
.hulyPanels-container {
display: flex;
Expand Down
6 changes: 4 additions & 2 deletions packages/theme/styles/prose.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
// limitations under the License.
//

@use 'sass:meta';

/* Table */
table.proseTable {
--table-selection-border-width: 1px;
Expand Down Expand Up @@ -563,9 +565,9 @@ pre.proseCodeBlock>pre.proseCode {
}

.theme-dark {
@import './github-dark.scss';
@include meta.load-css('./github-dark.scss');
}

.theme-light {
@import './github-light.scss';
@include meta.load-css('./github-light.scss');
}
4 changes: 2 additions & 2 deletions packages/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
"jest": "^29.7.0",
"prettier": "^3.6.2",
"prettier-plugin-svelte": "^3.4.0",
"sass": "^1.53.0",
"sass": "^1.80.0",
"svelte-check": "^3.6.9",
"svelte-eslint-parser": "^0.33.1",
"svelte-loader": "^3.2.0",
"svelte-preprocess": "^5.1.3",
"svelte-preprocess": "^5.1.4",
"ts-jest": "^29.1.1",
"typescript": "^5.9.3"
},
Expand Down
Loading
Loading