diff --git a/test/helpers/getCodeFromSass.js b/test/helpers/getCodeFromSass.js index eb2910f2..a336f3df 100644 --- a/test/helpers/getCodeFromSass.js +++ b/test/helpers/getCodeFromSass.js @@ -190,6 +190,22 @@ function getCodeFromSass(testId, options) { testFolder, 'node_modules/sass-main-field/nested/style.sass' ); + const pathToSCSSAlias = path.resolve( + testFolder, + 'scss/directory-6/file/_index.scss' + ); + const pathToSassAlias = path.resolve( + testFolder, + 'sass/directory-6/file/_index.sass' + ); + const pathToSCSSIndexAlias = path.resolve( + testFolder, + 'scss/dir-with-underscore-index/_index.scss' + ); + const pathToSassIndexAlias = path.resolve( + testFolder, + 'sass/dir-with-underscore-index/_index.sass' + ); const pathToScopedNpmPkg = path.resolve( testFolder, 'node_modules/@org/pkg/index.scss' @@ -628,6 +644,24 @@ function getCodeFromSass(testId, options) { .replace(/^~sass-main-field/, pathToSassMainField) .replace(/^~scss-custom-sass-field/, pathToSCSSCustomSassField) .replace(/^~sass-custom-sass-field/, pathToSassCustomSassField) + .replace(/^~@scss$/, pathToSCSSAlias) + .replace(/^~@sass$/, pathToSassAlias) + .replace( + /^~@path-to-scss-dir\/dir-with-underscore-index$/, + pathToSCSSIndexAlias + ) + .replace( + /^~@path-to-sass-dir\/dir-with-underscore-index$/, + pathToSassIndexAlias + ) + .replace( + /^~@\/path-to-scss-dir\/dir-with-underscore-index$/, + pathToSCSSIndexAlias + ) + .replace( + /^~@\/path-to-sass-dir\/dir-with-underscore-index$/, + pathToSassIndexAlias + ) .replace(/^~@org\/pkg/, pathToScopedNpmPkg) .replace(/^~bootstrap-sass$/, pathToBootstrap3Entry) .replace(/^~bootstrap-sass/, pathToBootstrap3Package) diff --git a/test/loader.test.js b/test/loader.test.js index 1c4e3dd8..ae5cb196 100644 --- a/test/loader.test.js +++ b/test/loader.test.js @@ -549,6 +549,24 @@ describe('loader', () => { 'another', `alias.${syntax}` ), + '@sass': path.resolve( + __dirname, + 'sass', + 'directory-6', + 'file', + '_index.sass' + ), + '@scss': path.resolve( + __dirname, + 'scss', + 'directory-6', + 'file', + `_index.scss` + ), + '@path-to-scss-dir': path.resolve(__dirname, 'scss'), + '@path-to-sass-dir': path.resolve(__dirname, 'sass'), + '@/path-to-scss-dir': path.resolve(__dirname, 'scss'), + '@/path-to-sass-dir': path.resolve(__dirname, 'sass'), }, }, loader: { options }, diff --git a/test/sass/dir-with-underscore-index/_index.sass b/test/sass/dir-with-underscore-index/_index.sass new file mode 100644 index 00000000..737e5b3c --- /dev/null +++ b/test/sass/dir-with-underscore-index/_index.sass @@ -0,0 +1,2 @@ +.dir-with-underscore-index + color: red diff --git a/test/sass/import-alias.sass b/test/sass/import-alias.sass index 5ebbfdfe..241ddd62 100644 --- a/test/sass/import-alias.sass +++ b/test/sass/import-alias.sass @@ -1 +1,4 @@ -@import path-to-alias +@import 'path-to-alias' +@import "~@sass" +@import "~@path-to-sass-dir/dir-with-underscore-index" +@import "~@/path-to-sass-dir/dir-with-underscore-index" diff --git a/test/scss/dir-with-underscore-index/_index.scss b/test/scss/dir-with-underscore-index/_index.scss new file mode 100644 index 00000000..ebf9afe8 --- /dev/null +++ b/test/scss/dir-with-underscore-index/_index.scss @@ -0,0 +1,3 @@ +.dir-with-underscore-index { + color: red; +} diff --git a/test/scss/import-alias.scss b/test/scss/import-alias.scss index 1b0a928f..64872db1 100644 --- a/test/scss/import-alias.scss +++ b/test/scss/import-alias.scss @@ -1 +1,4 @@ @import 'path-to-alias'; +@import "~@scss"; +@import "~@path-to-scss-dir/dir-with-underscore-index"; +@import "~@/path-to-scss-dir/dir-with-underscore-index";