Skip to content

Commit 2375f56

Browse files
committed
make removeCR default on windows
1 parent 1cc721f commit 2375f56

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

packages/resolve-url-loader/index.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
*/
55
'use strict';
66

7-
var path = require('path'),
7+
var os = require('os'),
8+
path = require('path'),
89
fs = require('fs'),
910
util = require('util'),
1011
loaderUtils = require('loader-utils'),
@@ -77,7 +78,7 @@ function resolveUrlLoader(content, sourceMap) {
7778
sourceMap: loader.sourceMap,
7879
engine : 'postcss',
7980
silent : false,
80-
removeCR : false,
81+
removeCR : os.EOL.includes('\r'),
8182
root : false,
8283
debug : false,
8384
join : joinFn.defaultJoin

test/cases/common/test/valid.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ exports.testDebug = (...elements) =>
5353
)
5454
);
5555

56-
exports.testRemoveCR = (...elements) =>
56+
exports.testRemoveCR = (removeCR) => (...elements) =>
5757
test(
58-
'removeCR=true',
58+
`removeCR=${removeCR}`,
5959
layer()(
6060
env({
61-
LOADER_OPTIONS: {removeCR: true},
62-
OUTPUT: 'remove-cr'
61+
LOADER_OPTIONS: {removeCR},
62+
OUTPUT: `remove-cr-${removeCR}`
6363
}),
6464
...elements,
65-
test('validate', assertStderr('options.removeCR')(1)`removeCR: true`)
65+
test('validate', assertStderr('options.removeCR')(1)`removeCR: ${String(removeCR)}`)
6666
)
6767
);
6868

test/cases/orphan-carriage-return.postcss.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,15 @@ module.exports = test(
5858
env({
5959
ENTRY: join('src', 'index.scss')
6060
}),
61-
testDefault(
62-
all(buildDevNormal, buildProdNormal, buildDevNoUrl, buildProdNoUrl)(
63-
assertWebpackNotOk,
64-
assertCssError
61+
testRemoveCR(false)(
62+
testDefault(
63+
all(buildDevNormal, buildProdNormal, buildDevNoUrl, buildProdNoUrl)(
64+
assertWebpackNotOk,
65+
assertCssError
66+
)
6567
)
6668
),
67-
testRemoveCR(
69+
testRemoveCR(true)(
6870
testDebug(
6971
buildDevNormal(
7072
assertWebpackOk,

0 commit comments

Comments
 (0)