2
2
MIT License http://www.opensource.org/licenses/mit-license.php
3
3
Author Tobias Koppers @sokra
4
4
*/
5
- const formatCodeFrame = require ( 'babel-code-frame' ) ;
6
5
const Tokenizer = require ( 'css-selector-tokenizer' ) ;
7
6
const postcss = require ( 'postcss' ) ;
8
7
const loaderUtils = require ( 'loader-utils' ) ;
@@ -14,6 +13,7 @@ const modulesScope = require('postcss-modules-scope');
14
13
const modulesValues = require ( 'postcss-modules-values' ) ;
15
14
const valueParser = require ( 'postcss-value-parser' ) ;
16
15
16
+ const CssSyntaxError = require ( './CssSyntaxError' ) ;
17
17
const getLocalIdent = require ( './getLocalIdent' ) ;
18
18
19
19
const parserPlugin = postcss . plugin ( 'css-loader-parser' , ( options ) => ( css ) => {
@@ -227,46 +227,9 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
227
227
urlItemRegExp : / _ _ _ C S S _ L O A D E R _ U R L _ _ _ ( [ 0 - 9 ] + ) _ _ _ / ,
228
228
} ) ;
229
229
} )
230
- . catch ( ( err ) => {
231
- if ( err . name === 'CssSyntaxError' ) {
232
- const wrappedError = new CSSLoaderError (
233
- 'Syntax Error' ,
234
- err . reason ,
235
- err . line != null && err . column != null
236
- ? { line : err . line , column : err . column }
237
- : null ,
238
- err . input . source
239
- ) ;
240
- callback ( wrappedError ) ;
241
- } else {
242
- callback ( err ) ;
243
- }
230
+ . catch ( ( error ) => {
231
+ callback (
232
+ error . name === 'CssSyntaxError' ? new CssSyntaxError ( error ) : error
233
+ ) ;
244
234
} ) ;
245
235
} ;
246
-
247
- function formatMessage ( message , loc , source ) {
248
- let formatted = message ;
249
- if ( loc ) {
250
- formatted = `${ formatted } (${ loc . line } :${ loc . column } )` ;
251
- }
252
- if ( loc && source ) {
253
- formatted = `${ formatted } \n\n${ formatCodeFrame (
254
- source ,
255
- loc . line ,
256
- loc . column
257
- ) } \n`;
258
- }
259
- return formatted ;
260
- }
261
-
262
- function CSSLoaderError ( name , message , loc , source , error ) {
263
- Error . call ( this ) ;
264
- Error . captureStackTrace ( this , CSSLoaderError ) ;
265
- this . name = name ;
266
- this . error = error ;
267
- this . message = formatMessage ( message , loc , source ) ;
268
- this . hideStack = true ;
269
- }
270
-
271
- CSSLoaderError . prototype = Object . create ( Error . prototype ) ;
272
- CSSLoaderError . prototype . constructor = CSSLoaderError ;
0 commit comments