Permalink
Browse files

Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	.editorconfig
#	.gitattributes
#	.travis.yml
#	.verb.md
#	LICENSE
#	README.md
#	bin/assemble.js
#	index.js
#	lib/utils.js
#	package.json
#	test/fixtures/copy/example.txt
#	test/fixtures/helpers/obj.js
#	test/fixtures/test.coffee
#	test/utils.js
  • Loading branch information...
1 parent 4a9a572 commit bfefce1aafba348eb08b96e42ae3ade113da1695 @jonschlinkert jonschlinkert committed Dec 20, 2015
Showing with 15,004 additions and 3,655 deletions.
  1. +4 −0 .bowerrc
  2. +22 −0 .editorconfig
  3. +125 −0 .eslintrc
  4. +10 −0 .gitattributes
  5. +12 −16 .gitignore
  6. +9 −0 .travis.yml
  7. +229 −0 .verb.md
  8. +1 −0 CHANGELOG.md
  9. +21 −0 LICENSE
  10. +282 −0 README.md
  11. +88 −0 assemblefile.js
  12. +0 −204 bin/assemble.js
  13. +105 −0 bower.json
  14. +0 −17 completion/README.md
  15. +0 −27 completion/bash
  16. +0 −63 completion/powershell
  17. +0 −25 completion/zsh
  18. +43 −0 contributing.md
  19. +0 −5 docs/_verb/api-options.md
  20. +0 −5 docs/_verb/api-templates.md
  21. +0 −33 docs/_verb/assemble.files.md
  22. +0 −74 docs/_verb/helpers.md
  23. +0 −45 docs/_verb/options-built-in.md
  24. +0 −23 docs/_verb/options.assets.md
  25. +0 −161 docs/_verb/options.md
  26. +0 −116 docs/_verb/pages.md
  27. +0 −16 docs/_verb/plugins.md
  28. +0 −30 docs/_verb/tasks.md
  29. +0 −3 docs/api-options.md
  30. +0 −3 docs/api-templates.md
  31. +0 −33 docs/assemble.files.md
  32. +0 −31 docs/draft/0-OVERVIEW.md
  33. +0 −34 docs/draft/1-WORKFLOW.md
  34. +0 −56 docs/draft/2-OPTIONS.md
  35. +0 −57 docs/draft/3-DATA.md
  36. +0 −45 docs/draft/4-TEMPLATE.md
  37. +0 −145 docs/draft/CHANGELOG.yml
  38. +0 −33 docs/draft/api-collection.md
  39. +0 −22 docs/draft/api-collections.md
  40. +0 −46 docs/draft/api-engine.md
  41. +0 −14 docs/draft/api-file-properties.md
  42. +0 −181 docs/draft/api-templates.md
  43. +0 −128 docs/draft/api.md
  44. +0 −114 docs/draft/collections-example.md
  45. +0 −57 docs/draft/data.md
  46. +0 −3 docs/draft/defining-tasks.md
  47. +0 −68 docs/draft/engines.md
  48. +0 −4 docs/draft/events.md
  49. +0 −10 docs/draft/file.md
  50. +0 −91 docs/draft/flush.md
  51. +0 −66 docs/draft/layouts.md
  52. +0 −22 docs/draft/parsers.md
  53. +0 −30 docs/draft/partials.md
  54. +0 −35 docs/draft/plugins.md
  55. +0 −8 docs/draft/settings.md
  56. +0 −55 docs/draft/temp.md
  57. +0 −6 docs/draft/template.md
  58. +0 −87 docs/engines.md
  59. +0 −74 docs/helpers.md
  60. +0 −168 docs/layouts.md
  61. +0 −51 docs/middleware.md
  62. +0 −45 docs/options-built-in.md
  63. +0 −23 docs/options.assets.md
  64. +0 −161 docs/options.md
  65. +0 −116 docs/pages.md
  66. +0 −27 docs/partials.md
  67. +0 −16 docs/plugins.md
  68. +0 −1 docs/recipes/_links.md
  69. +11 −0 docs/recipes/create-a-collection.md
  70. +0 −106 docs/recipes/defining-and-loading-templates.md
  71. +0 −87 docs/recipes/defining-tasks.md
  72. +0 −147 docs/recipes/dynamically-update-dest-path.md
  73. +0 −88 docs/recipes/register-a-template-engine.md
  74. +0 −27 docs/recipes/using-gulp-tap.md
  75. +0 −9 docs/recipes/using-layouts.md
  76. +0 −7 docs/recipes/using-partials.md
  77. +0 −96 docs/routes.md
  78. +83 −0 docs/src/content/assemble.md
  79. +32 −0 docs/src/content/collections.md
  80. +22 −0 docs/src/content/layouts.md
  81. +84 −0 docs/src/content/options.md
  82. +35 −0 docs/src/content/pagination.md
  83. +116 −0 docs/src/content/plugins.md
  84. +137 −0 docs/src/content/router.md
  85. +58 −0 docs/src/content/view-types.md
  86. +14 −0 docs/src/content/view.md
  87. +436 −0 docs/src/docs.md
  88. +8 −0 docs/src/helpers/assets.js
  89. +1 −0 docs/src/helpers/index.js
  90. +13 −0 docs/src/helpers/is.js
  91. +34 −0 docs/src/helpers/link-to.js
  92. +5 −0 docs/src/helpers/log.js
  93. +1 −0 docs/src/helpers/markdown.js
  94. +31 −0 docs/src/recipes/declarative-config.md
  95. +1 −0 docs/src/scaffolds/includes/include.hbs
  96. +13 −0 docs/src/scaffolds/index.js
  97. +10 −0 docs/src/scaffolds/layouts/default.hbs
  98. +7 −0 docs/src/scaffolds/pages/page.hbs
  99. +6 −0 docs/src/scaffolds/posts/post.md
  100. +20 −0 docs/src/templates/layouts/default.hbs
  101. +7 −0 docs/src/templates/layouts/markdown.hbs
  102. +4 −0 docs/src/templates/layouts/recipe.hbs
  103. +34 −0 docs/src/templates/pages/building-blocks.md
  104. +8 −0 docs/src/templates/pages/index.hbs
  105. +1 −0 docs/src/templates/partials/link.hbs
  106. +11 −0 docs/src/templates/partials/nav.hbs
  107. +0 −30 docs/tasks.md
  108. +52 −0 examples/app.scaffold.js
  109. +5 −0 examples/app.view.js
  110. +42 −0 examples/generate-scaffolds.js
  111. +44 −0 examples/generate.js
  112. +16 −0 examples/list-from-views.js
  113. +11 −0 examples/list.js
  114. +55 −0 examples/pre-post-process.js
  115. +51 −0 examples/process.js
  116. +57 −0 examples/scaffold-tasks.js
  117. +15 −0 examples/templates/tags.hbs
  118. +5 −0 examples/view.js
  119. +9 −0 examples/views.js
  120. +50 −0 gulpfile.js
  121. +103 −0 index.js
  122. +37 −0 lib/utils.js
  123. +138 −0 package.json
  124. +0 −29 tasks/assemble.js
  125. +85 −0 test/app.applyLayout.js
  126. +50 −0 test/app.collection.compile.js
  127. +173 −0 test/app.collection.js
  128. +155 −0 test/app.collection.render.js
  129. +52 −0 test/app.compile.js
  130. +30 −0 test/app.copy.js
  131. +176 −0 test/app.create.js
  132. +94 −0 test/app.data.js
  133. +1,103 −0 test/app.dest.js
  134. +159 −0 test/app.engines.js
  135. +50 −0 test/app.events.js
  136. +72 −0 test/app.get-set.js
  137. +23 −0 test/app.handle.js
  138. +137 −0 test/app.handlers.js
  139. +130 −0 test/app.js
  140. +20 −0 test/app.layout.js
  141. +22 −0 test/app.layouts.js
  142. +44 −0 test/app.list.compile.js
  143. +110 −0 test/app.list.js
  144. +157 −0 test/app.list.render.js
  145. +112 −0 test/app.lookups.js
  146. +60 −0 test/app.middleware.js
  147. +98 −0 test/app.option.js
  148. +42 −0 test/app.page.js
  149. +29 −0 test/app.pages.js
  150. +20 −0 test/app.partial.js
  151. +22 −0 test/app.partials.js
  152. +88 −0 test/app.render.js
  153. +135 −0 test/app.renderFile.js
  154. +93 −0 test/app.route.js
  155. +295 −0 test/app.src.js
  156. +396 −0 test/app.symlink.js
  157. +156 −0 test/app.task.js
  158. +64 −0 test/app.toStream.js
  159. +281 −0 test/app.use.js
  160. +38 −0 test/app.view.compile.js
  161. +92 −0 test/app.view.render.js
  162. +42 −0 test/app.watch.js
  163. +177 −0 test/collection.engines.js
  164. +27 −0 test/collection.events.js
  165. +537 −0 test/collection.js
  166. +25 −0 test/collection.options.js
  167. +138 −0 test/collection.render.js
  168. +156 −0 test/collection.use.js
  169. BIN test/fixtures/bom-utf16be.txt
  170. BIN test/fixtures/bom-utf16le.txt
  171. +1 −0 test/fixtures/bom-utf8.txt
  172. +1 −0 test/fixtures/copy/example.txt
  173. +3 −0 test/fixtures/data/a.json
  174. +3 −0 test/fixtures/data/b.json
  175. +3 −0 test/fixtures/data/c.json
  176. +1 −0 test/fixtures/example.txt
  177. +3 −0 test/fixtures/helpers/a.js
  178. +3 −0 test/fixtures/helpers/b.js
  179. +3 −0 test/fixtures/helpers/c.js
  180. +9 −0 test/fixtures/helpers/obj.js
  181. +21 −0 test/fixtures/noext/license
  182. +2 −0 test/fixtures/pages/a.hbs
  183. +2 −0 test/fixtures/pages/b.hbs
  184. +2 −0 test/fixtures/pages/c.hbs
  185. +4 −0 test/fixtures/posts/a.txt
  186. +4 −0 test/fixtures/posts/b.txt
  187. +4 −0 test/fixtures/posts/c.txt
  188. +1 −0 test/fixtures/templates/a.tmpl
  189. +1 −0 test/fixtures/templates/b.tmpl
  190. +1 −0 test/fixtures/templates/c.tmpl
  191. +1 −0 test/fixtures/test-symlink
  192. +1 −0 test/fixtures/test-symlink-dir
  193. +1 −0 test/fixtures/test.coffee
  194. BIN test/fixtures/vinyl/bom-utf16be.txt
  195. BIN test/fixtures/vinyl/bom-utf16le.txt
  196. +1 −0 test/fixtures/vinyl/bom-utf8.txt
  197. +1 −0 test/fixtures/vinyl/test-symlink
  198. +1 −0 test/fixtures/vinyl/test-symlink-dir
  199. +1 −0 test/fixtures/vinyl/test.coffee
  200. +1 −0 test/fixtures/vinyl/wow/suchempty
  201. +1 −0 test/fixtures/watch/test.txt
  202. +1 −0 test/fixtures/wow/suchempty
  203. +140 −0 test/group.js
  204. +46 −0 test/handlers.js
  205. +707 −0 test/helpers.js
  206. +1,069 −0 test/item.js
  207. +127 −0 test/layouts.js
  208. +679 −0 test/list.js
  209. +137 −0 test/list.render.js
  210. +156 −0 test/list.use.js
  211. +108 −0 test/mergePartials.js
  212. +202 −0 test/partials.js
  213. +350 −0 test/renameKey.js
  214. +70 −0 test/render.js
  215. +98 −0 test/routes.js
  216. +6 −0 test/support/ignore.js
  217. +75 −0 test/support/index.js
  218. +27 −0 test/support/spy.js
  219. +14 −0 test/utils.js
  220. +29 −0 test/view.content.js
  221. +28 −0 test/view.events.js
  222. +1,154 −0 test/view.js
  223. +40 −0 test/view.methods.js
  224. +29 −0 test/view.option.js
  225. +54 −0 test/view.render.js
  226. +34 −0 test/view.set.js
  227. +60 −0 test/view.use.js
  228. +33 −0 test/viewTypes.js
  229. +445 −0 test/views.js
  230. +156 −0 test/views.use.js
