postcss-loader
Advanced tools
Comparing version
@@ -51,3 +51,2 @@ "use strict"; | ||
} | ||
const useSourceMap = typeof options.sourceMap !== "undefined" ? options.sourceMap : this.sourceMap; | ||
const { | ||
@@ -57,2 +56,3 @@ plugins, | ||
} = await (0, _utils.getPostcssOptions)(this, loadedConfig, options.postcssOptions); | ||
const useSourceMap = typeof options.sourceMap !== "undefined" ? options.sourceMap : this.sourceMap; | ||
if (useSourceMap) { | ||
@@ -59,0 +59,0 @@ processOptions.map = { |
@@ -18,3 +18,2 @@ "use strict"; | ||
var _module = _interopRequireDefault(require("module")); | ||
var _full = require("klona/full"); | ||
var _cosmiconfig = require("cosmiconfig"); | ||
@@ -63,3 +62,3 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
try { | ||
result = _cosmiconfig.defaultLoaders[".js"](...args); | ||
result = _cosmiconfig.defaultLoadersSync[".js"](...args); | ||
} catch (error) { | ||
@@ -82,2 +81,3 @@ let importESM; | ||
}, | ||
".cjs": _cosmiconfig.defaultLoadersSync[".cjs"], | ||
".mjs": async (...args) => { | ||
@@ -144,5 +144,7 @@ let result; | ||
}; | ||
result.config = result.config(api); | ||
return { | ||
...result, | ||
config: result.config(api) | ||
}; | ||
} | ||
result = (0, _full.klona)(result); | ||
return result; | ||
@@ -247,3 +249,5 @@ } | ||
} | ||
const processOptionsFromConfig = loadedConfig.config || {}; | ||
const processOptionsFromConfig = { | ||
...loadedConfig.config | ||
} || {}; | ||
if (processOptionsFromConfig.from) { | ||
@@ -255,6 +259,5 @@ processOptionsFromConfig.from = _path.default.resolve(_path.default.dirname(loadedConfig.filepath), processOptionsFromConfig.from); | ||
} | ||
// No need them for processOptions | ||
delete processOptionsFromConfig.plugins; | ||
const processOptionsFromOptions = (0, _full.klona)(normalizedPostcssOptions); | ||
const processOptionsFromOptions = { | ||
...normalizedPostcssOptions | ||
}; | ||
if (processOptionsFromOptions.from) { | ||
@@ -267,5 +270,12 @@ processOptionsFromOptions.from = _path.default.resolve(loaderContext.rootContext, processOptionsFromOptions.from); | ||
// No need them for processOptions | ||
delete processOptionsFromOptions.config; | ||
delete processOptionsFromOptions.plugins; | ||
// No need `plugins` and `config` for processOptions | ||
const { | ||
plugins: __plugins, | ||
...optionsFromConfig | ||
} = processOptionsFromConfig; | ||
const { | ||
config: _config, | ||
plugins: _plugins, | ||
...optionsFromOptions | ||
} = processOptionsFromOptions; | ||
const processOptions = { | ||
@@ -275,4 +285,4 @@ from: file, | ||
map: false, | ||
...processOptionsFromConfig, | ||
...processOptionsFromOptions | ||
...optionsFromConfig, | ||
...optionsFromOptions | ||
}; | ||
@@ -279,0 +289,0 @@ if (typeof processOptions.parser === "string") { |
{ | ||
"name": "postcss-loader", | ||
"version": "7.3.2", | ||
"version": "7.3.3", | ||
"description": "PostCSS loader for webpack", | ||
@@ -48,5 +48,4 @@ "license": "MIT", | ||
"dependencies": { | ||
"cosmiconfig": "^8.1.3", | ||
"cosmiconfig": "^8.2.0", | ||
"jiti": "^1.18.2", | ||
"klona": "^2.0.6", | ||
"semver": "^7.3.8" | ||
@@ -53,0 +52,0 @@ }, |
74318
43.84%5
-16.67%9
12.5%682
1.64%- Removed
- Removed
Updated