Permalink
Browse files

housekeeping, update dotfiles

  • Loading branch information...
1 parent 43e46bd commit d1609e6534e2ee793b97d9a50ec87b4d4fb82ff1 @jonschlinkert jonschlinkert committed Jun 14, 2014
Showing with 111 additions and 69 deletions.
  1. +1 −1 .gitattributes
  2. +1 −0 .jshintrc
  3. +73 −42 Gruntfile.js
  4. +18 −19 LICENSE-MIT
  5. +18 −7 package.json
View
@@ -1,4 +1,4 @@
-# Set default behaviour, in case users don't have core.autocrlf set.
+# Enforce Unix newlines, in case users don't have core.autocrlf set.
*.* text=lf
*.* text eol=lf
*.* eol=lf
View
@@ -1,4 +1,5 @@
{
+ "esnext": true,
"curly": true,
"eqeqeq": true,
"immed": true,
View
@@ -1,28 +1,26 @@
/*
- * lesscss.org
- * https://github.com/less/less-docs
- * Copyright (c) 2013
+ * lesscss.org <https://github.com/less/less-docs>
+ *
+ * Copyright (c) 2014, Alexis Sellier, LESS Core Team, contributors.
* Licensed under the MIT license.
*/
'use strict';
module.exports = function(grunt) {
-
// Project configuration.
grunt.initConfig({
// Project metadata
pkg: grunt.file.readJSON('package.json'),
- site: grunt.file.readYAML('_config.yml'),
+ site: grunt.file.readYAML('.assemblerc.yml'),
jshint: {
- options: {jshintrc: '.jshintrc'},
- all: [
- 'Gruntfile.js',
- 'templates/helpers/*.js'
- ]
+ options: {
+ jshintrc: '.jshintrc'
+ },
+ all: ['Gruntfile.js', '<%= site.helpers %>/*.js']
},
// Pull down a JSON list of repos from the Less org, using
@@ -48,54 +46,64 @@ module.exports = function(grunt) {
site: '<%= site %>',
data: ['<%= site.data %>/*.{json,yml}', 'content/**/*.json'],
+ // Templates
+ partials: '<%= site.includes %>/*.hbs',
+ layoutdir: '<%= site.layouts %>',
+ layoutext: '<%= site.layoutext %>',
+ layout: '<%= site.layout %>',
+
// Extensions
- plugins: '<%= site.plugins %>',
+ // mixins: ['<%= site.mixins %>/utils.js'],
helpers: ['<%= site.helpers %>/*.js'],
+ plugins: ['<%= site.plugins %>'],
- // Helper options
+ // `compose` helper options
compose: {cwd: 'content'},
+
+ // markdown options
marked: {
process: true,
- heading: '<%= site.markedtemplates %>/heading.tmpl',
+ heading: '<%= site.snippets %>/heading.tmpl',
+
// highlight.js options
prefix: 'lang-'
- },
-
- // Templates
- partials: '<%= site.includes %>/*.hbs',
- layoutdir: '<%= site.layouts %>',
- layoutext: '<%= site.layoutext %>',
- layout: '<%= site.layout %>'
+ }
},
+ // feed: {
+ // options: {
+ // ext: '.xml',
+ // layout: 'none'
+ // },
+ // src: '<%= site.snippets %>/feed.xml',
+ // dest: '<%= site.dest %>/'
+ // },
site: {
options: {
+ permalinks: {preset: 'pretty'},
partials: ['content/**/*.md'],
- permalinks: {preset: 'pretty'}
},
src: '<%= site.pages %>/*.hbs',
dest: '<%= site.dest %>/'
- },
- feed: {
- options: {
- ext: '.xml',
- layout: 'none'
- },
- src: '<%= site.pages %>/feed.xml',
- dest: '<%= site.dest %>/'
}
},
prettify: {
site: {
files: [
- {expand: true, cwd: '<%= site.dest %>', src: '*.html', dest: '<%= site.dest %>/', ext: '.html'}
+ {
+ expand: true,
+ cwd: '<%= site.dest %>',
+ src: '*.html',
+ dest: '<%= site.dest %>/',
+ ext: '.html'
+ }
]
}
},
connect: {
options: {
- port: 3000,
+ port: 9000,
livereload: 35729,
hostname: 'localhost'
},
@@ -122,11 +130,22 @@ module.exports = function(grunt) {
copy: {
assets: {
files: [
- {expand: true, cwd: '<%= site.assets %>/public', src: ['**'], dest: '<%= site.dest %>/public/'},
- {expand: true, cwd: '<%= site.assets %>/root', src: ['*'], dest: '<%= site.dest %>/', rename: function(dest, src) {
+ {
+ expand: true,
+ cwd: '<%= site.assets %>/public',
+ src: ['**'],
+ dest: '<%= site.dest %>/public/'
+ },
+ {
+ expand: true,
+ cwd: '<%= site.assets %>/root',
+ src: ['*'],
+ dest: '<%= site.dest %>/',
+ rename: function (dest, src) {
dest = dest + src.replace(/^_/, '');
return dest;
- }}
+ }
+ }
]
}
},
@@ -136,18 +155,17 @@ module.exports = function(grunt) {
},
watch: {
- options: {livereload: true},
+ options: {livereload: true },
site: {
files: [
- '<%= site.helpers %>',
+ // '<%= site.helpers %>/*.js',
+ // '<%= site.plugins %>/*.js',
'<%= site.styles %>/**/*.less',
'<%= site.templates %>/**/*.hbs',
'<%= site.content %>/**/*.md',
- '<%= site.content %>/_config.yml',
- '<%= site.data %>/*.yml',
- '<%= site.data %>/*.json'
+ '<%= site.data %>/*.{json,yml}'
],
- tasks: ['clean', 'copy', 'less:site', 'assemble']
+ tasks: ['clean', 'copy', 'less:site', 'assemble:site']
}
}
});
@@ -165,8 +183,21 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-sync-pkg');
grunt.registerTask('update', ['repos', 'default']);
- grunt.registerTask('design', ['clean', 'copy', 'less:site', 'assemble:site', 'connect', 'watch']);
+ grunt.registerTask('design', [
+ 'clean',
+ 'copy',
+ 'less:site',
+ 'assemble:site',
+ 'connect',
+ 'watch'
+ ]);
// Default tasks to be run.
- grunt.registerTask('default', ['jshint', 'clean', 'copy', 'less:site', 'assemble:site']);
+ grunt.registerTask('default', [
+ 'jshint',
+ 'clean',
+ 'copy',
+ 'less:site',
+ 'assemble:site'
+ ]);
};
View
@@ -1,22 +1,21 @@
-Copyright (c) 2014 Alexis Sellier, LESS Core Team, Contributors.
+The MIT License (MIT)
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+Copyright (c) 2014 Alexis Sellier, the LESS Core Team, Contributors.
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
View
@@ -33,11 +33,19 @@
"main": "Gruntfile.js",
"devDependencies": {
"assemble": "~0.4.36",
- "assemble-contrib-permalinks": "~0.3.4",
+ "assemble-contrib-navigation": "^0.2.0",
+ "assemble-contrib-permalinks": "^0.3.6",
"assemble-less": "~0.7.0",
+ "chalk": "^0.4.0",
"cheerio": "~0.13.1",
"cwd": "~0.2.2",
+ "fs-utils": "^0.4.3",
+ "git-branch": "^0.1.2",
+ "git-repo-name": "^0.2.0",
+ "git-username": "^0.2.0",
"github": "~0.1.14",
+ "github-repo-url": "^0.2.1",
+ "gray-matter": "^0.4.2",
"grunt": "~0.4.2",
"grunt-contrib-clean": "~0.5.0",
"grunt-contrib-connect": "~0.7.1",
@@ -49,23 +57,26 @@
"grunt-sync-pkg": "~0.1.2",
"handlebars-helper-compose": "~0.2.12",
"handlebars-helper-datetime": "~0.1.0",
- "handlebars-helper-eachitems": "~0.1.2",
- "handlebars-helper-feed": "~0.1.1",
+ "handlebars-helper-feed": "^0.1.1",
"handlebars-helper-md": "~0.2.0",
- "handlebars-helper-partial": "~0.1.3",
"handlebars-helper-rel": "~0.1.1",
"handlebars-helper-slugify": "~0.2.0",
+ "highlight.js": "^8.0.0",
"lodash": "~2.4.1",
- "request": "~2.34.0"
+ "marked": "^0.3.1",
+ "marked-extras": "^0.2.4",
+ "relative": "^0.1.4",
+ "remote-origin-url": "^0.2.1",
+ "request": "~2.34.0",
+ "strip-indent": "^0.1.3",
+ "verbalize": "^0.1.2"
},
"keywords": [
"handlebars-helper-compose",
"handlebars-helper-datetime",
- "handlebars-helper-eachitems",
"handlebars-helper-feed",
"handlebars-helper-md",
"handlebars-helper-nav",
- "handlebars-helper-partial",
"handlebars-helper-rel",
"handlebars-helper-slugify",
"less css",

0 comments on commit d1609e6

Please sign in to comment.