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.

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

Merge and enable feature.use 🎉 #1468

Merged
merged 60 commits into from
Oct 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
10d13c7
Run tests on feature branches
nex3 Feb 11, 2019
708c5fe
Run against Dart Sass's feature.use branch
nex3 Feb 11, 2019
3d8e447
Add @use syntax error tests
nex3 Feb 10, 2019
523fe18
Update a non-@use test for a new parsing error
nex3 Feb 12, 2019
c70d500
Update specs for a better ordering error message
nex3 Feb 13, 2019
abeaff3
Merge pull request #1341 from sass/use.syntax
nex3 Feb 13, 2019
831bd56
Merge branch 'master' into 'feature.use'
nex3 Feb 21, 2019
821bd8a
Add @import specs for @import-only files
nex3 Feb 11, 2019
1bff139
Update Dart Sass error messages for @use
nex3 Feb 16, 2019
8359a83
Add specs for @use errors
nex3 Feb 11, 2019
e0df66b
Add specs for member usage with @use
nex3 Feb 14, 2019
f74c74c
Add specs for core functions interacting with modules
nex3 Feb 16, 2019
491a7a6
Merge pull request #1349 from sass/use-members
nex3 Feb 26, 2019
2c3d64b
Make .scss and .sass take precedence over .css in @use (#1350)
nex3 Mar 5, 2019
f5285d0
Add specs for loading files with @use
nex3 Mar 11, 2019
117e3e0
Merge branch 'master' into feature.use
nex3 Mar 11, 2019
e04fcec
Add specs for CSS ordering with @use
nex3 Mar 11, 2019
fec05ad
Merge pull request #1357 from sass/use.css
nex3 Mar 11, 2019
9b1a9e2
Merge pull request #1356 from sass/merge-master
nex3 Mar 12, 2019
3a91c3b
Add @extend tests for @use (#1359)
nex3 Mar 13, 2019
b30eddd
Split CSS specs out from load specs
nex3 Mar 13, 2019
0d9dc70
Add specs for @use interacting with @import
nex3 Mar 21, 2019
61ee037
Merge pull request #1367 from sass/use.import
nex3 Mar 30, 2019
3e25ad9
Add a spec for @extend being isolated to a single @use (#1368)
nex3 Apr 3, 2019
43dc909
Merge branch 'master' into feature.use
nex3 May 6, 2019
987a66e
Merge pull request #1389 from sass/merge-master
nex3 May 7, 2019
a6ddf69
Fix weird and unhelpful @use stack traces (#1392)
nex3 May 24, 2019
e980469
Add specs for @forward (#1393)
nex3 Jun 5, 2019
60ea8a3
Add specs for built-in modules (#1400)
nex3 Jun 12, 2019
00eff57
Merge remote-tracking branch 'origin/master' into feature.use
nex3 Jun 17, 2019
9aee94d
Use issue references for TODOs
nex3 Jun 17, 2019
8f6f798
Merge pull request #1406 from sass/merge-into-use
nex3 Jun 18, 2019
9cd83a8
Move existing introspection specs into the meta/ directory
nex3 Jun 6, 2019
784047f
Add specs for new module-system features for existing functions
nex3 Jun 7, 2019
9432c58
Merge pull request #1402 from sass/new-function-features
nex3 Jun 18, 2019
62b539b
Add specs for the module-variables() function
nex3 Jun 12, 2019
be7b493
Materialize parent HRX directories if necessary
nex3 Jun 12, 2019
6f01419
Add specs for the module-functions() function
nex3 Jun 12, 2019
38d6195
Merge pull request #1403 from sass/new-functions
nex3 Jun 18, 2019
69252ac
Produce better stack traces for syntax errors loaded via import/use (…
nex3 Jun 19, 2019
afc5acd
Add a spec for a nested import of a module that forwards a variable (…
nex3 Jun 24, 2019
88f14b9
Update specs with new behavior from Dart Sass's master branch (#1415)
nex3 Jun 26, 2019
cbe1fcb
Add support for "@use with" (#1412)
nex3 Jun 27, 2019
e9b1764
Add specs for load-css() (#1417)
nex3 Jun 29, 2019
d0d1985
Merge remote-tracking branch 'origin/master' into feature.use
nex3 Jul 17, 2019
3a9889c
Merge pull request #1436 from sass/merge-master
nex3 Jul 17, 2019
2919a8e
Update specs for global member conflicts (#1435)
nex3 Jul 18, 2019
12bc338
Merge remote-tracking branch 'origin/master' into merge-master
nex3 Jul 26, 2019
c49b78b
Update specs for new variable messages and sass/sass#2726
nex3 Jul 26, 2019
395c249
Merge pull request #1449 from sass/merge-master
nex3 Jul 29, 2019
becf518
Change the variable syntax to namespace.$name (#1459)
nex3 Aug 29, 2019
340805f
Add a regression test for sass/sass#2744
nex3 Sep 24, 2019
22f4ebf
Fix load-css() specs to allow an empty configuration
nex3 Sep 24, 2019
d499df1
Move the new spec to a better location and add a new one
nex3 Sep 24, 2019
701f077
Merge remote-tracking branch 'origin/master' into feature.use
nex3 Sep 24, 2019
544d0ab
Merge pull request #1466 from sass/merge-master
nex3 Sep 27, 2019
ca0393d
Merge branch 'feature.use' into forward-and-use
nex3 Sep 27, 2019
8a55287
Merge pull request #1464 from sass/forward-and-use
nex3 Sep 27, 2019
a70b00d
Remove adjust-hue() from sass:color (#1465)
nex3 Sep 27, 2019
93c3f01
Add a spec for multiple global uses in one file (#1467)
nex3 Sep 27, 2019
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
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ language: ruby

# Only building master means that we don't run two builds for each pull request.
branches:
only: [master]
only:
- master
# Feature branches beginning with "feature."
- "/^feature\\..*/"

matrix:
fast_finish: true
Expand Down
9 changes: 3 additions & 6 deletions spec/core_functions/meta/function_exists.hrx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ a {
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===>
================================================================================
Expand Down Expand Up @@ -214,7 +213,6 @@ a {
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===> named/input.scss
@use "sass:color";
Expand Down Expand Up @@ -253,7 +251,6 @@ Error: $name: 12px is not a string for `function-exists'
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===> error/argument/type/module/input.scss
a {b: function-exists("red", 1)}
Expand Down Expand Up @@ -312,7 +309,6 @@ Error: wrong number of arguments (3 for 1) for `function-exists'
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===> error/conflict/input.scss
@use "other1" as *;
Expand All @@ -327,7 +323,9 @@ a {b: function-exists(member)}
@function member() {@return from other2}

<===> error/conflict/error
Error: Multiple global modules have a function named "member".
Error: This function is available from multiple global modules:
* other1.scss
* other2.scss
,
4 | a {b: function-exists(member)}
| ^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -340,7 +338,6 @@ Error: Multiple global modules have a function named "member".
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===>
================================================================================
Expand Down
2 changes: 0 additions & 2 deletions spec/core_functions/meta/get_function/different_module.hrx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===>
================================================================================
Expand Down Expand Up @@ -120,7 +119,6 @@ a {
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===> named/input.scss
@use "sass:color";
Expand Down
15 changes: 3 additions & 12 deletions spec/core_functions/meta/get_function/error.hrx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Error: $name: 2px is not a string for `get-function'
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===> argument/type/module/input.scss
a {b: get-function(c, $module: 1)}
Expand Down Expand Up @@ -117,14 +116,6 @@ Error: Function not found: does-not-exist
Use --trace for backtrace.


<===>
================================================================================
<===> through_forward/options.yml
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===>
================================================================================
<===> through_forward/show/input.scss
Expand Down Expand Up @@ -221,7 +212,6 @@ Error: $name: get-function("add-two") is not a string for `get-function'
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===> conflict/input.scss
@use "other1" as *;
Expand All @@ -236,7 +226,9 @@ a {b: get-function(member)}
@function member() {@return from other2}

<===> conflict/error
Error: Multiple global modules have a function named "member".
Error: This function is available from multiple global modules:
* other1.scss
* other2.scss
,
4 | a {b: get-function(member)}
| ^^^^^^^^^^^^^^^^^^^^
Expand All @@ -249,7 +241,6 @@ Error: Multiple global modules have a function named "member".
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===>
================================================================================
Expand Down
11 changes: 5 additions & 6 deletions spec/core_functions/meta/global_variable_exists.hrx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ a {
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===>
================================================================================
Expand Down Expand Up @@ -118,6 +117,8 @@ b {
c: true;
}

<===>
================================================================================
<===> different_module/through_use/input.scss
@use "other" as *;
a {b: global-variable-exists(global-variable)}
Expand Down Expand Up @@ -218,7 +219,6 @@ a {
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===> named/input.scss
@use "other";
Expand Down Expand Up @@ -259,7 +259,6 @@ Error: argument `$name` of `global-variable-exists($name)` must be a string
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===> error/argument/type/module/input.scss
a {b: global-variable-exists("c", 1)}
Expand Down Expand Up @@ -318,7 +317,6 @@ Error: wrong number of arguments (3 for 1) for `global-variable-exists'
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===> error/conflict/input.scss
@use "other1" as *;
Expand All @@ -333,7 +331,9 @@ $member: from other1;
$member: from other2;

<===> error/conflict/error
Error: Multiple global modules have a variable named "$member".
Error: This variable is available from multiple global modules:
* other1.scss
* other2.scss
,
4 | a {b: global-variable-exists(member)}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -346,7 +346,6 @@ Error: Multiple global modules have a variable named "$member".
---
:todo:
- sass/libsass#2807
- sass/dart-sass#554

<===>
================================================================================
Expand Down
Loading