Skip to content

Commit

Permalink
Merge pull request #3163 from matthew-dean/master
Browse files Browse the repository at this point in the history
Merge 3.x into master
  • Loading branch information
matthew-dean authored Feb 11, 2018
2 parents 60a5c3b + 9590b7b commit 45d06b9
Show file tree
Hide file tree
Showing 176 changed files with 11,325 additions and 3,124 deletions.
88 changes: 88 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
{
"env": {
"node": true
},
"globals": {},
"rules": {
"no-eval": 2,
"no-use-before-define": [
2,
{
"functions": false
}
],
"no-undef": 0,
"no-unused-vars": 1,
"no-caller": 2,
"no-eq-null": 1,
"guard-for-in": 2,
"no-implicit-coercion": [
2,
{
"boolean": false,
"string": true,
"number": true
}
],
"no-with": 2,
"no-mixed-spaces-and-tabs": 2,
"no-multiple-empty-lines": 2,
"dot-location": [
2,
"property"
],
"operator-linebreak": [
0,
"after"
],
"keyword-spacing": [
2,
{}
],
"space-unary-ops": [
2,
{
"words": false,
"nonwords": false
}
],
"no-spaced-func": 2,
"space-before-function-paren": [
1,
{
"anonymous": "ignore",
"named": "never"
}
],
"comma-dangle": [
2,
"never"
],
"no-trailing-spaces": 0,
"max-len": [
2,
160
],
"comma-style": [
2,
"last"
],
"curly": [
2,
"all"
],
"space-infix-ops": 2,
"spaced-comment": 1,
"space-before-blocks": [
2,
"always"
],
"indent": [
2,
4,
{
"SwitchCase": 1
}
]
}
}
17 changes: 17 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 120
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 14
# Issues with these labels will never be considered stale
exemptLabels:
- up-for-grabs
- bug
# Label to use when marking an issue as stale
staleLabel: stale
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
73 changes: 0 additions & 73 deletions .jscsrc

This file was deleted.

11 changes: 0 additions & 11 deletions .jshintrc

This file was deleted.

25 changes: 22 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
language: node_js
cache:
directories:
- travis-phantomjs
node_js:
- "9"
- "8"
- "6"
- "4"
- "0.12"
- "0.10"
before_install:
# from https://github.com/travis-ci/travis-ci/issues/3225#issuecomment-177592725
# and also from https://github.com/travis-ci/travis-ci/issues/3225#issuecomment-200965782
- phantomjs --version
- export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
- phantomjs --version
# Clear cache and download new copy of PhantomJS if the current version doesn't match 2.1.1.
- "if [ $(phantomjs --version) != '2.1.1' ]; then rm -rf $PWD/travis-phantomjs; mkdir -p $PWD/travis-phantomjs; fi"
- "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"
- "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"
- phantomjs --version
install:
- npm install -g grunt-cli
- npm install
# node 0.10 & 0.12 have race condition issues when running custom install scripts
# this can cause phantomjs-prebuilt install script to fail with the error:
# <Cannot find module 'boom'>
# Seems related to: https://github.com/npm/npm/issues/8152
# using <travis_retry> solves this.
- travis_retry npm install
env:
global:
- PHANTOMJS_CDNURL=http://cnpmjs.org/downloads
Expand Down
25 changes: 23 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,29 @@
# 2.7.2
# 3.0.0
2018-02-04
- Fix `calc()` function to not do math operations on compile
- Rename Directive -> AtRule & Rule -> Declaration
- Cross-platform `@plugin` loading! (Node & Browser)
- Numerous changes / improvements to plugin architecture
- Simplified API calls in plugins (`less.atrule()` vs `new less.tree.AtRule()`)
- Property accessors (`$width` to refer to `width: 300px` value)
- Inline JavaScript disabled by default for security reasons (use `@plugin`)
- Improvements in Less error reporting
- Added feature: returning `null` / `false` from Less functions will remove that line
- Simple `boolean()` and `if()` functions added
- Bug fixes
- Removal of unnecessary nodes from API (like IE's `alpha()`)

# 2.7.3
2017-10-23

- Bump `request` dependency

# 2.7.2
2017-01-04

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

# 2.7.1 HOTFIX

Expand Down
Loading

0 comments on commit 45d06b9

Please sign in to comment.