Fix error when separateCSS: true and sourceMaps: false

Hypercubed · Hypercubed · commit df18510e3f1c · 2016-10-07T11:30:20.000+09:00
diff --git a/css-plugin-base-builder.js b/css-plugin-base-builder.js
@@ -155,8 +155,8 @@ exports.bundle = function(loads, compileOpts, outputOpts) {
 
     // write a separate CSS file if necessary
     if (loader.separateCSS) {
+      var outFile = path.resolve(outputOpts.outFile).replace(/\.js$/, '.css');
       if (outputOpts.sourceMaps) {
-        var outFile = path.resolve(outputOpts.outFile).replace(/\.js$/, '.css');
         fs.writeFileSync(outFile + '.map', result.map.toString());
         cssOutput += '\n/*# sourceMappingURL=' + outFile.split(/[\\/]/).pop() + '.map*/';
       }
diff --git a/test/css.builder.spec.js b/test/css.builder.spec.js
@@ -33,5 +33,14 @@ describe('CSS Builder', function() {
 				return expect(results.source).to.equal('');
 			});
 		})
+
+		it('Should support separateCSS: true and sourceMaps: false', function() {
+			var builder = new Builder();
+			builder.config(System.getConfig());
+			builder.config({ separateCSS: true });
+			return builder.bundle('test/data/test.css!', {sourceMaps: false, minify: false, outFile: 'test/bundle.js'}).then((results) => {
+				return expect(results.source).to.contain("test/data/test.css!css.js");
+			});
+		})
 	});
 });

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,8 @@ exports.bundle = function(loads, compileOpts, outputOpts) {`
`155`	`155`
`156`	`156`	`// write a separate CSS file if necessary`
`157`	`157`	`if (loader.separateCSS) {`
	`158`	`+ var outFile = path.resolve(outputOpts.outFile).replace(/\.js$/, '.css');`
`158`	`159`	`if (outputOpts.sourceMaps) {`
`159`		`- var outFile = path.resolve(outputOpts.outFile).replace(/\.js$/, '.css');`
`160`	`160`	`fs.writeFileSync(outFile + '.map', result.map.toString());`
`161`	`161`	`cssOutput += '\n/# sourceMappingURL=' + outFile.split(/[\\/]/).pop() + '.map/';`
`162`	`162`	`}`