bugfix: Rewrite to the pitch function, so that it can work together with the css-loader

Zhicheng Wang · Zhicheng Wang · commit c5a390bb8c7c · 2017-02-03T17:21:51.000+08:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "css-with-mapping-loader",
   "description": "css to string with source mapping loader for webpack",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "main": "./src/css-with-mapping.js",
   "author": {
     "name": "Zhicheng Wang",
diff --git a/src/css-with-mapping.js b/src/css-with-mapping.js
@@ -1,11 +1,25 @@
 /**
  * @see https://webpack.github.io/docs/loaders.html
  */
-module.exports = function (script) {
-    var content = this.exec(script, __filename);
-    if (!content || content.length !== 1) {
-        throw new Error('The css-with-mapping-loader must be chained after the css-loader\n' + content);
-    }
+module.exports = function () {};
+
+/**
+ * @see https://webpack.github.io/docs/loaders.html#pitching-loader
+ */
+module.exports.pitch = function (remainingRequest) {
+    this.cacheable && this.cacheable();
+
+    var loaderUtils = require('loader-utils');
+    return encode.toString() + '\n' +
+        'var result = require(' + loaderUtils.stringifyRequest(this, "!!" + remainingRequest) + ');\n' +
+        'if (typeof result === "string") {\n' +
+        'module.exports = result;\n' +
+        '} else {\n' +
+        'module.exports = encode(result);\n' +
+        '}\n';
+};
+
+function encode(content) {
     var cssObject = content[0];
     var cssContent = cssObject[1] || '';
     var cssMapping = cssObject[3];
@@ -17,5 +31,5 @@ module.exports = function (script) {
     var sourceURLs = cssMapping.sources.map(function (source) {
         return '/*# sourceURL=' + cssMapping.sourceRoot + source + ' */'
     });
-    return 'module.exports = ' + JSON.stringify([cssContent].concat(sourceURLs).concat([sourceMapping]).join('\n'));
-};
+    return [cssContent].concat(sourceURLs).concat([sourceMapping]).join('\n');
+}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "css-with-mapping-loader",`
`3`	`3`	`"description": "css to string with source mapping loader for webpack",`
`4`		`- "version": "0.0.3",`
	`4`	`+ "version": "0.0.5",`
`5`	`5`	`"main": "./src/css-with-mapping.js",`
`6`	`6`	`"author": {`
`7`	`7`	`"name": "Zhicheng Wang",`