Skip to content
This repository has been archived by the owner on Nov 21, 2021. It is now read-only.

Commit

Permalink
Merge branch 'release/1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Marco Solazzi committed May 24, 2016
2 parents 3fa071b + de38df0 commit 442030f
Show file tree
Hide file tree
Showing 11 changed files with 360 additions and 221 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/
.eslintrc.json
146 changes: 146 additions & 0 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
{
"env": { // http://eslint.org/docs/user-guide/configuring.html#specifying-environments
"node": true // browser global variables
},
"root": true,
"rules": {
/**
* Strict mode
*/
// babel inserts "use strict"; for us
"strict": [2], // http://eslint.org/docs/rules/strict

/**
* Variables
*/
"no-shadow": 2, // http://eslint.org/docs/rules/no-shadow
"no-shadow-restricted-names": 2, // http://eslint.org/docs/rules/no-shadow-restricted-names
"no-unused-vars": [2, { // http://eslint.org/docs/rules/no-unused-vars
"vars": "local",
"args": "after-used"
}],
"no-use-before-define": 2, // http://eslint.org/docs/rules/no-use-before-define

/**
* Possible errors
*/
"comma-dangle": [2, "never"], // http://eslint.org/docs/rules/comma-dangle
"no-cond-assign": [2, "always"], // http://eslint.org/docs/rules/no-cond-assign
"no-console": 0, // http://eslint.org/docs/rules/no-console
"no-debugger": 1, // http://eslint.org/docs/rules/no-debugger
"no-alert": 1, // http://eslint.org/docs/rules/no-alert
"no-constant-condition": 1, // http://eslint.org/docs/rules/no-constant-condition
"no-dupe-keys": 2, // http://eslint.org/docs/rules/no-dupe-keys
"no-duplicate-case": 2, // http://eslint.org/docs/rules/no-duplicate-case
"no-empty": 2, // http://eslint.org/docs/rules/no-empty
"no-ex-assign": 2, // http://eslint.org/docs/rules/no-ex-assign
"no-extra-boolean-cast": 0, // http://eslint.org/docs/rules/no-extra-boolean-cast
"no-extra-semi": 2, // http://eslint.org/docs/rules/no-extra-semi
"no-func-assign": 2, // http://eslint.org/docs/rules/no-func-assign
"no-inner-declarations": 2, // http://eslint.org/docs/rules/no-inner-declarations
"no-invalid-regexp": 2, // http://eslint.org/docs/rules/no-invalid-regexp
"no-irregular-whitespace": 2, // http://eslint.org/docs/rules/no-irregular-whitespace
"no-obj-calls": 2, // http://eslint.org/docs/rules/no-obj-calls
"no-sparse-arrays": 2, // http://eslint.org/docs/rules/no-sparse-arrays
"no-unreachable": 2, // http://eslint.org/docs/rules/no-unreachable
"use-isnan": 2, // http://eslint.org/docs/rules/use-isnan
"block-scoped-var": 2, // http://eslint.org/docs/rules/block-scoped-var

/**
* Best practices
*/
"consistent-return": 2, // http://eslint.org/docs/rules/consistent-return
"curly": [2, "all"], // http://eslint.org/docs/rules/curly
"default-case": 2, // http://eslint.org/docs/rules/default-case
"dot-notation": [2, { // http://eslint.org/docs/rules/dot-notation
"allowKeywords": true
}],
"eqeqeq": 2, // http://eslint.org/docs/rules/eqeqeq
"guard-for-in": 2, // http://eslint.org/docs/rules/guard-for-in
"no-caller": 2, // http://eslint.org/docs/rules/no-caller
"no-else-return": 2, // http://eslint.org/docs/rules/no-else-return
"no-eq-null": 2, // http://eslint.org/docs/rules/no-eq-null
"no-eval": 2, // http://eslint.org/docs/rules/no-eval
"no-extend-native": 2, // http://eslint.org/docs/rules/no-extend-native
"no-extra-bind": 2, // http://eslint.org/docs/rules/no-extra-bind
"no-fallthrough": 2, // http://eslint.org/docs/rules/no-fallthrough
"no-floating-decimal": 2, // http://eslint.org/docs/rules/no-floating-decimal
"no-implied-eval": 2, // http://eslint.org/docs/rules/no-implied-eval
"no-lone-blocks": 2, // http://eslint.org/docs/rules/no-lone-blocks
"no-loop-func": 2, // http://eslint.org/docs/rules/no-loop-func
"no-multi-str": 2, // http://eslint.org/docs/rules/no-multi-str
"no-native-reassign": 2, // http://eslint.org/docs/rules/no-native-reassign
"no-new": 2, // http://eslint.org/docs/rules/no-new
"no-new-func": 2, // http://eslint.org/docs/rules/no-new-func
"no-new-wrappers": 2, // http://eslint.org/docs/rules/no-new-wrappers
"no-octal": 2, // http://eslint.org/docs/rules/no-octal
"no-octal-escape": 2, // http://eslint.org/docs/rules/no-octal-escape
"no-param-reassign": 2, // http://eslint.org/docs/rules/no-param-reassign
"no-proto": 2, // http://eslint.org/docs/rules/no-proto
"no-redeclare": 2, // http://eslint.org/docs/rules/no-redeclare
"no-return-assign": 2, // http://eslint.org/docs/rules/no-return-assign
"no-script-url": 2, // http://eslint.org/docs/rules/no-script-url
"no-self-compare": 2, // http://eslint.org/docs/rules/no-self-compare
"no-sequences": 2, // http://eslint.org/docs/rules/no-sequences
"no-throw-literal": 2, // http://eslint.org/docs/rules/no-throw-literal
"no-with": 2, // http://eslint.org/docs/rules/no-with
"radix": 2, // http://eslint.org/docs/rules/radix
"vars-on-top": 2, // http://eslint.org/docs/rules/vars-on-top
"wrap-iife": [2, "any"], // http://eslint.org/docs/rules/wrap-iife
"yoda": 2, // http://eslint.org/docs/rules/yoda

/**
* Style
*/
"indent": [2, 4], // http://eslint.org/docs/rules/indent
"brace-style": [2, // http://eslint.org/docs/rules/brace-style
"1tbs", {
"allowSingleLine": true
}],
"quotes": [
2, "single", "avoid-escape" // http://eslint.org/docs/rules/quotes
],
"camelcase": [2, { // http://eslint.org/docs/rules/camelcase
"properties": "always"
}],
"comma-spacing": [2, { // http://eslint.org/docs/rules/comma-spacing
"before": false,
"after": true
}],
"comma-style": [2, "last"], // http://eslint.org/docs/rules/comma-style
"eol-last": 0, // http://eslint.org/docs/rules/eol-last
"func-names": 1, // http://eslint.org/docs/rules/func-names
"key-spacing": [2, { // http://eslint.org/docs/rules/key-spacing
"beforeColon": false,
"afterColon": true
}],
"new-cap": [2, { // http://eslint.org/docs/rules/new-cap
"newIsCap": true
}],
"no-multiple-empty-lines": [2, { // http://eslint.org/docs/rules/no-multiple-empty-lines
"max": 3
}],
"no-nested-ternary": 2, // http://eslint.org/docs/rules/no-nested-ternary
"no-new-object": 2, // http://eslint.org/docs/rules/no-new-object
"no-spaced-func": 2, // http://eslint.org/docs/rules/no-spaced-func
"no-trailing-spaces": 2, // http://eslint.org/docs/rules/no-trailing-spaces
"no-extra-parens": [2, "functions"], // http://eslint.org/docs/rules/no-extra-parens
"no-underscore-dangle": 0, // http://eslint.org/docs/rules/no-underscore-dangle
"one-var": [2, {
"var": "always", // Exactly one var declaration per function
"let": "always", // Exactly one let declaration per block
"const": "never" // Exactly one declarator per const declaration per block
}], // http://eslint.org/docs/rules/one-var
"padded-blocks": 0, // http://eslint.org/docs/rules/padded-blocks
"semi": [2, "always"], // http://eslint.org/docs/rules/semi
"semi-spacing": [2, { // http://eslint.org/docs/rules/semi-spacing
"before": false,
"after": true
}],
"keyword-spacing": 2, // http://eslint.org/docs/rules/keyword-spacing
"space-before-blocks": 2, // http://eslint.org/docs/rules/space-before-blocks
"space-before-function-paren": [2, {"anonymous": "always", "named": "never"}], // http://eslint.org/docs/rules/space-before-function-paren
"space-infix-ops": 2, // http://eslint.org/docs/rules/space-infix-ops
"spaced-comment": 0
}
}
15 changes: 0 additions & 15 deletions .jsbeautifyrc
View file

