Skip to content

Commit 45d06b9

Browse files
authored
Merge pull request #3163 from matthew-dean/master
Merge 3.x into master
2 parents 60a5c3b + 9590b7b commit 45d06b9

File tree

176 files changed

+11325
-3124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+11325
-3124
lines changed

.eslintrc.json

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
{
2+
"env": {
3+
"node": true
4+
},
5+
"globals": {},
6+
"rules": {
7+
"no-eval": 2,
8+
"no-use-before-define": [
9+
2,
10+
{
11+
"functions": false
12+
}
13+
],
14+
"no-undef": 0,
15+
"no-unused-vars": 1,
16+
"no-caller": 2,
17+
"no-eq-null": 1,
18+
"guard-for-in": 2,
19+
"no-implicit-coercion": [
20+
2,
21+
{
22+
"boolean": false,
23+
"string": true,
24+
"number": true
25+
}
26+
],
27+
"no-with": 2,
28+
"no-mixed-spaces-and-tabs": 2,
29+
"no-multiple-empty-lines": 2,
30+
"dot-location": [
31+
2,
32+
"property"
33+
],
34+
"operator-linebreak": [
35+
0,
36+
"after"
37+
],
38+
"keyword-spacing": [
39+
2,
40+
{}
41+
],
42+
"space-unary-ops": [
43+
2,
44+
{
45+
"words": false,
46+
"nonwords": false
47+
}
48+
],
49+
"no-spaced-func": 2,
50+
"space-before-function-paren": [
51+
1,
52+
{
53+
"anonymous": "ignore",
54+
"named": "never"
55+
}
56+
],
57+
"comma-dangle": [
58+
2,
59+
"never"
60+
],
61+
"no-trailing-spaces": 0,
62+
"max-len": [
63+
2,
64+
160
65+
],
66+
"comma-style": [
67+
2,
68+
"last"
69+
],
70+
"curly": [
71+
2,
72+
"all"
73+
],
74+
"space-infix-ops": 2,
75+
"spaced-comment": 1,
76+
"space-before-blocks": [
77+
2,
78+
"always"
79+
],
80+
"indent": [
81+
2,
82+
4,
83+
{
84+
"SwitchCase": 1
85+
}
86+
]
87+
}
88+
}

.github/stale.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 120
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 14
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- up-for-grabs
8+
- bug
9+
# Label to use when marking an issue as stale
10+
staleLabel: stale
11+
# Comment to post when marking an issue as stale. Set to `false` to disable
12+
markComment: >
13+
This issue has been automatically marked as stale because it has not had
14+
recent activity. It will be closed if no further activity occurs. Thank you
15+
for your contributions.
16+
# Comment to post when closing a stale issue. Set to `false` to disable
17+
closeComment: false

.jscsrc

Lines changed: 0 additions & 73 deletions
This file was deleted.

.jshintrc

Lines changed: 0 additions & 11 deletions
This file was deleted.

.travis.yml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,31 @@
11
language: node_js
2+
cache:
3+
directories:
4+
- travis-phantomjs
25
node_js:
6+
- "9"
7+
- "8"
38
- "6"
49
- "4"
5-
- "0.12"
6-
- "0.10"
10+
before_install:
11+
# from https://github.com/travis-ci/travis-ci/issues/3225#issuecomment-177592725
12+
# and also from https://github.com/travis-ci/travis-ci/issues/3225#issuecomment-200965782
13+
- phantomjs --version
14+
- export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
15+
- phantomjs --version
16+
# Clear cache and download new copy of PhantomJS if the current version doesn't match 2.1.1.
17+
- "if [ $(phantomjs --version) != '2.1.1' ]; then rm -rf $PWD/travis-phantomjs; mkdir -p $PWD/travis-phantomjs; fi"
18+
- "if [ $(phantomjs --version) != '2.1.1' ]; then wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi"
19+
- "if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs; fi"
20+
- phantomjs --version
721
install:
822
- npm install -g grunt-cli
9-
- npm install
23+
# node 0.10 & 0.12 have race condition issues when running custom install scripts
24+
# this can cause phantomjs-prebuilt install script to fail with the error:
25+
# <Cannot find module 'boom'>
26+
# Seems related to: https://github.com/npm/npm/issues/8152
27+
# using <travis_retry> solves this.
28+
- travis_retry npm install
1029
env:
1130
global:
1231
- PHANTOMJS_CDNURL=http://cnpmjs.org/downloads

CHANGELOG.md

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,29 @@
1-
# 2.7.2
1+
# 3.0.0
2+
2018-02-04
3+
- Fix `calc()` function to not do math operations on compile
4+
- Rename Directive -> AtRule & Rule -> Declaration
5+
- Cross-platform `@plugin` loading! (Node & Browser)
6+
- Numerous changes / improvements to plugin architecture
7+
- Simplified API calls in plugins (`less.atrule()` vs `new less.tree.AtRule()`)
8+
- Property accessors (`$width` to refer to `width: 300px` value)
9+
- Inline JavaScript disabled by default for security reasons (use `@plugin`)
10+
- Improvements in Less error reporting
11+
- Added feature: returning `null` / `false` from Less functions will remove that line
12+
- Simple `boolean()` and `if()` functions added
13+
- Bug fixes
14+
- Removal of unnecessary nodes from API (like IE's `alpha()`)
15+
16+
# 2.7.3
17+
2017-10-23
18+
19+
- Bump `request` dependency
220

21+
# 2.7.2
322
2017-01-04
423

5-
- Revert changes to contrast() function in 2.7.0
24+
- Revert breaking changes to contrast() function
25+
- Fix error reporting of lessc executable
26+
- Changed octals to hex for ES6 strict mode
627

728
# 2.7.1 HOTFIX
829

0 commit comments

Comments
 (0)