Skip to content

Commit 1ecb327

Browse files
committed
Merge branch 'feature/@plugin' into 3.x
* feature/@plugin: All tests passing for @plugin - Inline JavaScript disabled by default - Deprecated "preprocessor" option removed (preprocessor plugins still valid) Plugin loader set up for lessc, node, and browser
2 parents 52e9b5e + ad57737 commit 1ecb327

File tree

69 files changed

+613
-465
lines changed

Some content is hidden

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

69 files changed

+613
-465
lines changed

.jscsrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"disallowImplicitTypeConversion": ["numeric", "boolean", "binary", "string"],
2+
"disallowImplicitTypeConversion": ["numeric", "binary", "string"],
33
"disallowKeywords": ["with"],
44
"disallowMixedSpacesAndTabs": true,
55
"disallowMultipleLineBreaks": true,
@@ -14,7 +14,7 @@
1414
"disallowSpacesInNamedFunctionExpression": {
1515
"beforeOpeningRoundBrace": true},
1616
"disallowTrailingComma": true,
17-
"disallowTrailingWhitespace": true,
17+
"disallowTrailingWhitespace": false,
1818
"maximumLineLength": 160,
1919
"requireCommaBeforeLineBreak": true,
2020
"requireCurlyBraces": [ "if",

Gruntfile.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = function (grunt) {
3131
shell: {
3232
options: {stdout: true, failOnError: true},
3333
test: {
34-
command: 'node test'
34+
command: 'node test/index.js'
3535
},
3636
benchmark: {
3737
command: 'node benchmark/index.js'
@@ -241,14 +241,6 @@ module.exports = function (grunt) {
241241
outfile: 'tmp/browser/test-runner-global-vars.html'
242242
}
243243
},
244-
postProcessor: {
245-
src: ['test/browser/less/postProcessor/*.less'],
246-
options: {
247-
helpers: 'test/browser/runner-postProcessor-options.js',
248-
specs: 'test/browser/runner-postProcessor.js',
249-
outfile: 'tmp/browser/test-runner-post-processor.html'
250-
}
251-
},
252244
postProcessorPlugin: {
253245
src: ['test/less/postProcessorPlugin/*.less'],
254246
options: {

0 commit comments

Comments
 (0)