balm-core 4.17.0 → 4.17.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -88,7 +88,12 @@ function cssLoader() {
|
|
|
88
88
|
}
|
|
89
89
|
}, 'sass-loader', {
|
|
90
90
|
// Prefer `dart-sass`
|
|
91
|
-
implementation: requireModule.resolve('sass')
|
|
91
|
+
implementation: requireModule.resolve('sass'),
|
|
92
|
+
sassOptions: Object.assign({
|
|
93
|
+
includePaths: BalmJS.file.stylePaths,
|
|
94
|
+
outputStyle: 'expanded',
|
|
95
|
+
quietDeps: BalmJS.config.logs.level < BalmJS.LogLevel.Warn
|
|
96
|
+
}, BalmJS.config.styles.sassOptions)
|
|
92
97
|
}),
|
|
93
98
|
// Don't consider CSS imports dead code even if the
|
|
94
99
|
// containing package claims to have no side effects.
|
package/lib/plugins/sass.js
CHANGED
|
@@ -7,11 +7,11 @@ import replaceExtension from 'replace-ext';
|
|
|
7
7
|
import stripAnsi from 'strip-ansi';
|
|
8
8
|
import applySourceMap from 'vinyl-sourcemaps-apply';
|
|
9
9
|
import ansiColors from 'ansi-colors';
|
|
10
|
-
|
|
11
|
-
// Just for `npm i -D sass@1.39.2`
|
|
12
10
|
process.env.BALM_CWD = process.env.INIT_CWD || process.cwd();
|
|
13
|
-
const localSassModule = path.join(process.env.BALM_ROOT || process.env.BALM_CWD, 'node_modules', 'sass'
|
|
14
|
-
const
|
|
11
|
+
const localSassModule = path.join(process.env.BALM_ROOT || process.env.BALM_CWD, 'node_modules', 'sass');
|
|
12
|
+
const newLocalSassModule = path.join(localSassModule, 'sass.default.js');
|
|
13
|
+
const oldLocalSassModule = path.join(localSassModule, 'sass.dart.js'); // Just for `npm i -D sass@1.39.2`
|
|
14
|
+
const sassModule = fs.existsSync(newLocalSassModule) ? requireModule(newLocalSassModule) : fs.existsSync(oldLocalSassModule) ? requireModule(oldLocalSassModule) : sass;
|
|
15
15
|
const PLUGIN_NAME = 'sass';
|
|
16
16
|
const transformObj = transform => new Transform({
|
|
17
17
|
transform,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "balm-core",
|
|
3
|
-
"version": "4.17.
|
|
3
|
+
"version": "4.17.2",
|
|
4
4
|
"description": "BalmJS compiler core",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"balm",
|
|
@@ -120,5 +120,5 @@
|
|
|
120
120
|
"engines": {
|
|
121
121
|
"node": ">=16"
|
|
122
122
|
},
|
|
123
|
-
"gitHead": "
|
|
123
|
+
"gitHead": "f7977af2a7ba58edc1dce2037af52d3182d5e43f"
|
|
124
124
|
}
|
|
@@ -79,7 +79,12 @@ function cssLoader() {
|
|
|
79
79
|
mode: 'icss'
|
|
80
80
|
}
|
|
81
81
|
}, 'sass-loader', {
|
|
82
|
-
implementation: requireModule.resolve('sass')
|
|
82
|
+
implementation: requireModule.resolve('sass'),
|
|
83
|
+
sassOptions: Object.assign({
|
|
84
|
+
includePaths: BalmJS.file.stylePaths,
|
|
85
|
+
outputStyle: 'expanded',
|
|
86
|
+
quietDeps: BalmJS.config.logs.level < BalmJS.LogLevel.Warn
|
|
87
|
+
}, BalmJS.config.styles.sassOptions)
|
|
83
88
|
}),
|
|
84
89
|
sideEffects: true
|
|
85
90
|
}
|
package/tslib/plugins/sass.js
CHANGED
|
@@ -7,10 +7,14 @@ import stripAnsi from 'strip-ansi';
|
|
|
7
7
|
import applySourceMap from 'vinyl-sourcemaps-apply';
|
|
8
8
|
import ansiColors from 'ansi-colors';
|
|
9
9
|
process.env.BALM_CWD = process.env.INIT_CWD || process.cwd();
|
|
10
|
-
const localSassModule = path.join(process.env.BALM_ROOT || process.env.BALM_CWD, 'node_modules', 'sass'
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
const localSassModule = path.join(process.env.BALM_ROOT || process.env.BALM_CWD, 'node_modules', 'sass');
|
|
11
|
+
const newLocalSassModule = path.join(localSassModule, 'sass.default.js');
|
|
12
|
+
const oldLocalSassModule = path.join(localSassModule, 'sass.dart.js');
|
|
13
|
+
const sassModule = fs.existsSync(newLocalSassModule)
|
|
14
|
+
? requireModule(newLocalSassModule)
|
|
15
|
+
: fs.existsSync(oldLocalSassModule)
|
|
16
|
+
? requireModule(oldLocalSassModule)
|
|
17
|
+
: sass;
|
|
14
18
|
const PLUGIN_NAME = 'sass';
|
|
15
19
|
const transformObj = (transform) => new Transform({ transform, objectMode: true });
|
|
16
20
|
const filePush = (file, sassObject, callback) => {
|