Skip to content

Commit a8709c9

Browse files
authoredDec 14, 2018
feat: support sass field in package.json (#647)
1 parent ff90dd6 commit a8709c9

File tree

9 files changed

+56
-0
lines changed

9 files changed

+56
-0
lines changed
 

‎lib/loader.js

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ function sassLoader(content) {
4040
// Supported since v4.27.0
4141
if (this.getResolve) {
4242
resolve = this.getResolve({
43+
mainFields: ['sass', 'main'],
4344
extensions: ['.scss', '.sass', '.css'],
4445
});
4546
}

‎test/index.test.js

+2
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ implementations.forEach((implementation) => {
169169
},
170170
}
171171
));
172+
it('should resolve sass field correctly', () =>
173+
execTest(`import-sass-field`));
172174
});
173175
describe('custom importers', () => {
174176
it('should use custom importer', () =>

‎test/node_modules/sass-sass-field/nested/style.sass

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/node_modules/sass-sass-field/package.json

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/node_modules/scss-sass-field/nested/style.scss

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/node_modules/scss-sass-field/package.json

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/sass/import-sass-field.sass

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import "~sass-sass-field"

‎test/scss/import-sass-field.scss

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import "~scss-sass-field";

‎test/tools/createSpec.js

+22
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,26 @@ function createSpec(ext) {
3838
basePath,
3939
path.resolve(testFolder, ext, 'another', `alias.${ext}`)
4040
);
41+
const pathToScssSassField = path.relative(
42+
basePath,
43+
path.resolve(
44+
testFolder,
45+
'node_modules',
46+
'scss-sass-field',
47+
'nested',
48+
'style.scss'
49+
)
50+
);
51+
const pathToSASSSassField = path.relative(
52+
basePath,
53+
path.resolve(
54+
testFolder,
55+
'node_modules',
56+
'sass-sass-field',
57+
'nested',
58+
'style.sass'
59+
)
60+
);
4161

4262
fs.readdirSync(path.join(testFolder, ext))
4363
.filter(
@@ -57,6 +77,8 @@ function createSpec(ext) {
5777
if (/\.css$/.test(url) === false) {
5878
// eslint-disable-next-line no-param-reassign
5979
url = url
80+
.replace(/^~scss-sass-field/, pathToScssSassField)
81+
.replace(/^~sass-sass-field/, pathToSASSSassField)
6082
.replace(/^~bootstrap-sass/, pathToBootstrap)
6183
.replace(/^~@org\/pkg/, pathToScopedNpmPkg)
6284
.replace(/^~module/, pathToModule)

0 commit comments

Comments
 (0)
Please sign in to comment.