Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Experimental] Add built-in Sass support #10133

Merged
merged 38 commits into from Jan 22, 2020
Merged

[Experimental] Add built-in Sass support #10133

merged 38 commits into from Jan 22, 2020

Commits on Jan 17, 2020

  1. Add built-in Sass support

    @alejalapeno
    alejalapeno committed Jan 17, 2020
    Copy the full SHA
    b3cab28 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2020

  1. Add copy of CSS tests for SCSS

    @timneutkens
    timneutkens committed Jan 19, 2020
    Copy the full SHA
    49f47af View commit details
    Browse the repository at this point in the history

  2. Fix failing tests

    @timneutkens
    timneutkens committed Jan 19, 2020
    Copy the full SHA
    6877b99 View commit details
    Browse the repository at this point in the history

  3. Fix url-loader tests

    @timneutkens
    timneutkens committed Jan 19, 2020
    Copy the full SHA
    7302fed View commit details
    Browse the repository at this point in the history

  4. Remove css file generated by tests

    @timneutkens
    timneutkens committed Jan 19, 2020
    Copy the full SHA
    11ce903 View commit details
    Browse the repository at this point in the history

  5. Fix nprogress import for css file

    @timneutkens
    timneutkens committed Jan 19, 2020
    Copy the full SHA
    952aba6 View commit details
    Browse the repository at this point in the history

  6. Fix SCSS modules (still 2 tests that need investigating)

    @timneutkens
    timneutkens committed Jan 19, 2020
    Copy the full SHA
    cd23277 View commit details
    Browse the repository at this point in the history

  7. Update documentation for Sass support

    @alejalapeno
    alejalapeno committed Jan 19, 2020
    Copy the full SHA
    81a6a80 View commit details
    Browse the repository at this point in the history

  8. Fix plain CSS import test

    @alejalapeno
    alejalapeno committed Jan 19, 2020
    Copy the full SHA
    380319d View commit details
    Browse the repository at this point in the history

  9. Fix formatting with prettier fix

    @alejalapeno
    alejalapeno committed Jan 19, 2020
    Copy the full SHA
    ac9288d View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2020

  1. Update test output to reflect scss usage

    @timneutkens
    timneutkens committed Jan 20, 2020
    Copy the full SHA
    7095ed5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sass-support' of github.com:alejalapeno/next.js into al… 

    …ejalapeno-sass-support

# Conflicts:
#	test/integration/scss-modules/test/index.test.js
    @timneutkens
    timneutkens committed Jan 20, 2020
    Copy the full SHA
    d45e799 View commit details
    Browse the repository at this point in the history

  3. Revert "Fix plain CSS import test" 

    This reverts commit 380319d.

# Conflicts:
#	test/integration/scss-modules/test/index.test.js
    @timneutkens
    timneutkens committed Jan 20, 2020
    Copy the full SHA
    bd25e8e View commit details
    Browse the repository at this point in the history

  4. Update loader structure 

    * Resolve loaders before passing to compile function

* Remove dead filter  code

* Arrange loaders in order and push to array
    @alejalapeno
    alejalapeno committed Jan 20, 2020
    Copy the full SHA
    c271571 View commit details
    Browse the repository at this point in the history

  5. Fix loader order bug

    @alejalapeno
    alejalapeno committed Jan 20, 2020
    Copy the full SHA
    5bc4e72 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2020

  1. Fix global Sass loader and make module prepocessor optional

    @alejalapeno
    alejalapeno committed Jan 21, 2020
    Copy the full SHA
    0fa30ac View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2020

  1. Merge remote-tracking branch 'upstream/canary' into sass-support

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    a69c9b9 View commit details
    Browse the repository at this point in the history

  2. Adjust Sass Modules Implementation

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    c0fb936 View commit details
    Browse the repository at this point in the history

  3. Fix typo

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    d54ba9e View commit details
    Browse the repository at this point in the history

  4. Adjust regexps

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    4cb6e9b View commit details
    Browse the repository at this point in the history

  5. Use regexes

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    20ce297 View commit details
    Browse the repository at this point in the history

  6. Simplify global setup

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    1039a23 View commit details
    Browse the repository at this point in the history

  7. Adjust comments

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    ba5e73f View commit details
    Browse the repository at this point in the history

  8. fix regex

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    711837b View commit details
    Browse the repository at this point in the history

  9. Simplify identifier file

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    dca6b50 View commit details
    Browse the repository at this point in the history

  10. Update Sass Instructions

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    feab923 View commit details
    Browse the repository at this point in the history

  11. Remove unneeded fixtures

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    251d5f8 View commit details
    Browse the repository at this point in the history

  12. Adjust global tests

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    c14c7f0 View commit details
    Browse the repository at this point in the history

  13. Remove wrapper

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    e5f3931 View commit details
    Browse the repository at this point in the history

  14. Update source maps

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    6196d9a View commit details
    Browse the repository at this point in the history

  15. Flag scss behavior

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    34500ac View commit details
    Browse the repository at this point in the history

  16. Fix css property value

    @alejalapeno @Timer
    alejalapeno authored and Timer committed Jan 22, 2020
    Copy the full SHA
    703b7ad View commit details
    Browse the repository at this point in the history

  17. Update fixtures with Sass vars

    @alejalapeno @Timer
    alejalapeno authored and Timer committed Jan 22, 2020
    Copy the full SHA
    cf6834f View commit details
    Browse the repository at this point in the history

  18. Merge branch 'canary' into sass-support

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    fa1dd81 View commit details
    Browse the repository at this point in the history

  19. Turn on Scss support

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    3000643 View commit details
    Browse the repository at this point in the history

  20. fix HMR test

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    825d790 View commit details
    Browse the repository at this point in the history

  21. Fix snapshots

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    7572109 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'canary' into sass-support

    @Timer
    Timer committed Jan 22, 2020
    Copy the full SHA
    fb04a14 View commit details
    Browse the repository at this point in the history