Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ before_script:
- npm install node-sass sass-extract

node_js:
- "6"
- "5"
- "10"

env:
- WEBPACK_VERSION=^1.12.6"
- WEBPACK_VERSION=^2
- WEBPACK_VERSION=^3
- WEBPACK_VERSION=^4
- WEBPACK_VERSION=^5
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@
"node": ">=4"
},
"peerDependencies": {
"webpack": "^3 || ^2 || ^2.2.0-rc.0 || ^2.1.0-beta || ^1.12.6",
"webpack": "^5 || ^4",
"sass-extract": "^1.0.1 || ^2.0.0"
},
"devDependencies": {
"bluebird": "^3.4.7",
"chai": "^4.1.2",
"cz-conventional-changelog": "^2.1.0",
"mocha": "^4.0.1",
"webpack": "^3.9.1"
"webpack": "5.20.1"
},
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
},
"dependencies": {
"loader-utils": "^1.1.0"
"loader-utils": "^2.0.0"
}
}
16 changes: 8 additions & 8 deletions test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('sass-vars-loader', () => {
expect(compiled.global.$e.sources).to.have.members([source]);
expect(compiled.global.$f.sources).to.have.members([source]);

expect(stats.compilation.fileDependencies).to.have.members([source]);
expect(Array.from(stats.compilation.fileDependencies)).to.include.members([source]);
});
});

Expand All @@ -46,15 +46,15 @@ describe('sass-vars-loader', () => {
expect(compiled.global.$e.sources).to.have.members([sourceSub2]);
expect(compiled.global.$f.sources).to.have.members([sourceSub2]);

expect(stats.compilation.fileDependencies).to.have.members([sourceRoot, sourceSub1, sourceSub2]);
expect(Array.from(stats.compilation.fileDependencies)).to.include.members([sourceRoot, sourceSub1, sourceSub2]);
});
});

it('should succesfully track dependencies on error', () => {
return runTest('./scss/error.scss')
.catch(err => {
const source = path.resolve(__dirname, './scss/error.scss');
expect(err.stats.compilation.fileDependencies).to.have.members([source]);
expect(Array.from(err.stats.compilation.fileDependencies)).to.include.members([source]);
});
});

Expand All @@ -63,12 +63,12 @@ describe('sass-vars-loader', () => {
.catch(err => {
const sourceRoot = path.resolve(__dirname, './scss/nested-error.scss');
const sourceSub = path.resolve(__dirname, './scss/sub/error.scss');
expect(err.stats.compilation.fileDependencies).to.have.members([sourceRoot, sourceSub]);
expect(Array.from(err.stats.compilation.fileDependencies)).to.include.members([sourceRoot, sourceSub]);
});
});

it('should succesfully include files from includePaths', () => {
return runTest('./scss/include.scss', '?{"includePaths": ["./test/scss/include"]}')
return runTest('./scss/include.scss', {"includePaths": ["./test/scss/include"]})
.then(results => {
const compiled = results.compiled;
const stats = results.stats;
Expand All @@ -80,12 +80,12 @@ describe('sass-vars-loader', () => {
const sourceRoot = path.resolve(__dirname, './scss/include.scss');
const sourceIncluded = path.resolve(__dirname, './scss/include/included.scss');

expect(stats.compilation.fileDependencies).to.have.members([sourceRoot, sourceIncluded]);
expect(Array.from(stats.compilation.fileDependencies)).to.include.members([sourceRoot, sourceIncluded]);
});
});

it('should succesfully use minimal plugin', () => {
return runTest('./scss/basic.scss', '?{"plugins": ["minimal"]}')
return runTest('./scss/basic.scss', {"plugins": ["minimal"]})
.then(results => {
const compiled = results.compiled;
const stats = results.stats;
Expand All @@ -101,7 +101,7 @@ describe('sass-vars-loader', () => {
expect(compiled.global.$d).to.equal('1px solid black');
expect(compiled.global.$e).to.equal('string');

expect(stats.compilation.fileDependencies).to.have.members([source]);
expect(Array.from(stats.compilation.fileDependencies)).to.include.members([source]);
});
});
});
8 changes: 5 additions & 3 deletions test/run-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@ const webpack = Promise.promisify(require('webpack'));
const path = require('path');

const pathToLoader = path.resolve(__dirname, "../index.js");
const pathToTestBundle = path.resolve(__dirname, "./output/test.bundle.js")
const pathToTestBundle = path.resolve(__dirname, "./output/test.bundle.js");

module.exports = exports = (filename, options) => {
return webpack({
entry: filename,
context: __dirname,
mode: 'development',
module: {
loaders: [
rules: [
{
test: /.scss$/,
loader: pathToLoader + (options || ''),
loader: pathToLoader,
options
}
],
},
Expand Down