Skip to content

Commit bccec15

Browse files
committed
Temporarily revert the sass.json features from 9aeadf2 because heft-sass-plugin is not quite ready yet
1 parent 72ad161 commit bccec15

3 files changed

Lines changed: 17 additions & 3 deletions

File tree

rigs/heft-web-rig/profiles/app/config/sass.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*
4141
* Default value: undefined
4242
*/
43-
"cssOutputFolders": ["lib", "lib-commonjs"],
43+
// "cssOutputFolders": ["lib", "lib-commonjs"],
4444

4545
/**
4646
* Files with these extensions will pass through the Sass transpiler for typings generation.

rigs/heft-web-rig/profiles/library/config/sass.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*
4141
* Default value: undefined
4242
*/
43-
"cssOutputFolders": ["lib", "lib-commonjs"],
43+
// "cssOutputFolders": ["lib", "lib-commonjs"],
4444

4545
/**
4646
* Files with these extensions will pass through the Sass transpiler for typings generation.

rigs/heft-web-rig/shared/webpack-base.config.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function createWebpackConfig({ env, argv, projectRoot, configOverride }) {
6969
//
7070
// COMPILATION STRATEGY
7171
//
72-
// - Sass compilation: handled by @rushstack/heft-sass-plugin, configured using config/sass.json
72+
// - Sass compilation: handled by Webpack
7373
// - .d.ts generation: handled by @rushstack/heft-sass-plugin, configured using config/sass.json
7474
// - Autoprefixer: handled by Webpack
7575
// - CSS modules: handled by Webpack
@@ -177,6 +177,20 @@ function createWebpackConfig({ env, argv, projectRoot, configOverride }) {
177177
]
178178
},
179179

180+
sourceMap: !production
181+
}
182+
},
183+
{
184+
// Compiles SASS syntax into CSS
185+
// https://www.npmjs.com/package/sass-loader
186+
loader: require.resolve('sass-loader'),
187+
188+
options: {
189+
implementation: sass,
190+
sassOptions: {
191+
includePaths: [path.resolve(__dirname, 'node_modules')]
192+
},
193+
180194
sourceMap: !production
181195
}
182196
}

0 commit comments

Comments
 (0)