Skip to content
Closed
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 27 additions & 3 deletions common/config/rush/pnpm-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,11 @@
* PNPM documentation: https://pnpm.io/package_json#pnpmoverrides
*/
"globalOverrides": {
// DEV: Uncomment the lines below to use local huly.core packages
// DEV: Uncomment the lines below to use local huly.core, huly.server, and huly.utils 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.
// NOTE: It's configured to work if huly.core, huly.server, and huly.utils are placed adjacent to the platform. If you have them in a different location, you need to change the paths below.

// huly.core packages:
// "@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",
Expand All @@ -224,7 +225,30 @@
// "@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"
// "@hcengineering/token": "file:../../../huly.core/packages/token",

// huly.server packages:
// "@hcengineering/collaboration": "file:../../../huly.server/packages/collaboration",
// "@hcengineering/datalake": "file:../../../huly.server/packages/datalake",
// "@hcengineering/elastic": "file:../../../huly.server/packages/elastic",
// "@hcengineering/hulylake": "file:../../../huly.server/packages/hulylake",
// "@hcengineering/kafka": "file:../../../huly.server/packages/kafka",
// "@hcengineering/middleware": "file:../../../huly.server/packages/middleware",
// "@hcengineering/minio": "file:../../../huly.server/packages/minio",
// "@hcengineering/mongo": "file:../../../huly.server/packages/mongo",
// "@hcengineering/postgres": "file:../../../huly.server/packages/postgres",
// "@hcengineering/s3": "file:../../../huly.server/packages/s3",
// "@hcengineering/server": "file:../../../huly.server/packages/server",
// "@hcengineering/server-client": "file:../../../huly.server/packages/client",
// "@hcengineering/server-core": "file:../../../huly.server/packages/core",
// "@hcengineering/server-storage": "file:../../../huly.server/packages/server-storage",

// huly.utils packages:
// "@hcengineering/measurements": "file:../../../huly.utils/packages/measurements",
// "@hcengineering/measurements-otlp": "file:../../../huly.utils/packages/measurements-otlp",
// "@hcengineering/platform-rig": "file:../../../huly.utils/packages/platform-rig",
// "@hcengineering/postgres-base": "file:../../../huly.utils/packages/postgres-base",
// "@hcengineering/ui-test": "file:../../../huly.utils/packages/ui-test"
},

/**
Expand Down
24,447 changes: 12,510 additions & 11,937 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion common/scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"template": "none",
"devDependencies": {
"@hcengineering/platform-rig": "^0.7.15",
"@hcengineering/platform-rig": "0.7.15",
"esbuild": "^0.25.9",
"sharp": "~0.34.3",
"@typescript-eslint/eslint-plugin": "^6.21.0",
Expand Down
41 changes: 25 additions & 16 deletions common/scripts/sass-quiet.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,31 @@
// 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();
// Install the stderr filter globally as early as possible
if (!process.stderr._originalWrite) {
process.stderr._originalWrite = process.stderr.write;

process.stderr.write = function (chunk, encoding, callback) {
const chunkStr = typeof chunk === 'string' ? chunk : (chunk?.toString?.() || '');

// Filter out sass legacy API deprecation warnings
if (chunkStr.includes('Deprecation Warning [legacy-js-api]') ||
chunkStr.includes('DEPRECATION WARNING [legacy-js-api]') ||
chunkStr.includes('The legacy JS API is deprecated') ||
chunkStr.includes('More info: https://sass-lang.com/d/legacy-js-api')) {
// Suppress the warning - just call the callback
if (typeof encoding === 'function') {
encoding();
} else if (typeof callback === 'function') {
callback();
}
return true;
}
return true;
}
return originalStderrWrite(chunk, encoding, callback);
};

return process.stderr._originalWrite.call(this, chunk, encoding, callback);
};
}

const sass = require('sass');

module.exports = sass;
4 changes: 2 additions & 2 deletions desktop-package/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"bump": "bump-package-version"
},
"devDependencies": {
"@hcengineering/platform-rig": "^0.7.15",
"@hcengineering/desktop": "^0.7.0",
"@hcengineering/platform-rig": "0.7.15",
"@hcengineering/desktop": "0.7.0",
"@vercel/webpack-asset-relocator-loader": "^1.7.3",
"node-loader": "~2.0.0",
"cross-env": "~7.0.3",
Expand Down
Loading
Loading