View
@@ -0,0 +1,4 @@
+{
+ "analytics": false,
+ "directory": "_spec"
+}
View
@@ -0,0 +1,22 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+end_of_line = lf
+charset = utf-8
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+insert_final_newline = false
+
+[test/**]
+trim_trailing_whitespace = false
+insert_final_newline = false
+
+[templates/**]
+trim_trailing_whitespace = false
+insert_final_newline = false
View
@@ -0,0 +1,125 @@
+{
+ "ecmaFeatures": {
+ "modules": true,
+ "experimentalObjectRestSpread": true
+ },
+
+ "env": {
+ "browser": false,
+ "es6": true,
+ "node": true,
+ "mocha": true
+ },
+
+ "globals": {
+ "document": false,
+ "navigator": false,
+ "window": false
+ },
+
+ "rules": {
+ "accessor-pairs": 2,
+ "arrow-spacing": [2, { "before": true, "after": true }],
+ "block-spacing": [2, "always"],
+ "brace-style": [2, "1tbs", { "allowSingleLine": true }],
+ "comma-dangle": [2, "never"],
+ "comma-spacing": [2, { "before": false, "after": true }],
+ "comma-style": [2, "last"],
+ "constructor-super": 2,
+ "curly": [2, "multi-line"],
+ "dot-location": [2, "property"],
+ "eol-last": 2,
+ "eqeqeq": [2, "allow-null"],
+ "generator-star-spacing": [2, { "before": true, "after": true }],
+ "handle-callback-err": [2, "^(err|error)$" ],
+ "indent": [2, 2, { "SwitchCase": 1 }],
+ "key-spacing": [2, { "beforeColon": false, "afterColon": true }],
+ "new-cap": [2, { "newIsCap": true, "capIsNew": false }],
+ "new-parens": 2,
+ "no-array-constructor": 2,
+ "no-caller": 2,
+ "no-class-assign": 2,
+ "no-cond-assign": 2,
+ "no-const-assign": 2,
+ "no-control-regex": 2,
+ "no-debugger": 2,
+ "no-delete-var": 2,
+ "no-dupe-args": 2,
+ "no-dupe-class-members": 2,
+ "no-dupe-keys": 2,
+ "no-duplicate-case": 2,
+ "no-empty-character-class": 2,
+ "no-empty-label": 2,
+ "no-eval": 2,
+ "no-ex-assign": 2,
+ "no-extend-native": 2,
+ "no-extra-bind": 2,
+ "no-extra-boolean-cast": 2,
+ "no-extra-parens": [2, "functions"],
+ "no-fallthrough": 2,
+ "no-floating-decimal": 2,
+ "no-func-assign": 2,
+ "no-implied-eval": 2,
+ "no-inner-declarations": [2, "functions"],
+ "no-invalid-regexp": 2,
+ "no-irregular-whitespace": 2,
+ "no-iterator": 2,
+ "no-label-var": 2,
+ "no-labels": 2,
+ "no-lone-blocks": 2,
+ "no-mixed-spaces-and-tabs": 2,
+ "no-multi-spaces": 2,
+ "no-multi-str": 2,
+ "no-multiple-empty-lines": [2, { "max": 1 }],
+ "no-native-reassign": 2,
+ "no-negated-in-lhs": 2,
+ "no-new": 2,
+ "no-new-func": 2,
+ "no-new-object": 2,
+ "no-new-require": 2,
+ "no-new-wrappers": 2,
+ "no-obj-calls": 2,
+ "no-octal": 2,
+ "no-octal-escape": 2,
+ "no-proto": 0,
+ "no-redeclare": 2,
+ "no-regex-spaces": 2,
+ "no-return-assign": 2,
+ "no-self-compare": 2,
+ "no-sequences": 2,
+ "no-shadow-restricted-names": 2,
+ "no-spaced-func": 2,
+ "no-sparse-arrays": 2,
+ "no-this-before-super": 2,
+ "no-throw-literal": 2,
+ "no-trailing-spaces": 0,
+ "no-undef": 2,
+ "no-undef-init": 2,
+ "no-unexpected-multiline": 2,
+ "no-unneeded-ternary": [2, { "defaultAssignment": false }],
+ "no-unreachable": 2,
+ "no-unused-vars": [2, { "vars": "all", "args": "none" }],
+ "no-useless-call": 0,
+ "no-with": 2,
+ "one-var": [0, { "initialized": "never" }],
+ "operator-linebreak": [0, "after", { "overrides": { "?": "before", ":": "before" } }],
+ "padded-blocks": [0, "never"],
+ "quotes": [2, "single", "avoid-escape"],
+ "radix": 2,
+ "semi": [2, "always"],
+ "semi-spacing": [2, { "before": false, "after": true }],
+ "space-after-keywords": [2, "always"],
+ "space-before-blocks": [2, "always"],
+ "space-before-function-paren": [2, "never"],
+ "space-before-keywords": [2, "always"],
+ "space-in-parens": [2, "never"],
+ "space-infix-ops": 2,
+ "space-return-throw-case": 2,
+ "space-unary-ops": [2, { "words": true, "nonwords": false }],
+ "spaced-comment": [0, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }],
+ "use-isnan": 2,
+ "valid-typeof": 2,
+ "wrap-iife": [2, "any"],
+ "yoda": [2, "never"]
+ }
+}
View
@@ -0,0 +1,10 @@
+# Enforce Unix newlines
+* text eol=lf
+
+# binaries
+*.ai binary
+*.psd binary
+*.jpg binary
+*.gif binary
+*.png binary
+*.jpeg binary
View
@@ -1,20 +1,16 @@
-lib-cov
-*.seed
-*.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
-*.rar
+*.DS_Store
*.sublime-*
+_gh_pages
+bower_components
+node_modules
npm-debug.log
-.DS*
+actual
+test/actual
+test/_spec
+temp
+tmp
TODO.md
-
-# Always-ignore dirs
-node_modules/
-tmp/
-temp/
-vendor/
+vendor
+.idea
+benchmark
coverage
View
@@ -0,0 +1,9 @@
+language: node_js
+node_js:
+ - "stable"
+ - "0.12"
+ - "0.10"
+matrix:
+ fast_finish: true
+ allow_failures:
+ - node_js: "0.10"
Oops, something went wrong.

0 comments on commit bfefce1

Please sign in to comment.