fix: proper sass mapping and always failing test
This commit is contained in:
parent
8e772277bb
commit
44b78e7fb2
1 changed files with 11 additions and 2 deletions
|
|
@ -109,7 +109,7 @@ function get_rollup_options_for_js(output_file, input_files) {
|
|||
|
||||
function get_rollup_options_for_css(output_file, input_files) {
|
||||
const output_path = path.resolve(assets_path, output_file);
|
||||
const minimize_css = output_path.startsWith('css/') && production;
|
||||
const starts_with_css = output_file.startsWith('css/');
|
||||
|
||||
const plugins = [
|
||||
// enables array of inputs
|
||||
|
|
@ -125,15 +125,24 @@ function get_rollup_options_for_css(output_file, input_files) {
|
|||
path.resolve(get_public_path('frappe'), 'less')
|
||||
]
|
||||
}],
|
||||
['sass', get_options_for_scss()]
|
||||
['sass', {
|
||||
...get_options_for_scss(),
|
||||
outFile: output_path,
|
||||
sourceMapContents: true
|
||||
}]
|
||||
],
|
||||
include: [
|
||||
path.resolve(bench_path, '**/*.less'),
|
||||
path.resolve(bench_path, '**/*.scss'),
|
||||
path.resolve(bench_path, '**/*.css')
|
||||
],
|
||||
<<<<<<< Updated upstream
|
||||
minimize: minimize_css,
|
||||
sourceMap: output_file.startsWith('css/') && !production
|
||||
=======
|
||||
minimize: starts_with_css && production,
|
||||
sourceMap: starts_with_css && !production
|
||||
>>>>>>> Stashed changes
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue