fix::新版本商品页面\订单页面逻辑完善\依赖完善
This commit is contained in:
16
node_modules/sass-loader/dist/utils.js
generated
vendored
16
node_modules/sass-loader/dist/utils.js
generated
vendored
@@ -113,7 +113,7 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
|
||||
if (!sassOptions.logger) {
|
||||
const needEmitWarning = loaderOptions.warnRuleAsWarning !== false;
|
||||
const logger = loaderContext.getLogger("sass-loader");
|
||||
const formatSpan = span => `${span.url || "-"}:${span.start.line}:${span.start.column}: `;
|
||||
const formatSpan = span => `Warning on line ${span.start.line}, column ${span.start.column} of ${span.url || "-"}:${span.start.line}:${span.start.column}:\n`;
|
||||
const formatDebugSpan = span => `[debug:${span.start.line}:${span.start.column}] `;
|
||||
sassOptions.logger = {
|
||||
debug(message, loggerOptions) {
|
||||
@@ -129,11 +129,14 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
|
||||
if (loggerOptions.deprecation) {
|
||||
builtMessage += "Deprecation ";
|
||||
}
|
||||
if (loggerOptions.span && !loggerOptions.stack) {
|
||||
builtMessage = formatSpan(loggerOptions.span);
|
||||
if (loggerOptions.span) {
|
||||
builtMessage += formatSpan(loggerOptions.span);
|
||||
}
|
||||
builtMessage += message;
|
||||
if (loggerOptions.stack) {
|
||||
if (loggerOptions.span && loggerOptions.span.context) {
|
||||
builtMessage += `\n\n${loggerOptions.span.start.line} | ${loggerOptions.span.context}`;
|
||||
}
|
||||
if (loggerOptions.stack && loggerOptions.stack !== "null") {
|
||||
builtMessage += `\n\n${loggerOptions.stack}`;
|
||||
}
|
||||
if (needEmitWarning) {
|
||||
@@ -227,6 +230,11 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
|
||||
|
||||
// Allow passing custom importers to `sass`/`node-sass`. Accepts `Function` or an array of `Function`s.
|
||||
sassOptions.importer = sassOptions.importer ? proxyCustomImporters(Array.isArray(sassOptions.importer) ? sassOptions.importer.slice() : [sassOptions.importer], loaderContext) : [];
|
||||
|
||||
// Regression on the `sass-embedded` side
|
||||
if (loaderOptions.webpackImporter === false && sassOptions.importer.length === 0) {
|
||||
sassOptions.importer = undefined;
|
||||
}
|
||||
sassOptions.includePaths = [].concat(process.cwd()).concat(
|
||||
// We use `includePaths` in context for resolver, so it should be always absolute
|
||||
(sassOptions.includePaths ? sassOptions.includePaths.slice() : []).map(includePath => _path.default.isAbsolute(includePath) ? includePath : _path.default.join(process.cwd(), includePath))).concat(process.env.SASS_PATH ? process.env.SASS_PATH.split(process.platform === "win32" ? ";" : ":") : []);
|
||||
|
||||
Reference in New Issue
Block a user