Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: webpack-contrib/stylus-loader
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.0.1
Choose a base ref
...
head repository: webpack-contrib/stylus-loader
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.0.2
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Jan 30, 2018

  1. webpack 4 doesn’t provide this.options

    Artemy Tregubenko committed Jan 30, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    fc81e32 View commit details

Commits on Feb 26, 2018

  1. Merge pull request #190 from arty-name/master

    webpack 4 doesn’t provide `this.options`
    shama authored Feb 26, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    b3c98e8 View commit details
  2. Update copyright year

    shama committed Feb 26, 2018
    Copy the full SHA
    c98f748 View commit details
  3. v3.0.2

    shama committed Feb 26, 2018
    Copy the full SHA
    5258d97 View commit details
Showing with 7 additions and 5 deletions.
  1. +2 −2 LICENSE
  2. +1 −1 README.md
  3. +3 −1 index.js
  4. +1 −1 package.json
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2014 Kyle Robinson Young
Copyright (c) 2018 Kyle Robinson Young

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -19,4 +19,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
OTHER DEALINGS IN THE SOFTWARE.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -228,5 +228,5 @@ In lieu of a formal styleguide, take care to maintain the existing coding style.
* 0.1.0 - Initial release

## License
Copyright (c) 2014 Kyle Robinson Young
Copyright (c) 2018 Kyle Robinson Young
Licensed under the MIT license.
4 changes: 3 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -24,9 +24,11 @@ module.exports = function(source) {
if (this.stylus) {
configKey = options.config || 'default';
stylusOptions = this.stylus[configKey] || {};
} else {
} else if (this.options) {
configKey = options.config || 'stylus';
stylusOptions = this.options[configKey] || {};
} else {
stylusOptions = {};
}
// Instead of assigning to options, we run them manually later so their side effects apply earlier for
// resolving paths.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "stylus-loader",
"version": "3.0.1",
"version": "3.0.2",
"description": "Stylus loader for webpack",
"main": "index.js",
"files": [