From 611a11d723c616157bbab69341c9523dcf910d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Wed, 8 Apr 2026 15:20:04 +0200 Subject: [PATCH] ensure skel-full delegates to Rspack and uses SCSS --- .../static-assets/skel-full/.meteor/packages | 1 - tools/static-assets/skel-full/client/main.js | 1 + .../skel-full/client/{main.less => main.scss} | 2 +- .../{not-found.less => _not-found.scss} | 0 tools/static-assets/skel-full/package.json | 4 +++- .../static-assets/skel-full/rspack.config.js | 20 ++++++++++++++++++- 6 files changed, 24 insertions(+), 4 deletions(-) rename tools/static-assets/skel-full/client/{main.less => main.scss} (50%) rename tools/static-assets/skel-full/imports/ui/stylesheets/{not-found.less => _not-found.scss} (100%) diff --git a/tools/static-assets/skel-full/.meteor/packages b/tools/static-assets/skel-full/.meteor/packages index 45b99ff8b6..ebe40b5dfd 100644 --- a/tools/static-assets/skel-full/.meteor/packages +++ b/tools/static-assets/skel-full/.meteor/packages @@ -21,7 +21,6 @@ typescript # Enable TypeScript syntax in .ts and .tsx modules shell-server # Server-side component of the `meteor shell` command ostrio:flow-router-extra # FlowRouter is a very simple router for Meteor -less # Leaner CSS language meteortesting:mocha # A package for writing and running your meteor app and package tests with mocha communitypackages:publication-collector@2.0.0-rc.1 # Test a Meteor publication by collecting its output diff --git a/tools/static-assets/skel-full/client/main.js b/tools/static-assets/skel-full/client/main.js index f5384b43a6..9ca71679ba 100644 --- a/tools/static-assets/skel-full/client/main.js +++ b/tools/static-assets/skel-full/client/main.js @@ -2,3 +2,4 @@ import '/imports/startup/client'; import '/imports/startup/both'; +import './main.scss'; diff --git a/tools/static-assets/skel-full/client/main.less b/tools/static-assets/skel-full/client/main.scss similarity index 50% rename from tools/static-assets/skel-full/client/main.less rename to tools/static-assets/skel-full/client/main.scss index fee4b2d78c..9a12560ed9 100644 --- a/tools/static-assets/skel-full/client/main.less +++ b/tools/static-assets/skel-full/client/main.scss @@ -1,4 +1,4 @@ -@import "{}/imports/ui/stylesheets/not-found.less"; +@use "../imports/ui/stylesheets/not-found"; body { padding: 10px; diff --git a/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less b/tools/static-assets/skel-full/imports/ui/stylesheets/_not-found.scss similarity index 100% rename from tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less rename to tools/static-assets/skel-full/imports/ui/stylesheets/_not-found.scss diff --git a/tools/static-assets/skel-full/package.json b/tools/static-assets/skel-full/package.json index bba99b04ac..3e1be40f44 100644 --- a/tools/static-assets/skel-full/package.json +++ b/tools/static-assets/skel-full/package.json @@ -16,7 +16,9 @@ "@rsdoctor/rspack-plugin": "^1.5.7", "@rspack/cli": "^1.7.1", "@rspack/core": "^1.7.1", - "chai": "^4.2.0" + "chai": "^4.2.0", + "sass-embedded": "^1.89.0", + "sass-loader": "^16.0.5" }, "meteor": { "mainModule": { diff --git a/tools/static-assets/skel-full/rspack.config.js b/tools/static-assets/skel-full/rspack.config.js index 33f02e3bbe..2ba8adc520 100644 --- a/tools/static-assets/skel-full/rspack.config.js +++ b/tools/static-assets/skel-full/rspack.config.js @@ -11,5 +11,23 @@ const { defineConfig } = require('@meteorjs/rspack'); * Use these flags to adjust your build settings based on environment. */ module.exports = defineConfig(Meteor => { - return {}; + return { + module: { + rules: [ + { + test: /\.scss$/i, + use: [ + { + loader: 'sass-loader', + options: { + api: 'modern-compiler', + implementation: require.resolve('sass-embedded'), + }, + }, + ], + type: 'css/auto', + }, + ], + }, + }; });