This file was deleted.

13 changes: 0 additions & 13 deletions .jshintrc
View file

This file was deleted.

198 changes: 104 additions & 94 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,111 +8,121 @@

'use strict';

module.exports = function(grunt) {

// Project configuration.
grunt.initConfig({

paths: {
fixtures: 'test/fixtures'
},

jshint: {
all: [
'Gruntfile.js',
'tasks/*.js',
'<%= nodeunit.tests %>'
],
options: {
jshintrc: '.jshintrc'
}
},

// Before generating any new files, remove any previously-created files.
clean: {
tests: ['tmp']
},

// Configuration to be run (and then tested).
premailer: {
html: {
options: {
},
files: {
'tmp/email.html': ['<%= paths.fixtures %>/email.html']
}
},
multiple: {
files: {
'tmp/email.html': ['<%= paths.fixtures %>/inexistant.html', '<%= paths.fixtures %>/email.html', '<%= paths.fixtures %>/email-not-tobe-included.html'],
'tmp/email-2.html': ['<%= paths.fixtures %>/email-2.html']
}
},
txt: {
options: {
mode: 'txt'
/* eslint-disable func-names */
module.exports = function (grunt) {

// Project configuration.
grunt.initConfig({

paths: {
fixtures: 'test/fixtures'
},
files: {
'tmp/email.txt': ['<%= paths.fixtures %>/email.html']
}
},
full: {
options: {
baseUrl: 'http://www.mydomain.com/',
queryString: 'foo=bar',
css: ['<%= paths.fixtures %>/css/*.css'],
removeClasses: true,
removeScripts: true,
preserveStyles: true,
verbose: true

// jshint: {
// all: [
// 'Gruntfile.js',
// 'tasks/*.js',
// '<%= nodeunit.tests %>'
// ],
// options: {
// jshintrc: '.jshintrc'
// }
// },

eslint: {
src: [
'Gruntfile.js',
'tasks/*.js',
'<%= nodeunit.tests %>'
]
},
files: {
'tmp/email-full.html': ['<%= paths.fixtures %>/email-full.html']
}
},

verbose: {
files: {
'tmp/email-verbose.html': ['<%= paths.fixtures %>/email-verbose.html']
}
},
// Before generating any new files, remove any previously-created files.
clean: {
tests: ['tmp']
},

mediaq: {
options: {
css: ['<%= paths.fixtures %>/css/external-mq.css']
// Configuration to be run (and then tested).
premailer: {
html: {
options: {
},
files: {
'tmp/email.html': ['<%= paths.fixtures %>/email.html']
}
},
multiple: {
files: {
'tmp/email.html': ['<%= paths.fixtures %>/inexistant.html', '<%= paths.fixtures %>/email.html', '<%= paths.fixtures %>/email-not-tobe-included.html'],
'tmp/email-2.html': ['<%= paths.fixtures %>/email-2.html']
}
},
txt: {
options: {
mode: 'txt'
},
files: {
'tmp/email.txt': ['<%= paths.fixtures %>/email.html']
}
},
full: {
options: {
baseUrl: 'http://www.mydomain.com/',
queryString: 'foo=bar',
css: ['<%= paths.fixtures %>/css/*.css'],
removeClasses: true,
removeScripts: true,
preserveStyles: true,
verbose: true
},
files: {
'tmp/email-full.html': ['<%= paths.fixtures %>/email-full.html']
}
},

verbose: {
files: {
'tmp/email-verbose.html': ['<%= paths.fixtures %>/email-verbose.html']
}
},

mediaq: {
options: {
css: ['<%= paths.fixtures %>/css/external-mq.css']
},
files: {
'tmp/email-mq.html': ['<%= paths.fixtures %>/email-mq.html']
}
},

overwrite: {
files: {
'<%= paths.fixtures %>/email-overwrite.html': ['<%= paths.fixtures %>/email-overwrite.html']
}
}
},
files: {
'tmp/email-mq.html': ['<%= paths.fixtures %>/email-mq.html']
}
},

overwrite: {
files: {
'<%= paths.fixtures %>/email-overwrite.html': ['<%= paths.fixtures %>/email-overwrite.html']
// Unit tests.
nodeunit: {
tests: ['test/*_test.js']
}
}
},

// Unit tests.
nodeunit: {
tests: ['test/*_test.js']
}

});
});

// Actually load this plugin's task(s).
grunt.loadTasks('tasks');
// Actually load this plugin's task(s).
grunt.loadTasks('tasks');

// These plugins provide necessary tasks.
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-nodeunit');
// These plugins provide necessary tasks.
grunt.loadNpmTasks('grunt-eslint');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-nodeunit');

// Whenever the "test" task is run, first clean the "tmp" dir, then run this
// plugin's task(s), then test the result.
grunt.registerTask('test', ['clean', 'premailer', 'nodeunit']);
// Whenever the "test" task is run, first clean the "tmp" dir, then run this
// plugin's task(s), then test the result.
grunt.registerTask('test', ['clean', 'premailer', 'nodeunit']);

// By default, lint and run all tests.
grunt.registerTask('default', ['jshint', 'test']);
// By default, lint and run all tests.
grunt.registerTask('default', ['eslint', 'test']);

};
/* eslint-enable func-names */
Loading

0 comments on commit 442030f

Please sign in to comment.