author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
699 | 26.11.2019 08:24:09 | 21,600 | 16a7bc45e3989afc6a549bb655c83a9578a7e3bd | Updates ava version | [
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n\"devDependencies\": {\n\"@11ty/eleventy-plugin-syntaxhighlight\": \"^2.0.3\",\n- \"ava\": \"^2.2.0\",\n+ \"ava\": \"^2.4.0\",\n\"ink-docstrap\": \"1.3.2\",\n\"jsdoc\": \"3.6.2\",\n\"lint-staged\": \"^9.2.5\",\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Updates ava version |
699 | 27.11.2019 08:19:58 | 21,600 | a3b4433af8c8eccf1027e6c66c7c316280727c9c | When you watch a dir it needs to be a glob, for | [
{
"change_type": "MODIFY",
"old_path": "src/Eleventy.js",
"new_path": "src/Eleventy.js",
"diff": "@@ -73,7 +73,7 @@ class Eleventy {\n/** @member {Object} - tbd. */\nthis.watchTargets = new EleventyWatchTargets();\n- this.watchTargets.add(this.config.additionalWatchTargets);\n+ this.watchTargets.addAndMakeGlob(this.config.additionalWatchTargets);\nthis.watchTargets.watchJavaScriptDependencies = this.config.watchJavaScriptDependencies;\n}\n@@ -559,8 +559,7 @@ Arguments:\ndebug(\"Watching for changes to: %o\", rawFiles);\nlet ignores = this.eleventyFiles.getGlobWatcherIgnores();\n- debug(\"Watching but ignoring changes to: %o\", ignores);\n-\n+ debug(\"Ignoring watcher changes to: %o\", ignores);\nlet watcher = chokidar.watch(rawFiles, {\nignored: ignores,\nignoreInitial: true\n"
},
{
"change_type": "MODIFY",
"old_path": "test/EleventyWatchTargetsTest.js",
"new_path": "test/EleventyWatchTargetsTest.js",
"diff": "@@ -25,6 +25,14 @@ test(\"Add array\", t => {\nt.deepEqual(targets.getTargets(), [\"./.eleventy.js\", \"./b.js\", \"./c.js\"]);\n});\n+test(\"Add and make glob\", t => {\n+ let targets = new EleventyWatchTargets();\n+\n+ // Note the `test` directory must exist here for this to pass.\n+ targets.addAndMakeGlob([\"test\", \"test/b.js\"]);\n+ t.deepEqual(targets.getTargets(), [\"./test/**\", \"./test/b.js\"]);\n+});\n+\ntest(\"JavaScript get dependencies\", t => {\nlet targets = new EleventyWatchTargets();\nt.deepEqual(\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | When you watch a dir it needs to be a glob, for #641 |
699 | 27.11.2019 22:52:24 | 21,600 | dbb6c93645d1926dcc70933180fe0da3953b2c05 | Adds warning for lack of support for ! in .gitignore and .eleventyignore. Future support TBD at | [
{
"change_type": "MODIFY",
"old_path": "src/EleventyFiles.js",
"new_path": "src/EleventyFiles.js",
"diff": "@@ -182,6 +182,16 @@ class EleventyFiles {\nreturn line.trim();\n})\n.filter(line => {\n+ if (line.charAt(0) === \"!\") {\n+ debug(\n+ \">>> When processing .gitignore/.eleventyignore, Eleventy does not currently support negative patterns but encountered one:\"\n+ );\n+ debug(\">>>\", line);\n+ debug(\n+ \"Follow along at https://github.com/11ty/eleventy/issues/693 to track support.\"\n+ );\n+ }\n+\n// empty lines or comments get filtered out\nreturn (\nline.length > 0 && line.charAt(0) !== \"#\" && line.charAt(0) !== \"!\"\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Adds warning for lack of support for ! in .gitignore and .eleventyignore. Future support TBD at #693. |
699 | 27.11.2019 22:52:56 | 21,600 | e40fb33031831bf6438029195c19354ce6e6639e | Oops, the .gitignore and .eleventyignore files were being processed twice! | [
{
"change_type": "MODIFY",
"old_path": "src/EleventyFiles.js",
"new_path": "src/EleventyFiles.js",
"diff": "@@ -221,29 +221,28 @@ class EleventyFiles {\ngetIgnores() {\nlet files = [];\n+ let rootDirectory = this.localPathRoot || TemplatePath.getWorkingDir();\n+ let absoluteInputDir = TemplatePath.absolutePath(this.inputDir);\nif (this.config.useGitIgnore) {\n+ let gitIgnores = [TemplatePath.join(rootDirectory, \".gitignore\")];\n+ if (rootDirectory !== absoluteInputDir) {\n+ gitIgnores.push(TemplatePath.join(this.inputDir, \".gitignore\"));\n+ }\n+\nfiles = files.concat(\n- EleventyFiles.getFileIgnores(\n- [\n- TemplatePath.join(\n- this.localPathRoot || TemplatePath.getWorkingDir(),\n- \".gitignore\"\n- ),\n- TemplatePath.join(this.inputDir, \".gitignore\")\n- ],\n- \"node_modules/**\"\n- )\n+ EleventyFiles.getFileIgnores(gitIgnores, \"node_modules/**\")\n);\n}\nif (this.config.eleventyignoreOverride !== false) {\nlet eleventyIgnores = [\n- TemplatePath.join(\n- this.localPathRoot || TemplatePath.getWorkingDir(),\n- \".eleventyignore\"\n- ),\n- TemplatePath.join(this.inputDir, \".eleventyignore\")\n+ TemplatePath.join(rootDirectory, \".eleventyignore\")\n];\n+ if (rootDirectory !== absoluteInputDir) {\n+ eleventyIgnores.push(\n+ TemplatePath.join(this.inputDir, \".eleventyignore\")\n+ );\n+ }\nfiles = files.concat(\nthis.config.eleventyignoreOverride ||\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Oops, the .gitignore and .eleventyignore files were being processed twice! |
699 | 29.11.2019 13:54:30 | 21,600 | 7fe644d9a78605853c31d24299f6a880168f2d8f | Fix sortable issue surfaced by in | [
{
"change_type": "MODIFY",
"old_path": "src/Util/Sortable.js",
"new_path": "src/Util/Sortable.js",
"diff": "@@ -2,8 +2,8 @@ const capitalize = require(\"./Capitalize\");\nclass Sortable {\nconstructor() {\n- this.sortAscending = true;\n- this.sortNumeric = false;\n+ this.isSortAscending = true;\n+ this.isSortNumeric = false;\nthis.items = [];\nthis.sortFunctionStringMap = {\n@@ -44,24 +44,16 @@ class Sortable {\nreturn this.sort(this.getSortFunctionDescending());\n}\n- isSortAscending() {\n- return this.sortAscending;\n- }\n-\n- isSortNumeric() {\n- return this.sortNumeric;\n- }\n-\nsetSortDescending() {\n- this.sortAscending = false;\n+ this.isSortAscending = false;\n}\nsetSortAscending(isAscending) {\n- this.sortAscending = isAscending;\n+ this.isSortAscending = isAscending;\n}\nsetSortNumeric(isNumeric) {\n- this.sortNumeric = isNumeric;\n+ this.isSortNumeric = isNumeric;\n}\n/* Sort functions */\n@@ -117,7 +109,7 @@ class Sortable {\n/* End sort functions */\ngetSortFunction() {\n- if (this.sortAscending) {\n+ if (this.isSortAscending) {\nreturn this.getSortFunctionAscending();\n} else {\nreturn this.getSortFunctionDescending();\n@@ -125,7 +117,7 @@ class Sortable {\n}\ngetSortFunctionAscending() {\n- if (this.sortNumeric) {\n+ if (this.isSortNumeric) {\nreturn Sortable.sortFunctionNumericAscending;\n} else {\nreturn Sortable.sortFunctionAlphabeticAscending;\n@@ -133,7 +125,7 @@ class Sortable {\n}\ngetSortFunctionDescending() {\n- if (this.sortNumeric) {\n+ if (this.isSortNumeric) {\nreturn Sortable.sortFunctionNumericDescending;\n} else {\nreturn Sortable.sortFunctionAlphabeticDescending;\n"
},
{
"change_type": "MODIFY",
"old_path": "test/SortableTest.js",
"new_path": "test/SortableTest.js",
"diff": "@@ -9,8 +9,8 @@ test(\"get Sort Function\", t => {\ntest(\"Alphabetic Ascending\", t => {\nlet s = new Sortable();\n- t.false(s.isSortNumeric());\n- t.true(s.isSortAscending());\n+ t.false(s.isSortNumeric);\n+ t.true(s.isSortAscending);\ns.add(\"a\");\ns.add(\"z\");\n@@ -18,12 +18,7 @@ test(\"Alphabetic Ascending\", t => {\nt.deepEqual(s.sort(), [\"a\", \"m\", \"z\"]);\n});\n-test.skip(\"Alphabetic Ascending (shortcut)\", t => {\n- /* FIXME THIS WILL NOT WORK because s.sortAscending() has been replaced by the boolean sortAscending.\n- *\n- * If backwards compatibility were not an issue, I'd recommend renaming the boolean properties\n- * to isSort(Ascending|Numeric) and renaming the getters & Setters to (get|set)IsSort(Ascending|Numeric)\n- */\n+test(\"Alphabetic Ascending (shortcut)\", t => {\nlet s = new Sortable();\ns.add(\"a\");\ns.add(\"z\");\n@@ -34,8 +29,8 @@ test.skip(\"Alphabetic Ascending (shortcut)\", t => {\ntest(\"Alphabetic Descending\", t => {\nlet s = new Sortable();\ns.setSortDescending();\n- t.false(s.isSortNumeric());\n- t.false(s.isSortAscending());\n+ t.false(s.isSortNumeric);\n+ t.false(s.isSortAscending);\ns.add(\"a\");\ns.add(\"z\");\n@@ -54,8 +49,8 @@ test(\"Alphabetic Descending (shortcut)\", t => {\ntest(\"Numeric Ascending\", t => {\nlet s = new Sortable();\ns.setSortNumeric(true);\n- t.true(s.isSortNumeric());\n- t.true(s.isSortAscending());\n+ t.true(s.isSortNumeric);\n+ t.true(s.isSortAscending);\ns.add(1);\ns.add(4);\n@@ -67,8 +62,8 @@ test(\"Numeric Descending\", t => {\nlet s = new Sortable();\ns.setSortNumeric(true);\ns.setSortDescending();\n- t.true(s.isSortNumeric());\n- t.false(s.isSortAscending());\n+ t.true(s.isSortNumeric);\n+ t.false(s.isSortAscending);\ns.add(1);\ns.add(4);\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Fix sortable issue surfaced by @edbrannin in #747 |
699 | 30.11.2019 19:36:18 | 21,600 | e62ebfa7726de9c48736430af1c8e9324daf4702 | Show pathPrefix on the command line when in use. | [
{
"change_type": "MODIFY",
"old_path": "src/Eleventy.js",
"new_path": "src/Eleventy.js",
"diff": "@@ -233,15 +233,21 @@ class Eleventy {\n}`\n);\n+ let versionStr = `v${pkg.version}`;\nlet time = ((new Date() - this.start) / 1000).toFixed(2);\nret.push(`in ${time} ${simplePlural(time, \"second\", \"seconds\")}`);\nif (writeCount >= 10) {\nret.push(\n- `(${((time * 1000) / writeCount).toFixed(1)}ms each, v${pkg.version})`\n+ `(${((time * 1000) / writeCount).toFixed(1)}ms each, ${versionStr})`\n);\n} else {\n- ret.push(`(v${pkg.version})`);\n+ ret.push(`(${versionStr})`);\n+ }\n+\n+ let pathPrefix = this.config.pathPrefix;\n+ if (pathPrefix && pathPrefix !== \"/\") {\n+ return `Using pathPrefix: ${pathPrefix}\\n${ret.join(\" \")}`;\n}\nreturn ret.join(\" \");\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Show pathPrefix on the command line when in use. |
699 | 08.12.2019 20:01:46 | 21,600 | 4247c4ca1f29aaf0e9f97205989c9f23dd8c4b98 | Update dependencies in preparation for 0.10.0-beta.1 | [
{
"change_type": "MODIFY",
"old_path": "cmd.js",
"new_path": "cmd.js",
"diff": "#!/usr/bin/env node\nconst pkg = require(\"./package.json\");\n-const chalk = require(\"chalk\"); // node 4+\n+const chalk = require(\"chalk\"); // node 8+\nrequire(\"please-upgrade-node\")(pkg, {\nmessage: function(requiredVersion) {\nreturn chalk.red(\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"@11ty/eleventy-plugin-syntaxhighlight\": \"^2.0.3\",\n\"ava\": \"^2.4.0\",\n\"ink-docstrap\": \"1.3.2\",\n- \"jsdoc\": \"3.6.2\",\n- \"lint-staged\": \"^9.2.5\",\n+ \"jsdoc\": \"3.6.3\",\n+ \"lint-staged\": \"^9.5.0\",\n\"markdown-it-emoji\": \"^1.4.0\",\n\"nyc\": \"^14.1.1\",\n\"pre-commit\": \"^1.2.2\",\n\"pre-push\": \"^0.1.1\",\n- \"prettier\": \"^1.18.2\",\n+ \"prettier\": \"^1.19.1\",\n\"rimraf\": \"^3.0.0\",\n\"toml\": \"^3.0.0\",\n- \"viperhtml\": \"^2.17.0\",\n+ \"viperhtml\": \"^2.17.1\",\n\"vue\": \"^2.6.10\",\n\"vue-server-renderer\": \"^2.6.10\",\n\"js-yaml\": \"^3.13.1\"\n\"dependencies\": {\n\"@11ty/dependency-tree\": \"^1.0.0\",\n\"browser-sync\": \"^2.26.7\",\n- \"chalk\": \"^2.4.2\",\n- \"chokidar\": \"^3.0.2\",\n+ \"chalk\": \"^3.0.0\",\n+ \"chokidar\": \"^3.3.0\",\n\"debug\": \"^4.1.1\",\n- \"dependency-graph\": \"^0.8.0\",\n+ \"dependency-graph\": \"^0.8.1\",\n\"ejs\": \"^2.6.2\",\n- \"fast-glob\": \"^3.0.4\",\n+ \"fast-glob\": \"^3.1.1\",\n\"fs-extra\": \"^8.1.0\",\n\"gray-matter\": \"^4.0.2\",\n\"hamljs\": \"^0.6.2\",\n- \"handlebars\": \"^4.1.2\",\n- \"javascript-stringify\": \"^2.0.0\",\n+ \"handlebars\": \"^4.5.3\",\n+ \"javascript-stringify\": \"^2.0.1\",\n\"liquidjs\": \"^6.4.3\",\n\"lodash\": \"^4.17.15\",\n- \"luxon\": \"^1.17.2\",\n+ \"luxon\": \"^1.21.3\",\n\"markdown-it\": \"^8.4.2\",\n\"minimist\": \"^1.2.0\",\n- \"moo\": \"^0.5.0\",\n+ \"moo\": \"^0.5.1\",\n\"multimatch\": \"^4.0.0\",\n\"mustache\": \"^2.3.0\",\n\"normalize-path\": \"^3.0.0\",\n\"pug\": \"^2.0.4\",\n\"recursive-copy\": \"^2.0.10\",\n\"semver\": \"^6.3.0\",\n- \"slugify\": \"^1.3.4\",\n+ \"slugify\": \"^1.3.6\",\n\"time-require\": \"^0.1.2\",\n\"valid-url\": \"^1.0.9\"\n},\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Update dependencies in preparation for 0.10.0-beta.1 |
701 | 13.12.2019 01:07:45 | -7,200 | 19b97ff93765e3c48d0b572c1acd6fc8e59d5197 | Add global data extension priority and merge data objects
with the same base filename
according to data file extension priority | [
{
"change_type": "MODIFY",
"old_path": "src/TemplateData.js",
"new_path": "src/TemplateData.js",
"diff": "@@ -2,6 +2,7 @@ const fs = require(\"fs-extra\");\nconst fastglob = require(\"fast-glob\");\nconst parsePath = require(\"parse-filepath\");\nconst lodashset = require(\"lodash/set\");\n+const lodashget = require(\"lodash/get\");\nconst lodashUniq = require(\"lodash/uniq\");\nconst merge = require(\"./Util/Merge\");\nconst TemplateRender = require(\"./TemplateRender\");\n@@ -135,26 +136,52 @@ class TemplateData {\nasync getGlobalDataGlob() {\nlet dir = await this.getInputDir();\n- let userExtensions = \"\";\n- // creating glob string for user extensions\n- if (this.hasUserDataExtensions()) {\n- userExtensions = this.getUserDataExtensions().join(\"|\") + \"|\";\n- }\n- return [\n- this._getGlobalDataGlobByExtension(dir, \"(\" + userExtensions + \"json|js)\")\n- ];\n+ let extGlob = this.getGlobalDataExtensionPriorities().join(\"|\");\n+ return [this._getGlobalDataGlobByExtension(dir, \"(\" + extGlob + \")\")];\n}\ngetWatchPathCache() {\nreturn this.pathCache;\n}\n+ getGlobalDataExtensionPriorities() {\n+ return this.getUserDataExtensions().concat([\"json\", \"js\"]);\n+ }\n+\n+ static calculateExtensionPriority(path, priorities) {\n+ for (let i = 0; i < priorities.length; i++) {\n+ let ext = priorities[i];\n+ if (path.endsWith(ext)) {\n+ return i;\n+ }\n+ }\n+ return priorities.length;\n+ }\n+\nasync getGlobalDataFiles() {\n+ let priorities = this.getGlobalDataExtensionPriorities();\n+\nlet paths = await fastglob(await this.getGlobalDataGlob(), {\ncaseSensitiveMatch: false,\ndot: true\n});\n+\n+ // sort paths according to extension priorities\n+ // here we use reverse ordering, because paths with bigger index in array will override the first ones\n+ // example [path/file.json, path/file.js] here js will override json\n+ paths = paths.sort((first, second) => {\n+ let p1 = TemplateData.calculateExtensionPriority(first, priorities);\n+ let p2 = TemplateData.calculateExtensionPriority(second, priorities);\n+ if (p1 < p2) {\n+ return -1;\n+ }\n+ if (p1 > p2) {\n+ return 1;\n+ }\n+ return 0;\n+ });\n+\nthis.pathCache = paths;\nreturn paths;\n}\n@@ -179,17 +206,19 @@ class TemplateData {\nfor (let j = 0, k = files.length; j < k; j++) {\nlet folders = await this.getObjectPathForDataFile(files[j]);\n+ let data = await this.getDataValue(files[j], rawImports);\n- // TODO maybe merge these two? (if both valid objects)\nif (dataFileConflicts[folders]) {\ndebugWarn(\n- `Warning: the key for a global data file (${files[j]}) will overwrite data from an already existing global data file (${dataFileConflicts[folders]})`\n+ `merging global data from ${files[j]} with an already existing global data file (${dataFileConflicts[folders]}). Overriding existing keys`\n);\n+\n+ let oldData = lodashget(globalData, folders);\n+ data = TemplateData.mergeDeep(this.config, oldData, data);\n}\n- dataFileConflicts[folders] = files[j];\n+ dataFileConflicts[folders] = files[j];\ndebug(`Found global data file ${files[j]} and adding as: ${folders}`);\n- let data = await this.getDataValue(files[j], rawImports);\nlodashset(globalData, folders, data);\n}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Add global data extension priority and merge data objects
with the same base filename
according to data file extension priority |
701 | 13.12.2019 01:11:48 | -7,200 | c5966f8b5143ca681fa5b69044a3cfc308720bf6 | add tests for new global data priority and merging | [
{
"change_type": "MODIFY",
"old_path": "test/UserDataExtensionsTest.js",
"new_path": "test/UserDataExtensionsTest.js",
"diff": "@@ -70,7 +70,6 @@ test(\"Global data\", async t => {\n\"./test/stubs-630/_data/**/*.(nosj|yaml|json|js)\"\n]);\n- let dataFilePaths = await dataObj.getGlobalDataFiles();\nlet data = await dataObj.getData();\n// JS GLOBAL DATA\n@@ -90,3 +89,21 @@ test(\"Global data\", async t => {\nt.is(data.subdir.globalDataSubdir.keyyaml, \"yaml\");\n});\n+\n+test(\"Global data merging and priority\", async t => {\n+ let dataObj = new TemplateData(\"./test/stubs-630/\");\n+ injectDataExtensions(dataObj);\n+\n+ let data = await dataObj.getData();\n+\n+ // TESTING GLOBAL DATA PRIORITY AND MERGING\n+ t.is(data.mergingGlobalData.datakey1, \"js-value1\");\n+ t.is(data.mergingGlobalData.datakey2, \"json-value2\");\n+ t.is(data.mergingGlobalData.datakey3, \"yaml-value3\");\n+ t.is(data.mergingGlobalData.datakey4, \"nosj-value4\");\n+\n+ t.is(data.mergingGlobalData.jskey, \"js\");\n+ t.is(data.mergingGlobalData.jsonkey, \"json\");\n+ t.is(data.mergingGlobalData.yamlkey, \"yaml\");\n+ t.is(data.mergingGlobalData.nosjkey, \"nosj\");\n+});\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs-630/_data/mergingGlobalData.js",
"diff": "+module.exports = {\n+ datakey1: \"js-value1\",\n+ jskey: \"js\"\n+};\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs-630/_data/mergingGlobalData.json",
"diff": "+{\n+ \"datakey1\": \"json-value1\",\n+ \"datakey2\": \"json-value2\",\n+ \"jsonkey\": \"json\"\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs-630/_data/mergingGlobalData.nosj",
"diff": "+{\n+ \"datakey1\": \"nosj-value1\",\n+ \"datakey2\": \"nosj-value2\",\n+ \"datakey3\": \"nosj-value3\",\n+ \"datakey4\": \"nosj-value4\",\n+ \"nosjkey\": \"nosj\"\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs-630/_data/mergingGlobalData.yaml",
"diff": "+datakey1: \"yaml-value1\"\n+datakey2: \"yaml-value2\"\n+datakey3: \"yaml-value3\"\n+yamlkey: \"yaml\"\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | add tests for new global data priority and merging |
716 | 13.12.2019 08:55:09 | -7,200 | a689764ca1a5db2146c75f360fcbec67a26808a3 | Update test to check that changes made by a plugin surface in the final markdown | [
{
"change_type": "MODIFY",
"old_path": "test/TemplateRenderMarkdownPluginTest.js",
"new_path": "test/TemplateRenderMarkdownPluginTest.js",
"diff": "@@ -6,6 +6,8 @@ const createTestMarkdownPlugin = () => {\nconst plugin = md => {\nmd.core.ruler.after(\"inline\", \"replace-link\", function(state) {\nplugin.environment = state.env;\n+ const link = state.tokens[1].children[0].attrs[0][1];\n+ state.tokens[1].children[0].attrs[0][1] = `${link}?data=${state.env.some}`;\nreturn false;\n});\n};\n@@ -25,6 +27,7 @@ test(\"Markdown Render: with HTML prerender, sends context data to the markdown l\nlet fn = await tr.getCompiledTemplate(\"[link text](http://link.com)\");\nlet result = await fn(data);\nt.deepEqual(plugin.environment, data);\n+ t.is(result, '<p><a href=\"http://link.com?data=data\">link text</a></p>\\n');\n});\ntest(\"Markdown Render: without HTML prerender, sends context data to the markdown library\", async t => {\n@@ -40,4 +43,5 @@ test(\"Markdown Render: without HTML prerender, sends context data to the markdow\nlet fn = await tr.getCompiledTemplate(\"[link text](http://link.com)\");\nlet result = await fn(data);\nt.deepEqual(plugin.environment, data);\n+ t.is(result, '<p><a href=\"http://link.com?data=data\">link text</a></p>\\n');\n});\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Update test to check that changes made by a plugin surface in the final markdown
(cherry picked from commit 7424813eec7731ca8530f343416245de01d4a425) |
699 | 18.12.2019 08:20:37 | 21,600 | dd22c086cfb1f4aa628b01c47805d32c5303dd67 | Adds publishConfig and funding to package.json | [
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"@11ty/eleventy\",\n\"version\": \"0.10.0-beta.1\",\n\"description\": \"Transform a directory of templates into HTML.\",\n+ \"publishConfig\": {\n+ \"access\": \"public\"\n+ },\n\"main\": \"src/Eleventy.js\",\n\"license\": \"MIT\",\n\"engines\": {\n\"node\": \">=8\"\n},\n+ \"funding\": {\n+ \"type\": \"opencollective\",\n+ \"url\": \"https://opencollective.com/11ty\"\n+ },\n\"keywords\": [\n\"static-site-generator\",\n\"static-site\",\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Adds publishConfig and funding to package.json |
699 | 18.12.2019 08:20:56 | 21,600 | 0d18f4d1ca4c0587c1ebba298a9603ca11429243 | Adds `getFilter` to config API for plugins | [
{
"change_type": "MODIFY",
"old_path": "src/UserConfig.js",
"new_path": "src/UserConfig.js",
"diff": "@@ -195,6 +195,15 @@ class UserConfig {\nthis.addHandlebarsHelper(name, callback);\n}\n+ getFilter(name) {\n+ return (\n+ this.javascriptFunctions[name] ||\n+ this.nunjucksFilters[name] ||\n+ this.liquidFilters[name] ||\n+ this.handlebarsHelpers[name]\n+ );\n+ }\n+\naddNunjucksTag(name, tagFn) {\nname = this.getNamespacedName(name);\n@@ -255,7 +264,8 @@ class UserConfig {\naddPlugin(plugin, options) {\ndebug(\"Adding plugin (unknown name: check your config file).\");\nif (typeof plugin === \"function\") {\n- plugin(this);\n+ let configFunction = plugin;\n+ configFunction(this, options);\n} else if (plugin && plugin.configFunction) {\nif (options && typeof options.init === \"function\") {\noptions.init.call(this, plugin.initArguments || {});\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Adds `getFilter` to config API for plugins |
699 | 18.12.2019 10:30:21 | 21,600 | 727607c0325bcceaba6dabc7a958663d40a25e49 | Adds --quiet=false support for | [
{
"change_type": "MODIFY",
"old_path": "src/Eleventy.js",
"new_path": "src/Eleventy.js",
"diff": "@@ -41,6 +41,12 @@ class Eleventy {\n*/\nthis.isVerbose = process.env.DEBUG ? false : !this.config.quietMode;\n+ /**\n+ * @member {Boolean} - Was verbose mode overrode manually?\n+ * @default false\n+ */\n+ this.isVerboseOverride = false;\n+\n/**\n* @member {Boolean} - Is Eleventy running in debug mode?\n* @default false\n@@ -283,7 +289,6 @@ class Eleventy {\nthis.writer.setEleventyFiles(this.eleventyFiles);\n- // TODO maybe isVerbose -> console.log?\ndebug(`Directories:\nInput: ${this.inputDir}\nData: ${this.templateData.getDataDir()}\n@@ -318,6 +323,10 @@ Verbose Output: ${this.isVerbose}`);\nsetIsVerbose(isVerbose) {\nthis.isVerbose = !!isVerbose;\n+ // mark that this was changed from the default (probably from --quiet)\n+ // this is used when we reset the config (only applies if not overridden)\n+ this.isVerboseOverride = true;\n+\nif (this.writer) {\nthis.writer.setVerboseOutput(this.isVerbose);\n}\n@@ -392,6 +401,10 @@ Arguments:\nthis.config = config.getConfig();\nthis.eleventyServe.config = this.config;\n+\n+ if (!this.isVerboseOverride && !process.env.DEBUG) {\n+ this.isVerbose = !this.config.quietMode;\n+ }\n}\n/**\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Adds --quiet=false support for #808. |
699 | 29.12.2019 14:00:03 | 21,600 | 89b2f19c2bf4d17db465c8e48457b4565b1efba5 | Tests for async filters in Liquid and Nunjucks | [
{
"change_type": "MODIFY",
"old_path": "test/TemplateRenderLiquidTest.js",
"new_path": "test/TemplateRenderLiquidTest.js",
"diff": "@@ -139,6 +139,21 @@ test(\"Liquid Custom Filter\", async t => {\nt.is(await tr._testRender(\"{{ 'test' | prefixWithZach }}\", {}), \"Zachtest\");\n});\n+test.skip(\"Liquid Async Filter\", async t => {\n+ let tr = new TemplateRender(\"liquid\", \"test/stubs\");\n+ tr.engine.addFilter({\n+ myAsyncFilter: function(value) {\n+ return new Promise((resolve, reject) => {\n+ setTimeout(function() {\n+ resolve(`HI${value}`);\n+ }, 100);\n+ });\n+ }\n+ });\n+ let fn = await tr.getCompiledTemplate(\"{{ 'test' | myAsyncFilter }}\");\n+ t.is((await fn()).trim(), \"HItest\");\n+});\n+\ntest(\"Liquid Custom Tag prefixWithZach\", async t => {\nlet tr = new TemplateRender(\"liquid\", \"./test/stubs/\");\ntr.engine.addTag(\"prefixWithZach\", function(liquidEngine) {\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateRenderNunjucksTest.js",
"new_path": "test/TemplateRenderNunjucksTest.js",
"diff": "@@ -139,6 +139,23 @@ test(\"Nunjucks Render Relative Include (ambiguous path, file exists in _includes\n// t.is(await fn2(), \"<p>HELLO FROM THE OTHER SIDE.</p>\");\n});\n+test(\"Nunjucks Async Filter\", async t => {\n+ let tr = new TemplateRender(\"njk\", \"test/stubs\");\n+ let engine = tr.engine;\n+ engine.addFilters(\n+ {\n+ myAsyncFilter: function(value, callback) {\n+ setTimeout(function() {\n+ callback(null, `HI${value}`);\n+ }, 100);\n+ }\n+ },\n+ true\n+ );\n+ let fn = await tr.getCompiledTemplate(\"{{ 'test' | myAsyncFilter }}\");\n+ t.is((await fn()).trim(), \"HItest\");\n+});\n+\ntest(\"Nunjucks Render Include a JS file (Issue 398)\", async t => {\nlet tr = new TemplateRender(\"njk\", \"test/stubs\");\nlet engine = tr.engine;\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Tests for async filters in Liquid and Nunjucks |
699 | 29.12.2019 14:00:19 | 21,600 | ab7f0dcba7692ae377b9bbb73ab8394299ad33c4 | Add bugs and homepage to package.json | [
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"type\": \"git\",\n\"url\": \"git://github.com/11ty/eleventy.git\"\n},\n+ \"bugs\": \"https://github.com/11ty/eleventy/issues\",\n+ \"homepage\": \"https://www.11ty.dev/\",\n\"ava\": {\n\"files\": [\n\"./test/*.js\"\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Add bugs and homepage to package.json |
699 | 04.01.2020 13:49:19 | 21,600 | 241a0388b7adedc554f43f72cdf45c8d3b660fe1 | Fix tests that broke with syntaxhighlight major version upgrade 2.0 to 3.0 | [
{
"change_type": "MODIFY",
"old_path": "test/TemplateRenderMarkdownTest.js",
"new_path": "test/TemplateRenderMarkdownTest.js",
"diff": "@@ -171,7 +171,7 @@ var key = \"value\";\n\\`\\`\\``);\nt.is(\n(await fn()).trim(),\n- `<pre class=\"language-js\"><code class=\"language-js\"><span class=\"highlight-line\"><span class=\"token keyword\">var</span> key <span class=\"token operator\">=</span> <span class=\"token string\">\"value\"</span><span class=\"token punctuation\">;</span></span></code></pre>`\n+ `<pre class=\"language-js\"><code class=\"language-js\"><span class=\"token keyword\">var</span> key <span class=\"token operator\">=</span> <span class=\"token string\">\"value\"</span><span class=\"token punctuation\">;</span></code></pre>`\n);\n});\n@@ -194,7 +194,7 @@ var key = \"value\";\n\\`\\`\\``);\nt.is(\n(await fn()).trim(),\n- `<pre class=\"language-js\"><code class=\"language-js\"><span class=\"highlight-line\"><span class=\"token keyword\">var</span> key <span class=\"token operator\">=</span> <span class=\"token string\">\"value\"</span><span class=\"token punctuation\">;</span></span></code></pre>`\n+ `<pre class=\"language-js\"><code class=\"language-js\"><span class=\"token keyword\">var</span> key <span class=\"token operator\">=</span> <span class=\"token string\">\"value\"</span><span class=\"token punctuation\">;</span></code></pre>`\n);\n});\n@@ -257,10 +257,12 @@ test(\"Markdown Render: use Markdown inside of a Liquid shortcode (Issue #536)\",\nlet fn = await tr.getCompiledTemplate(`# {{title}}\n{% testShortcode %}`);\nt.is(\n- (await fn({\n+ (\n+ await fn({\ntitle: \"My Title\",\notherTitle: \"My Other Title\"\n- })).trim(),\n+ })\n+ ).trim(),\n`<h1>My Title</h1>\n<h2>My Other Title</h2>`\n);\n@@ -279,10 +281,12 @@ test(\"Markdown Render: use Markdown inside of a Nunjucks shortcode (Issue #536)\"\nlet fn = await tr.getCompiledTemplate(`# {{title}}\n{% testShortcode %}`);\nt.is(\n- (await fn({\n+ (\n+ await fn({\ntitle: \"My Title\",\notherTitle: \"My Other Title\"\n- })).trim(),\n+ })\n+ ).trim(),\n`<h1>My Title</h1>\n<h2>My Other Title</h2>`\n);\n@@ -301,10 +305,12 @@ test(\"Markdown Render: use Markdown inside of a Liquid paired shortcode (Issue #\nlet fn = await tr.getCompiledTemplate(`# {{title}}\n{% testShortcode %}## My Other Title{% endtestShortcode %}`);\nt.is(\n- (await fn({\n+ (\n+ await fn({\ntitle: \"My Title\",\notherTitle: \"My Other Title\"\n- })).trim(),\n+ })\n+ ).trim(),\n`<h1>My Title</h1>\n<h2>My Other Title</h2>`\n);\n@@ -323,10 +329,12 @@ test(\"Markdown Render: use Markdown inside of a Nunjucks paired shortcode (Issue\nlet fn = await tr.getCompiledTemplate(`# {{title}}\n{% testShortcode %}## My Other Title{% endtestShortcode %}`);\nt.is(\n- (await fn({\n+ (\n+ await fn({\ntitle: \"My Title\",\notherTitle: \"My Other Title\"\n- })).trim(),\n+ })\n+ ).trim(),\n`<h1>My Title</h1>\n<h2>My Other Title</h2>`\n);\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Fix tests that broke with syntaxhighlight major version upgrade 2.0 to 3.0 |
699 | 04.01.2020 14:02:29 | 21,600 | 4ea61135ab5e7eb3b658a8a8240e3fb5c0c90d72 | Coverage for 0.10.0-beta.2 | [
{
"change_type": "MODIFY",
"old_path": "docs-src/_data/coverage.json",
"new_path": "docs-src/_data/coverage.json",
"diff": "-{\"total\": {\"lines\":{\"total\":2919,\"covered\":2564,\"skipped\":0,\"pct\":87.84},\"statements\":{\"total\":2936,\"covered\":2581,\"skipped\":0,\"pct\":87.91},\"functions\":{\"total\":690,\"covered\":601,\"skipped\":0,\"pct\":87.1},\"branches\":{\"total\":1235,\"covered\":992,\"skipped\":0,\"pct\":80.32}}\n+{\"total\": {\"lines\":{\"total\":2928,\"covered\":2569,\"skipped\":0,\"pct\":87.74},\"statements\":{\"total\":2946,\"covered\":2587,\"skipped\":0,\"pct\":87.81},\"functions\":{\"total\":694,\"covered\":604,\"skipped\":0,\"pct\":87.03},\"branches\":{\"total\":1243,\"covered\":991,\"skipped\":0,\"pct\":79.73}}\n,\"/Users/zachleat/Code/eleventy/config.js\": {\"lines\":{\"total\":6,\"covered\":6,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":1,\"covered\":1,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":6,\"covered\":6,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/Benchmark.js\": {\"lines\":{\"total\":12,\"covered\":11,\"skipped\":0,\"pct\":91.67},\"functions\":{\"total\":6,\"covered\":5,\"skipped\":0,\"pct\":83.33},\"statements\":{\"total\":12,\"covered\":11,\"skipped\":0,\"pct\":91.67},\"branches\":{\"total\":6,\"covered\":4,\"skipped\":0,\"pct\":66.67}}\n,\"/Users/zachleat/Code/eleventy/src/BenchmarkGroup.js\": {\"lines\":{\"total\":34,\"covered\":23,\"skipped\":0,\"pct\":67.65},\"functions\":{\"total\":7,\"covered\":5,\"skipped\":0,\"pct\":71.43},\"statements\":{\"total\":34,\"covered\":23,\"skipped\":0,\"pct\":67.65},\"branches\":{\"total\":10,\"covered\":3,\"skipped\":0,\"pct\":30}}\n,\"/Users/zachleat/Code/eleventy/src/BenchmarkManager.js\": {\"lines\":{\"total\":17,\"covered\":13,\"skipped\":0,\"pct\":76.47},\"functions\":{\"total\":7,\"covered\":5,\"skipped\":0,\"pct\":71.43},\"statements\":{\"total\":17,\"covered\":13,\"skipped\":0,\"pct\":76.47},\"branches\":{\"total\":4,\"covered\":3,\"skipped\":0,\"pct\":75}}\n,\"/Users/zachleat/Code/eleventy/src/Config.js\": {\"lines\":{\"total\":5,\"covered\":5,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":5,\"covered\":5,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100}}\n-,\"/Users/zachleat/Code/eleventy/src/Eleventy.js\": {\"lines\":{\"total\":189,\"covered\":103,\"skipped\":0,\"pct\":54.5},\"functions\":{\"total\":34,\"covered\":19,\"skipped\":0,\"pct\":55.88},\"statements\":{\"total\":189,\"covered\":103,\"skipped\":0,\"pct\":54.5},\"branches\":{\"total\":69,\"covered\":27,\"skipped\":0,\"pct\":39.13}}\n+,\"/Users/zachleat/Code/eleventy/src/Eleventy.js\": {\"lines\":{\"total\":193,\"covered\":105,\"skipped\":0,\"pct\":54.4},\"functions\":{\"total\":34,\"covered\":19,\"skipped\":0,\"pct\":55.88},\"statements\":{\"total\":193,\"covered\":105,\"skipped\":0,\"pct\":54.4},\"branches\":{\"total\":73,\"covered\":27,\"skipped\":0,\"pct\":36.99}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyBaseError.js\": {\"lines\":{\"total\":6,\"covered\":6,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":1,\"covered\":1,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":6,\"covered\":6,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyCommandCheck.js\": {\"lines\":{\"total\":28,\"covered\":28,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":5,\"covered\":5,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":28,\"covered\":28,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":8,\"covered\":7,\"skipped\":0,\"pct\":87.5}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyConfig.js\": {\"lines\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyWatchTargets.js\": {\"lines\":{\"total\":49,\"covered\":45,\"skipped\":0,\"pct\":91.84},\"functions\":{\"total\":21,\"covered\":18,\"skipped\":0,\"pct\":85.71},\"statements\":{\"total\":49,\"covered\":45,\"skipped\":0,\"pct\":91.84},\"branches\":{\"total\":13,\"covered\":12,\"skipped\":0,\"pct\":92.31}}\n,\"/Users/zachleat/Code/eleventy/src/Template.js\": {\"lines\":{\"total\":288,\"covered\":271,\"skipped\":0,\"pct\":94.1},\"functions\":{\"total\":48,\"covered\":47,\"skipped\":0,\"pct\":97.92},\"statements\":{\"total\":290,\"covered\":273,\"skipped\":0,\"pct\":94.14},\"branches\":{\"total\":103,\"covered\":88,\"skipped\":0,\"pct\":85.44}}\n,\"/Users/zachleat/Code/eleventy/src/TemplateCache.js\": {\"lines\":{\"total\":9,\"covered\":9,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":6,\"covered\":6,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":9,\"covered\":9,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100}}\n-,\"/Users/zachleat/Code/eleventy/src/TemplateCollection.js\": {\"lines\":{\"total\":29,\"covered\":27,\"skipped\":0,\"pct\":93.1},\"functions\":{\"total\":13,\"covered\":12,\"skipped\":0,\"pct\":92.31},\"statements\":{\"total\":31,\"covered\":29,\"skipped\":0,\"pct\":93.55},\"branches\":{\"total\":10,\"covered\":8,\"skipped\":0,\"pct\":80}}\n+,\"/Users/zachleat/Code/eleventy/src/TemplateCollection.js\": {\"lines\":{\"total\":32,\"covered\":29,\"skipped\":0,\"pct\":90.63},\"functions\":{\"total\":16,\"covered\":15,\"skipped\":0,\"pct\":93.75},\"statements\":{\"total\":35,\"covered\":32,\"skipped\":0,\"pct\":91.43},\"branches\":{\"total\":10,\"covered\":7,\"skipped\":0,\"pct\":70}}\n,\"/Users/zachleat/Code/eleventy/src/TemplateConfig.js\": {\"lines\":{\"total\":57,\"covered\":52,\"skipped\":0,\"pct\":91.23},\"functions\":{\"total\":9,\"covered\":6,\"skipped\":0,\"pct\":66.67},\"statements\":{\"total\":57,\"covered\":52,\"skipped\":0,\"pct\":91.23},\"branches\":{\"total\":24,\"covered\":22,\"skipped\":0,\"pct\":91.67}}\n,\"/Users/zachleat/Code/eleventy/src/TemplateContent.js\": {\"lines\":{\"total\":81,\"covered\":76,\"skipped\":0,\"pct\":93.83},\"functions\":{\"total\":17,\"covered\":16,\"skipped\":0,\"pct\":94.12},\"statements\":{\"total\":81,\"covered\":76,\"skipped\":0,\"pct\":93.83},\"branches\":{\"total\":34,\"covered\":31,\"skipped\":0,\"pct\":91.18}}\n,\"/Users/zachleat/Code/eleventy/src/TemplateData.js\": {\"lines\":{\"total\":193,\"covered\":178,\"skipped\":0,\"pct\":92.23},\"functions\":{\"total\":34,\"covered\":33,\"skipped\":0,\"pct\":97.06},\"statements\":{\"total\":195,\"covered\":180,\"skipped\":0,\"pct\":92.31},\"branches\":{\"total\":66,\"covered\":55,\"skipped\":0,\"pct\":83.33}}\n,\"/Users/zachleat/Code/eleventy/src/TemplatePermalinkNoWrite.js\": {\"lines\":{\"total\":3,\"covered\":3,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":3,\"covered\":3,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/TemplateRender.js\": {\"lines\":{\"total\":77,\"covered\":76,\"skipped\":0,\"pct\":98.7},\"functions\":{\"total\":22,\"covered\":22,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":77,\"covered\":76,\"skipped\":0,\"pct\":98.7},\"branches\":{\"total\":42,\"covered\":40,\"skipped\":0,\"pct\":95.24}}\n,\"/Users/zachleat/Code/eleventy/src/TemplateWriter.js\": {\"lines\":{\"total\":93,\"covered\":71,\"skipped\":0,\"pct\":76.34},\"functions\":{\"total\":25,\"covered\":17,\"skipped\":0,\"pct\":68},\"statements\":{\"total\":93,\"covered\":71,\"skipped\":0,\"pct\":76.34},\"branches\":{\"total\":16,\"covered\":6,\"skipped\":0,\"pct\":37.5}}\n-,\"/Users/zachleat/Code/eleventy/src/UserConfig.js\": {\"lines\":{\"total\":195,\"covered\":114,\"skipped\":0,\"pct\":58.46},\"functions\":{\"total\":52,\"covered\":24,\"skipped\":0,\"pct\":46.15},\"statements\":{\"total\":196,\"covered\":115,\"skipped\":0,\"pct\":58.67},\"branches\":{\"total\":77,\"covered\":39,\"skipped\":0,\"pct\":50.65}}\n+,\"/Users/zachleat/Code/eleventy/src/UserConfig.js\": {\"lines\":{\"total\":197,\"covered\":115,\"skipped\":0,\"pct\":58.38},\"functions\":{\"total\":53,\"covered\":24,\"skipped\":0,\"pct\":45.28},\"statements\":{\"total\":198,\"covered\":116,\"skipped\":0,\"pct\":58.59},\"branches\":{\"total\":81,\"covered\":39,\"skipped\":0,\"pct\":48.15}}\n,\"/Users/zachleat/Code/eleventy/src/Engines/Ejs.js\": {\"lines\":{\"total\":20,\"covered\":19,\"skipped\":0,\"pct\":95},\"functions\":{\"total\":7,\"covered\":6,\"skipped\":0,\"pct\":85.71},\"statements\":{\"total\":20,\"covered\":19,\"skipped\":0,\"pct\":95},\"branches\":{\"total\":9,\"covered\":8,\"skipped\":0,\"pct\":88.89}}\n,\"/Users/zachleat/Code/eleventy/src/Engines/Haml.js\": {\"lines\":{\"total\":9,\"covered\":9,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":3,\"covered\":3,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":9,\"covered\":9,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/Engines/Handlebars.js\": {\"lines\":{\"total\":30,\"covered\":30,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":9,\"covered\":9,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":30,\"covered\":30,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":6,\"covered\":5,\"skipped\":0,\"pct\":83.33}}\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/coverage.md",
"new_path": "docs/coverage.md",
"diff": "-# Code Coverage for Eleventy v0.10.0-beta.1\n+# Code Coverage for Eleventy v0.10.0-beta.2\n| Filename | % Lines | % Statements | % Functions | % Branches |\n| ---------------------------------------------------------- | ------- | ------------ | ----------- | ---------- |\n-| `total` | 87.84% | 87.91% | 87.1% | 80.32% |\n+| `total` | 87.74% | 87.81% | 87.03% | 79.73% |\n| `config.js` | 100% | 100% | 100% | 100% |\n| `src/Benchmark.js` | 91.67% | 91.67% | 83.33% | 66.67% |\n| `src/BenchmarkGroup.js` | 67.65% | 67.65% | 71.43% | 30% |\n| `src/BenchmarkManager.js` | 76.47% | 76.47% | 71.43% | 75% |\n| `src/Config.js` | 100% | 100% | 100% | 100% |\n-| `src/Eleventy.js` | 54.5% | 54.5% | 55.88% | 39.13% |\n+| `src/Eleventy.js` | 54.4% | 54.4% | 55.88% | 36.99% |\n| `src/EleventyBaseError.js` | 100% | 100% | 100% | 100% |\n| `src/EleventyCommandCheck.js` | 100% | 100% | 100% | 87.5% |\n| `src/EleventyConfig.js` | 100% | 100% | 100% | 100% |\n| `src/EleventyWatchTargets.js` | 91.84% | 91.84% | 85.71% | 92.31% |\n| `src/Template.js` | 94.1% | 94.14% | 97.92% | 85.44% |\n| `src/TemplateCache.js` | 100% | 100% | 100% | 100% |\n-| `src/TemplateCollection.js` | 93.1% | 93.55% | 92.31% | 80% |\n+| `src/TemplateCollection.js` | 90.63% | 91.43% | 93.75% | 70% |\n| `src/TemplateConfig.js` | 91.23% | 91.23% | 66.67% | 91.67% |\n| `src/TemplateContent.js` | 93.83% | 93.83% | 94.12% | 91.18% |\n| `src/TemplateData.js` | 92.23% | 92.31% | 97.06% | 83.33% |\n| `src/TemplatePermalinkNoWrite.js` | 100% | 100% | 100% | 100% |\n| `src/TemplateRender.js` | 98.7% | 98.7% | 100% | 95.24% |\n| `src/TemplateWriter.js` | 76.34% | 76.34% | 68% | 37.5% |\n-| `src/UserConfig.js` | 58.46% | 58.67% | 46.15% | 50.65% |\n+| `src/UserConfig.js` | 58.38% | 58.59% | 45.28% | 48.15% |\n| `src/Engines/Ejs.js` | 95% | 95% | 85.71% | 88.89% |\n| `src/Engines/Haml.js` | 100% | 100% | 100% | 100% |\n| `src/Engines/Handlebars.js` | 100% | 100% | 100% | 83.33% |\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Coverage for 0.10.0-beta.2 |
701 | 10.01.2020 14:52:42 | -7,200 | a6067d518e4c4124129b2435f5671ba8d21e6147 | adds new tests for cjs data extension in TemplateDataTest
and fixes a lot of checks of data files listings in old tests | [
{
"change_type": "MODIFY",
"old_path": "test/EleventyFilesTest.js",
"new_path": "test/EleventyFilesTest.js",
"diff": "@@ -558,6 +558,7 @@ test(\"Glob Watcher Files with Config Passthroughs (no template formats)\", async\nt.deepEqual(await evf.getGlobWatcherTemplateDataFiles(), [\n\"./test/stubs/**/*.json\",\n+ \"./test/stubs/**/*.11tydata.cjs\",\n\"./test/stubs/**/*.11tydata.js\"\n]);\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "test/EleventyTest.js",
"new_path": "test/EleventyTest.js",
"diff": "@@ -56,6 +56,7 @@ test(\"Eleventy file watching\", async t => {\n\"./test/stubs/_data/**\",\n\"./.eleventy.js\",\n\"./test/stubs/**/*.json\",\n+ \"./test/stubs/**/*.11tydata.cjs\",\n\"./test/stubs/**/*.11tydata.js\",\n\"./test/stubs/deps/dep1.js\",\n\"./test/stubs/deps/dep2.js\"\n@@ -78,6 +79,7 @@ test(\"Eleventy file watching (no JS dependencies)\", async t => {\n\"./test/stubs/_data/**\",\n\"./.eleventy.js\",\n\"./test/stubs/**/*.json\",\n+ \"./test/stubs/**/*.11tydata.cjs\",\n\"./test/stubs/**/*.11tydata.js\"\n]);\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateTest.js",
"new_path": "test/TemplateTest.js",
"diff": "@@ -443,6 +443,7 @@ test(\"Local template data file import (without a global data json)\", async t =>\nt.deepEqual(await dataObj.getLocalDataPaths(tmpl.getInputPath()), [\n\"./test/stubs/component/component.json\",\n\"./test/stubs/component/component.11tydata.json\",\n+ \"./test/stubs/component/component.11tydata.cjs\",\n\"./test/stubs/component/component.11tydata.js\"\n]);\nt.is(data.localdatakey1, \"localdatavalue1\");\n@@ -463,12 +464,15 @@ test(\"Local template data file import (two subdirectories deep)\", async t => {\nt.deepEqual(await dataObj.getLocalDataPaths(tmpl.getInputPath()), [\n\"./test/stubs/firstdir/firstdir.json\",\n\"./test/stubs/firstdir/firstdir.11tydata.json\",\n+ \"./test/stubs/firstdir/firstdir.11tydata.cjs\",\n\"./test/stubs/firstdir/firstdir.11tydata.js\",\n\"./test/stubs/firstdir/seconddir/seconddir.json\",\n\"./test/stubs/firstdir/seconddir/seconddir.11tydata.json\",\n+ \"./test/stubs/firstdir/seconddir/seconddir.11tydata.cjs\",\n\"./test/stubs/firstdir/seconddir/seconddir.11tydata.js\",\n\"./test/stubs/firstdir/seconddir/component.json\",\n\"./test/stubs/firstdir/seconddir/component.11tydata.json\",\n+ \"./test/stubs/firstdir/seconddir/component.11tydata.cjs\",\n\"./test/stubs/firstdir/seconddir/component.11tydata.js\"\n]);\n});\n@@ -488,9 +492,11 @@ test(\"Posts inherits local JSON, layouts\", async t => {\nt.deepEqual(localDataPaths, [\n\"./test/stubs/posts/posts.json\",\n\"./test/stubs/posts/posts.11tydata.json\",\n+ \"./test/stubs/posts/posts.11tydata.cjs\",\n\"./test/stubs/posts/posts.11tydata.js\",\n\"./test/stubs/posts/post1.json\",\n\"./test/stubs/posts/post1.11tydata.json\",\n+ \"./test/stubs/posts/post1.11tydata.cjs\",\n\"./test/stubs/posts/post1.11tydata.js\"\n]);\n@@ -523,6 +529,7 @@ test(\"Template and folder name are the same, make sure data imports work ok\", as\nt.deepEqual(localDataPaths, [\n\"./test/stubs/posts/posts.json\",\n\"./test/stubs/posts/posts.11tydata.json\",\n+ \"./test/stubs/posts/posts.11tydata.cjs\",\n\"./test/stubs/posts/posts.11tydata.js\"\n]);\n"
},
{
"change_type": "MODIFY",
"old_path": "test/UserDataExtensionsTest.js",
"new_path": "test/UserDataExtensionsTest.js",
"diff": "@@ -50,6 +50,7 @@ test(\"Local files\", async t => {\n\"./test/stubs-630/component-yaml/component-yaml.11tydata.yaml\",\n\"./test/stubs-630/component-yaml/component-yaml.11tydata.nosj\",\n\"./test/stubs-630/component-yaml/component-yaml.11tydata.json\",\n+ \"./test/stubs-630/component-yaml/component-yaml.11tydata.cjs\",\n\"./test/stubs-630/component-yaml/component-yaml.11tydata.js\",\n\"./test/stubs-630/component-yaml/component.yaml\",\n\"./test/stubs-630/component-yaml/component.nosj\",\n@@ -57,6 +58,7 @@ test(\"Local files\", async t => {\n\"./test/stubs-630/component-yaml/component.11tydata.yaml\",\n\"./test/stubs-630/component-yaml/component.11tydata.nosj\",\n\"./test/stubs-630/component-yaml/component.11tydata.json\",\n+ \"./test/stubs-630/component-yaml/component.11tydata.cjs\",\n\"./test/stubs-630/component-yaml/component.11tydata.js\"\n]);\n});\n@@ -67,7 +69,7 @@ test(\"Global data\", async t => {\ninjectDataExtensions(dataObj);\nt.deepEqual(await dataObj.getGlobalDataGlob(), [\n- \"./test/stubs-630/_data/**/*.(nosj|yaml|json|js)\"\n+ \"./test/stubs-630/_data/**/*.(nosj|yaml|json|cjs|js)\"\n]);\nlet dataFilePaths = await dataObj.getGlobalDataFiles();\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs/_data/globalDataFnCJS.cjs",
"diff": "+const dep1 = require(\"../deps/dep1\");\n+\n+module.exports = function() {\n+ return {\n+ datakeyfromcjsfn: \"common-js-howdy\"\n+ };\n+};\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs/component-async/component.11tydata.cjs",
"diff": "+module.exports = async function() {\n+ return new Promise(resolve => {\n+ setTimeout(function() {\n+ resolve({\n+ localdatakeyfromcjs: \"common-js-howdydoody\"\n+ });\n+ }, 1);\n+ });\n+};\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs/component/component.11tydata.cjs",
"diff": "+const dep2 = require(\"../deps/dep2\");\n+\n+module.exports = {\n+ localdatakeyfromcjs: \"common-js-howdydoody\"\n+};\n"
},
{
"change_type": "MODIFY",
"old_path": "test/stubs/component/component.11tydata.json",
"new_path": "test/stubs/component/component.11tydata.json",
"diff": "{\n\"localdatakeyfromjs\": \"this_is_overridden\",\n+ \"localdatakeyfromcjs\": \"this_is_overridden\",\n\"localdatakeyfromjs2\": \"howdy2\"\n}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | adds new tests for cjs data extension in TemplateDataTest
and fixes a lot of checks of data files listings in old tests |
699 | 17.01.2020 17:07:37 | 21,600 | f3d90f97b40158946ed81ecffeefd3ece7cc8e8a | Match the test to the workaround in | [
{
"change_type": "MODIFY",
"old_path": "test/TemplateRenderNunjucksTest.js",
"new_path": "test/TemplateRenderNunjucksTest.js",
"diff": "@@ -246,15 +246,15 @@ test(\"Nunjucks Render with getGlobals Issue #567\", async t => {\nt.is(await fn({ \"my-global-name\": \"Zach\" }), \"<p>Zach</p>\");\n});\n-test(\"Nunjucks Render with getVarByName Filter Issue #567\", async t => {\n+test(\"Nunjucks Render with getVarFromString Filter Issue #567\", async t => {\nlet tr = new TemplateRender(\"njk\");\nlet env = tr.engine.getEngineLib();\n- env.addFilter(\"getVarByName\", function(varName) {\n+ env.addFilter(\"getVarFromString\", function(varName) {\nreturn this.getVariables()[varName];\n});\nlet fn = await tr.getCompiledTemplate(\n- \"<p>{{ 'my-global-name' | getVarByName }}</p>\"\n+ \"<p>{{ 'my-global-name' | getVarFromString }}</p>\"\n);\nt.is(await fn({ \"my-global-name\": \"Zach\" }), \"<p>Zach</p>\");\n});\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Match the test to the workaround in #567 |
699 | 22.01.2020 22:43:39 | 21,600 | 76fbae68f5f03af71698cf276fc5695442728496 | js-yaml should be a devDependency not a dep | [
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"@ava/babel\": \"^1.0.0\",\n\"ava\": \"^3.0.0\",\n\"ink-docstrap\": \"1.3.2\",\n+ \"js-yaml\": \"^3.13.1\",\n\"jsdoc\": \"3.6.3\",\n\"lint-staged\": \"^9.5.0\",\n\"markdown-it-emoji\": \"^1.4.0\",\n\"toml\": \"^3.0.0\",\n\"viperhtml\": \"^2.17.1\",\n\"vue\": \"^2.6.11\",\n- \"vue-server-renderer\": \"^2.6.11\",\n- \"js-yaml\": \"^3.13.1\"\n+ \"vue-server-renderer\": \"^2.6.11\"\n},\n\"dependencies\": {\n\"@11ty/dependency-tree\": \"^1.0.0\",\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | js-yaml should be a devDependency not a dep |
699 | 22.01.2020 22:44:08 | 21,600 | 4d4e827cae4bf6d556a5e0e1820e89f9a7b38428 | Adds times called to benchmarking | [
{
"change_type": "MODIFY",
"old_path": "src/Benchmark.js",
"new_path": "src/Benchmark.js",
"diff": "@@ -5,10 +5,12 @@ class Benchmark {\nreset() {\nthis.timeSpent = 0;\n+ this.timesCalled = 0;\nthis.beforeDates = [];\n}\nbefore() {\n+ this.timesCalled++;\nthis.beforeDates.push(new Date());\n}\n@@ -23,6 +25,10 @@ class Benchmark {\n}\n}\n+ getTimesCalled() {\n+ return this.timesCalled;\n+ }\n+\ngetTotal() {\nreturn this.timeSpent;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Markdown.js",
"new_path": "src/Engines/Markdown.js",
"diff": "const markdownIt = require(\"markdown-it\");\nconst TemplateEngine = require(\"./TemplateEngine\");\n-const config = require(\"../Config\");\n// const debug = require(\"debug\")(\"Eleventy:Markdown\");\nclass Markdown extends TemplateEngine {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplatePassthrough.js",
"new_path": "src/TemplatePassthrough.js",
"diff": "@@ -4,6 +4,7 @@ const TemplatePath = require(\"./TemplatePath\");\nconst debug = require(\"debug\")(\"Eleventy:TemplatePassthrough\");\nconst fastglob = require(\"fast-glob\");\nconst EleventyBaseError = require(\"./EleventyBaseError\");\n+const bench = require(\"./BenchmarkManager\").get(\"PassthroughCopy\");\nclass TemplatePassthroughError extends EleventyBaseError {}\n@@ -64,12 +65,20 @@ class TemplatePassthrough {\nreturn files;\n}\n- copy(src, dest, copyOptions) {\n+ async copy(src, dest, copyOptions) {\nif (\nTemplatePath.stripLeadingDotSlash(dest).includes(\nTemplatePath.stripLeadingDotSlash(this.outputDir)\n)\n) {\n+ // Uncomment this if you want to add benchmarking to copy\n+ // (Warning, it seems to be noisy and low value feedback)\n+ // return bench.addAsync(`Copying ${src}`, function() {\n+ // // copy() returns a promise\n+ // return copy(src, dest, copyOptions);\n+ // });\n+\n+ // copy() returns a promise\nreturn copy(src, dest, copyOptions);\n}\nreturn Promise.reject(\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Adds times called to benchmarking |
699 | 22.01.2020 22:44:38 | 21,600 | 556f2d83196a3845e34b1d7f23c6cef2365f0e66 | Ava 3.0 update to one test | [
{
"change_type": "MODIFY",
"old_path": "test/EleventyErrorUtilTest.js",
"new_path": "test/EleventyErrorUtilTest.js",
"diff": "@@ -22,18 +22,15 @@ test(\"cleanMessage()\", t => {\n});\ntest(\"deconvertErrorToObject() should throw on invalid inputs\", t => {\n- t.throws(\n- () => deconvertErrorToObject(undefined),\n- \"Could not convert error object from: undefined\"\n- );\n- t.throws(\n- () => deconvertErrorToObject(\"\"),\n- \"Could not convert error object from: \"\n- );\n- t.throws(\n- () => deconvertErrorToObject(\"Not an error\"),\n- \"Could not convert error object from: Not an error\"\n- );\n+ t.throws(() => deconvertErrorToObject(undefined), {\n+ message: \"Could not convert error object from: undefined\"\n+ });\n+ t.throws(() => deconvertErrorToObject(\"\"), {\n+ message: \"Could not convert error object from: \"\n+ });\n+ t.throws(() => deconvertErrorToObject(\"Not an error\"), {\n+ message: \"Could not convert error object from: Not an error\"\n+ });\n});\ntest(\"deconvertErrorToObject() should return its argument if it does not contain another error\", t => {\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Ava 3.0 update to one test |
699 | 24.01.2020 13:15:54 | 21,600 | b3adaabc5c1de0bcf59f00d2957483b2ec6aac4b | Slow move to async from sync directory checks | [
{
"change_type": "MODIFY",
"old_path": "src/EleventyExtensionMap.js",
"new_path": "src/EleventyExtensionMap.js",
"diff": "@@ -54,7 +54,7 @@ class EleventyExtensionMap {\n}\n_getGlobs(formatKeys, inputDir) {\n- let dir = TemplatePath.convertToRecursiveGlob(inputDir);\n+ let dir = TemplatePath.convertToRecursiveGlobSync(inputDir);\nlet globs = [];\nformatKeys.forEach(\nfunction(key) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/EleventyWatchTargets.js",
"new_path": "src/EleventyWatchTargets.js",
"diff": "@@ -63,7 +63,7 @@ class EleventyWatchTargets {\naddAndMakeGlob(targets) {\ntargets = this._normalizeTargets(targets).map(entry =>\n- TemplatePath.convertToRecursiveGlob(entry)\n+ TemplatePath.convertToRecursiveGlobSync(entry)\n);\nthis.addRaw(targets);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplatePassthrough.js",
"new_path": "src/TemplatePassthrough.js",
"diff": "const copy = require(\"recursive-copy\");\n-const fs = require(\"fs\");\nconst TemplatePath = require(\"./TemplatePath\");\nconst debug = require(\"debug\")(\"Eleventy:TemplatePassthrough\");\nconst fastglob = require(\"fast-glob\");\nconst EleventyBaseError = require(\"./EleventyBaseError\");\n-const bench = require(\"./BenchmarkManager\").get(\"PassthroughCopy\");\n+//const bench = require(\"./BenchmarkManager\").get(\"PassthroughCopy\");\nclass TemplatePassthroughError extends EleventyBaseError {}\n@@ -98,11 +97,9 @@ class TemplatePassthrough {\nif (!this.isDryRun) {\ndebug(\"Copying %o\", this.inputPath);\n- const isDirectory = TemplatePath.isDirectorySync(this.inputPath);\n- const isFile = fs.existsSync(this.inputPath);\n// If directory or file, recursive copy\n- if (isDirectory || isFile) {\n+ if (await TemplatePath.exists(this.inputPath)) {\n// IMPORTANT: this returns a promise, does not await for promise to finish\nreturn this.copy(this.inputPath, this.getOutputPath(), copyOptions);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplatePassthroughManager.js",
"new_path": "src/TemplatePassthroughManager.js",
"diff": "@@ -67,7 +67,7 @@ class TemplatePassthroughManager {\ngetConfigPathGlobs() {\nreturn this.getConfigPaths().map(path => {\n- return TemplatePath.convertToRecursiveGlob(path.inputPath);\n+ return TemplatePath.convertToRecursiveGlobSync(path.inputPath);\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplatePath.js",
"new_path": "src/TemplatePath.js",
"diff": "const path = require(\"path\");\nconst normalize = require(\"normalize-path\");\nconst parsePath = require(\"parse-filepath\");\n-const fs = require(\"fs-extra\");\n+const fs = require(\"fs\");\nfunction TemplatePath() {}\n@@ -228,6 +228,36 @@ TemplatePath.isDirectorySync = function(path) {\nreturn fs.existsSync(path) && fs.statSync(path).isDirectory();\n};\n+/**\n+ * @param {String} path A path\n+ * @returns {Boolean} whether `path` points to an existing directory.\n+ */\n+TemplatePath.isDirectory = async function(path) {\n+ return new Promise(resolve => {\n+ fs.stat(path, (err, stats) => {\n+ if (stats) {\n+ resolve(stats.isDirectory());\n+ }\n+ resolve(false);\n+ });\n+ });\n+};\n+\n+/**\n+ * @param {String} path A path\n+ * @returns {Boolean} whether `path` points to a existing directory or file.\n+ */\n+TemplatePath.exists = async function(path) {\n+ return new Promise(resolve => {\n+ fs.stat(path, (err, stats) => {\n+ if (stats) {\n+ resolve(true);\n+ }\n+ resolve(false);\n+ });\n+ });\n+};\n+\n/**\n* Appends a recursive wildcard glob pattern to `path`\n* unless `path` is not a directory; then, `path` is assumed to be a file path\n@@ -236,7 +266,7 @@ TemplatePath.isDirectorySync = function(path) {\n* @param {String} path\n* @returns {String}\n*/\n-TemplatePath.convertToRecursiveGlob = function(path) {\n+TemplatePath.convertToRecursiveGlobSync = function(path) {\nif (path === \"\") {\nreturn \"./**\";\n}\n@@ -250,6 +280,28 @@ TemplatePath.convertToRecursiveGlob = function(path) {\nreturn path;\n};\n+/**\n+ * Appends a recursive wildcard glob pattern to `path`\n+ * unless `path` is not a directory; then, `path` is assumed to be a file path\n+ * and is left unchaged.\n+ *\n+ * @param {String} path\n+ * @returns {String}\n+ */\n+TemplatePath.convertToRecursiveGlob = async function(path) {\n+ if (path === \"\") {\n+ return \"./**\";\n+ }\n+\n+ path = TemplatePath.addLeadingDotSlash(path);\n+\n+ if (await TemplatePath.isDirectory(path)) {\n+ return path + (!path.endsWith(\"/\") ? \"/\" : \"\") + \"**\";\n+ }\n+\n+ return path;\n+};\n+\n/**\n* Returns the extension of the path without the leading dot.\n* If the path has no extensions, the empty string is returned.\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplatePathTest.js",
"new_path": "test/TemplatePathTest.js",
"diff": "@@ -225,15 +225,46 @@ test(\"stripLeadingSubPath\", t => {\nt.is(TemplatePath.stripLeadingSubPath(\".htaccess\", \".\"), \".htaccess\");\n});\n-test(\"convertToRecursiveGlob\", t => {\n- t.is(TemplatePath.convertToRecursiveGlob(\"\"), \"./**\");\n- t.is(TemplatePath.convertToRecursiveGlob(\".\"), \"./**\");\n- t.is(TemplatePath.convertToRecursiveGlob(\"./\"), \"./**\");\n- t.is(TemplatePath.convertToRecursiveGlob(\"test/stubs\"), \"./test/stubs/**\");\n- t.is(TemplatePath.convertToRecursiveGlob(\"test/stubs/\"), \"./test/stubs/**\");\n- t.is(TemplatePath.convertToRecursiveGlob(\"./test/stubs/\"), \"./test/stubs/**\");\n+test(\"convertToRecursiveGlobSync\", t => {\n+ t.is(TemplatePath.convertToRecursiveGlobSync(\"\"), \"./**\");\n+ t.is(TemplatePath.convertToRecursiveGlobSync(\".\"), \"./**\");\n+ t.is(TemplatePath.convertToRecursiveGlobSync(\"./\"), \"./**\");\nt.is(\n- TemplatePath.convertToRecursiveGlob(\"./test/stubs/config.js\"),\n+ TemplatePath.convertToRecursiveGlobSync(\"test/stubs\"),\n+ \"./test/stubs/**\"\n+ );\n+ t.is(\n+ TemplatePath.convertToRecursiveGlobSync(\"test/stubs/\"),\n+ \"./test/stubs/**\"\n+ );\n+ t.is(\n+ TemplatePath.convertToRecursiveGlobSync(\"./test/stubs/\"),\n+ \"./test/stubs/**\"\n+ );\n+ t.is(\n+ TemplatePath.convertToRecursiveGlobSync(\"./test/stubs/config.js\"),\n+ \"./test/stubs/config.js\"\n+ );\n+});\n+\n+test(\"convertToRecursiveGlob\", async t => {\n+ t.is(await TemplatePath.convertToRecursiveGlob(\"\"), \"./**\");\n+ t.is(await TemplatePath.convertToRecursiveGlob(\".\"), \"./**\");\n+ t.is(await TemplatePath.convertToRecursiveGlob(\"./\"), \"./**\");\n+ t.is(\n+ await TemplatePath.convertToRecursiveGlob(\"test/stubs\"),\n+ \"./test/stubs/**\"\n+ );\n+ t.is(\n+ await TemplatePath.convertToRecursiveGlob(\"test/stubs/\"),\n+ \"./test/stubs/**\"\n+ );\n+ t.is(\n+ await TemplatePath.convertToRecursiveGlob(\"./test/stubs/\"),\n+ \"./test/stubs/**\"\n+ );\n+ t.is(\n+ await TemplatePath.convertToRecursiveGlob(\"./test/stubs/config.js\"),\n\"./test/stubs/config.js\"\n);\n});\n@@ -276,3 +307,24 @@ test(\"removeExtension\", t => {\n\"./test/stubs\"\n);\n});\n+\n+test(\"isDirectorySync\", t => {\n+ t.is(TemplatePath.isDirectorySync(\"asdlkfjklsadjflkja\"), false);\n+ t.is(TemplatePath.isDirectorySync(\"test\"), true);\n+ t.is(TemplatePath.isDirectorySync(\"test/stubs\"), true);\n+ t.is(TemplatePath.isDirectorySync(\"test/stubs/.eleventyignore\"), false);\n+});\n+\n+test(\"isDirectory\", async t => {\n+ t.is(await TemplatePath.isDirectory(\"asdlkfjklsadjflkja\"), false);\n+ t.is(await TemplatePath.isDirectory(\"test\"), true);\n+ t.is(await TemplatePath.isDirectory(\"test/stubs\"), true);\n+ t.is(await TemplatePath.isDirectory(\"test/stubs/.eleventyignore\"), false);\n+});\n+\n+test(\"exists\", async t => {\n+ t.is(await TemplatePath.exists(\"asdlkfjklsadjflkja\"), false);\n+ t.is(await TemplatePath.exists(\"test\"), true);\n+ t.is(await TemplatePath.exists(\"test/stubs\"), true);\n+ t.is(await TemplatePath.exists(\"test/stubs/.eleventyignore\"), true);\n+});\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Slow move to async from sync directory checks |
699 | 11.02.2020 09:34:05 | 21,600 | ec4535dd4d623f8debfe41380fa55aad09b89b95 | Adds new docs issue template | [
{
"change_type": "ADD",
"old_path": null,
"new_path": ".github/ISSUE_TEMPLATE/documentation.md",
"diff": "+---\n+name: The documentation needs improvement\n+about: A thing that Eleventy does needs to be documented better or is currently documented incorrectly!\n+title: \"\"\n+labels: documentation\n+assignees: \"\"\n+---\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": ".github/ISSUE_TEMPLATE/enhancement.md",
"diff": "+---\n+name: I want Eleventy do to this new thing\n+about: Suggest an idea for this project\n+title: \"\"\n+labels: enhancement\n+assignees: \"\"\n+---\n+\n+**Is your feature request related to a problem? Please describe.**\n+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]\n+\n+**Describe the solution you'd like**\n+A clear and concise description of what you want to happen.\n+\n+**Describe alternatives you've considered**\n+A clear and concise description of any alternative solutions or features you've considered.\n+\n+**Additional context**\n+Add any other context or screenshots about the feature request here.\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Adds new docs issue template |
699 | 11.02.2020 09:35:02 | 21,600 | e707dbcb98df9f328039f14f375323209537b69d | Missing deletes | [
{
"change_type": "DELETE",
"old_path": ".github/ISSUE_TEMPLATE/i-want-eleventy-do-to-this-new-thing.md",
"new_path": null,
"diff": "----\n-name: I want Eleventy do to this new thing\n-about: Suggest an idea for this project\n-title: \"\"\n-labels: enhancement\n-assignees: \"\"\n----\n-\n-**Is your feature request related to a problem? Please describe.**\n-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]\n-\n-**Describe the solution you'd like**\n-A clear and concise description of what you want to happen.\n-\n-**Describe alternatives you've considered**\n-A clear and concise description of any alternative solutions or features you've considered.\n-\n-**Additional context**\n-Add any other context or screenshots about the feature request here.\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Missing deletes |
699 | 11.02.2020 09:53:53 | 21,600 | fb10b66ec83658f2835e62f95e14c3258b301afc | Copy improvements to issue templates | [
{
"change_type": "MODIFY",
"old_path": ".github/ISSUE_TEMPLATE/documentation.md",
"new_path": ".github/ISSUE_TEMPLATE/documentation.md",
"diff": "---\n-name: The documentation needs improvement\n+name: Documentation!\nabout: A thing that Eleventy does needs to be documented better or is currently documented incorrectly!\ntitle: \"\"\nlabels: documentation\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Copy improvements to issue templates |
701 | 02.02.2020 12:24:05 | -7,200 | 94aa574f650a9095cbf516c2ddc23d805b0b5e0e | merge with upstream master | [
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"bugs\": \"https://github.com/11ty/eleventy/issues\",\n\"homepage\": \"https://www.11ty.dev/\",\n\"ava\": {\n+ \"babel\": true,\n+ \"failFast\": true,\n\"files\": [\n\"./test/*.js\"\n],\n- \"sources\": [\n- \"./**/.eleventyignore\",\n- \"./src/**/*.js\",\n- \"./test/stubs/**\",\n- \"!./test/stubs/**/_site/**\"\n+ \"ignoredByWatcher\": [\n+ \"./test/stubs/**/*\"\n]\n},\n\"lint-staged\": {\n},\n\"devDependencies\": {\n\"@11ty/eleventy-plugin-syntaxhighlight\": \"^3.0.1\",\n- \"ava\": \"^2.4.0\",\n+ \"@ava/babel\": \"^1.0.0\",\n+ \"ava\": \"^3.0.0\",\n\"ink-docstrap\": \"1.3.2\",\n+ \"js-yaml\": \"^3.13.1\",\n\"jsdoc\": \"3.6.3\",\n\"lint-staged\": \"^9.5.0\",\n\"markdown-it-emoji\": \"^1.4.0\",\n\"toml\": \"^3.0.0\",\n\"viperhtml\": \"^2.17.1\",\n\"vue\": \"^2.6.11\",\n- \"vue-server-renderer\": \"^2.6.11\",\n- \"js-yaml\": \"^3.13.1\"\n+ \"vue-server-renderer\": \"^2.6.11\"\n},\n\"dependencies\": {\n\"@11ty/dependency-tree\": \"^1.0.0\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Benchmark.js",
"new_path": "src/Benchmark.js",
"diff": "@@ -5,10 +5,12 @@ class Benchmark {\nreset() {\nthis.timeSpent = 0;\n+ this.timesCalled = 0;\nthis.beforeDates = [];\n}\nbefore() {\n+ this.timesCalled++;\nthis.beforeDates.push(new Date());\n}\n@@ -23,6 +25,10 @@ class Benchmark {\n}\n}\n+ getTimesCalled() {\n+ return this.timesCalled;\n+ }\n+\ngetTotal() {\nreturn this.timeSpent;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Markdown.js",
"new_path": "src/Engines/Markdown.js",
"diff": "const markdownIt = require(\"markdown-it\");\nconst TemplateEngine = require(\"./TemplateEngine\");\n-const config = require(\"../Config\");\n// const debug = require(\"debug\")(\"Eleventy:Markdown\");\nclass Markdown extends TemplateEngine {\n@@ -69,7 +68,7 @@ class Markdown extends TemplateEngine {\n} else {\nreturn async function(data) {\nlet preTemplateEngineRender = await fn(data);\n- let finishedRender = mdlib.render(preTemplateEngineRender);\n+ let finishedRender = mdlib.render(preTemplateEngineRender, data);\nreturn finishedRender;\n};\n}\n@@ -79,9 +78,8 @@ class Markdown extends TemplateEngine {\nreturn str;\n};\n} else {\n- return function() {\n- // throw away data if preTemplateEngine is falsy\n- return mdlib.render(str);\n+ return function(data) {\n+ return mdlib.render(str, data);\n};\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Template.js",
"new_path": "src/Template.js",
"diff": "@@ -602,7 +602,7 @@ class Template extends TemplateContent {\nasync getMappedDate(data) {\n// should we use Luxon dates everywhere? Right now using built-in `Date`\n- if (\"date\" in data) {\n+ if (\"date\" in data && data.date) {\ndebug(\n\"getMappedDate: using a date in the data for %o of %o\",\nthis.inputPath,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateData.js",
"new_path": "src/TemplateData.js",
"diff": "@@ -2,6 +2,7 @@ const fs = require(\"fs-extra\");\nconst fastglob = require(\"fast-glob\");\nconst parsePath = require(\"parse-filepath\");\nconst lodashset = require(\"lodash/set\");\n+const lodashget = require(\"lodash/get\");\nconst lodashUniq = require(\"lodash/uniq\");\nconst merge = require(\"./Util/Merge\");\nconst TemplateRender = require(\"./TemplateRender\");\n@@ -136,29 +137,52 @@ class TemplateData {\nasync getGlobalDataGlob() {\nlet dir = await this.getInputDir();\n- let userExtensions = \"\";\n- // creating glob string for user extensions\n- if (this.hasUserDataExtensions()) {\n- userExtensions = this.getUserDataExtensions().join(\"|\") + \"|\";\n- }\n- return [\n- this._getGlobalDataGlobByExtension(\n- dir,\n- \"(\" + userExtensions + \"json|cjs|js)\"\n- )\n- ];\n+ let extGlob = this.getGlobalDataExtensionPriorities().join(\"|\");\n+ return [this._getGlobalDataGlobByExtension(dir, \"(\" + extGlob + \")\")];\n}\ngetWatchPathCache() {\nreturn this.pathCache;\n}\n+ getGlobalDataExtensionPriorities() {\n+ return this.getUserDataExtensions().concat([\"json\", \"cjs\", \"js\"]);\n+ }\n+\n+ static calculateExtensionPriority(path, priorities) {\n+ for (let i = 0; i < priorities.length; i++) {\n+ let ext = priorities[i];\n+ if (path.endsWith(ext)) {\n+ return i;\n+ }\n+ }\n+ return priorities.length;\n+ }\n+\nasync getGlobalDataFiles() {\n+ let priorities = this.getGlobalDataExtensionPriorities();\n+\nlet paths = await fastglob(await this.getGlobalDataGlob(), {\ncaseSensitiveMatch: false,\ndot: true\n});\n+\n+ // sort paths according to extension priorities\n+ // here we use reverse ordering, because paths with bigger index in array will override the first ones\n+ // example [path/file.json, path/file.js] here js will override json\n+ paths = paths.sort((first, second) => {\n+ let p1 = TemplateData.calculateExtensionPriority(first, priorities);\n+ let p2 = TemplateData.calculateExtensionPriority(second, priorities);\n+ if (p1 < p2) {\n+ return -1;\n+ }\n+ if (p1 > p2) {\n+ return 1;\n+ }\n+ return 0;\n+ });\n+\nthis.pathCache = paths;\nreturn paths;\n}\n@@ -183,17 +207,19 @@ class TemplateData {\nfor (let j = 0, k = files.length; j < k; j++) {\nlet folders = await this.getObjectPathForDataFile(files[j]);\n+ let data = await this.getDataValue(files[j], rawImports);\n- // TODO maybe merge these two? (if both valid objects)\nif (dataFileConflicts[folders]) {\ndebugWarn(\n- `Warning: the key for a global data file (${files[j]}) will overwrite data from an already existing global data file (${dataFileConflicts[folders]})`\n+ `merging global data from ${files[j]} with an already existing global data file (${dataFileConflicts[folders]}). Overriding existing keys`\n);\n+\n+ let oldData = lodashget(globalData, folders);\n+ data = TemplateData.mergeDeep(this.config, oldData, data);\n}\n- dataFileConflicts[folders] = files[j];\n+ dataFileConflicts[folders] = files[j];\ndebug(`Found global data file ${files[j]} and adding as: ${folders}`);\n- let data = await this.getDataValue(files[j], rawImports);\nlodashset(globalData, folders, data);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplatePassthrough.js",
"new_path": "src/TemplatePassthrough.js",
"diff": "@@ -4,6 +4,7 @@ const TemplatePath = require(\"./TemplatePath\");\nconst debug = require(\"debug\")(\"Eleventy:TemplatePassthrough\");\nconst fastglob = require(\"fast-glob\");\nconst EleventyBaseError = require(\"./EleventyBaseError\");\n+const bench = require(\"./BenchmarkManager\").get(\"PassthroughCopy\");\nclass TemplatePassthroughError extends EleventyBaseError {}\n@@ -64,12 +65,20 @@ class TemplatePassthrough {\nreturn files;\n}\n- copy(src, dest, copyOptions) {\n+ async copy(src, dest, copyOptions) {\nif (\nTemplatePath.stripLeadingDotSlash(dest).includes(\nTemplatePath.stripLeadingDotSlash(this.outputDir)\n)\n) {\n+ // Uncomment this if you want to add benchmarking to copy\n+ // (Warning, it seems to be noisy and low value feedback)\n+ // return bench.addAsync(`Copying ${src}`, function() {\n+ // // copy() returns a promise\n+ // return copy(src, dest, copyOptions);\n+ // });\n+\n+ // copy() returns a promise\nreturn copy(src, dest, copyOptions);\n}\nreturn Promise.reject(\n"
},
{
"change_type": "MODIFY",
"old_path": "test/EleventyErrorUtilTest.js",
"new_path": "test/EleventyErrorUtilTest.js",
"diff": "@@ -22,18 +22,15 @@ test(\"cleanMessage()\", t => {\n});\ntest(\"deconvertErrorToObject() should throw on invalid inputs\", t => {\n- t.throws(\n- () => deconvertErrorToObject(undefined),\n- \"Could not convert error object from: undefined\"\n- );\n- t.throws(\n- () => deconvertErrorToObject(\"\"),\n- \"Could not convert error object from: \"\n- );\n- t.throws(\n- () => deconvertErrorToObject(\"Not an error\"),\n- \"Could not convert error object from: Not an error\"\n- );\n+ t.throws(() => deconvertErrorToObject(undefined), {\n+ message: \"Could not convert error object from: undefined\"\n+ });\n+ t.throws(() => deconvertErrorToObject(\"\"), {\n+ message: \"Could not convert error object from: \"\n+ });\n+ t.throws(() => deconvertErrorToObject(\"Not an error\"), {\n+ message: \"Could not convert error object from: Not an error\"\n+ });\n});\ntest(\"deconvertErrorToObject() should return its argument if it does not contain another error\", t => {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/TemplateRenderMarkdownPluginTest.js",
"diff": "+import test from \"ava\";\n+import TemplateRender from \"../src/TemplateRender\";\n+import md from \"markdown-it\";\n+\n+const createTestMarkdownPlugin = () => {\n+ const plugin = md => {\n+ md.core.ruler.after(\"inline\", \"replace-link\", function(state) {\n+ plugin.environment = state.env;\n+ const link = state.tokens[1].children[0].attrs[0][1];\n+ state.tokens[1].children[0].attrs[0][1] = `${link}?data=${state.env.some}`;\n+ return false;\n+ });\n+ };\n+ plugin.environment = {};\n+ return plugin;\n+};\n+\n+test(\"Markdown Render: with HTML prerender, sends context data to the markdown library\", async t => {\n+ let tr = new TemplateRender(\"md\");\n+\n+ const plugin = createTestMarkdownPlugin();\n+ let mdLib = md().use(plugin);\n+ tr.engine.setLibrary(mdLib);\n+\n+ const data = { some: \"data\" };\n+\n+ let fn = await tr.getCompiledTemplate(\"[link text](http://link.com)\");\n+ let result = await fn(data);\n+ t.deepEqual(plugin.environment, data);\n+ t.is(result, '<p><a href=\"http://link.com?data=data\">link text</a></p>\\n');\n+});\n+\n+test(\"Markdown Render: without HTML prerender, sends context data to the markdown library\", async t => {\n+ let tr = new TemplateRender(\"md\");\n+\n+ const plugin = createTestMarkdownPlugin();\n+ let mdLib = md().use(plugin);\n+ tr.engine.setLibrary(mdLib);\n+ tr.setHtmlEngine(false);\n+\n+ const data = { some: \"data\" };\n+\n+ let fn = await tr.getCompiledTemplate(\"[link text](http://link.com)\");\n+ let result = await fn(data);\n+ t.deepEqual(plugin.environment, data);\n+ t.is(result, '<p><a href=\"http://link.com?data=data\">link text</a></p>\\n');\n+});\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateRenderNunjucksTest.js",
"new_path": "test/TemplateRenderNunjucksTest.js",
"diff": "@@ -246,15 +246,15 @@ test(\"Nunjucks Render with getGlobals Issue #567\", async t => {\nt.is(await fn({ \"my-global-name\": \"Zach\" }), \"<p>Zach</p>\");\n});\n-test(\"Nunjucks Render with getVarByName Filter Issue #567\", async t => {\n+test(\"Nunjucks Render with getVarFromString Filter Issue #567\", async t => {\nlet tr = new TemplateRender(\"njk\");\nlet env = tr.engine.getEngineLib();\n- env.addFilter(\"getVarByName\", function(varName) {\n+ env.addFilter(\"getVarFromString\", function(varName) {\nreturn this.getVariables()[varName];\n});\nlet fn = await tr.getCompiledTemplate(\n- \"<p>{{ 'my-global-name' | getVarByName }}</p>\"\n+ \"<p>{{ 'my-global-name' | getVarFromString }}</p>\"\n);\nt.is(await fn({ \"my-global-name\": \"Zach\" }), \"<p>Zach</p>\");\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "test/UserDataExtensionsTest.js",
"new_path": "test/UserDataExtensionsTest.js",
"diff": "@@ -72,7 +72,6 @@ test(\"Global data\", async t => {\n\"./test/stubs-630/_data/**/*.(nosj|yaml|json|cjs|js)\"\n]);\n- let dataFilePaths = await dataObj.getGlobalDataFiles();\nlet data = await dataObj.getData();\n// JS GLOBAL DATA\n@@ -92,3 +91,21 @@ test(\"Global data\", async t => {\nt.is(data.subdir.globalDataSubdir.keyyaml, \"yaml\");\n});\n+\n+test(\"Global data merging and priority\", async t => {\n+ let dataObj = new TemplateData(\"./test/stubs-630/\");\n+ injectDataExtensions(dataObj);\n+\n+ let data = await dataObj.getData();\n+\n+ // TESTING GLOBAL DATA PRIORITY AND MERGING\n+ t.is(data.mergingGlobalData.datakey1, \"js-value1\");\n+ t.is(data.mergingGlobalData.datakey2, \"json-value2\");\n+ t.is(data.mergingGlobalData.datakey3, \"yaml-value3\");\n+ t.is(data.mergingGlobalData.datakey4, \"nosj-value4\");\n+\n+ t.is(data.mergingGlobalData.jskey, \"js\");\n+ t.is(data.mergingGlobalData.jsonkey, \"json\");\n+ t.is(data.mergingGlobalData.yamlkey, \"yaml\");\n+ t.is(data.mergingGlobalData.nosjkey, \"nosj\");\n+});\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs-630/_data/mergingGlobalData.js",
"diff": "+module.exports = {\n+ datakey1: \"js-value1\",\n+ jskey: \"js\"\n+};\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs-630/_data/mergingGlobalData.json",
"diff": "+{\n+ \"datakey1\": \"json-value1\",\n+ \"datakey2\": \"json-value2\",\n+ \"jsonkey\": \"json\"\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs-630/_data/mergingGlobalData.nosj",
"diff": "+{\n+ \"datakey1\": \"nosj-value1\",\n+ \"datakey2\": \"nosj-value2\",\n+ \"datakey3\": \"nosj-value3\",\n+ \"datakey4\": \"nosj-value4\",\n+ \"nosjkey\": \"nosj\"\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs-630/_data/mergingGlobalData.yaml",
"diff": "+datakey1: \"yaml-value1\"\n+datakey2: \"yaml-value2\"\n+datakey3: \"yaml-value3\"\n+yamlkey: \"yaml\"\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | merge with upstream master |
701 | 11.02.2020 16:02:15 | -7,200 | 52414b8d9e6cdb65ff765e09f761a48e7193d205 | bump ava/babel version | [
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n\"devDependencies\": {\n\"@11ty/eleventy-plugin-syntaxhighlight\": \"^3.0.1\",\n- \"@ava/babel\": \"^1.0.0\",\n+ \"@ava/babel\": \"^1.0.1\",\n\"ava\": \"^3.0.0\",\n\"ink-docstrap\": \"1.3.2\",\n\"js-yaml\": \"^3.13.1\",\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | bump ava/babel version |
701 | 12.02.2020 01:14:15 | -7,200 | 90e5a07bab90c68a53a75aeb1e9c3c8cc7008875 | tests for cjs order in global data files resolution | [
{
"change_type": "MODIFY",
"old_path": "test/TemplateDataTest.js",
"new_path": "test/TemplateDataTest.js",
"diff": "@@ -179,7 +179,7 @@ test(\"getAllGlobalData() with common js function data file\", async t => {\n);\nt.truthy(data.globalDataFnCJS);\n- t.is(data.globalDataFnCJS.datakeyfromcjsfn, \"common-js-howdy\");\n+ t.is(data.globalDataFnCJS.datakeyfromcjsfn, \"common-cjs-howdy\");\n});\ntest(\"getDataValue() without a dataTemplateEngine\", async t => {\n"
},
{
"change_type": "MODIFY",
"old_path": "test/UserDataExtensionsTest.js",
"new_path": "test/UserDataExtensionsTest.js",
"diff": "@@ -16,12 +16,12 @@ test(\"Local data\", async t => {\nlet data = await dataObj.getData();\n// YAML GLOBAL DATA\n- t.is(data.globalData2.datakey1, \"datavalue2\");\n- t.is(data.globalData2.datakey2, \"@11ty/eleventy--yaml\");\n+ t.is(data.globalData3.datakey1, \"datavalue3\");\n+ t.is(data.globalData3.datakey2, \"@11ty/eleventy--yaml\");\n// NOSJ (JSON) GLOBAL DATA\n- t.is(data.globalData3.datakey1, \"datavalue3\");\n- t.is(data.globalData3.datakey2, \"@11ty/eleventy--nosj\");\n+ t.is(data.globalData4.datakey1, \"datavalue4\");\n+ t.is(data.globalData4.datakey2, \"@11ty/eleventy--nosj\");\nlet withLocalData = await dataObj.getLocalData(\n\"./test/stubs-630/component-yaml/component.njk\"\n@@ -77,17 +77,20 @@ test(\"Global data\", async t => {\n// JS GLOBAL DATA\nt.is(data.globalData0.datakey1, \"datavalue0\");\n- // JSON GLOBAL DATA\n+ // CJS GLOBAL DATA\nt.is(data.globalData1.datakey1, \"datavalue1\");\n- t.is(data.globalData1.datakey2, \"@11ty/eleventy--json\");\n- // YAML GLOBAL DATA\n+ // JSON GLOBAL DATA\nt.is(data.globalData2.datakey1, \"datavalue2\");\n- t.is(data.globalData2.datakey2, \"@11ty/eleventy--yaml\");\n+ t.is(data.globalData2.datakey2, \"@11ty/eleventy--json\");\n- // NOSJ (JSON) GLOBAL DATA\n+ // YAML GLOBAL DATA\nt.is(data.globalData3.datakey1, \"datavalue3\");\n- t.is(data.globalData3.datakey2, \"@11ty/eleventy--nosj\");\n+ t.is(data.globalData3.datakey2, \"@11ty/eleventy--yaml\");\n+\n+ // NOSJ (JSON) GLOBAL DATA\n+ t.is(data.globalData4.datakey1, \"datavalue4\");\n+ t.is(data.globalData4.datakey2, \"@11ty/eleventy--nosj\");\nt.is(data.subdir.globalDataSubdir.keyyaml, \"yaml\");\n});\n@@ -99,12 +102,14 @@ test(\"Global data merging and priority\", async t => {\nlet data = await dataObj.getData();\n// TESTING GLOBAL DATA PRIORITY AND MERGING\n- t.is(data.mergingGlobalData.datakey1, \"js-value1\");\n+ t.is(data.mergingGlobalData.datakey0, \"js-value0\");\n+ t.is(data.mergingGlobalData.datakey1, \"cjs-value1\");\nt.is(data.mergingGlobalData.datakey2, \"json-value2\");\nt.is(data.mergingGlobalData.datakey3, \"yaml-value3\");\nt.is(data.mergingGlobalData.datakey4, \"nosj-value4\");\nt.is(data.mergingGlobalData.jskey, \"js\");\n+ t.is(data.mergingGlobalData.cjskey, \"cjs\");\nt.is(data.mergingGlobalData.jsonkey, \"json\");\nt.is(data.mergingGlobalData.yamlkey, \"yaml\");\nt.is(data.mergingGlobalData.nosjkey, \"nosj\");\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs-630/_data/globalData1.cjs",
"diff": "+module.exports = {\n+ datakey1: \"datavalue1\"\n+};\n"
},
{
"change_type": "RENAME",
"old_path": "test/stubs-630/_data/globalData1.json",
"new_path": "test/stubs-630/_data/globalData2.json",
"diff": "{\n- \"datakey1\": \"datavalue1\",\n+ \"datakey1\": \"datavalue2\",\n\"datakey2\": \"{{pkg.name}}--json\"\n}\n"
},
{
"change_type": "RENAME",
"old_path": "test/stubs-630/_data/globalData2.yaml",
"new_path": "test/stubs-630/_data/globalData3.yaml",
"diff": "-datakey1: datavalue2\n+datakey1: datavalue3\ndatakey2: \"{{pkg.name}}--yaml\"\n"
},
{
"change_type": "RENAME",
"old_path": "test/stubs-630/_data/globalData3.nosj",
"new_path": "test/stubs-630/_data/globalData4.nosj",
"diff": "{\n- \"datakey1\": \"datavalue3\",\n+ \"datakey1\": \"datavalue4\",\n\"datakey2\": \"{{pkg.name}}--nosj\"\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs-630/_data/mergingGlobalData.cjs",
"diff": "+module.exports = {\n+ datakey0: \"cjs-value1\",\n+ datakey1: \"cjs-value1\",\n+ cjskey: \"cjs\"\n+};\n"
},
{
"change_type": "MODIFY",
"old_path": "test/stubs-630/_data/mergingGlobalData.js",
"new_path": "test/stubs-630/_data/mergingGlobalData.js",
"diff": "module.exports = {\n- datakey1: \"js-value1\",\n+ datakey0: \"js-value0\",\njskey: \"js\"\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "test/stubs-630/_data/mergingGlobalData.json",
"new_path": "test/stubs-630/_data/mergingGlobalData.json",
"diff": "{\n+ \"datakey0\": \"json-value1\",\n\"datakey1\": \"json-value1\",\n\"datakey2\": \"json-value2\",\n\"jsonkey\": \"json\"\n"
},
{
"change_type": "MODIFY",
"old_path": "test/stubs-630/_data/mergingGlobalData.nosj",
"new_path": "test/stubs-630/_data/mergingGlobalData.nosj",
"diff": "{\n+ \"datakey0\": \"nosj-value1\",\n\"datakey1\": \"nosj-value1\",\n\"datakey2\": \"nosj-value2\",\n\"datakey3\": \"nosj-value3\",\n"
},
{
"change_type": "MODIFY",
"old_path": "test/stubs-630/_data/mergingGlobalData.yaml",
"new_path": "test/stubs-630/_data/mergingGlobalData.yaml",
"diff": "+datakey0: \"yaml-value1\"\ndatakey1: \"yaml-value1\"\ndatakey2: \"yaml-value2\"\ndatakey3: \"yaml-value3\"\n"
},
{
"change_type": "MODIFY",
"old_path": "test/stubs/_data/globalDataFnCJS.cjs",
"new_path": "test/stubs/_data/globalDataFnCJS.cjs",
"diff": "@@ -2,6 +2,6 @@ const dep1 = require(\"../deps/dep1\");\nmodule.exports = function() {\nreturn {\n- datakeyfromcjsfn: \"common-js-howdy\"\n+ datakeyfromcjsfn: \"common-cjs-howdy\"\n};\n};\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | tests for cjs order in global data files resolution |
699 | 11.02.2020 21:21:05 | 21,600 | 46059ddb59a4ad17cdecdcadd2133b43e331a35a | Adds 3 new filters: log, getPreviousCollectionItem, getNextCollectionItem. | [
{
"change_type": "MODIFY",
"old_path": "config.js",
"new_path": "config.js",
"diff": "const urlFilter = require(\"./src/Filters/Url\");\nconst slugFilter = require(\"./src/Filters/Slug\");\n+const getCollectionItem = require(\"./src/Filters/GetCollectionItem\");\nmodule.exports = function(config) {\nconfig.addFilter(\"slug\", slugFilter);\nconfig.addFilter(\"url\", urlFilter);\n+ config.addFilter(\"log\", console.log);\n+ config.addLiquidFilter(\"getPreviousCollectionItem\", (collection, page) => getCollectionItem(collection, page, -1));\n+ config.addLiquidFilter(\"getNextCollectionItem\", (collection, page) => getCollectionItem(collection, page, 1));\nreturn {\ntemplateFormats: [\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateCollection.js",
"new_path": "src/TemplateCollection.js",
"diff": "@@ -3,10 +3,6 @@ const Sortable = require(\"./Util/Sortable\");\nconst TemplatePath = require(\"./TemplatePath\");\nclass TemplateCollection extends Sortable {\n- constructor() {\n- super();\n- }\n-\n// right now this is only used by the tests\nasync _testAddTemplate(template) {\nlet data = await template.getData();\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Adds 3 new filters: log, getPreviousCollectionItem, getNextCollectionItem. |
699 | 11.02.2020 21:34:44 | 21,600 | 3cdbaa4ee9c4a9945e4f5e37cafc31676b75987f | Adds getNextCollectionItem and getPreviousCollectionItem filters and tests. | [
{
"change_type": "MODIFY",
"old_path": "config.js",
"new_path": "config.js",
"diff": "@@ -6,8 +6,12 @@ module.exports = function(config) {\nconfig.addFilter(\"slug\", slugFilter);\nconfig.addFilter(\"url\", urlFilter);\nconfig.addFilter(\"log\", console.log);\n- config.addLiquidFilter(\"getPreviousCollectionItem\", (collection, page) => getCollectionItem(collection, page, -1));\n- config.addLiquidFilter(\"getNextCollectionItem\", (collection, page) => getCollectionItem(collection, page, 1));\n+ config.addLiquidFilter(\"getPreviousCollectionItem\", (collection, page) =>\n+ getCollectionItem(collection, page, -1)\n+ );\n+ config.addLiquidFilter(\"getNextCollectionItem\", (collection, page) =>\n+ getCollectionItem(collection, page, 1)\n+ );\nreturn {\ntemplateFormats: [\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Filters/GetCollectionItem.js",
"diff": "+module.exports = function getCollectionItem(collection, page, modifier = 0) {\n+ let j = 0;\n+ let index;\n+ for(let item of collection) {\n+ if(item.inputPath === page.inputPath && item.outputPath === page.outputPath) {\n+ index = j;\n+ break;\n+ }\n+ j++;\n+ }\n+\n+ if(index !== undefined && collection && collection.length) {\n+ if( index + modifier >= 0 && index + modifier < collection.length ) {\n+ return collection[index + modifier];\n+ }\n+ }\n+};\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/GetCollectionItemTest.js",
"diff": "+import test from \"ava\";\n+import getCollectionItem from \"../src/Filters/GetCollectionItem\";\n+\n+test(\"getCollectionItem\", t => {\n+ let first = {\n+ inputPath: \"hello.md\",\n+ outputPath: \"/hello/\"\n+ };\n+ let second = {\n+ inputPath: \"hello2.md\",\n+ outputPath: \"/hello2/\"\n+ };\n+ let third = {\n+ inputPath: \"hello3.md\",\n+ outputPath: \"/hello3/\"\n+ };\n+ let collections = [first, second, third];\n+\n+ t.deepEqual(getCollectionItem(collections, first), first);\n+ t.deepEqual(getCollectionItem(collections, second), second);\n+ t.deepEqual(getCollectionItem(collections, third), third);\n+\n+ t.deepEqual(getCollectionItem(collections, first, -1), undefined);\n+ t.deepEqual(getCollectionItem(collections, second, -1), first);\n+ t.deepEqual(getCollectionItem(collections, third, -1), second);\n+\n+ t.deepEqual(getCollectionItem(collections, first, 1), second);\n+ t.deepEqual(getCollectionItem(collections, second, 1), third);\n+ t.deepEqual(getCollectionItem(collections, third, 1), undefined);\n+});\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Adds getNextCollectionItem and getPreviousCollectionItem filters and tests. |
699 | 11.02.2020 22:09:11 | 21,600 | d5be63fdbc8c4310e4baaaecd5641e66d2be4b48 | Make sure Nunjucks `set = ` works with filters. | [
{
"change_type": "MODIFY",
"old_path": "test/TemplateRenderNunjucksTest.js",
"new_path": "test/TemplateRenderNunjucksTest.js",
"diff": "@@ -156,6 +156,20 @@ test(\"Nunjucks Async Filter\", async t => {\nt.is((await fn()).trim(), \"HItest\");\n});\n+test(\"Nunjucks Render set with a filter\", async t => {\n+ let tr = new TemplateRender(\"njk\", \"test/stubs\");\n+ let engine = tr.engine;\n+ engine.addFilters({\n+ uppercase: function(str) {\n+ return str.toUpperCase();\n+ }\n+ });\n+ let fn = await tr.getCompiledTemplate(\n+ `{% set test = \"hi\" | uppercase %}{{ test }}`\n+ );\n+ t.is((await fn()).trim(), `HI`);\n+});\n+\ntest(\"Nunjucks Render Include a JS file (Issue 398)\", async t => {\nlet tr = new TemplateRender(\"njk\", \"test/stubs\");\nlet engine = tr.engine;\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Make sure Nunjucks `set = ` works with filters. |
699 | 12.02.2020 07:52:32 | 21,600 | f1440046f3ae0c378a79c398541b97258c03bce4 | Trying out husky again. | [
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"@11ty/eleventy-plugin-syntaxhighlight\": \"^3.0.1\",\n\"@ava/babel\": \"^1.0.0\",\n\"ava\": \"^3.0.0\",\n+ \"husky\": \"^4.2.2\",\n\"ink-docstrap\": \"1.3.2\",\n\"js-yaml\": \"^3.13.1\",\n\"jsdoc\": \"3.6.3\",\n\"lint-staged\": \"^10.0.7\",\n\"markdown-it-emoji\": \"^1.4.0\",\n\"nyc\": \"^15.0.0\",\n- \"pre-commit\": \"^1.2.2\",\n- \"pre-push\": \"^0.1.1\",\n\"prettier\": \"^1.19.1\",\n\"rimraf\": \"^3.0.0\",\n\"toml\": \"^3.0.0\",\n\"time-require\": \"^0.1.2\",\n\"valid-url\": \"^1.0.9\"\n},\n+ \"husky\": {\n+ \"hooks\": {\n\"pre-commit\": \"lint-staged\",\n\"pre-push\": \"test\"\n}\n+ }\n+}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Trying out husky again. |
699 | 12.02.2020 22:12:22 | 21,600 | 37ff4895403494edcffec97760449090f5a2e8db | Duplicated code path | [
{
"change_type": "MODIFY",
"old_path": "src/Template.js",
"new_path": "src/Template.js",
"diff": "@@ -535,18 +535,12 @@ class Template extends TemplateContent {\nthis.config\n);\ncontent = await layout.render(page.data, page.templateContent);\n- await this.runLinters(content, page.inputPath, page.outputPath);\n- content = await this.runTransforms(content, page.outputPath); // pass in page.inputPath?\n- return content;\n} else {\ncontent = page.templateContent;\n- await this.runLinters(\n- page.templateContent,\n- page.inputPath,\n- page.outputPath\n- );\n- content = await this.runTransforms(content, page.outputPath); // pass in page.inputPath?\n}\n+\n+ await this.runLinters(content, page.inputPath, page.outputPath);\n+ content = await this.runTransforms(content, page.outputPath); // pass in page.inputPath?\nreturn content;\n}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Duplicated code path |
699 | 14.02.2020 10:27:02 | 21,600 | 63ac0bb637783c6d39fc23db991049fdba42a1bf | Adds skipped test for | [
{
"change_type": "MODIFY",
"old_path": "src/Engines/JavaScript.js",
"new_path": "src/Engines/JavaScript.js",
"diff": "@@ -34,12 +34,18 @@ class JavaScript extends TemplateEngine {\nmod.prototype &&\n(\"data\" in mod.prototype || \"render\" in mod.prototype)\n) {\n+ // render function is optional\nif (!(\"render\" in mod.prototype)) {\nmod.prototype.render = noop;\n}\nreturn new mod();\n} else {\n- return { render: mod };\n+ // let fn = function() {};\n+ // fn.prototype.render = mod;\n+ // return new fn();\n+ return {\n+ render: mod\n+ };\n}\n} else if (\"data\" in mod || \"render\" in mod) {\nif (!(\"render\" in mod)) {\n@@ -103,6 +109,7 @@ class JavaScript extends TemplateEngine {\nlet inst;\nif (str) {\n// When str has a value, it's being used for permalinks in data\n+ // and maybe not be a str (could be any valid *.11ty.js)\ninst = this._getInstance(str);\n} else {\n// For normal templates, str will be falsy.\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs/function-filter-arrow.11ty.js",
"diff": "+module.exports = ({ name }) => {\n+ return `<p>${this.upper(name)}</p>`;\n+};\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Adds skipped test for #934 |
699 | 14.02.2020 16:12:05 | 21,600 | 7a5dad7199d21e97bfb70453794d021ccaa8a787 | Code cleanup (duplicate code paths) | [
{
"change_type": "MODIFY",
"old_path": "src/TemplateData.js",
"new_path": "src/TemplateData.js",
"diff": "@@ -384,6 +384,20 @@ class TemplateData {\npaths.push(curpath + \".\" + extension);\n}\n}\n+ _addBaseToPaths(paths, base, extensions) {\n+ let dataSuffix = this.config.jsDataFileSuffix;\n+\n+ // data suffix\n+ paths.push(base + dataSuffix + \".js\");\n+ paths.push(base + dataSuffix + \".json\");\n+\n+ // inject user extensions\n+ this._pushExtensionsToPaths(paths, base + dataSuffix, extensions);\n+\n+ // top level\n+ paths.push(base + \".json\");\n+ this._pushExtensionsToPaths(paths, base, extensions);\n+ }\nasync getLocalDataPaths(templatePath) {\nlet paths = [];\n@@ -406,55 +420,20 @@ class TemplateData {\nlet dataSuffix = this.config.jsDataFileSuffix;\ndebug(\"Using %o to find data files.\", dataSuffix);\n- // data suffix\n- paths.push(filePathNoExt + dataSuffix + \".js\");\n- paths.push(filePathNoExt + dataSuffix + \".json\");\n- // inject user extensions\n- this._pushExtensionsToPaths(\n- paths,\n- filePathNoExt + dataSuffix,\n- userExtensions\n- );\n-\n- // top level\n- paths.push(filePathNoExt + \".json\");\n- this._pushExtensionsToPaths(paths, filePathNoExt, userExtensions);\n+ this._addBaseToPaths(paths, filePathNoExt, userExtensions);\nlet allDirs = TemplatePath.getAllDirs(parsed.dir);\n+\ndebugDev(\"allDirs: %o\", allDirs);\nfor (let dir of allDirs) {\nlet lastDir = TemplatePath.getLastPathSegment(dir);\nlet dirPathNoExt = dir + \"/\" + lastDir;\n- if (!inputDir) {\n- // data suffix\n- paths.push(dirPathNoExt + dataSuffix + \".js\");\n- paths.push(dirPathNoExt + dataSuffix + \".json\");\n- this._pushExtensionsToPaths(\n- paths,\n- dirPathNoExt + dataSuffix,\n- userExtensions\n- );\n-\n- // top level\n- paths.push(dirPathNoExt + \".json\");\n- this._pushExtensionsToPaths(paths, dirPathNoExt, userExtensions);\n- } else {\n+ if (inputDir) {\ndebugDev(\"dirStr: %o; inputDir: %o\", dir, inputDir);\n- if (dir.indexOf(inputDir) === 0 && dir !== inputDir) {\n- // data suffix\n- paths.push(dirPathNoExt + dataSuffix + \".js\");\n- paths.push(dirPathNoExt + dataSuffix + \".json\");\n- this._pushExtensionsToPaths(\n- paths,\n- dirPathNoExt + dataSuffix,\n- userExtensions\n- );\n-\n- // top level\n- paths.push(dirPathNoExt + \".json\");\n- this._pushExtensionsToPaths(paths, dirPathNoExt, userExtensions);\n}\n+ if (!inputDir || (dir.indexOf(inputDir) === 0 && dir !== inputDir)) {\n+ this._addBaseToPaths(paths, dirPathNoExt, userExtensions);\n}\n}\n}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Code cleanup (duplicate code paths) |
699 | 16.02.2020 13:35:03 | 21,600 | 5f57ce0b597c27b765cd05b5e70ef3f774ab3739 | Look into cjs files to find watch target dependencies | [
{
"change_type": "MODIFY",
"old_path": "src/EleventyWatchTargets.js",
"new_path": "src/EleventyWatchTargets.js",
"diff": "@@ -90,7 +90,7 @@ class EleventyWatchTargets {\ngetJavaScriptDependenciesFromList(files = []) {\nlet depSet = new Set();\nfiles\n- .filter(file => file.endsWith(\".js\")) // TODO does this need to work with aliasing? what other JS extensions will have deps?\n+ .filter(file => file.endsWith(\".js\") || file.endsWith(\".cjs\")) // TODO does this need to work with aliasing? what other JS extensions will have deps?\n.forEach(file => {\ndependencyTree(file, { allowNotFound: true })\n.map(dependency => {\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Look into cjs files to find watch target dependencies |
699 | 16.02.2020 13:47:04 | 21,600 | cde29307ef06722e5708e373f9ba6b38c11db018 | Uncomment test for | [
{
"change_type": "MODIFY",
"old_path": "test/TemplateTest.js",
"new_path": "test/TemplateTest.js",
"diff": "@@ -1942,19 +1942,20 @@ test(\"global variable with dashes Issue #567 (liquid)\", async t => {\nt.is(pages[0].templateContent.trim(), \"Yes\");\n});\n-// test(\"Issue #446: Layout has a permalink with a different template language than content\", async t => {\n-// let tmpl = new Template(\n-// \"./test/stubs/layout-permalink-difflang/test.md\",\n-// \"./test/stubs/layout-permalink-difflang/\",\n-// \"dist\"\n-// );\n-\n-// let data = await tmpl.getData();\n-// let pages = await tmpl.getRenderedTemplates(data);\n-\n-// t.is(data.permalink, \"/{{ page.fileSlug }}/\");\n-// t.is(data.page.url, \"/test/\");\n-// });\n+test(\"Issue #446: Layout has a permalink with a different template language than content\", async t => {\n+ let tmpl = new Template(\n+ \"./test/stubs/layout-permalink-difflang/test.md\",\n+ \"./test/stubs/layout-permalink-difflang/\",\n+ \"dist\"\n+ );\n+\n+ let data = await tmpl.getData();\n+ // this call is needed for page data to be added\n+ let pages = await tmpl.getRenderedTemplates(data);\n+\n+ t.is(data.permalink, \"/{{ page.fileSlug }}/\");\n+ t.is(data.page.url, \"/test/\");\n+});\n// Prior to and including 0.10.0 this mismatched the documentation)!\ntest(\"Layout front matter should override template files\", async t => {\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Uncomment test for #446 |
699 | 20.02.2020 23:22:12 | 21,600 | 9c13e4d0fe24efa0fdd8ba9d0d39437b427609d3 | A few more tests for | [
{
"change_type": "MODIFY",
"old_path": "test/TemplateTest.js",
"new_path": "test/TemplateTest.js",
"diff": "@@ -2033,6 +2033,28 @@ test(\"eleventyComputed\", async t => {\nt.is((await tmpl.render(data)).trim(), \"hi:value2-value1.css\");\n});\n+test(\"eleventyComputed overrides existing value.\", async t => {\n+ let tmpl = new Template(\n+ \"./test/stubs/eleventyComputed/override.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\"\n+ );\n+ let data = await getRenderedData(tmpl);\n+ t.is(data.key1, \"override\");\n+ t.is((await tmpl.render(data)).trim(), \"hi:override\");\n+});\n+\n+test(\"eleventyComputed overrides existing value and reuses that upstream value\", async t => {\n+ let tmpl = new Template(\n+ \"./test/stubs/eleventyComputed/override-reuse.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\"\n+ );\n+ let data = await getRenderedData(tmpl);\n+ t.is(data.key1, \"over(value1)ride\");\n+ t.is((await tmpl.render(data)).trim(), \"hi:over(value1)ride\");\n+});\n+\ntest(\"eleventyComputed permalink\", async t => {\nlet tmpl = new Template(\n\"./test/stubs/eleventyComputed/permalink.njk\",\n@@ -2059,3 +2081,14 @@ test(\"eleventyComputed js front matter (function)\", async t => {\nt.is(data.key3, \"value3-value2-value1.css\");\nt.is((await tmpl.render(data)).trim(), \"hi:value2-value1.css\");\n});\n+\n+test(\"eleventyComputed js front matter key reuses and overrides\", async t => {\n+ let tmpl = new Template(\n+ \"./test/stubs/eleventyComputed/third.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\"\n+ );\n+ let data = await getRenderedData(tmpl);\n+ t.is(data.key1, \"value2-value1\");\n+ t.is((await tmpl.render(data)).trim(), \"hi:value2-value1\");\n+});\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs/eleventyComputed/override-reuse.njk",
"diff": "+---\n+key1: value1\n+eleventyComputed:\n+ key1: \"over({{key1}})ride\"\n+---\n+hi:{{ key1 }}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs/eleventyComputed/override.njk",
"diff": "+---\n+key1: value1\n+eleventyComputed:\n+ key1: override\n+---\n+hi:{{ key1 }}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs/eleventyComputed/third.njk",
"diff": "+---js\n+{\n+ key1: \"value1\",\n+ eleventyComputed: {\n+ key1: function(data) {\n+ return `value2-${data.key1}`;\n+ }\n+ }\n+}\n+---\n+hi:{{ key1 }}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | A few more tests for #481 |
672 | 23.02.2020 14:30:51 | -3,600 | 0d65518f4329bb29fec4b7c0860a2e05add5c8dc | Correct verb conjugation mistake in comment
The past participle of the verb "override" is "overridden", not "overrode".
We say: "foo overrode bar", but "bar was overriden by foo". | [
{
"change_type": "MODIFY",
"old_path": "src/Eleventy.js",
"new_path": "src/Eleventy.js",
"diff": "@@ -42,7 +42,7 @@ class Eleventy {\nthis.isVerbose = process.env.DEBUG ? false : !this.config.quietMode;\n/**\n- * @member {Boolean} - Was verbose mode overrode manually?\n+ * @member {Boolean} - Was verbose mode overridden manually?\n* @default false\n*/\nthis.isVerboseOverride = false;\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Correct verb conjugation mistake in comment
The past participle of the verb "override" is "overridden", not "overrode".
We say: "foo overrode bar", but "bar was overriden by foo".
https://www.theconjugator.com/english/verb/to+override.html |
699 | 23.02.2020 21:51:39 | 21,600 | 72c2e74e7760c383493ea1cf08d7a324d0a5b5bf | Even more tests for | [
{
"change_type": "MODIFY",
"old_path": "test/ComputedDataTest.js",
"new_path": "test/ComputedDataTest.js",
"diff": "@@ -121,3 +121,61 @@ test(\"use a computed value in another computed (out of order), async callbacks\",\nt.is(data.keyComputed2nd, \"using computed this is a test inject me\");\n});\n+\n+test(\"Basic get/set nested\", async t => {\n+ let cd = new ComputedData();\n+\n+ cd.add(\"key1.nested\", data => {\n+ return `${data.key2}`;\n+ });\n+ cd.add(\"key2\", data => \"hi\");\n+\n+ let data = {\n+ key2: \"inject me\"\n+ };\n+ await cd.setupData(data);\n+\n+ t.deepEqual(data.key1, { nested: \"hi\" });\n+ t.is(data.key1.nested, \"hi\");\n+ t.is(data.key2, \"hi\");\n+});\n+\n+test(\"Basic get/set nested deeper\", async t => {\n+ let cd = new ComputedData();\n+\n+ cd.add(\"key1.nested.deeperA\", data => {\n+ return `${data.key2}`;\n+ });\n+ cd.add(\"key1.nested.deeperB\", data => {\n+ return `${data.key2}`;\n+ });\n+ cd.add(\"key1.nested.deeperC.wow\", data => {\n+ return `${data.key2}`;\n+ });\n+ cd.add(\"key2\", data => \"hi\");\n+\n+ let data = {\n+ key1: {\n+ nonComputed: \"hi\"\n+ },\n+ key2: \"inject me\"\n+ };\n+ await cd.setupData(data);\n+\n+ t.deepEqual(data.key1, {\n+ nonComputed: \"hi\",\n+ nested: {\n+ deeperA: \"hi\",\n+ deeperB: \"hi\",\n+ deeperC: {\n+ wow: \"hi\"\n+ }\n+ }\n+ });\n+\n+ t.is(data.key1.nested.deeperA, \"hi\");\n+ t.is(data.key1.nested.deeperB, \"hi\");\n+ t.is(data.key1.nested.deeperC.wow, \"hi\");\n+ t.is(data.key1.nonComputed, \"hi\");\n+ t.is(data.key2, \"hi\");\n+});\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateTest.js",
"new_path": "test/TemplateTest.js",
"diff": "@@ -2092,3 +2092,16 @@ test(\"eleventyComputed js front matter key reuses and overrides\", async t => {\nt.is(data.key1, \"value2-value1\");\nt.is((await tmpl.render(data)).trim(), \"hi:value2-value1\");\n});\n+\n+test(\"eleventyComputed true primitive\", async t => {\n+ let tmpl = new Template(\n+ \"./test/stubs/eleventyComputed/true.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\"\n+ );\n+ let data = await getRenderedData(tmpl);\n+ t.is(data.key1, \"value1\");\n+ t.is(data.key2, true);\n+ t.is(data.key3, false);\n+ t.is(data.key4, 324);\n+});\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs/eleventyComputed/true.njk",
"diff": "+---\n+key1: value1\n+eleventyComputed:\n+ key2: true\n+ key3: false\n+ key4: 324\n+---\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Even more tests for #481 |
672 | 26.02.2020 16:49:02 | -3,600 | cfcf54b86a87b9bdde39f46430145392424d467b | Inverse boolean logic to avoid empty statement
I'm not sure what's the benefit of having a condition leading to an empty statement ?
You may have a good reason that I have missed though. | [
{
"change_type": "MODIFY",
"old_path": "src/Engines/Ejs.js",
"new_path": "src/Engines/Ejs.js",
"diff": "@@ -40,9 +40,8 @@ class Ejs extends TemplateEngine {\nasync compile(str, inputPath) {\nlet options = this.getEjsOptions();\n- if (!inputPath || inputPath === \"ejs\" || inputPath === \"md\") {\n- // do nothing\n- } else {\n+\n+ if (inputPath && inputPath ==! \"ejs\" && inputPath ==! \"md\") {\noptions.filename = inputPath;\n}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Inverse boolean logic to avoid empty statement
I'm not sure what's the benefit of having a condition leading to an empty statement ?
You may have a good reason that I have missed though. |
699 | 28.02.2020 08:43:26 | 21,600 | a7b89458a2e5ba03c6855701be41acabe9151009 | Make dependency graph test file | [
{
"change_type": "MODIFY",
"old_path": "test/TemplateMapTest.js",
"new_path": "test/TemplateMapTest.js",
"diff": "@@ -749,28 +749,6 @@ test(\"Dependency Map should have include orphan user config collections (in the\nt.is(collections.userCollection.length, 2);\n});\n-test(\"Dependency graph assumptions\", async t => {\n- const DependencyGraph = require(\"dependency-graph\").DepGraph;\n- let graph = new DependencyGraph();\n-\n- graph.addNode(\"all\");\n- graph.addNode(\"template-a\");\n- graph.addNode(\"template-b\");\n- graph.addNode(\"template-c\");\n- graph.addNode(\"userCollection\");\n- graph.addDependency(\"all\", \"template-a\");\n- graph.addDependency(\"all\", \"template-b\");\n- graph.addDependency(\"all\", \"template-c\");\n- graph.addDependency(\"userCollection\", \"all\");\n- t.deepEqual(graph.overallOrder(), [\n- \"template-a\",\n- \"template-b\",\n- \"template-c\",\n- \"all\",\n- \"userCollection\"\n- ]);\n-});\n-\ntest(\"Template pages should not have layouts when added to collections\", async t => {\nlet tm = new TemplateMap();\nlet tmpl = new Template(\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Make dependency graph test file |
699 | 28.02.2020 23:07:27 | 21,600 | 8ad24ab96f80802c39f28921f938a8a6c943e05a | Tweaks to computed data that allow primitives to be used. No console.logs in first pass for dependency graph creation | [
{
"change_type": "MODIFY",
"old_path": "src/Template.js",
"new_path": "src/Template.js",
"diff": "@@ -391,6 +391,8 @@ class Template extends TemplateContent {\n},\ndeclaredDependencies\n);\n+ } else {\n+ computedData.add(parentKey, obj, declaredDependencies);\n}\n}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | #481 Tweaks to computed data that allow primitives to be used. No console.logs in first pass for dependency graph creation |
672 | 03.03.2020 16:00:05 | -3,600 | f65e2c96f1691ec3456ab96c0a856a5d924343c8 | Add getTemplateData caching test | [
{
"change_type": "MODIFY",
"old_path": "test/EleventyFilesTest.js",
"new_path": "test/EleventyFilesTest.js",
"diff": "@@ -383,6 +383,14 @@ test(\"Get ignores (both .eleventyignore and .gitignore exists, but .gitignore ha\n});\n/* End .eleventyignore and .gitignore combos */\n+test(\"getTemplateData caching\", t => {\n+ let evf = new EleventyFiles(\"test/stubs\", \"test/stubs/_site\", []);\n+ evf.init();\n+ let templateDataFirstCall = evf.getTemplateData();\n+ let templateDataSecondCall = evf.getTemplateData();\n+ t.is(templateDataFirstCall, templateDataSecondCall);\n+});\n+\ntest(\"getDataDir\", t => {\nlet evf = new EleventyFiles(\".\", \"_site\", []);\nevf.init();\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Add getTemplateData caching test |
672 | 05.03.2020 16:50:52 | -3,600 | 05204918fa04ff0fe2339f0dd92afaf40c162af6 | Use getter/setter for getTemplateData | [
{
"change_type": "MODIFY",
"old_path": "src/Eleventy.js",
"new_path": "src/Eleventy.js",
"diff": "@@ -277,7 +277,7 @@ class Eleventy {\nthis.eleventyFiles.init();\nthis.templateData = new TemplateData(this.inputDir);\n- this.eleventyFiles.setTemplateData(this.templateData);\n+ this.eleventyFiles.templateData = this.templateData;\nthis.writer = new TemplateWriter(\nthis.input,\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Use getter/setter for getTemplateData |
699 | 05.03.2020 14:56:29 | 21,600 | b82341721a3e7128dfd9d520064f3aee6ba08fb0 | Just in time config includes to allow template compilation inside of configuration files | [
{
"change_type": "MODIFY",
"old_path": "src/EleventyExtensionMap.js",
"new_path": "src/EleventyExtensionMap.js",
"diff": "const TemplatePath = require(\"./TemplatePath\");\n-const config = require(\"./Config\");\nclass EleventyExtensionMap {\nconstructor(formatKeys = []) {\n@@ -17,7 +16,7 @@ class EleventyExtensionMap {\n}\nget config() {\n- return this.configOverride || config.getConfig();\n+ return this.configOverride || require(\"./Config\").getConfig();\n}\nset config(cfg) {\nthis.configOverride = cfg;\n@@ -133,7 +132,7 @@ class EleventyExtensionMap {\n}\nstatic get keyMap() {\nreturn EleventyExtensionMap._getKeyMap(\n- config.getConfig().templateExtensionAliases || {}\n+ require(\"./Config\").getConfig().templateExtensionAliases || {}\n);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/TemplateEngine.js",
"new_path": "src/Engines/TemplateEngine.js",
"diff": "@@ -2,7 +2,6 @@ const fastglob = require(\"fast-glob\");\nconst fs = require(\"fs-extra\");\nconst TemplatePath = require(\"../TemplatePath\");\nconst EleventyExtensionMap = require(\"../EleventyExtensionMap\");\n-const config = require(\"../Config\");\nconst debug = require(\"debug\")(\"Eleventy:TemplateEngine\");\nclass TemplateEngine {\n@@ -19,7 +18,7 @@ class TemplateEngine {\nget config() {\nif (!this._config) {\n- this._config = config.getConfig();\n+ this._config = require(\"../Config\").getConfig();\n}\nreturn this._config;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateRender.js",
"new_path": "src/TemplateRender.js",
"diff": "@@ -2,7 +2,6 @@ const TemplatePath = require(\"./TemplatePath\");\nconst TemplateEngine = require(\"./Engines/TemplateEngine\");\nconst EleventyBaseError = require(\"./EleventyBaseError\");\nconst EleventyExtensionMap = require(\"./EleventyExtensionMap\");\n-const config = require(\"./Config\");\n// const debug = require(\"debug\")(\"Eleventy:TemplateRender\");\nclass TemplateRenderUnknownEngineError extends EleventyBaseError {}\n@@ -32,7 +31,7 @@ class TemplateRender {\nget config() {\nif (!this._config) {\n- this._config = config.getConfig();\n+ this._config = require(\"./Config\").getConfig();\n}\nreturn this._config;\n}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Just in time config includes to allow template compilation inside of configuration files |
672 | 06.03.2020 16:03:54 | -3,600 | efb8edee3a3ca6f3fc0c6111ac9c2bc608773ff8 | Refactor command check to use minimist options.unknown callback | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/EleventyCommandCheckError.js",
"diff": "+const EleventyBaseError = require(\"./EleventyBaseError\");\n+class EleventyCommandCheckError extends EleventyBaseError {}\n+module.exports = EleventyCommandCheckError;\n"
},
{
"change_type": "DELETE",
"old_path": "test/EleventyCommandCheckTest.js",
"new_path": null,
"diff": "-import test from \"ava\";\n-import EleventyCommandCheck from \"../src/EleventyCommandCheck\";\n-\n-test(\"Constructor\", t => {\n- let cmdCheck = new EleventyCommandCheck({});\n- t.is(cmdCheck.toString(), \"\");\n-});\n-\n-test(\"Has an argument\", t => {\n- let cmdCheck = new EleventyCommandCheck({\n- input: \"src\"\n- });\n- t.is(cmdCheck.toString(), \"--input=src\");\n-});\n-\n-test(\"Boolean argument\", t => {\n- let cmdCheck = new EleventyCommandCheck({\n- version: true\n- });\n- t.is(cmdCheck.toString(), \"--version\");\n-});\n-\n-test(\"Multiple arguments\", t => {\n- let cmdCheck = new EleventyCommandCheck({\n- input: \"src\",\n- version: true\n- });\n-\n- // technically invalid but eleventy should quit early on --version\n- t.is(cmdCheck.toString(), \"--input=src --version\");\n-});\n-\n-test(\"getArgumentLookupMap\", t => {\n- let cmdCheck = new EleventyCommandCheck({});\n- t.is(cmdCheck.getArgumentLookupMap()[\"input\"], true);\n- t.is(cmdCheck.getArgumentLookupMap()[\"version\"], true);\n- t.falsy(cmdCheck.getArgumentLookupMap()[\"not-an-arg\"]);\n-\n- t.is(cmdCheck.isKnownArgument(\"input\"), true);\n- t.is(cmdCheck.isKnownArgument(\"version\"), true);\n- t.is(cmdCheck.isKnownArgument(\"unknown-thing\"), false);\n-\n- t.is(cmdCheck.isKnownArgument(\"_\"), true);\n-});\n-\n-test(\"throws\", t => {\n- let cmdCheck = new EleventyCommandCheck({ \"unknown-argument\": true });\n- t.throws(() => {\n- cmdCheck.hasUnknownArguments();\n- });\n-});\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Refactor command check to use minimist options.unknown callback |
672 | 06.03.2020 16:07:13 | -3,600 | 5e8ebdb1a5a1f5ede9d186dfaf862ef332307ff6 | Add proper formatting with line breaks to string property | [
{
"change_type": "MODIFY",
"old_path": "cmd.js",
"new_path": "cmd.js",
"diff": "@@ -19,7 +19,14 @@ const EleventyErrorHandler = require(\"./src/EleventyErrorHandler\");\ntry {\nconst EleventyCommandCheckError = require(\"./src/EleventyCommandCheckError\");\nconst argv = require(\"minimist\")(process.argv.slice(2), {\n- string: [\"input\", \"output\", \"formats\", \"config\", \"pathprefix\", \"port\"],\n+ string: [\n+ \"input\",\n+ \"output\",\n+ \"formats\",\n+ \"config\",\n+ \"pathprefix\",\n+ \"port\"\n+ ],\nboolean: [\n\"quiet\",\n\"version\",\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Add proper formatting with line breaks to string property |
672 | 06.03.2020 16:42:13 | -3,600 | 2604277a6ce6d3ab5fb6e5449075a7feb37baa66 | Move Template.write in TemplateTest, since only used there (TODO fix) | [
{
"change_type": "MODIFY",
"old_path": "src/Template.js",
"new_path": "src/Template.js",
"diff": "@@ -584,17 +584,6 @@ class Template extends TemplateContent {\nreturn Promise.all(promises);\n}\n- // TODO is this still used by anything but tests?\n- async write(outputPath, data) {\n- let templates = await this.getRenderedTemplates(data);\n- let promises = [];\n- for (let tmpl of templates) {\n- promises.push(this._write(tmpl.outputPath, tmpl.templateContent));\n- }\n-\n- return Promise.all(promises);\n- }\n-\n// TODO this but better\nclone() {\nlet tmpl = new Template(\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateTest.js",
"new_path": "test/TemplateTest.js",
"diff": "@@ -16,6 +16,15 @@ async function getRenderedData(tmpl, pageNumber = 0) {\nreturn templates[pageNumber].data;\n}\n+async function write(tmpl, data) {\n+ let templates = await tmpl.getRenderedTemplates(data);\n+ let promises = [];\n+ for (let template of templates) {\n+ promises.push(tmpl._write(template.outputPath, template.templateContent));\n+ }\n+ return Promise.all(promises);\n+}\n+\nfunction cleanHtml(str) {\nreturn pretty(str, { ocd: true });\n}\n@@ -1330,7 +1339,7 @@ test(\"permalink: false\", async t => {\nt.is(await tmpl.getOutputHref(), false);\nlet data = await tmpl.getData();\n- await tmpl.write(false, data);\n+ await write(tmpl, data);\n// Input file exists (sanity check for paths)\nt.is(fs.existsSync(\"./test/stubs/permalink-false/\"), true);\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Move Template.write in TemplateTest, since only used there (TODO fix) |
672 | 10.03.2020 14:37:32 | -3,600 | a1338070837f2c07fdd31f723757f7aa94ed166d | Use getter for pagedItems in Pagination class ("TODO" fix) | [
{
"change_type": "MODIFY",
"old_path": "src/Plugins/Pagination.js",
"new_path": "src/Plugins/Pagination.js",
"diff": "@@ -63,7 +63,7 @@ class Pagination {\nthis.alias = data.pagination.alias;\nthis.target = this._resolveItems();\n- this.items = this.getPagedItems();\n+ this.items = this.pagedItems;\n}\nsetTemplate(tmpl) {\n@@ -134,8 +134,7 @@ class Pagination {\nreturn result;\n}\n- getPagedItems() {\n- // TODO switch to a getter\n+ get pagedItems() {\nif (!this.data) {\nthrow new Error(\"Missing `setData` call for Pagination object.\");\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "test/PaginationTest.js",
"new_path": "test/PaginationTest.js",
"diff": "@@ -13,7 +13,7 @@ test(\"No data passed to pagination\", async t => {\nlet paging = new Pagination();\npaging.setTemplate(tmpl);\n- t.is(paging.getPagedItems().length, 0);\n+ t.is(paging.pagedItems.length, 0);\nt.is((await paging.getPageTemplates()).length, 0);\n});\n@@ -30,7 +30,7 @@ test(\"No pagination\", async t => {\nt.falsy(data.pagination);\nt.is(paging.getPageCount(), 0);\n- t.is(paging.getPagedItems().length, 0);\n+ t.is(paging.pagedItems.length, 0);\nt.is((await paging.getPageTemplates()).length, 0);\n});\n@@ -66,7 +66,7 @@ test(\"Resolve paged data in frontmatter\", async t => {\npaging.setTemplate(tmpl);\nt.is(paging._resolveItems().length, 8);\nt.is(paging.getPageCount(), 2);\n- t.is(paging.getPagedItems().length, 2);\n+ t.is(paging.pagedItems.length, 2);\n});\ntest(\"Paginate data in frontmatter\", async t => {\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Use getter for pagedItems in Pagination class ("TODO" fix) |
699 | 18.03.2020 17:17:19 | 18,000 | c8e04f0bf767bb12d71266403822a2987477adc4 | Adds support for `init` in custom template engines (in this case to support loading Vue single file components) | [
{
"change_type": "MODIFY",
"old_path": "src/Engines/Custom.js",
"new_path": "src/Engines/Custom.js",
"diff": "@@ -3,13 +3,18 @@ const TemplateEngine = require(\"./TemplateEngine\");\nclass CustomEngine extends TemplateEngine {\nconstructor(name, includesDir) {\nsuper(name, includesDir);\n+\n+ this.entry = this.getExtensionMapEntry();\n+ this.needsInit =\n+ \"init\" in this.entry && typeof this.entry.init === \"function\";\n+ this.initFinished = false;\n}\n- get compileFunction() {\n+ getExtensionMapEntry() {\nif (\"extensionMap\" in this.config) {\nfor (let entry of this.config.extensionMap) {\nif (entry.key.toLowerCase() === this.name.toLowerCase()) {\n- return entry.compile;\n+ return entry;\n}\n}\n}\n@@ -19,23 +24,25 @@ class CustomEngine extends TemplateEngine {\n);\n}\n- async compile(str, inputPath) {\n- // TODO generalize this (look at JavaScript.js)\n- return this.compileFunction(str, inputPath);\n+ needsToReadFileContents() {\n+ if (\"read\" in this.entry) {\n+ return this.entry.read;\n}\n-\n- get defaultTemplateFileExtension() {\n- if (\"extensionMap\" in this.config) {\n- for (let entry of this.config.extensionMap) {\n- if (entry.key.toLowerCase() === this.name.toLowerCase()) {\n- return entry.outputFileExtension;\n+ return true;\n}\n+\n+ async compile(str, inputPath) {\n+ if (this.needsInit && !this.initFinished) {\n+ await this.entry.init();\n+ this.initFinished = true;\n}\n+\n+ // TODO generalize this (look at JavaScript.js)\n+ return this.entry.compile(str, inputPath);\n}\n- throw Error(\n- `Could not find a custom extension for ${this.name}. Did you add it to your config file?`\n- );\n+ get defaultTemplateFileExtension() {\n+ return this.entry.outputFileExtension;\n}\n}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Adds support for `init` in custom template engines (in this case to support loading Vue single file components) |
699 | 19.03.2020 07:47:14 | 18,000 | 041db759ff02c59ea7cb890c5a3f39be00dd6269 | Allow access to the config in the custom template methods | [
{
"change_type": "MODIFY",
"old_path": "src/Engines/Custom.js",
"new_path": "src/Engines/Custom.js",
"diff": "@@ -33,12 +33,12 @@ class CustomEngine extends TemplateEngine {\nasync compile(str, inputPath) {\nif (this.needsInit && !this.initFinished) {\n- await this.entry.init();\n+ await this.entry.init.bind({ config: this.config })();\nthis.initFinished = true;\n}\n// TODO generalize this (look at JavaScript.js)\n- return this.entry.compile(str, inputPath);\n+ return this.entry.compile.bind({ config: this.config })(str, inputPath);\n}\nget defaultTemplateFileExtension() {\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Allow access to the config in the custom template methods |
699 | 19.03.2020 11:51:43 | 18,000 | 2f4b39b62066ebcfe13c8eb630cd8b8920e5e326 | Adds `addTemplateFormat` config API method to allow additive templateFormats inside of plugins for | [
{
"change_type": "MODIFY",
"old_path": "src/TemplateFileSlug.js",
"new_path": "src/TemplateFileSlug.js",
"diff": "@@ -15,7 +15,6 @@ class TemplateFileSlug {\nthis.dirs.pop();\nthis.parsed = parsePath(inputPath);\n- // TODO update this after the fix for issue #117 merges\nthis.filenameNoExt = extensionMap.removeTemplateExtension(this.parsed.base);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/UserConfig.js",
"new_path": "src/UserConfig.js",
"diff": "@@ -19,6 +19,7 @@ class UserConfig {\ndebug(\"Resetting EleventyConfig to initial values.\");\nthis.events = new EventEmitter();\nthis.collections = {};\n+ this.templateFormats = undefined;\nthis.liquidOptions = {};\nthis.liquidTags = {};\n@@ -316,12 +317,25 @@ class UserConfig {\nreturn this;\n}\n- setTemplateFormats(templateFormats) {\n+ _normalizeTemplateFormats(templateFormats) {\nif (typeof templateFormats === \"string\") {\ntemplateFormats = templateFormats.split(\",\").map(format => format.trim());\n}\n+ return templateFormats;\n+ }\n- this.templateFormats = templateFormats;\n+ setTemplateFormats(templateFormats) {\n+ this.templateFormats = this._normalizeTemplateFormats(templateFormats);\n+ }\n+\n+ // additive, usually for plugins\n+ addTemplateFormats(templateFormats) {\n+ if (!this.templateFormatsAdded) {\n+ this.templateFormatsAdded = [];\n+ }\n+ this.templateFormatsAdded = this.templateFormatsAdded.concat(\n+ this._normalizeTemplateFormats(templateFormats)\n+ );\n}\nsetLibrary(engineName, libraryInstance) {\n@@ -617,6 +631,7 @@ class UserConfig {\ngetMergingConfigObject() {\nreturn {\ntemplateFormats: this.templateFormats,\n+ templateFormatsAdded: this.templateFormatsAdded,\nfilters: this.filters, // now called transforms\nlinters: this.linters,\nlayoutAliases: this.layoutAliases,\n"
},
{
"change_type": "RENAME",
"old_path": "config.js",
"new_path": "src/defaultConfig.js",
"diff": "-const urlFilter = require(\"./src/Filters/Url\");\n-const slugFilter = require(\"./src/Filters/Slug\");\n-const getCollectionItem = require(\"./src/Filters/GetCollectionItem\");\n+const urlFilter = require(\"./Filters/Url\");\n+const slugFilter = require(\"./Filters/Slug\");\n+const getCollectionItem = require(\"./Filters/GetCollectionItem\");\nmodule.exports = function(config) {\nconfig.addFilter(\"slug\", slugFilter);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/UserConfigTest.js",
"diff": "+import test from \"ava\";\n+import UserConfig from \"../src/UserConfig\";\n+\n+test(\"Template Formats\", t => {\n+ let cfg = new UserConfig();\n+\n+ t.falsy(cfg.getMergingConfigObject().templateFormats);\n+\n+ cfg.setTemplateFormats(\"njk,liquid\");\n+ t.deepEqual(cfg.getMergingConfigObject().templateFormats, [\"njk\", \"liquid\"]);\n+\n+ // setting multiple times takes the last one\n+ cfg.setTemplateFormats(\"njk,liquid,pug\");\n+ cfg.setTemplateFormats(\"njk,liquid\");\n+ t.deepEqual(cfg.getMergingConfigObject().templateFormats, [\"njk\", \"liquid\"]);\n+});\n+\n+test(\"Template Formats (Arrays)\", t => {\n+ let cfg = new UserConfig();\n+\n+ t.falsy(cfg.getMergingConfigObject().templateFormats);\n+\n+ cfg.setTemplateFormats([\"njk\", \"liquid\"]);\n+ t.deepEqual(cfg.getMergingConfigObject().templateFormats, [\"njk\", \"liquid\"]);\n+\n+ // setting multiple times takes the last one\n+ cfg.setTemplateFormats([\"njk\", \"liquid\", \"pug\"]);\n+ cfg.setTemplateFormats([\"njk\", \"liquid\"]);\n+ t.deepEqual(cfg.getMergingConfigObject().templateFormats, [\"njk\", \"liquid\"]);\n+});\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Adds `addTemplateFormat` config API method to allow additive templateFormats inside of plugins for #117 |
699 | 19.03.2020 13:01:38 | 18,000 | cf9d7b5f57d0a4bc8689cb984d1af9d21ed7c03c | Remove unused experiments API | [
{
"change_type": "MODIFY",
"old_path": "src/UserConfig.js",
"new_path": "src/UserConfig.js",
"diff": "@@ -52,7 +52,6 @@ class UserConfig {\nthis.dynamicPermalinks = true;\nthis.useGitIgnore = true;\nthis.dataDeepMerge = false;\n- this.experiments = new Set();\nthis.extensionMap = new Set();\nthis.watchJavaScriptDependencies = true;\nthis.additionalWatchTargets = [];\n@@ -576,10 +575,6 @@ class UserConfig {\n);\n}\n- addExperiment(key) {\n- this.experiments.add(key);\n- }\n-\nsetDataDeepMerge(deepMerge) {\nthis.dataDeepMerge = !!deepMerge;\n}\n@@ -659,7 +654,6 @@ class UserConfig {\ndynamicPermalinks: this.dynamicPermalinks,\nuseGitIgnore: this.useGitIgnore,\ndataDeepMerge: this.dataDeepMerge,\n- experiments: this.experiments,\nwatchJavaScriptDependencies: this.watchJavaScriptDependencies,\nadditionalWatchTargets: this.additionalWatchTargets,\nbrowserSyncConfig: this.browserSyncConfig,\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Remove unused experiments API |
699 | 19.03.2020 17:05:56 | 18,000 | 24155cc6446b47f0363249d524eae3bafaa99957 | Get current input directory from this.config | [
{
"change_type": "MODIFY",
"old_path": "src/Eleventy.js",
"new_path": "src/Eleventy.js",
"diff": "@@ -273,6 +273,8 @@ class Eleventy {\n* @returns {} - tbd.\n*/\nasync init() {\n+ this.config.inputDir = this.inputDir;\n+\nlet formats = this.formatsOverride || this.config.templateFormats;\nthis.extensionMap = new EleventyExtensionMap(formats);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateConfig.js",
"new_path": "src/TemplateConfig.js",
"diff": "@@ -29,6 +29,14 @@ class TemplateConfig {\nreturn TemplatePath.addLeadingDotSlash(this.localProjectConfigPath);\n}\n+ get inputDir() {\n+ return this._inputDir;\n+ }\n+\n+ set inputDir(inputDir) {\n+ this._inputDir = inputDir;\n+ }\n+\nreset() {\neleventyConfig.reset();\nthis.initializeRootConfig();\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Get current input directory from this.config |
699 | 19.03.2020 20:36:26 | 18,000 | d44f9ee089697989f0db11faff081a4681f07e3e | Add warning about unstable addExtension | [
{
"change_type": "MODIFY",
"old_path": "src/UserConfig.js",
"new_path": "src/UserConfig.js",
"diff": "@@ -608,6 +608,11 @@ class UserConfig {\n}\naddExtension(fileExtension, options = {}) {\n+ console.log(\n+ chalk.yellow(\n+ \"Warning: Configuration API `addExtension` is an undocumented experimental feature of Eleventy with an unstable API. Be careful!\"\n+ )\n+ );\nthis.extensionMap.add(\nObject.assign(\n{\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Add warning about unstable addExtension |
699 | 20.03.2020 07:11:10 | 18,000 | 679d353805e80155b43f8803bbe59bb8a474d793 | Updating experimental warning | [
{
"change_type": "MODIFY",
"old_path": "src/UserConfig.js",
"new_path": "src/UserConfig.js",
"diff": "@@ -610,7 +610,7 @@ class UserConfig {\naddExtension(fileExtension, options = {}) {\nconsole.log(\nchalk.yellow(\n- \"Warning: Configuration API `addExtension` is an undocumented experimental feature of Eleventy with an unstable API. Be careful!\"\n+ \"Warning: Configuration API `addExtension` is an experimental Eleventy feature with an unstable API. Be careful!\"\n)\n);\nthis.extensionMap.add(\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Updating experimental warning |
699 | 20.03.2020 12:05:57 | 18,000 | b2e84639d7fc144142e6f32f5a6200a25757dbe8 | Experimental features require ELEVENTY_EXPERIMENTAL environment variable to opt-in | [
{
"change_type": "MODIFY",
"old_path": "src/UserConfig.js",
"new_path": "src/UserConfig.js",
"diff": "@@ -608,11 +608,16 @@ class UserConfig {\n}\naddExtension(fileExtension, options = {}) {\n+ if (!process.env.ELEVENTY_EXPERIMENTAL) {\n+ return;\n+ }\n+\nconsole.log(\nchalk.yellow(\n\"Warning: Configuration API `addExtension` is an experimental Eleventy feature with an unstable API. Be careful!\"\n)\n);\n+\nthis.extensionMap.add(\nObject.assign(\n{\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Experimental features require ELEVENTY_EXPERIMENTAL environment variable to opt-in |
699 | 25.03.2020 16:53:46 | 18,000 | 72d2c1a63e95da7b0117c2a6778357301ca29ac5 | Adds `beforeWatch` event that fires when a watch build runs (only on re-runs, not on first run). Code for Related to | [
{
"change_type": "MODIFY",
"old_path": "src/Eleventy.js",
"new_path": "src/Eleventy.js",
"diff": "@@ -442,6 +442,8 @@ Arguments:\nreturn;\n}\n+ this.config.events.emit(\"beforeWatch\");\n+\nthis.watchManager.setBuildRunning();\n// reset and reload global configuration :O\n"
},
{
"change_type": "MODIFY",
"old_path": "src/UserConfig.js",
"new_path": "src/UserConfig.js",
"diff": "@@ -672,7 +672,8 @@ class UserConfig {\nfrontMatterParsingOptions: this.frontMatterParsingOptions,\ndataExtensions: this.dataExtensions,\nextensionMap: this.extensionMap,\n- quietMode: this.quietMode\n+ quietMode: this.quietMode,\n+ events: this.events\n};\n}\n}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Adds `beforeWatch` event that fires when a watch build runs (only on re-runs, not on first run). Code for #1042. Related to #729 |
699 | 26.03.2020 09:49:37 | 18,000 | c1ed84a01a4dde3ad8c5e70ccb1d831f18ab9069 | Going to limit to just the `page` data right now. | [
{
"change_type": "MODIFY",
"old_path": "src/Engines/JavaScript.js",
"new_path": "src/Engines/JavaScript.js",
"diff": "@@ -109,9 +109,7 @@ class JavaScript extends TemplateEngine {\nlet fns = {};\nlet configFns = this.config.javascriptFunctions;\nfor (let key in configFns) {\n- fns[key] = configFns[key].bind(\n- Object.assign(inst, { templateData: data })\n- );\n+ fns[key] = configFns[key].bind(Object.assign(inst, { page: data.page }));\n}\nreturn fns;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Liquid.js",
"new_path": "src/Engines/Liquid.js",
"diff": "@@ -125,6 +125,14 @@ class Liquid extends TemplateEngine {\nreturn argArray;\n}\n+ static _normalizeShortcodeScope(scope) {\n+ let obj = {};\n+ if (scope && scope.contexts && scope.contexts[0]) {\n+ obj.page = scope.contexts[0].page;\n+ }\n+ return obj;\n+ }\n+\naddShortcode(shortcodeName, shortcodeFn) {\nlet _t = this;\nthis.addTag(shortcodeName, function(liquidEngine) {\n@@ -136,7 +144,10 @@ class Liquid extends TemplateEngine {\nrender: function(scope, hash) {\nlet argArray = Liquid.parseArguments(_t.argLexer, this.args, scope);\nreturn Promise.resolve(\n- shortcodeFn.call({ templateData: scope.contexts[0] }, ...argArray)\n+ shortcodeFn.call(\n+ Liquid._normalizeShortcodeScope(scope),\n+ ...argArray\n+ )\n);\n}\n};\n@@ -171,7 +182,7 @@ class Liquid extends TemplateEngine {\n.then(function(html) {\nresolve(\nshortcodeFn.call(\n- { templateData: scope.contexts[0] },\n+ Liquid._normalizeShortcodeScope(scope),\nhtml,\n...argArray\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Nunjucks.js",
"new_path": "src/Engines/Nunjucks.js",
"diff": "@@ -75,6 +75,14 @@ class Nunjucks extends TemplateEngine {\n}\n}\n+ static _normalizeShortcodeContext(context) {\n+ let obj = {};\n+ if (context.ctx && context.ctx.page) {\n+ obj.page = context.ctx.page;\n+ }\n+ return obj;\n+ }\n+\naddShortcode(shortcodeName, shortcodeFn, isAsync = false) {\nfunction ShortcodeFunction() {\nthis.tags = [shortcodeName];\n@@ -109,7 +117,7 @@ class Nunjucks extends TemplateEngine {\nif (isAsync) {\nshortcodeFn\n- .call({ templateData: context.ctx }, ...argArray)\n+ .call(Nunjucks._normalizeShortcodeContext(context), ...argArray)\n.then(function(returnValue) {\nresolve(null, new NunjucksLib.runtime.SafeString(returnValue));\n})\n@@ -127,7 +135,10 @@ class Nunjucks extends TemplateEngine {\ntry {\n// console.log( shortcodeFn.toString() );\nreturn new NunjucksLib.runtime.SafeString(\n- shortcodeFn.call({ templateData: context.ctx }, ...argArray)\n+ shortcodeFn.call(\n+ Nunjucks._normalizeShortcodeContext(context),\n+ ...argArray\n+ )\n);\n} catch (e) {\nthrow new EleventyShortcodeError(\n@@ -172,7 +183,11 @@ class Nunjucks extends TemplateEngine {\nif (isAsync) {\nshortcodeFn\n- .call({ templateData: context.ctx }, body(), ...argArray)\n+ .call(\n+ Nunjucks._normalizeShortcodeContext(context),\n+ body(),\n+ ...argArray\n+ )\n.then(function(returnValue) {\nresolve(null, new NunjucksLib.runtime.SafeString(returnValue));\n})\n@@ -190,7 +205,7 @@ class Nunjucks extends TemplateEngine {\ntry {\nreturn new NunjucksLib.runtime.SafeString(\nshortcodeFn.call(\n- { templateData: context.ctx },\n+ Nunjucks._normalizeShortcodeContext(context),\nbody(),\n...argArray\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateRenderLiquidTest.js",
"new_path": "test/TemplateRenderLiquidTest.js",
"diff": "@@ -268,18 +268,24 @@ test(\"Liquid addTags\", async t => {\n});\ntest(\"Liquid Shortcode\", async t => {\n- t.plan(2);\n+ t.plan(3);\nlet tr = getNewTemplateRender(\"liquid\", \"./test/stubs/\");\ntr.engine.addShortcode(\"postfixWithZach\", function(str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\n+ t.not(this.name, \"test\");\nreturn str + \"Zach\";\n});\nt.is(\n- await tr._testRender(\"{% postfixWithZach name %}\", { name: \"test\" }),\n+ await tr._testRender(\"{% postfixWithZach name %}\", {\n+ name: \"test\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }),\n\"testZach\"\n);\n});\n@@ -290,7 +296,7 @@ test(\"Liquid Shortcode returns promise\", async t => {\nlet tr = new TemplateRender(\"liquid\", \"./test/stubs/\");\ntr.engine.addShortcode(\"postfixWithZach\", function(str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn new Promise(function(resolve) {\nsetTimeout(function() {\n@@ -300,7 +306,12 @@ test(\"Liquid Shortcode returns promise\", async t => {\n});\nt.is(\n- await tr._testRender(\"{% postfixWithZach name %}\", { name: \"test\" }),\n+ await tr._testRender(\"{% postfixWithZach name %}\", {\n+ name: \"test\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }),\n\"testZach\"\n);\n});\n@@ -311,13 +322,18 @@ test(\"Liquid Shortcode returns promise (await inside)\", async t => {\nlet tr = new TemplateRender(\"liquid\", \"./test/stubs/\");\ntr.engine.addShortcode(\"postfixWithZach\", async function(str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn await getPromise(str + \"Zach\");\n});\nt.is(\n- await tr._testRender(\"{% postfixWithZach name %}\", { name: \"test\" }),\n+ await tr._testRender(\"{% postfixWithZach name %}\", {\n+ name: \"test\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }),\n\"testZach\"\n);\n});\n@@ -328,12 +344,17 @@ test(\"Liquid Shortcode returns promise (no await inside)\", async t => {\nlet tr = new TemplateRender(\"liquid\", \"./test/stubs/\");\ntr.engine.addShortcode(\"postfixWithZach\", async function(str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn getPromise(str + \"Zach\");\n});\nt.is(\n- await tr._testRender(\"{% postfixWithZach name %}\", { name: \"test\" }),\n+ await tr._testRender(\"{% postfixWithZach name %}\", {\n+ name: \"test\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }),\n\"testZach\"\n);\n});\n@@ -343,12 +364,17 @@ test(\"Liquid Shortcode Safe Output\", async t => {\nlet tr = getNewTemplateRender(\"liquid\", \"./test/stubs/\");\ntr.engine.addShortcode(\"postfixWithZach\", function(str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn `<span>${str}</span>`;\n});\nt.is(\n- await tr._testRender(\"{% postfixWithZach name %}\", { name: \"test\" }),\n+ await tr._testRender(\"{% postfixWithZach name %}\", {\n+ name: \"test\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }),\n\"<span>test</span>\"\n);\n});\n@@ -358,14 +384,19 @@ test(\"Liquid Paired Shortcode\", async t => {\nlet tr = getNewTemplateRender(\"liquid\", \"./test/stubs/\");\ntr.engine.addPairedShortcode(\"postfixWithZach\", function(content, str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn str + content + \"Zach\";\n});\nt.is(\nawait tr._testRender(\n\"{% postfixWithZach name %}Content{% endpostfixWithZach %}\",\n- { name: \"test\" }\n+ {\n+ name: \"test\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }\n),\n\"testContentZach\"\n);\n@@ -376,7 +407,7 @@ test(\"Liquid Async Paired Shortcode\", async t => {\nlet tr = new TemplateRender(\"liquid\", \"./test/stubs/\");\ntr.engine.addPairedShortcode(\"postfixWithZach\", function(content, str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn new Promise(function(resolve) {\nsetTimeout(function() {\nresolve(str + content + \"Zach\");\n@@ -387,7 +418,12 @@ test(\"Liquid Async Paired Shortcode\", async t => {\nt.is(\nawait tr._testRender(\n\"{% postfixWithZach name %}Content{% endpostfixWithZach %}\",\n- { name: \"test\" }\n+ {\n+ name: \"test\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }\n),\n\"testContentZach\"\n);\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateRenderNunjucksTest.js",
"new_path": "test/TemplateRenderNunjucksTest.js",
"diff": "@@ -290,18 +290,25 @@ test(\"Nunjucks Shortcode without args\", async t => {\n});\ntest(\"Nunjucks Shortcode\", async t => {\n- t.plan(2);\n+ t.plan(3);\nlet tr = getNewTemplateRender(\"njk\", \"./test/stubs/\");\ntr.engine.addShortcode(\"postfixWithZach\", function(str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\n+ // sanity check that all data is not carried forward\n+ t.not(this.name, \"test\");\nreturn str + \"Zach\";\n});\nt.is(\n- await tr._testRender(\"{% postfixWithZach name %}\", { name: \"test\" }),\n+ await tr._testRender(\"{% postfixWithZach name %}\", {\n+ name: \"test\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }),\n\"testZach\"\n);\n});\n@@ -314,7 +321,7 @@ test(\"Nunjucks Async Shortcode\", async t => {\n\"postfixWithZach\",\nfunction(str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn new Promise(function(resolve) {\nsetTimeout(function() {\n@@ -326,7 +333,12 @@ test(\"Nunjucks Async Shortcode\", async t => {\n);\nt.is(\n- await tr._testRender(\"{% postfixWithZach name %}\", { name: \"test\" }),\n+ await tr._testRender(\"{% postfixWithZach name %}\", {\n+ name: \"test\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }),\n\"testZach\"\n);\n});\n@@ -339,14 +351,20 @@ test(\"Nunjucks Async function Shortcode\", async t => {\n\"postfixWithZach\",\nasync function(str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\n+\nreturn await getPromise(str + \"Zach\");\n},\ntrue\n);\nt.is(\n- await tr._testRender(\"{% postfixWithZach name %}\", { name: \"test\" }),\n+ await tr._testRender(\"{% postfixWithZach name %}\", {\n+ name: \"test\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }),\n\"testZach\"\n);\n});\n@@ -451,13 +469,18 @@ test(\"Nunjucks Shortcode Safe Output\", async t => {\nlet tr = getNewTemplateRender(\"njk\", \"./test/stubs/\");\ntr.engine.addShortcode(\"postfixWithZach\", function(str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn `<span>${str}</span>`;\n});\nt.is(\n- await tr._testRender(\"{% postfixWithZach name %}\", { name: \"test\" }),\n+ await tr._testRender(\"{% postfixWithZach name %}\", {\n+ name: \"test\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }),\n\"<span>test</span>\"\n);\n});\n@@ -468,7 +491,7 @@ test(\"Nunjucks Paired Shortcode\", async t => {\nlet tr = getNewTemplateRender(\"njk\", \"./test/stubs/\");\ntr.engine.addPairedShortcode(\"postfixWithZach\", function(content, str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn str + content + \"Zach\";\n});\n@@ -476,7 +499,12 @@ test(\"Nunjucks Paired Shortcode\", async t => {\nt.is(\nawait tr._testRender(\n\"{% postfixWithZach name %}Content{% endpostfixWithZach %}\",\n- { name: \"test\" }\n+ {\n+ name: \"test\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }\n),\n\"testContentZach\"\n);\n@@ -490,7 +518,7 @@ test(\"Nunjucks Async Paired Shortcode\", async t => {\n\"postfixWithZach\",\nfunction(content, str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn new Promise(function(resolve) {\nsetTimeout(function() {\n@@ -504,7 +532,12 @@ test(\"Nunjucks Async Paired Shortcode\", async t => {\nt.is(\nawait tr._testRender(\n\"{% postfixWithZach name %}Content{% endpostfixWithZach %}\",\n- { name: \"test\" }\n+ {\n+ name: \"test\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }\n),\n\"testContentZach\"\n);\n@@ -514,7 +547,7 @@ test(\"Nunjucks Paired Shortcode without args\", async t => {\nlet tr = getNewTemplateRender(\"njk\", \"./test/stubs/\");\ntr.engine.addPairedShortcode(\"postfixWithZach\", function(content) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn content + \"Zach\";\n});\n@@ -522,7 +555,12 @@ test(\"Nunjucks Paired Shortcode without args\", async t => {\nt.is(\nawait tr._testRender(\n\"{% postfixWithZach %}Content{% endpostfixWithZach %}\",\n- { name: \"test\" }\n+ {\n+ name: \"test\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }\n),\n\"ContentZach\"\n);\n@@ -534,7 +572,7 @@ test(\"Nunjucks Paired Shortcode with Tag Inside\", async t => {\nlet tr = getNewTemplateRender(\"njk\", \"./test/stubs/\");\ntr.engine.addPairedShortcode(\"postfixWithZach\", function(content, str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn str + content + \"Zach\";\n});\n@@ -542,7 +580,13 @@ test(\"Nunjucks Paired Shortcode with Tag Inside\", async t => {\nt.is(\nawait tr._testRender(\n\"{% postfixWithZach name %}Content{% if tester %}If{% endif %}{% endpostfixWithZach %}\",\n- { name: \"test\", tester: true }\n+ {\n+ name: \"test\",\n+ tester: true,\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }\n),\n\"testContentIfZach\"\n);\n@@ -554,7 +598,7 @@ test(\"Nunjucks Nested Paired Shortcode\", async t => {\nlet tr = getNewTemplateRender(\"njk\", \"./test/stubs/\");\ntr.engine.addPairedShortcode(\"postfixWithZach\", function(content, str) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn str + content + \"Zach\";\n});\n@@ -562,7 +606,13 @@ test(\"Nunjucks Nested Paired Shortcode\", async t => {\nt.is(\nawait tr._testRender(\n\"{% postfixWithZach name %}Content{% postfixWithZach name2 %}Content{% endpostfixWithZach %}{% endpostfixWithZach %}\",\n- { name: \"test\", name2: \"test2\" }\n+ {\n+ name: \"test\",\n+ name2: \"test2\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n+ }\n),\n\"testContenttest2ContentZachZach\"\n);\n@@ -574,7 +624,7 @@ test(\"Nunjucks Shortcode Multiple Args\", async t => {\nlet tr = getNewTemplateRender(\"njk\", \"./test/stubs/\");\ntr.engine.addShortcode(\"postfixWithZach\", function(str, str2) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn str + str2 + \"Zach\";\n});\n@@ -582,7 +632,10 @@ test(\"Nunjucks Shortcode Multiple Args\", async t => {\nt.is(\nawait tr._testRender(\"{% postfixWithZach name, other %}\", {\nname: \"test\",\n- other: \"howdy\"\n+ other: \"howdy\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n}),\n\"testhowdyZach\"\n);\n@@ -608,7 +661,7 @@ test(\"Nunjucks Shortcode Named Args\", async t => {\nlet tr = getNewTemplateRender(\"njk\", \"./test/stubs/\");\ntr.engine.addShortcode(\"postfixWithZach\", function(arg) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn arg.arg1 + arg.arg2 + \"Zach\";\n});\n@@ -616,7 +669,10 @@ test(\"Nunjucks Shortcode Named Args\", async t => {\nt.is(\nawait tr._testRender(\"{% postfixWithZach arg1=name, arg2=other %}\", {\nname: \"test\",\n- other: \"howdy\"\n+ other: \"howdy\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n}),\n\"testhowdyZach\"\n);\n@@ -628,7 +684,7 @@ test(\"Nunjucks Shortcode Named Args (Reverse Order)\", async t => {\nlet tr = getNewTemplateRender(\"njk\", \"./test/stubs/\");\ntr.engine.addShortcode(\"postfixWithZach\", function(arg) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn arg.arg1 + arg.arg2 + \"Zach\";\n});\n@@ -636,7 +692,10 @@ test(\"Nunjucks Shortcode Named Args (Reverse Order)\", async t => {\nt.is(\nawait tr._testRender(\"{% postfixWithZach arg2=other, arg1=name %}\", {\nname: \"test\",\n- other: \"howdy\"\n+ other: \"howdy\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n}),\n\"testhowdyZach\"\n);\n@@ -648,7 +707,7 @@ test(\"Nunjucks Shortcode Named Args (JS notation)\", async t => {\nlet tr = getNewTemplateRender(\"njk\", \"./test/stubs/\");\ntr.engine.addShortcode(\"postfixWithZach\", function(arg) {\n// Data in context\n- t.is(this.templateData.name, \"test\");\n+ t.is(this.page.url, \"/hi/\");\nreturn arg.arg1 + arg.arg2 + \"Zach\";\n});\n@@ -656,7 +715,10 @@ test(\"Nunjucks Shortcode Named Args (JS notation)\", async t => {\nt.is(\nawait tr._testRender(\"{% postfixWithZach { arg1: name, arg2: other } %}\", {\nname: \"test\",\n- other: \"howdy\"\n+ other: \"howdy\",\n+ page: {\n+ url: \"/hi/\"\n+ }\n}),\n\"testhowdyZach\"\n);\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Going to limit #741 to just the `page` data right now. |
699 | 26.03.2020 09:54:20 | 18,000 | 141a71b4424e98b6e596ed357fb1f64533fb7174 | Add a handlebars test for | [
{
"change_type": "MODIFY",
"old_path": "src/Engines/Handlebars.js",
"new_path": "src/Engines/Handlebars.js",
"diff": "@@ -50,7 +50,6 @@ class Handlebars extends TemplateEngine {\ncontent = options.fn(this);\n}\n- // TODO breaking change, use { data: this } for consistency with Nunjucks, Liquid, 11ty.js\nreturn callback.call(this, content, ...args);\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateRenderHandlebarsTest.js",
"new_path": "test/TemplateRenderHandlebarsTest.js",
"diff": "@@ -114,12 +114,14 @@ test(\"Handlebars Render Helper (uses argument)\", async t => {\n});\ntest(\"Handlebars Render Shortcode\", async t => {\n- t.plan(2);\n+ t.plan(3);\nlet tr = getNewTemplateRender(\"hbs\");\ntr.engine.addShortcodes({\nshortcodename: function(name) {\n// Data in context\n+ // Note Handlebars exposes all data while other template languages only expose { page }. See #741\nt.is(this.name, \"Howdy\");\n+ t.is(this.page.url, \"/hi/\");\nreturn name.toUpperCase();\n}\n@@ -128,7 +130,10 @@ test(\"Handlebars Render Shortcode\", async t => {\nlet fn = await tr.getCompiledTemplate(\n\"<p>This is a {{shortcodename name}}.</p>\"\n);\n- t.is(await fn({ name: \"Howdy\" }), \"<p>This is a HOWDY.</p>\");\n+ t.is(\n+ await fn({ name: \"Howdy\", page: { url: \"/hi/\" } }),\n+ \"<p>This is a HOWDY.</p>\"\n+ );\n});\ntest(\"Handlebars Render HTML in Shortcode (Issue #460)\", async t => {\n@@ -137,6 +142,7 @@ test(\"Handlebars Render HTML in Shortcode (Issue #460)\", async t => {\ntr.engine.addShortcodes({\nshortcodenamehtml: function(name) {\n// Data in context\n+ // Note Handlebars exposes all data while other template languages only expose { page }. See #741\nt.is(this.name, \"Howdy\");\nreturn `<span>${name.toUpperCase()}</span>`;\n@@ -156,6 +162,7 @@ test(\"Handlebars Render Shortcode (Multiple args)\", async t => {\ntr.engine.addShortcodes({\nshortcodename2: function(name, name2) {\n// Data in context\n+ // Note Handlebars exposes all data while other template languages only expose { page }. See #741\nt.is(this.name, \"Howdy\");\nt.is(this.name2, \"Zach\");\n@@ -179,6 +186,7 @@ test(\"Handlebars Render Paired Shortcode\", async t => {\ntr.engine.addPairedShortcodes({\nshortcodename3: function(content, name, options) {\n// Data in context\n+ // Note Handlebars exposes all data while other template languages only expose { page }. See #741\nt.is(this.name, \"Howdy\");\nreturn (content + name).toUpperCase();\n@@ -198,6 +206,7 @@ test(\"Handlebars Render Paired Shortcode (HTML)\", async t => {\ntr.engine.addPairedShortcodes({\nshortcodename3html: function(content, name, options) {\n// Data in context\n+ // Note Handlebars exposes all data while other template languages only expose { page }. See #741\nt.is(this.name, \"Howdy\");\nreturn `<span>${(content + name).toUpperCase()}</span>`;\n@@ -220,6 +229,7 @@ test(\"Handlebars Render Paired Shortcode (Spaces)\", async t => {\ntr.engine.addPairedShortcodes({\nshortcodename4: function(content, name, options) {\n// Data in context\n+ // Note Handlebars exposes all data while other template languages only expose { page }. See #741\nt.is(this.name, \"Howdy\");\nreturn (content + name).toUpperCase();\n@@ -239,6 +249,7 @@ test(\"Handlebars Render Paired Shortcode with a Nested Single Shortcode\", async\ntr.engine.addShortcodes({\nshortcodechild: function(txt, options) {\n// Data in context\n+ // Note Handlebars exposes all data while other template languages only expose { page }. See #741\nt.is(this.name, \"Howdy\");\nt.is(this.name2, \"Zach\");\n@@ -249,6 +260,7 @@ test(\"Handlebars Render Paired Shortcode with a Nested Single Shortcode\", async\ntr.engine.addPairedShortcodes({\nshortcodeparent: function(content, name, name2, options) {\n// Data in context\n+ // Note Handlebars exposes all data while other template languages only expose { page }. See #741\nt.is(this.name, \"Howdy\");\nt.is(this.name2, \"Zach\");\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Add a handlebars test for #741 |
667 | 29.03.2020 18:43:30 | -28,800 | 02b70c2f39234a031f295ddd3bbee0ab196a4a25 | chore: upgrade 2x performant LiquidJS v9 | [
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"hamljs\": \"^0.6.2\",\n\"handlebars\": \"^4.7.3\",\n\"javascript-stringify\": \"^2.0.1\",\n- \"liquidjs\": \"^6.4.3\",\n+ \"liquidjs\": \"^9.11.7\",\n\"lodash\": \"^4.17.15\",\n\"luxon\": \"^1.22.2\",\n\"markdown-it\": \"^8.4.2\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Liquid.js",
"new_path": "src/Engines/Liquid.js",
"diff": "const moo = require(\"moo\");\n-const LiquidLib = require(\"liquidjs\");\n+const liquidLib = require(\"liquidjs\");\nconst TemplateEngine = require(\"./TemplateEngine\");\nconst TemplatePath = require(\"../TemplatePath\");\n// const debug = require(\"debug\")(\"Eleventy:Liquid\");\n@@ -26,7 +26,7 @@ class Liquid extends TemplateEngine {\nthis.liquidLibOverride = lib;\n// warning, the include syntax supported here does not exactly match what Jekyll uses.\n- this.liquidLib = lib || LiquidLib(this.getLiquidOptions());\n+ this.liquidLib = lib || new liquidLib.Liquid(this.getLiquidOptions());\nthis.setEngineLib(this.liquidLib);\nthis.addFilters(this.config.liquidFilters);\n@@ -48,7 +48,7 @@ class Liquid extends TemplateEngine {\nroot: [super.getIncludesDir()], // overrides in compile with inputPath below\nextname: \".liquid\",\ndynamicPartials: false,\n- strict_filters: false\n+ strictFilters: false\n};\nlet options = Object.assign(defaults, this.liquidOptions || {});\n@@ -97,7 +97,7 @@ class Liquid extends TemplateEngine {\n}\n}\n- static parseArguments(lexer, str, scope) {\n+ static async parseArguments(lexer, str, scope, engine) {\nlet argArray = [];\nif (typeof str === \"string\") {\n@@ -116,7 +116,7 @@ class Liquid extends TemplateEngine {\nline: 1,\ncol: 1 }*/\nif (arg.type.indexOf(\"ignore:\") === -1) {\n- argArray.push(LiquidLib.evalExp(arg.value, scope)); // or evalValue\n+ argArray.push(await engine.evalValue(arg.value, scope));\n}\narg = lexer.next();\n}\n@@ -125,10 +125,10 @@ class Liquid extends TemplateEngine {\nreturn argArray;\n}\n- static _normalizeShortcodeScope(scope) {\n+ static _normalizeShortcodeScope(ctx) {\nlet obj = {};\n- if (scope && scope.contexts && scope.contexts[0]) {\n- obj.page = scope.contexts[0].page;\n+ if (ctx) {\n+ obj.page = ctx.get([\"page\"]);\n}\nreturn obj;\n}\n@@ -141,8 +141,13 @@ class Liquid extends TemplateEngine {\nthis.name = tagToken.name;\nthis.args = tagToken.args;\n},\n- render: function(scope, hash) {\n- let argArray = Liquid.parseArguments(_t.argLexer, this.args, scope);\n+ render: async function(scope, hash) {\n+ let argArray = await Liquid.parseArguments(\n+ _t.argLexer,\n+ this.args,\n+ scope,\n+ this.liquid\n+ );\nreturn Promise.resolve(\nshortcodeFn.call(\nLiquid._normalizeShortcodeScope(scope),\n@@ -173,22 +178,22 @@ class Liquid extends TemplateEngine {\nstream.start();\n},\n- render: function(scope, hash) {\n- let argArray = Liquid.parseArguments(_t.argLexer, this.args, scope);\n-\n- return new Promise((resolve, reject) => {\n- liquidEngine.renderer\n- .renderTemplates(this.templates, scope)\n- .then(function(html) {\n- resolve(\n- shortcodeFn.call(\n- Liquid._normalizeShortcodeScope(scope),\n+ render: function*(ctx, hash) {\n+ let argArray = yield Liquid.parseArguments(\n+ _t.argLexer,\n+ this.args,\n+ ctx,\n+ this.liquid\n+ );\n+ const html = yield this.liquid.renderer.renderTemplates(\n+ this.templates,\n+ ctx\n+ );\n+ return shortcodeFn.call(\n+ Liquid._normalizeShortcodeScope(ctx),\nhtml,\n...argArray\n- )\n);\n- });\n- });\n}\n};\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateRenderLiquidTest.js",
"new_path": "test/TemplateRenderLiquidTest.js",
"diff": "@@ -184,7 +184,7 @@ test(\"Liquid Custom Tag prefixWithZach\", async t => {\nthis.str = tagToken.args; // name\n},\nrender: function(scope, hash) {\n- var str = liquidEngine.evalValue(this.str, scope); // 'alice'\n+ var str = liquidEngine.evalValueSync(this.str, scope); // 'alice'\nreturn Promise.resolve(\"Zach\" + str); // 'Alice'\n}\n};\n@@ -203,8 +203,8 @@ test(\"Liquid Custom Tag postfixWithZach\", async t => {\nparse: function(tagToken, remainTokens) {\nthis.str = tagToken.args;\n},\n- render: function(scope, hash) {\n- var str = liquidEngine.evalValue(this.str, scope);\n+ render: async function(scope, hash) {\n+ var str = await liquidEngine.evalValue(this.str, scope);\nreturn Promise.resolve(str + \"Zach\");\n}\n};\n@@ -253,8 +253,8 @@ test(\"Liquid addTags\", async t => {\nparse: function(tagToken, remainTokens) {\nthis.str = tagToken.args;\n},\n- render: function(scope, hash) {\n- var str = liquidEngine.evalValue(this.str, scope);\n+ render: async function(scope, hash) {\n+ var str = await liquidEngine.evalValue(this.str, scope);\nreturn Promise.resolve(str + \"Zach\");\n}\n};\n@@ -620,12 +620,11 @@ test(\"Liquid Render Include Subfolder Double quotes HTML dynamicPartials true, d\n});\ntest(\"Liquid Render: with Library Override\", async t => {\n- let tr = getNewTemplateRender(\"liquid\");\n+ const tr = getNewTemplateRender(\"liquid\");\n+ const { Liquid } = require(\"liquidjs\");\n+ tr.engine.setLibrary(new Liquid());\n- let lib = require(\"liquidjs\")();\n- tr.engine.setLibrary(lib);\n-\n- let fn = await tr.getCompiledTemplate(\"<p>{{name | capitalize}}</p>\");\n+ const fn = await tr.getCompiledTemplate(\"<p>{{name | capitalize}}</p>\");\nt.is(await fn({ name: \"tim\" }), \"<p>Tim</p>\");\n});\n@@ -688,7 +687,7 @@ test.skip(\"Liquid Include Scope Leak\", async t => {\n});\n// TODO this will change in 1.0\n-test(\"Liquid Missing Filter Issue #183 (no strict_filters)\", async t => {\n+test(\"Liquid Missing Filter Issue #183 (no strictFilters)\", async t => {\nlet tr = getNewTemplateRender(\"liquid\", \"./test/stubs/\");\ntry {\n@@ -701,7 +700,7 @@ test(\"Liquid Missing Filter Issue #183 (no strict_filters)\", async t => {\ntest(\"Liquid Missing Filter Issue #183\", async t => {\nlet tr = getNewTemplateRender(\"liquid\", \"./test/stubs/\");\n- tr.engine.setLiquidOptions({ strict_filters: true });\n+ tr.engine.setLiquidOptions({ strictFilters: true });\ntry {\nawait tr._testRender(\"{{ 'test' | prefixWithZach }}\", {});\n@@ -729,8 +728,8 @@ test(\"Issue 347: Liquid addTags with space in argument\", async t => {\nparse: function(tagToken, remainTokens) {\nthis.str = tagToken.args;\n},\n- render: function(scope, hash) {\n- var str = liquidEngine.evalValue(this.str, scope);\n+ render: async function(scope, hash) {\n+ var str = await liquidEngine.evalValue(this.str, scope);\nreturn Promise.resolve(str + \"Zach\");\n}\n};\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | chore: upgrade 2x performant LiquidJS v9 |
659 | 29.03.2020 21:49:59 | -7,200 | b8a0bdd9059a0018cf18e778e212d40f5ca210aa | allow registering Nunjucks globals | [
{
"change_type": "MODIFY",
"old_path": "src/Engines/Nunjucks.js",
"new_path": "src/Engines/Nunjucks.js",
"diff": "@@ -36,6 +36,7 @@ class Nunjucks extends TemplateEngine {\nthis.config.nunjucksAsyncPairedShortcodes,\ntrue\n);\n+ this.addGlobals(this.config.nunjucksGlobals);\n}\naddFilters(helpers, isAsync) {\n@@ -63,6 +64,16 @@ class Nunjucks extends TemplateEngine {\nthis.njkEnv.addExtension(name, tagObj);\n}\n+ addGlobals(globals) {\n+ for (let name in globals) {\n+ this.addGlobal(name, globals[name]);\n+ }\n+ }\n+\n+ addGlobal(name, globalFn) {\n+ this.njkEnv.addGlobal(name, globalFn);\n+ }\n+\naddAllShortcodes(shortcodes, isAsync = false) {\nfor (let name in shortcodes) {\nthis.addShortcode(name, shortcodes[name], isAsync);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/UserConfig.js",
"new_path": "src/UserConfig.js",
"diff": "@@ -29,6 +29,7 @@ class UserConfig {\nthis.nunjucksFilters = {};\nthis.nunjucksAsyncFilters = {};\nthis.nunjucksTags = {};\n+ this.nunjucksGlobals = {};\nthis.nunjucksShortcodes = {};\nthis.nunjucksAsyncShortcodes = {};\nthis.nunjucksPairedShortcodes = {};\n@@ -226,6 +227,21 @@ class UserConfig {\nthis.nunjucksTags[name] = bench.add(`\"${name}\" Nunjucks Custom Tag`, tagFn);\n}\n+ addNunjucksGlobal(name, globalFn) {\n+ name = this.getNamespacedName(name);\n+\n+ if (this.nunjucksGlobals[name]) {\n+ debug(\n+ chalk.yellow(\n+ \"Warning, overwriting a Nunjucks global with `addNunjucksGlobal(%o)`\"\n+ ),\n+ name\n+ );\n+ }\n+\n+ this.nunjucksGlobals[name] = bench.add(`\"${name}\" Nunjucks Global`, globalFn);\n+ }\n+\naddTransform(name, callback) {\nname = this.getNamespacedName(name);\n@@ -649,6 +665,7 @@ class UserConfig {\nnunjucksFilters: this.nunjucksFilters,\nnunjucksAsyncFilters: this.nunjucksAsyncFilters,\nnunjucksTags: this.nunjucksTags,\n+ nunjucksGlobals: this.nunjucksGlobals,\nnunjucksAsyncShortcodes: this.nunjucksAsyncShortcodes,\nnunjucksShortcodes: this.nunjucksShortcodes,\nnunjucksAsyncPairedShortcodes: this.nunjucksAsyncPairedShortcodes,\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateConfigTest.js",
"new_path": "test/TemplateConfigTest.js",
"diff": "@@ -57,6 +57,20 @@ test(\"Add nunjucks tag\", t => {\nt.not(Object.keys(cfg.nunjucksTags).indexOf(\"myNunjucksTag\"), -1);\n});\n+test(\"Add nunjucks global\", t => {\n+ eleventyConfig.reset();\n+ eleventyConfig.addNunjucksGlobal(\"myNunjucksGlobal1\", function() {});\n+ eleventyConfig.addNunjucksGlobal(\"myNunjucksGlobal2\", 42);\n+\n+ let templateCfg = new TemplateConfig(\n+ require(\"../src/defaultConfig.js\"),\n+ \"./test/stubs/config.js\"\n+ );\n+ let cfg = templateCfg.getConfig();\n+ t.not(Object.keys(cfg.nunjucksGlobals).indexOf(\"myNunjucksGlobal1\"), -1);\n+ t.not(Object.keys(cfg.nunjucksGlobals).indexOf(\"myNunjucksGlobal2\"), -1);\n+});\n+\ntest(\"Add liquid filter\", t => {\neleventyConfig.reset();\neleventyConfig.addLiquidFilter(\"myFilterName\", function(liquidEngine) {\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | allow registering Nunjucks globals |
667 | 01.04.2020 11:46:05 | -28,800 | 7a55e2d721bbfd345ef5c6882f0c1406b5c0f406 | chore: upgrade liquidjs to the latest | [
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"js-yaml\": \"^3.13.1\",\n\"jsdoc\": \"3.6.3\",\n\"lint-staged\": \"^10.0.9\",\n+ \"liquidjs\": \"^9.11.9\",\n\"markdown-it-emoji\": \"^1.4.0\",\n\"node-sass\": \"^4.13.1\",\n\"nyc\": \"^15.0.0\",\n\"hamljs\": \"^0.6.2\",\n\"handlebars\": \"^4.7.3\",\n\"javascript-stringify\": \"^2.0.1\",\n- \"liquidjs\": \"^9.11.7\",\n\"lodash\": \"^4.17.15\",\n\"luxon\": \"^1.22.2\",\n\"markdown-it\": \"^8.4.2\",\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | chore: upgrade liquidjs to the latest |
699 | 01.04.2020 11:02:48 | 18,000 | 8ffbb9927ea8482c5a46515f3a2ed25cd8830ad8 | Looks like the mitigation for fixes | [
{
"change_type": "MODIFY",
"old_path": "test/TemplateTest.js",
"new_path": "test/TemplateTest.js",
"diff": "@@ -2142,3 +2142,18 @@ test(\"eleventyComputed true primitive\", async t => {\nt.is(data.key3, false);\nt.is(data.key4, 324);\n});\n+\n+test(\"eleventyComputed relies on global data\", async t => {\n+ let dataObj = new TemplateData(\"./test/stubs/\");\n+ let tmpl = new Template(\n+ \"./test/stubs/eleventyComputed/use-global-data.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\",\n+ dataObj\n+ );\n+\n+ let fetchedData = await tmpl.getData();\n+ let templates = await tmpl.getTemplates(fetchedData);\n+ let data = templates[0].data;\n+ t.is(data.image, \"datavalue1\");\n+});\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs/eleventyComputed/use-global-data.njk",
"diff": "+---js\n+{\n+ eleventyComputed: {\n+ image: data => {\n+ return data.globalData.datakey1;\n+ }\n+ }\n+}\n+---\n+Issue #1043\n\\ No newline at end of file\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Looks like the mitigation for #1061 fixes #1043 |
699 | 04.04.2020 14:38:08 | 18,000 | b8144add8a5ecd7d41fb3c602237189e67ffb252 | Fixes `[object Object]` output in debug | [
{
"change_type": "MODIFY",
"old_path": "src/TemplatePassthroughManager.js",
"new_path": "src/TemplatePassthroughManager.js",
"diff": "@@ -181,7 +181,7 @@ class TemplatePassthroughManager {\nlet promises = [];\ndebug(\"TemplatePassthrough copy started.\");\nfor (let path of this.getConfigPaths()) {\n- debug(`TemplatePassthrough copying from config: ${path}`);\n+ debug(`TemplatePassthrough copying from config: %o`, path);\npromises.push(this.copyPath(path));\n}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Fixes `[object Object]` output in debug |
699 | 08.04.2020 17:28:30 | 18,000 | 82d83f55b92624b7b307c3814c80c7f83b264d7f | Now shows total files copied in passthrough copy output. Fixes
Adds aggregate benchmarks. Changes threshold percent from 10% to 8%. | [
{
"change_type": "MODIFY",
"old_path": "src/Benchmark.js",
"new_path": "src/Benchmark.js",
"diff": "+const { performance } = require(\"perf_hooks\");\n+\nclass Benchmark {\nconstructor() {\nthis.reset();\n}\n+ getNewTimestamp() {\n+ if (performance) {\n+ return performance.now();\n+ }\n+ return new Date().getTime();\n+ }\n+\nreset() {\nthis.timeSpent = 0;\nthis.timesCalled = 0;\n- this.beforeDates = [];\n+ this.beforeTimers = [];\n}\nbefore() {\nthis.timesCalled++;\n- this.beforeDates.push(new Date());\n+ this.beforeTimers.push(this.getNewTimestamp());\n}\nafter() {\n- if (!this.beforeDates.length) {\n+ if (!this.beforeTimers.length) {\nthrow new Error(\"You called Benchmark after() without a before().\");\n}\n- let before = this.beforeDates.pop();\n- if (!this.beforeDates.length) {\n- this.timeSpent += new Date().getTime() - before.getTime();\n+ let before = this.beforeTimers.pop();\n+ if (!this.beforeTimers.length) {\n+ this.timeSpent += this.getNewTimestamp() - before;\n}\n}\n@@ -32,10 +41,6 @@ class Benchmark {\ngetTotal() {\nreturn this.timeSpent;\n}\n-\n- getTotalString() {\n- return this.timeSpent > 0 ? ` (${this.timeSpent}ms)` : \"\";\n- }\n}\nmodule.exports = Benchmark;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/TemplateEngine.js",
"new_path": "src/Engines/TemplateEngine.js",
"diff": "@@ -3,6 +3,7 @@ const fs = require(\"fs-extra\");\nconst TemplatePath = require(\"../TemplatePath\");\nconst EleventyExtensionMap = require(\"../EleventyExtensionMap\");\nconst debug = require(\"debug\")(\"Eleventy:TemplateEngine\");\n+const aggregateBench = require(\"../BenchmarkManager\").get(\"Aggregate\");\nclass TemplateEngine {\nconstructor(name, includesDir) {\n@@ -61,6 +62,8 @@ class TemplateEngine {\n// TODO: reuse mustache partials in handlebars?\nlet partialFiles = [];\nif (this.includesDir) {\n+ let bench = aggregateBench.get(\"Searching the file system\");\n+ bench.before();\nthis.extensions.forEach(function(extension) {\npartialFiles = partialFiles.concat(\nfastglob.sync(prefix + extension, {\n@@ -69,6 +72,7 @@ class TemplateEngine {\n})\n);\n});\n+ bench.after();\n}\npartialFiles = TemplatePath.addLeadingDotSlashArray(partialFiles);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Template.js",
"new_path": "src/Template.js",
"diff": "@@ -14,8 +14,10 @@ const TemplateFileSlug = require(\"./TemplateFileSlug\");\nconst ComputedData = require(\"./ComputedData\");\nconst Pagination = require(\"./Plugins/Pagination\");\nconst TemplateContentPrematureUseError = require(\"./Errors/TemplateContentPrematureUseError\");\n+\nconst debug = require(\"debug\")(\"Eleventy:Template\");\nconst debugDev = require(\"debug\")(\"Dev:Eleventy:Template\");\n+const bench = require(\"./BenchmarkManager\").get(\"Aggregate\");\nclass Template extends TemplateContent {\nconstructor(path, inputDir, outputDir, templateData) {\n@@ -553,7 +555,10 @@ class Template extends TemplateContent {\nif (!shouldWriteFile) {\nthis.skippedCount++;\n} else {\n+ let templateBenchmark = bench.get(\"Template Write\");\n+ templateBenchmark.before();\nreturn fs.outputFile(outputPath, finalContent).then(() => {\n+ templateBenchmark.after();\nthis.writeCount++;\ndebug(`${outputPath} ${lang.finished}.`);\n});\n@@ -580,7 +585,8 @@ class Template extends TemplateContent {\nlet promises = [];\nfor (let page of mapEntry._pages) {\nlet content = await this.renderPageEntry(mapEntry, page);\n- promises.push(this._write(page.outputPath, content));\n+ let promise = this._write(page.outputPath, content);\n+ promises.push(promise);\n}\nreturn Promise.all(promises);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateContent.js",
"new_path": "src/TemplateContent.js",
"diff": "@@ -12,6 +12,7 @@ const EleventyErrorUtil = require(\"./EleventyErrorUtil\");\nconst config = require(\"./Config\");\nconst debug = require(\"debug\")(\"Eleventy:TemplateContent\");\nconst debugDev = require(\"debug\")(\"Dev:Eleventy:TemplateContent\");\n+const bench = require(\"./BenchmarkManager\").get(\"Aggregate\");\nclass TemplateContentCompileError extends EleventyBaseError {}\nclass TemplateContentRenderError extends EleventyBaseError {}\n@@ -107,11 +108,16 @@ class TemplateContent {\n}\nasync getInputContent() {\n- if (this.engine.needsToReadFileContents()) {\n- return fs.readFile(this.inputPath, \"utf-8\");\n+ if (!this.engine.needsToReadFileContents()) {\n+ return \"\";\n}\n- return \"\";\n+ let templateBenchmark = bench.get(\"Template Read\");\n+ templateBenchmark.before();\n+ let content = await fs.readFile(this.inputPath, \"utf-8\");\n+ templateBenchmark.after();\n+\n+ return content;\n}\nasync getFrontMatter() {\n@@ -170,7 +176,10 @@ class TemplateContent {\n);\ntry {\n+ let templateBenchmark = bench.get(\"Template Compile\");\n+ templateBenchmark.before();\nlet fn = await this.templateRender.getCompiledTemplate(str);\n+ templateBenchmark.after();\ndebugDev(\"%o getCompiledTemplate function created\", this.inputPath);\nreturn fn;\n} catch (e) {\n@@ -185,7 +194,10 @@ class TemplateContent {\nasync render(str, data, bypassMarkdown) {\ntry {\nlet fn = await this.compile(str, bypassMarkdown);\n+ let templateBenchmark = bench.get(\"Template Render\");\n+ templateBenchmark.before();\nlet rendered = await fn(data);\n+ templateBenchmark.after();\ndebugDev(\n\"%o getCompiledTemplate called, rendered content created\",\nthis.inputPath\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateData.js",
"new_path": "src/TemplateData.js",
"diff": "@@ -10,13 +10,16 @@ const TemplatePath = require(\"./TemplatePath\");\nconst TemplateGlob = require(\"./TemplateGlob\");\nconst EleventyExtensionMap = require(\"./EleventyExtensionMap\");\nconst EleventyBaseError = require(\"./EleventyBaseError\");\n-const bench = require(\"./BenchmarkManager\").get(\"Data\");\n+\nconst config = require(\"./Config\");\nconst debugWarn = require(\"debug\")(\"Eleventy:Warnings\");\nconst debug = require(\"debug\")(\"Eleventy:TemplateData\");\nconst debugDev = require(\"debug\")(\"Dev:Eleventy:TemplateData\");\nconst deleteRequireCache = require(\"./Util/DeleteRequireCache\");\n+const bench = require(\"./BenchmarkManager\").get(\"Data\");\n+const aggregateBench = require(\"./BenchmarkManager\").get(\"Aggregate\");\n+\nclass TemplateDataParseError extends EleventyBaseError {}\nclass TemplateData {\n@@ -175,10 +178,13 @@ class TemplateData {\nasync getGlobalDataFiles() {\nlet priorities = this.getGlobalDataExtensionPriorities();\n+ let fsBench = aggregateBench.get(\"Searching the file system\");\n+ fsBench.before();\nlet paths = await fastglob(await this.getGlobalDataGlob(), {\ncaseSensitiveMatch: false,\ndot: true\n});\n+ fsBench.after();\n// sort paths according to extension priorities\n// here we use reverse ordering, because paths with bigger index in array will override the first ones\n@@ -368,6 +374,8 @@ class TemplateData {\nreturn {};\n}\n+ let aggregateDataBench = aggregateBench.get(\"Data File\");\n+ aggregateDataBench.before();\nlet dataBench = bench.get(`\\`${path}\\``);\ndataBench.before();\ndeleteRequireCache(localPath);\n@@ -378,6 +386,7 @@ class TemplateData {\n}\ndataBench.after();\n+ aggregateDataBench.after();\nreturn returnValue;\n} else if (this.isUserDataExtension(extension)) {\n// Other extensions\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplatePassthrough.js",
"new_path": "src/TemplatePassthrough.js",
"diff": "@@ -3,7 +3,7 @@ const TemplatePath = require(\"./TemplatePath\");\nconst debug = require(\"debug\")(\"Eleventy:TemplatePassthrough\");\nconst fastglob = require(\"fast-glob\");\nconst EleventyBaseError = require(\"./EleventyBaseError\");\n-//const bench = require(\"./BenchmarkManager\").get(\"PassthroughCopy\");\n+const aggregateBench = require(\"./BenchmarkManager\").get(\"Aggregate\");\nclass TemplatePassthroughError extends EleventyBaseError {}\n@@ -55,12 +55,15 @@ class TemplatePassthrough {\nasync getFiles(glob) {\ndebug(\"Searching for: %o\", glob);\n+ let bench = aggregateBench.get(\"Searching the file system\");\n+ bench.before();\nconst files = TemplatePath.addLeadingDotSlashArray(\nawait fastglob(glob, {\ncaseSensitiveMatch: false,\ndot: true\n})\n);\n+ bench.after();\nreturn files;\n}\n@@ -70,15 +73,20 @@ class TemplatePassthrough {\nTemplatePath.stripLeadingDotSlash(this.outputDir)\n)\n) {\n- // Uncomment this if you want to add benchmarking to copy\n- // (Warning, it seems to be noisy and low value feedback)\n- // return bench.addAsync(`Copying ${src}`, function() {\n- // // copy() returns a promise\n- // return copy(src, dest, copyOptions);\n- // });\n-\n+ let fileCopyCount = 0;\n// copy() returns a promise\n- return copy(src, dest, copyOptions);\n+ return copy(src, dest, copyOptions)\n+ .on(copy.events.COPY_FILE_START, function(copyOp) {\n+ // Access to individual files at `copyOp.src`\n+ aggregateBench.get(\"Passthrough Copy File\").before();\n+ })\n+ .on(copy.events.COPY_FILE_COMPLETE, function() {\n+ fileCopyCount++;\n+ aggregateBench.get(\"Passthrough Copy File\").after();\n+ })\n+ .then(() => {\n+ return fileCopyCount;\n+ });\n}\nreturn Promise.reject(\nnew TemplatePassthroughError(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/UserConfig.js",
"new_path": "src/UserConfig.js",
"diff": "@@ -4,6 +4,7 @@ const semver = require(\"semver\");\nconst { DateTime } = require(\"luxon\");\nconst EleventyBaseError = require(\"./EleventyBaseError\");\nconst bench = require(\"./BenchmarkManager\").get(\"Configuration\");\n+const aggregateBench = require(\"./BenchmarkManager\").get(\"Aggregate\");\nconst debug = require(\"debug\")(\"Eleventy:UserConfig\");\nconst pkg = require(\"../package.json\");\n@@ -263,16 +264,22 @@ class UserConfig {\n}\naddPlugin(plugin, options) {\n+ // TODO support function.name in plugin config functions\ndebug(\"Adding plugin (unknown name: check your config file).\");\n+ let pluginBench = aggregateBench.get(\"Configuration addPlugin\");\nif (typeof plugin === \"function\") {\n+ pluginBench.before();\nlet configFunction = plugin;\nconfigFunction(this, options);\n+ pluginBench.after();\n} else if (plugin && plugin.configFunction) {\n+ pluginBench.before();\nif (options && typeof options.init === \"function\") {\noptions.init.call(this, plugin.initArguments || {});\n}\nplugin.configFunction(this, options);\n+ pluginBench.after();\n} else {\nthrow new UserConfigError(\n\"Invalid EleventyConfig.addPlugin signature. Should be a function or a valid Eleventy plugin object.\"\n"
},
{
"change_type": "MODIFY",
"old_path": "test/BenchmarkTest.js",
"new_path": "test/BenchmarkTest.js",
"diff": "@@ -25,7 +25,7 @@ test.cb(\nsetTimeout(function() {\nb.before();\nb.after();\n- t.is(b.getTotal(), 0);\n+ t.truthy(b.getTotal() <= 0.1);\nb.after();\nt.truthy(b.getTotal() >= 10);\n@@ -42,7 +42,7 @@ test.cb(\"Reset Benchmark\", t => {\nsetTimeout(function() {\nb.before();\nb.after();\n- t.is(b.getTotal(), 0);\n+ t.truthy(b.getTotal() <= 0.1);\nt.throws(function() {\n// throws because we reset\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Now shows total files copied in passthrough copy output. Fixes #1077.
Adds aggregate benchmarks. Changes threshold percent from 10% to 8%. |
699 | 08.04.2020 20:43:54 | 18,000 | fc115dc1440a2bb91b6b2088292ad98d0b0c0b30 | Better output during incremental passthrough copy changes | [
{
"change_type": "MODIFY",
"old_path": "src/Eleventy.js",
"new_path": "src/Eleventy.js",
"diff": "@@ -231,15 +231,17 @@ class Eleventy {\nif (copyCount) {\nret.push(\n- `Copied ${copyCount} ${simplePlural(copyCount, \"file\", \"files\")} /`\n+ `Copied ${copyCount} ${simplePlural(copyCount, \"file\", \"files\")}`\n);\n}\n+ if (writeCount || skippedCount) {\nret.push(\n`Wrote ${writeCount} ${simplePlural(writeCount, \"file\", \"files\")}${\nskippedCount ? ` (skipped ${skippedCount})` : \"\"\n}`\n);\n+ }\nlet versionStr = `v${pkg.version}`;\nlet time = ((new Date() - this.start) / 1000).toFixed(2);\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Better output during incremental passthrough copy changes |
699 | 08.04.2020 21:04:51 | 18,000 | 645a767c65c2333ae6d28776e7b8568f0a8a2fae | Use high resolution timers for full build time. Adds initial performance.now() warm up time to debug | [
{
"change_type": "MODIFY",
"old_path": "src/Eleventy.js",
"new_path": "src/Eleventy.js",
"diff": "@@ -8,6 +8,8 @@ const EleventyServe = require(\"./EleventyServe\");\nconst EleventyWatch = require(\"./EleventyWatch\");\nconst EleventyWatchTargets = require(\"./EleventyWatchTargets\");\nconst EleventyFiles = require(\"./EleventyFiles\");\n+const { performance } = require(\"perf_hooks\");\n+\nconst templateCache = require(\"./TemplateCache\");\nconst simplePlural = require(\"./Util/Pluralize\");\nconst deleteRequireCache = require(\"./Util/DeleteRequireCache\");\n@@ -61,8 +63,12 @@ class Eleventy {\n*/\nthis.isDryRun = false;\n- /** @member {Date} - The time of instantiation. */\n- this.start = new Date();\n+ if (performance) {\n+ debug(\"Eleventy warm up time (in ms) %o\", performance.now());\n+ }\n+\n+ /** @member {Number} - The timestamp of Eleventy start. */\n+ this.start = this.getNewTimestamp();\n/**\n* @member {Array<String>} - Subset of template types.\n@@ -88,6 +94,13 @@ class Eleventy {\nthis.watchTargets.watchJavaScriptDependencies = this.config.watchJavaScriptDependencies;\n}\n+ getNewTimestamp() {\n+ if (performance) {\n+ return performance.now();\n+ }\n+ return new Date().getTime();\n+ }\n+\n/** @type {String} */\nget input() {\nreturn this.rawInput || this.config.dir.input;\n@@ -186,7 +199,7 @@ class Eleventy {\n*/\nasync restart() {\ndebug(\"Restarting\");\n- this.start = new Date();\n+ this.start = this.getNewTimestamp();\ntemplateCache.clear();\nbench.reset();\nthis.eleventyFiles.restart();\n@@ -229,22 +242,27 @@ class Eleventy {\nlet skippedCount = this.writer.getSkippedCount();\nlet copyCount = this.writer.getCopyCount();\n+ let slashRet = [];\n+\nif (copyCount) {\n- ret.push(\n+ slashRet.push(\n`Copied ${copyCount} ${simplePlural(copyCount, \"file\", \"files\")}`\n);\n}\nif (writeCount || skippedCount) {\n- ret.push(\n+ slashRet.push(\n`Wrote ${writeCount} ${simplePlural(writeCount, \"file\", \"files\")}${\nskippedCount ? ` (skipped ${skippedCount})` : \"\"\n}`\n);\n}\n+ if (slashRet.length) {\n+ ret.push(slashRet.join(\" / \"));\n+ }\nlet versionStr = `v${pkg.version}`;\n- let time = ((new Date() - this.start) / 1000).toFixed(2);\n+ let time = ((this.getNewTimestamp() - this.start) / 1000).toFixed(2);\nret.push(`in ${time} ${simplePlural(time, \"second\", \"seconds\")}`);\nif (writeCount >= 10) {\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Use high resolution timers for full build time. Adds initial performance.now() warm up time to debug |
699 | 19.04.2020 21:10:34 | 18,000 | 1fd4f024969e7b83cab43808f0a3ac3ddac4b4f3 | COMPUTED DATA PROXIES | [
{
"change_type": "MODIFY",
"old_path": "src/ComputedData.js",
"new_path": "src/ComputedData.js",
"diff": "@@ -27,7 +27,7 @@ class ComputedData {\nthis.templateStringKeyLookup[key] = true;\n}\n- async getVarOrder() {\n+ async getVarOrder(data) {\nif (this.computedKeys.size > 0) {\nlet graph = new DependencyGraph();\n@@ -44,16 +44,15 @@ class ComputedData {\n}\n}\n- let varsUsed;\nlet proxy;\nlet isTemplateString = !!this.templateStringKeyLookup[key];\n+ // TODO move this out of the loop??\nif (isTemplateString) {\nproxy = new ComputedDataTemplateString(this.computedKeys);\n} else {\nproxy = new ComputedDataProxy(this.computedKeys);\n}\n- varsUsed = await proxy.findVarsUsed(computed);\n-\n+ let varsUsed = await proxy.findVarsUsed(computed, data);\nfor (let varUsed of varsUsed) {\nif (varUsed !== key && this.computedKeys.has(varUsed)) {\ngraph.addNode(varUsed);\n@@ -70,7 +69,7 @@ class ComputedData {\n}\nasync setupData(data) {\n- let order = await this.getVarOrder();\n+ let order = await this.getVarOrder(data);\nfor (let key of order) {\nlet computed = lodashGet(this.computed, key);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/ComputedDataTemplateString.js",
"new_path": "src/ComputedDataTemplateString.js",
"diff": "@@ -41,7 +41,7 @@ class ComputedDataTemplateString {\nreturn Array.from(vars);\n}\n- async findVarsUsed(fn) {\n+ async findVarsUsed(fn, data = {}) {\nlet proxyData = this.getProxyData();\nlet output;\nlet savedLog = console.log;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/ComputedDataTemplateStringTest.js",
"diff": "+import test from \"ava\";\n+import ComputedDataTemplateString from \"../src/ComputedDataTemplateString\";\n+\n+test(\"Get fake proxy data\", t => {\n+ let cd = new ComputedDataTemplateString([\"key1\", \"key2\"]);\n+ t.deepEqual(cd.getProxyData(), {\n+ key1: `${cd.prefix}key1${cd.suffix}`,\n+ key2: `${cd.prefix}key2${cd.suffix}`\n+ });\n+});\n+\n+test(\"Get nested fake proxy data\", t => {\n+ let cd = new ComputedDataTemplateString([\"key1.nested\", \"key2\"]);\n+ t.deepEqual(cd.getProxyData(), {\n+ key1: {\n+ nested: `${cd.prefix}key1.nested${cd.suffix}`\n+ },\n+ key2: `${cd.prefix}key2${cd.suffix}`\n+ });\n+});\n+\n+test(\"Get vars from output\", t => {\n+ let cd = new ComputedDataTemplateString();\n+ t.deepEqual(cd.findVarsInOutput(\"\"), []);\n+ t.deepEqual(cd.findVarsInOutput(\"slkdjfkljdsf\"), []);\n+ t.deepEqual(\n+ cd.findVarsInOutput(`slkdjfkljdsf${cd.prefix}${cd.suffix}sldkjflkds`),\n+ []\n+ );\n+ t.deepEqual(\n+ cd.findVarsInOutput(\n+ `slkdjfkljdsf${cd.prefix}firstVar${cd.suffix}sldkjflkds`\n+ ),\n+ [\"firstVar\"]\n+ );\n+ t.deepEqual(\n+ cd.findVarsInOutput(\n+ `slkdjfkljdsf${cd.prefix}firstVar${cd.suffix}test${cd.prefix}firstVar${cd.suffix}sldkjflkds`\n+ ),\n+ [\"firstVar\"]\n+ );\n+ t.deepEqual(\n+ cd.findVarsInOutput(\n+ `slkdjfkljdsf${cd.prefix}firstVar${cd.suffix}test${cd.prefix}secondVar${cd.suffix}sldkjflkds`\n+ ),\n+ [\"firstVar\", \"secondVar\"]\n+ );\n+});\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | COMPUTED DATA PROXIES |
699 | 24.04.2020 17:40:59 | 18,000 | 65ff465f2954642ed02ac3873862ace0dde7d2a3 | Fixed: Passthrough copy globs were not adding to individual file copy counts correctly. | [
{
"change_type": "MODIFY",
"old_path": "src/TemplatePassthrough.js",
"new_path": "src/TemplatePassthrough.js",
"diff": "@@ -78,6 +78,7 @@ class TemplatePassthrough {\nreturn copy(src, dest, copyOptions)\n.on(copy.events.COPY_FILE_START, function(copyOp) {\n// Access to individual files at `copyOp.src`\n+ debug(\"Copying individual file %o\", copyOp.src);\naggregateBench.get(\"Passthrough Copy File\").before();\n})\n.on(copy.events.COPY_FILE_COMPLETE, function() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplatePassthroughManager.js",
"new_path": "src/TemplatePassthroughManager.js",
"diff": "@@ -120,8 +120,15 @@ class TemplatePassthroughManager {\n\"Skipped %o (either from --dryrun or --incremental)\",\npath.inputPath\n);\n+ } else {\n+ if (Array.isArray(fileCopyCount)) {\n+ // globs\n+ for (let count of fileCopyCount) {\n+ this.count += count;\n+ }\n} else {\nthis.count += fileCopyCount;\n+ }\ndebug(\"Copied %o (%d files)\", path.inputPath, fileCopyCount);\n}\n})\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Fixed: Passthrough copy globs were not adding to individual file copy counts correctly. |
699 | 27.04.2020 17:06:38 | 18,000 | a0b19a3920a7d1ef18ce60aef7394a7ce4060268 | Some debug output for computed data | [
{
"change_type": "MODIFY",
"old_path": "src/ComputedData.js",
"new_path": "src/ComputedData.js",
"diff": "@@ -5,7 +5,7 @@ const DependencyGraph = require(\"dependency-graph\").DepGraph;\nconst ComputedDataTemplateString = require(\"./ComputedDataTemplateString\");\nconst ComputedDataProxy = require(\"./ComputedDataProxy\");\n-// const debug = require(\"debug\")(\"Eleventy:ComputedData\");\n+const debug = require(\"debug\")(\"Eleventy:ComputedData\");\nclass ComputedData {\nconstructor() {\n@@ -53,6 +53,7 @@ class ComputedData {\nproxy = new ComputedDataProxy(this.computedKeys);\n}\nlet varsUsed = await proxy.findVarsUsed(computed, data);\n+ debug(\"%o accesses %o variables\", key, varsUsed);\nfor (let varUsed of varsUsed) {\nif (varUsed !== key && this.computedKeys.has(varUsed)) {\ngraph.addNode(varUsed);\n@@ -70,6 +71,7 @@ class ComputedData {\nasync setupData(data) {\nlet order = await this.getVarOrder(data);\n+ debug(\"Computed data order of execution: %o\", order);\nfor (let key of order) {\nlet computed = lodashGet(this.computed, key);\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Some debug output for computed data |
699 | 28.04.2020 17:19:20 | 18,000 | 58858b16e24d20ae85b14c29ec80f6d07b5f100f | Delay computed data processing when they depend on collections. Fix for | [
{
"change_type": "MODIFY",
"old_path": "src/ComputedData.js",
"new_path": "src/ComputedData.js",
"diff": "const lodashGet = require(\"lodash/get\");\nconst lodashSet = require(\"lodash/set\");\n-const DependencyGraph = require(\"dependency-graph\").DepGraph;\n+const ComputedDataQueue = require(\"./ComputedDataQueue\");\nconst ComputedDataTemplateString = require(\"./ComputedDataTemplateString\");\nconst ComputedDataProxy = require(\"./ComputedDataProxy\");\n@@ -13,6 +13,7 @@ class ComputedData {\nthis.templateStringKeyLookup = {};\nthis.computedKeys = new Set();\nthis.declaredDependencies = {};\n+ this.queue = new ComputedDataQueue();\n}\nadd(key, fn, declaredDependencies = []) {\n@@ -27,22 +28,15 @@ class ComputedData {\nthis.templateStringKeyLookup[key] = true;\n}\n- async getVarOrder(data) {\n- if (this.computedKeys.size > 0) {\n- let graph = new DependencyGraph();\n-\n+ async resolveVarOrder(data) {\nfor (let key of this.computedKeys) {\nlet computed = lodashGet(this.computed, key);\n- graph.addNode(key);\n-\n- if (typeof computed === \"function\") {\n- if (this.declaredDependencies[key].length) {\n- for (let dep of this.declaredDependencies[key]) {\n- graph.addNode(dep);\n- graph.addDependency(key, dep);\n- }\n- }\n+ if (typeof computed !== \"function\") {\n+ // add nodes for non functions (primitives like booleans, etc)\n+ this.queue.addNode(key);\n+ } else {\n+ this.queue.uses(key, this.declaredDependencies[key]);\nlet proxy;\nlet isTemplateString = !!this.templateStringKeyLookup[key];\n@@ -52,25 +46,21 @@ class ComputedData {\n} else {\nproxy = new ComputedDataProxy(this.computedKeys);\n}\n+\nlet varsUsed = await proxy.findVarsUsed(computed, data);\ndebug(\"%o accesses %o variables\", key, varsUsed);\n- for (let varUsed of varsUsed) {\n- if (varUsed !== key && this.computedKeys.has(varUsed)) {\n- graph.addNode(varUsed);\n- graph.addDependency(key, varUsed);\n- }\n+ let filteredVarsUsed = varsUsed.filter(varUsed => {\n+ return (\n+ (varUsed !== key && this.computedKeys.has(varUsed)) ||\n+ varUsed.startsWith(\"collections.\")\n+ );\n+ });\n+ this.queue.uses(key, filteredVarsUsed);\n}\n}\n}\n- return graph.overallOrder();\n- }\n-\n- return [];\n- }\n-\n- async setupData(data) {\n- let order = await this.getVarOrder(data);\n+ async _setupDataEntry(data, order) {\ndebug(\"Computed data order of execution: %o\", order);\nfor (let key of order) {\n@@ -83,6 +73,18 @@ class ComputedData {\n}\n}\n}\n+\n+ async setupData(data, orderFilter) {\n+ await this.resolveVarOrder(data);\n+\n+ // process all variables\n+ let order = this.queue.getOrder();\n+ if (orderFilter && typeof orderFilter === \"function\") {\n+ order = order.filter(orderFilter.bind(this.queue));\n+ }\n+ await this._setupDataEntry(data, order);\n+ this.queue.markComputed(order);\n+ }\n}\nmodule.exports = ComputedData;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/ComputedDataProxy.js",
"new_path": "src/ComputedDataProxy.js",
"diff": "@@ -49,6 +49,11 @@ class ComputedDataProxy {\n} else if (Array.isArray(data)) {\nreturn new Proxy([], {\nget: (obj, key) => {\n+ // why\n+ if (key === \"then\") {\n+ keyRef.add(parentKey);\n+ return;\n+ }\nlet newKey = `${parentKey}[${key}]`;\nlet newData = this._getProxyData(data[key], keyRef, newKey);\nif (!this.isArrayOrPlainObject(newData)) {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/ComputedDataQueue.js",
"diff": "+const DependencyGraph = require(\"dependency-graph\").DepGraph;\n+\n+class ComputedDataQueue {\n+ constructor() {\n+ this.graph = new DependencyGraph();\n+ }\n+\n+ getOrder() {\n+ return this.graph.overallOrder();\n+ }\n+\n+ getOrderFor(name) {\n+ return this.graph.dependenciesOf(name);\n+ }\n+\n+ getDependsOn(name) {\n+ return this.graph.dependantsOf(name);\n+ }\n+\n+ isDependsOnStartsWith(name, prefix) {\n+ if (name.startsWith(prefix)) {\n+ return true;\n+ }\n+ return (\n+ this.graph.dependantsOf(name).filter(entry => entry.startsWith(prefix))\n+ .length > 0\n+ );\n+ }\n+\n+ addNode(name) {\n+ if (!this.graph.hasNode(name)) {\n+ this.graph.addNode(name);\n+ }\n+ }\n+\n+ _uses(graph, name, varsUsed = []) {\n+ if (!graph.hasNode(name)) {\n+ graph.addNode(name);\n+ }\n+\n+ for (let varUsed of varsUsed) {\n+ if (!graph.hasNode(varUsed)) {\n+ graph.addNode(varUsed);\n+ }\n+ graph.addDependency(name, varUsed);\n+ }\n+ }\n+\n+ uses(name, varsUsed = []) {\n+ this._uses(this.graph, name, varsUsed);\n+ }\n+\n+ markComputed(varsComputed = []) {\n+ for (let varComputed of varsComputed) {\n+ this.graph.removeNode(varComputed);\n+ }\n+ }\n+}\n+\n+module.exports = ComputedDataQueue;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateMap.js",
"new_path": "src/TemplateMap.js",
"diff": "@@ -287,6 +287,8 @@ class TemplateMap {\nlet secondPaginatedDepMap = this.getPaginatedOverAllCollectionMappedDependencies();\nawait this.initDependencyMap(secondPaginatedDepMap);\n+ await this.resolveRemainingComputedData();\n+\nlet orderedPaths = this.getOrderedInputPaths(\ndependencyMap,\ndelayedDependencyMap,\n@@ -501,6 +503,16 @@ class TemplateMap {\n}\n}\n+ async resolveRemainingComputedData() {\n+ let promises = [];\n+ for (let entry of this.map) {\n+ for (let page of entry._pages) {\n+ promises.push(page.template.resolveRemainingComputedData(page.data));\n+ }\n+ }\n+ return Promise.all(promises);\n+ }\n+\ncheckForDuplicatePermalinks() {\nlet permalinks = {};\nlet warnings = {};\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/ComputedDataQueueTest.js",
"diff": "+import test from \"ava\";\n+import ComputedDataQueue from \"../src/ComputedDataQueue\";\n+\n+test(\"Standard uses\", t => {\n+ let queue = new ComputedDataQueue();\n+ queue.uses(\"permalink\", [\"var1\", \"var2\"]);\n+ queue.uses(\"collections.all\", [\"var2\", \"var3\"]);\n+ t.deepEqual(queue.getOrder(), [\n+ \"var1\",\n+ \"var2\",\n+ \"permalink\",\n+ \"var3\",\n+ \"collections.all\"\n+ ]);\n+});\n+\n+test(\"What does permalink use\", t => {\n+ let queue = new ComputedDataQueue();\n+ queue.uses(\"permalink\", [\"var1\", \"var2\"]);\n+ queue.uses(\"collections.all\", [\"var2\", \"var3\"]);\n+\n+ let varsUsedByPermalink = queue.getOrderFor(\"permalink\");\n+ t.deepEqual(varsUsedByPermalink, [\"var1\", \"var2\"]);\n+\n+ // After we process these\n+ queue.markComputed([\"permalink\", ...varsUsedByPermalink]);\n+ t.deepEqual(queue.getOrder(), [\"var3\", \"collections.all\"]);\n+});\n+\n+test(\"What does page.url and page.outputPath use\", t => {\n+ let queue = new ComputedDataQueue();\n+ queue.uses(\"page.url\", [\"permalink\"]);\n+ queue.uses(\"page.url\", [\"var1\", \"var2\"]);\n+ queue.uses(\"page.outputPath\", [\"permalink\"]);\n+ queue.uses(\"page.outputPath\", [\"var2\", \"var3\"]);\n+\n+ let varsUsedByPageUrl = queue.getOrderFor(\"page.url\");\n+ t.deepEqual(varsUsedByPageUrl, [\"permalink\", \"var1\", \"var2\"]);\n+ queue.markComputed([...varsUsedByPageUrl, \"page.url\"]);\n+ t.deepEqual(queue.getOrder(), [\"var3\", \"page.outputPath\"]);\n+\n+ let varsUsedByPageOutput = queue.getOrderFor(\"page.outputPath\");\n+ // even though page.outputPath used permalink and var2,\n+ // they were already computed above by page.url\n+ t.deepEqual(varsUsedByPageOutput, [\"var3\"]);\n+ queue.markComputed([...varsUsedByPageOutput, \"page.outputPath\"]);\n+ t.deepEqual(queue.getOrder(), []);\n+});\n+\n+test(\"Permalink uses a collection (not yet supported in Eleventy)\", t => {\n+ let queue = new ComputedDataQueue();\n+ queue.uses(\"permalink\", [\"collections.dog\", \"var2\"]);\n+ queue.uses(\"collections.all\", [\"var2\", \"var3\"]);\n+ queue.uses(\"collections.dog\", [\"hi\"]);\n+ queue.uses(\"unrelated\", [\"test\"]);\n+\n+ t.deepEqual(queue.getDependsOn(\"collections.dog\"), [\"permalink\"]);\n+ t.deepEqual(queue.getDependsOn(\"var2\"), [\"permalink\", \"collections.all\"]);\n+ t.deepEqual(queue.getDependsOn(\"collections.all\"), []);\n+ t.deepEqual(queue.getDependsOn(\"hi\"), [\"permalink\", \"collections.dog\"]);\n+ t.is(queue.isDependsOnStartsWith(\"hi\", \"collections.\"), true);\n+ t.is(queue.isDependsOnStartsWith(\"collections.all\", \"collections.\"), true);\n+ t.is(queue.isDependsOnStartsWith(\"var2\", \"collections.\"), true);\n+ t.is(queue.isDependsOnStartsWith(\"unrelated\", \"collections.\"), false);\n+\n+ t.deepEqual(queue.getOrderFor(\"unrelated\"), [\"test\"]);\n+\n+ let varsUsedByPermalink = queue.getOrderFor(\"permalink\");\n+ t.deepEqual(varsUsedByPermalink, [\"hi\", \"collections.dog\", \"var2\"]);\n+\n+ // After we process these\n+ queue.markComputed([\"permalink\", ...varsUsedByPermalink]);\n+ t.deepEqual(queue.getOrder(), [\n+ \"var3\",\n+ \"collections.all\",\n+ \"test\",\n+ \"unrelated\"\n+ ]);\n+});\n"
},
{
"change_type": "MODIFY",
"old_path": "test/ComputedDataTest.js",
"new_path": "test/ComputedDataTest.js",
"diff": "@@ -19,20 +19,6 @@ test(\"Basic get/set\", async t => {\nt.is(data.keystr, \"this is a str\");\n});\n-test(\"Boolean computed value Issue #1114\", async t => {\n- let cd = new ComputedData();\n-\n- cd.add(\"bool1\", true);\n-\n- let data = {\n- key2: \"inject me\"\n- };\n- await cd.setupData(data);\n-\n- t.is(data.bool1, true);\n- t.is(data.key2, \"inject me\");\n-});\n-\ntest(\"Basic get/set (reverse order of adds)\", async t => {\nlet cd = new ComputedData();\n@@ -275,3 +261,113 @@ test(\"Computed returns deep object\", async t => {\nt.is(data.returnobj.key1, \"value1\");\nt.is(data.returnobj.nest.key2, \"value2\");\n});\n+\n+test(\"Boolean computed value Issue #1114\", async t => {\n+ let cd = new ComputedData();\n+\n+ cd.add(\"bool1\", true);\n+\n+ let data = {\n+ key2: \"inject me\"\n+ };\n+ await cd.setupData(data);\n+\n+ t.is(data.bool1, true);\n+ t.is(data.key2, \"inject me\");\n+});\n+\n+test(\"Expect collections in data callback #1114\", async t => {\n+ t.plan(4);\n+ let cd = new ComputedData();\n+\n+ cd.add(\"key1\", data => {\n+ t.is(data.collections.first[0], 1);\n+ t.is(data.collections.second[0], 2);\n+ return ``;\n+ });\n+\n+ let data = {\n+ collections: {\n+ first: [1],\n+ second: [2]\n+ }\n+ };\n+ await cd.setupData(data);\n+});\n+\n+test(\"Get var order\", async t => {\n+ let cd = new ComputedData();\n+\n+ cd.add(\"key1\", data => data.collections.all);\n+ cd.add(\"key2\", data => data.collections.dog);\n+ cd.add(\"key0\", data => \"\");\n+\n+ let data = {\n+ key2: \"inject me\",\n+ collections: {\n+ all: [1],\n+ dog: [2]\n+ }\n+ };\n+\n+ await cd.resolveVarOrder(data);\n+ t.deepEqual(cd.queue.getOrder(), [\n+ \"collections.all\",\n+ \"key1\",\n+ \"collections.dog\",\n+ \"key2\",\n+ \"key0\"\n+ ]);\n+});\n+\n+test(\"Get var order and process it in two stages\", async t => {\n+ let cd = new ComputedData();\n+\n+ cd.add(\"page.url\", data => data.key2);\n+ cd.add(\"page.outputPath\", data => `${data.key2}${data.collections.dog[0]}`);\n+ cd.add(\"key0\", data => \"hi\");\n+ cd.add(\"collections.processed\", data => \"hi\");\n+\n+ let data = {\n+ key2: \"/my-path/\",\n+ collections: {\n+ dog: [2]\n+ }\n+ };\n+\n+ // set page.url, page.outputPath, key2, collections.dog[0]\n+ await cd.setupData(data, function(entry) {\n+ return !this.isDependsOnStartsWith(entry, \"collections.\");\n+ });\n+\n+ t.deepEqual(data, {\n+ collections: {\n+ dog: [2],\n+ processed: \"\"\n+ },\n+ key0: \"hi\",\n+ key2: \"/my-path/\",\n+ page: {\n+ url: \"/my-path/\",\n+ outputPath: \"/my-path/2\"\n+ }\n+ });\n+\n+ // set collections.processed\n+ await cd.setupData(data);\n+\n+ t.deepEqual(data, {\n+ collections: {\n+ dog: [2],\n+ processed: \"hi\"\n+ },\n+ key0: \"hi\",\n+ key2: \"/my-path/\",\n+ page: {\n+ url: \"/my-path/\",\n+ outputPath: \"/my-path/2\"\n+ }\n+ });\n+\n+ // t.deepEqual(cd.queue.getOrder(), [\"collections.all\", \"key1\", \"collections.dog\", \"key2\", \"key0\"]);\n+});\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/TemplateMapTest-ComputedData.js",
"diff": "+import test from \"ava\";\n+import Template from \"../src/Template\";\n+import TemplateData from \"../src/TemplateData\";\n+import TemplateMap from \"../src/TemplateMap\";\n+import getNewTemplate from \"./_getNewTemplate\";\n+\n+test(\"Computed data can see tag generated collections\", async t => {\n+ let tm = new TemplateMap();\n+\n+ let dataObj = new TemplateData(\"./test/stubs-computed-collections/\");\n+ let tmpl = getNewTemplate(\n+ \"./test/stubs-computed-collections/collections.njk\",\n+ \"./test/stubs-computed-collections/\",\n+ \"./dist\",\n+ dataObj\n+ );\n+\n+ await tm.add(tmpl);\n+\n+ let dataObj2 = new TemplateData(\"./test/stubs-computed-collections/\");\n+ let tmpl2 = getNewTemplate(\n+ \"./test/stubs-computed-collections/dog.njk\",\n+ \"./test/stubs-computed-collections/\",\n+ \"./dist\",\n+ dataObj2\n+ );\n+\n+ await tm.add(tmpl2);\n+\n+ await tm.cache();\n+\n+ let map = tm.getMap();\n+\n+ t.is(map[0].inputPath.endsWith(\"collections.njk\"), true);\n+\n+ t.truthy(map[0].data.collections.all);\n+ t.is(map[0].data.collections.all.length, 2);\n+ t.truthy(map[0].data.collections.dog);\n+ t.is(map[0].data.collections.dog.length, 1);\n+ t.truthy(map[0].data.dogCollection);\n+ t.is(map[0].data.dogCollection.length, 1);\n+ t.is(map[0].data.test, \"hello\");\n+\n+ // THEY ARE THE SAME\n+ t.is(map[0].data.dogCollection, map[0].data.collections.dog);\n+});\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/TemplateTest-ComputedData.js",
"diff": "+import test from \"ava\";\n+import Template from \"../src/Template\";\n+import TemplateData from \"../src/TemplateData\";\n+import { cloneDeep } from \"lodash\";\n+import getNewTemplate from \"./_getNewTemplate\";\n+\n+async function getRenderedData(tmpl, pageNumber = 0) {\n+ let data = await tmpl.getData();\n+ let templates = await tmpl.getTemplates(data);\n+ return templates[pageNumber].data;\n+}\n+\n+test(\"eleventyComputed\", async t => {\n+ let tmpl = getNewTemplate(\n+ \"./test/stubs/eleventyComputed/first.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\"\n+ );\n+ let data = await getRenderedData(tmpl);\n+ t.is((await tmpl.render(data)).trim(), \"hi:value2-value1.css\");\n+});\n+\n+test(\"eleventyComputed overrides existing value.\", async t => {\n+ let tmpl = getNewTemplate(\n+ \"./test/stubs/eleventyComputed/override.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\"\n+ );\n+ let data = await getRenderedData(tmpl);\n+ t.is(data.key1, \"override\");\n+ t.is((await tmpl.render(data)).trim(), \"hi:override\");\n+});\n+\n+test(\"eleventyComputed overrides existing value and reuses that upstream value\", async t => {\n+ let tmpl = getNewTemplate(\n+ \"./test/stubs/eleventyComputed/override-reuse.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\"\n+ );\n+ let data = await getRenderedData(tmpl);\n+ t.is(data.key1, \"over(value1)ride\");\n+ t.is((await tmpl.render(data)).trim(), \"hi:over(value1)ride\");\n+});\n+\n+test(\"eleventyComputed permalink\", async t => {\n+ let tmpl = getNewTemplate(\n+ \"./test/stubs/eleventyComputed/permalink.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\"\n+ );\n+ let templates = await tmpl.getTemplates(await tmpl.getData());\n+ let data = templates[0].data;\n+ t.is(data.page.url, \"/haha-value1.html\");\n+ t.is(data.page.outputPath, \"./dist/haha-value1.html\");\n+ t.is(data.permalink, \"haha-value1.html\");\n+ t.is(data.nested.key3, \"value1\");\n+ t.is(data.nested.key4, \"depends on computed value1\");\n+ t.is(data.dependsOnPage, \"depends:/haha-value1.html\");\n+});\n+\n+test(\"eleventyComputed simple permalink\", async t => {\n+ let tmpl = getNewTemplate(\n+ \"./test/stubs/eleventyComputed/permalink-simple.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\"\n+ );\n+ let templates = await tmpl.getTemplates(await tmpl.getData());\n+ let data = templates[0].data;\n+ t.is(data.page.url, \"/haha-value1.html\");\n+ t.is(data.page.outputPath, \"./dist/haha-value1.html\");\n+ t.is(data.permalink, \"haha-value1.html\");\n+});\n+\n+test(\"eleventyComputed permalink using slug\", async t => {\n+ let tmpl = getNewTemplate(\n+ \"./test/stubs/eleventyComputed/permalink-slug.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\"\n+ );\n+ let templates = await tmpl.getTemplates(await tmpl.getData());\n+ let data = templates[0].data;\n+ t.is(data.page.url, \"/haha-this-is-a-string.html\");\n+ t.is(data.page.outputPath, \"./dist/haha-this-is-a-string.html\");\n+ t.is(data.permalink, \"haha-this-is-a-string.html\");\n+});\n+\n+test(\"eleventyComputed js front matter (function)\", async t => {\n+ let tmpl = getNewTemplate(\n+ \"./test/stubs/eleventyComputed/second.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\"\n+ );\n+ let data = await getRenderedData(tmpl);\n+ t.is(data.key3, \"value3-value2-value1.css\");\n+ t.is((await tmpl.render(data)).trim(), \"hi:value2-value1.css\");\n+});\n+\n+test(\"eleventyComputed js front matter key reuses and overrides\", async t => {\n+ let tmpl = getNewTemplate(\n+ \"./test/stubs/eleventyComputed/third.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\"\n+ );\n+ let data = await getRenderedData(tmpl);\n+ t.is(data.key1, \"value2-value1\");\n+ t.is((await tmpl.render(data)).trim(), \"hi:value2-value1\");\n+});\n+\n+test(\"eleventyComputed true primitive\", async t => {\n+ let tmpl = getNewTemplate(\n+ \"./test/stubs/eleventyComputed/true.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\"\n+ );\n+ let data = await getRenderedData(tmpl);\n+ t.is(data.key1, \"value1\");\n+ t.is(data.key2, true);\n+ t.is(data.key3, false);\n+ t.is(data.key4, 324);\n+});\n+\n+test(\"eleventyComputed relies on global data\", async t => {\n+ let dataObj = new TemplateData(\"./test/stubs/\");\n+ let tmpl = getNewTemplate(\n+ \"./test/stubs/eleventyComputed/use-global-data.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\",\n+ dataObj\n+ );\n+\n+ let fetchedData = await tmpl.getData();\n+ let templates = await tmpl.getTemplates(fetchedData);\n+ let data = templates[0].data;\n+ t.is(data.image, \"datavalue1\");\n+});\n+\n+test(\"eleventyComputed intermixes with global data\", async t => {\n+ let dataObj = new TemplateData(\"./test/stubs-computed-global/\");\n+\n+ let config = cloneDeep(dataObj.config);\n+ config.dataDeepMerge = true;\n+ dataObj._setConfig(config);\n+\n+ let tmpl = getNewTemplate(\n+ \"./test/stubs-computed-global/intermix.njk\",\n+ \"./test/stubs-computed-global/\",\n+ \"./dist\",\n+ dataObj\n+ );\n+ tmpl.config = config;\n+\n+ let fetchedData = await tmpl.getData();\n+ t.truthy(fetchedData.eleventyComputed.image);\n+ t.truthy(fetchedData.eleventyComputed.image2);\n+ t.truthy(fetchedData.eleventyComputed.image3);\n+ t.truthy(fetchedData.eleventyComputed.eleventyNavigation.key);\n+\n+ let templates = await tmpl.getTemplates(fetchedData);\n+ let data = templates[0].data;\n+ t.is(data.image, \"first\");\n+ t.is(data.image2, \"second\");\n+ t.is(data.image3, \"third-global\");\n+ t.is(data.eleventyNavigation.key, \"nested-first-global\");\n+});\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateTest.js",
"new_path": "test/TemplateTest.js",
"diff": "import test from \"ava\";\nimport fs from \"fs-extra\";\nimport pretty from \"pretty\";\n-import TemplateData from \"../src/TemplateData\";\nimport Template from \"../src/Template\";\n-import EleventyExtensionMap from \"../src/EleventyExtensionMap\";\n+import TemplateData from \"../src/TemplateData\";\nimport EleventyErrorUtil from \"../src/EleventyErrorUtil\";\nimport TemplateContentPrematureUseError from \"../src/Errors/TemplateContentPrematureUseError\";\nimport normalizeNewLines from \"./Util/normalizeNewLines\";\n-import { cloneDeep } from \"lodash\";\nimport templateConfig from \"../src/Config\";\nconst config = templateConfig.getConfig();\n+import getNewTemplate from \"./_getNewTemplate\";\n+\nasync function getRenderedData(tmpl, pageNumber = 0) {\nlet data = await tmpl.getData();\nlet templates = await tmpl.getTemplates(data);\nreturn templates[pageNumber].data;\n}\n-function getNewTemplate(\n- path,\n- inputDir,\n- outputDir,\n- templateData = null,\n- map = null\n-) {\n- if (!map) {\n- map = new EleventyExtensionMap([\n- \"liquid\",\n- \"ejs\",\n- \"md\",\n- \"hbs\",\n- \"mustache\",\n- \"haml\",\n- \"pug\",\n- \"njk\",\n- \"html\",\n- \"jstl\",\n- \"11ty.js\"\n- ]);\n- }\n- let tmpl = new Template(path, inputDir, outputDir, templateData, map);\n- return tmpl;\n-}\n-\nfunction cleanHtml(str) {\nreturn pretty(str, { ocd: true });\n}\n@@ -2066,156 +2040,3 @@ test(\"Get Layout Chain\", async t => {\n\"./test/stubs-incremental/layout-chain/_includes/parent.njk\"\n]);\n});\n-\n-test(\"eleventyComputed\", async t => {\n- let tmpl = getNewTemplate(\n- \"./test/stubs/eleventyComputed/first.njk\",\n- \"./test/stubs/\",\n- \"./dist\"\n- );\n- let data = await getRenderedData(tmpl);\n- t.is((await tmpl.render(data)).trim(), \"hi:value2-value1.css\");\n-});\n-\n-test(\"eleventyComputed overrides existing value.\", async t => {\n- let tmpl = getNewTemplate(\n- \"./test/stubs/eleventyComputed/override.njk\",\n- \"./test/stubs/\",\n- \"./dist\"\n- );\n- let data = await getRenderedData(tmpl);\n- t.is(data.key1, \"override\");\n- t.is((await tmpl.render(data)).trim(), \"hi:override\");\n-});\n-\n-test(\"eleventyComputed overrides existing value and reuses that upstream value\", async t => {\n- let tmpl = getNewTemplate(\n- \"./test/stubs/eleventyComputed/override-reuse.njk\",\n- \"./test/stubs/\",\n- \"./dist\"\n- );\n- let data = await getRenderedData(tmpl);\n- t.is(data.key1, \"over(value1)ride\");\n- t.is((await tmpl.render(data)).trim(), \"hi:over(value1)ride\");\n-});\n-\n-test(\"eleventyComputed permalink\", async t => {\n- let tmpl = getNewTemplate(\n- \"./test/stubs/eleventyComputed/permalink.njk\",\n- \"./test/stubs/\",\n- \"./dist\"\n- );\n- let templates = await tmpl.getTemplates(await tmpl.getData());\n- let data = templates[0].data;\n- t.is(data.page.url, \"/haha-value1.html\");\n- t.is(data.page.outputPath, \"./dist/haha-value1.html\");\n- t.is(data.permalink, \"haha-value1.html\");\n- t.is(data.nested.key3, \"value1\");\n- t.is(data.nested.key4, \"depends on computed value1\");\n- t.is(data.dependsOnPage, \"depends:/haha-value1.html\");\n-});\n-\n-test(\"eleventyComputed simple permalink\", async t => {\n- let tmpl = getNewTemplate(\n- \"./test/stubs/eleventyComputed/permalink-simple.njk\",\n- \"./test/stubs/\",\n- \"./dist\"\n- );\n- let templates = await tmpl.getTemplates(await tmpl.getData());\n- let data = templates[0].data;\n- t.is(data.page.url, \"/haha-value1.html\");\n- t.is(data.page.outputPath, \"./dist/haha-value1.html\");\n- t.is(data.permalink, \"haha-value1.html\");\n-});\n-\n-test(\"eleventyComputed permalink using slug\", async t => {\n- let tmpl = getNewTemplate(\n- \"./test/stubs/eleventyComputed/permalink-slug.njk\",\n- \"./test/stubs/\",\n- \"./dist\"\n- );\n- let templates = await tmpl.getTemplates(await tmpl.getData());\n- let data = templates[0].data;\n- t.is(data.page.url, \"/haha-this-is-a-string.html\");\n- t.is(data.page.outputPath, \"./dist/haha-this-is-a-string.html\");\n- t.is(data.permalink, \"haha-this-is-a-string.html\");\n-});\n-\n-test(\"eleventyComputed js front matter (function)\", async t => {\n- let tmpl = getNewTemplate(\n- \"./test/stubs/eleventyComputed/second.njk\",\n- \"./test/stubs/\",\n- \"./dist\"\n- );\n- let data = await getRenderedData(tmpl);\n- t.is(data.key3, \"value3-value2-value1.css\");\n- t.is((await tmpl.render(data)).trim(), \"hi:value2-value1.css\");\n-});\n-\n-test(\"eleventyComputed js front matter key reuses and overrides\", async t => {\n- let tmpl = getNewTemplate(\n- \"./test/stubs/eleventyComputed/third.njk\",\n- \"./test/stubs/\",\n- \"./dist\"\n- );\n- let data = await getRenderedData(tmpl);\n- t.is(data.key1, \"value2-value1\");\n- t.is((await tmpl.render(data)).trim(), \"hi:value2-value1\");\n-});\n-\n-test(\"eleventyComputed true primitive\", async t => {\n- let tmpl = getNewTemplate(\n- \"./test/stubs/eleventyComputed/true.njk\",\n- \"./test/stubs/\",\n- \"./dist\"\n- );\n- let data = await getRenderedData(tmpl);\n- t.is(data.key1, \"value1\");\n- t.is(data.key2, true);\n- t.is(data.key3, false);\n- t.is(data.key4, 324);\n-});\n-\n-test(\"eleventyComputed relies on global data\", async t => {\n- let dataObj = new TemplateData(\"./test/stubs/\");\n- let tmpl = getNewTemplate(\n- \"./test/stubs/eleventyComputed/use-global-data.njk\",\n- \"./test/stubs/\",\n- \"./dist\",\n- dataObj\n- );\n-\n- let fetchedData = await tmpl.getData();\n- let templates = await tmpl.getTemplates(fetchedData);\n- let data = templates[0].data;\n- t.is(data.image, \"datavalue1\");\n-});\n-\n-test(\"eleventyComputed intermixes with global data\", async t => {\n- let dataObj = new TemplateData(\"./test/stubs-computed-global/\");\n-\n- let config = cloneDeep(dataObj.config);\n- config.dataDeepMerge = true;\n- dataObj._setConfig(config);\n-\n- let tmpl = getNewTemplate(\n- \"./test/stubs-computed-global/intermix.njk\",\n- \"./test/stubs-computed-global/\",\n- \"./dist\",\n- dataObj\n- );\n- tmpl.config = config;\n-\n- let fetchedData = await tmpl.getData();\n- t.truthy(fetchedData.eleventyComputed.image);\n- t.truthy(fetchedData.eleventyComputed.image2);\n- t.truthy(fetchedData.eleventyComputed.image3);\n- t.truthy(fetchedData.eleventyComputed.eleventyNavigation.key);\n-\n- let templates = await tmpl.getTemplates(fetchedData);\n- let data = templates[0].data;\n- t.is(data.image, \"first\");\n- t.is(data.image2, \"second\");\n- t.is(data.image3, \"third-global\");\n- t.is(data.eleventyNavigation.key, \"nested-first-global\");\n-});\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/_getNewTemplate.js",
"diff": "+const EleventyExtensionMap = require(\"../src/EleventyExtensionMap\");\n+const Template = require(\"../src/Template\");\n+\n+module.exports = function getNewTemplate(\n+ path,\n+ inputDir,\n+ outputDir,\n+ templateData = null,\n+ map = null\n+) {\n+ if (!map) {\n+ map = new EleventyExtensionMap([\n+ \"liquid\",\n+ \"ejs\",\n+ \"md\",\n+ \"hbs\",\n+ \"mustache\",\n+ \"haml\",\n+ \"pug\",\n+ \"njk\",\n+ \"html\",\n+ \"jstl\",\n+ \"11ty.js\"\n+ ]);\n+ }\n+ let tmpl = new Template(path, inputDir, outputDir, templateData, map);\n+ return tmpl;\n+};\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs-computed-collections/collections.njk",
"diff": "+---js\n+{\n+ eleventyComputed: {\n+ test: \"hello\",\n+ dogCollection: data => {\n+ return data.collections.dog;\n+ }\n+ }\n+}\n+---\n+Issue #1114\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs-computed-collections/dog.njk",
"diff": "+---\n+tags: dog\n+---\n+Hi from dog\n\\ No newline at end of file\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Delay computed data processing when they depend on collections. Fix for #1114 |
699 | 29.04.2020 07:57:32 | 18,000 | b39203040702d49752064ca7384ab39abb93cef6 | Adds test for template engine singletons | [
{
"change_type": "MODIFY",
"old_path": "test/TemplateMapTest-ComputedData.js",
"new_path": "test/TemplateMapTest-ComputedData.js",
"diff": "@@ -2,7 +2,7 @@ import test from \"ava\";\nimport Template from \"../src/Template\";\nimport TemplateData from \"../src/TemplateData\";\nimport TemplateMap from \"../src/TemplateMap\";\n-import getNewTemplate from \"./_getNewTemplate\";\n+import getNewTemplate from \"./_getNewTemplateForTests\";\ntest(\"Computed data can see tag generated collections\", async t => {\nlet tm = new TemplateMap();\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateTest-ComputedData.js",
"new_path": "test/TemplateTest-ComputedData.js",
"diff": "@@ -2,7 +2,7 @@ import test from \"ava\";\nimport Template from \"../src/Template\";\nimport TemplateData from \"../src/TemplateData\";\nimport { cloneDeep } from \"lodash\";\n-import getNewTemplate from \"./_getNewTemplate\";\n+import getNewTemplate from \"./_getNewTemplateForTests\";\nasync function getRenderedData(tmpl, pageNumber = 0) {\nlet data = await tmpl.getData();\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateTest.js",
"new_path": "test/TemplateTest.js",
"diff": "@@ -3,6 +3,7 @@ import fs from \"fs-extra\";\nimport pretty from \"pretty\";\nimport Template from \"../src/Template\";\nimport TemplateData from \"../src/TemplateData\";\n+import EleventyExtensionMap from \"../src/EleventyExtensionMap\";\nimport EleventyErrorUtil from \"../src/EleventyErrorUtil\";\nimport TemplateContentPrematureUseError from \"../src/Errors/TemplateContentPrematureUseError\";\nimport normalizeNewLines from \"./Util/normalizeNewLines\";\n@@ -10,7 +11,7 @@ import normalizeNewLines from \"./Util/normalizeNewLines\";\nimport templateConfig from \"../src/Config\";\nconst config = templateConfig.getConfig();\n-import getNewTemplate from \"./_getNewTemplate\";\n+import getNewTemplate from \"./_getNewTemplateForTests\";\nasync function getRenderedData(tmpl, pageNumber = 0) {\nlet data = await tmpl.getData();\n@@ -2040,3 +2041,23 @@ test(\"Get Layout Chain\", async t => {\n\"./test/stubs-incremental/layout-chain/_includes/parent.njk\"\n]);\n});\n+\n+test(\"Engine Singletons\", async t => {\n+ let map = new EleventyExtensionMap([\"njk\"]);\n+ let tmpl1 = getNewTemplate(\n+ \"./test/stubs/engine-singletons/first.njk\",\n+ \"./test/stubs/engine-singletons/\",\n+ \"./dist\",\n+ null,\n+ map\n+ );\n+ let tmpl2 = getNewTemplate(\n+ \"./test/stubs/engine-singletons/second.njk\",\n+ \"./test/stubs/engine-singletons/\",\n+ \"./dist\",\n+ null,\n+ map\n+ );\n+\n+ t.deepEqual(tmpl1.engine, tmpl2.engine);\n+});\n"
},
{
"change_type": "RENAME",
"old_path": "test/_getNewTemplate.js",
"new_path": "test/_getNewTemplateForTests.js",
"diff": ""
},
{
"change_type": "ADD",
"old_path": "test/stubs/engine-singletons/first.njk",
"new_path": "test/stubs/engine-singletons/first.njk",
"diff": ""
},
{
"change_type": "ADD",
"old_path": "test/stubs/engine-singletons/second.njk",
"new_path": "test/stubs/engine-singletons/second.njk",
"diff": ""
}
]
| JavaScript | MIT License | 11ty/eleventy | Adds test for template engine singletons |
699 | 29.04.2020 08:17:36 | 18,000 | 3b0fdf25d6d49fa69a801ae0c8e7a0ace3295267 | A little performance optimization for computed data | [
{
"change_type": "MODIFY",
"old_path": "src/ComputedData.js",
"new_path": "src/ComputedData.js",
"diff": "@@ -29,6 +29,11 @@ class ComputedData {\n}\nasync resolveVarOrder(data) {\n+ let proxyByTemplateString = new ComputedDataTemplateString(\n+ this.computedKeys\n+ );\n+ let proxyByProxy = new ComputedDataProxy(this.computedKeys);\n+\nfor (let key of this.computedKeys) {\nlet computed = lodashGet(this.computed, key);\n@@ -38,16 +43,10 @@ class ComputedData {\n} else {\nthis.queue.uses(key, this.declaredDependencies[key]);\n- let proxy;\nlet isTemplateString = !!this.templateStringKeyLookup[key];\n- // TODO move this out of the loop??\n- if (isTemplateString) {\n- proxy = new ComputedDataTemplateString(this.computedKeys);\n- } else {\n- proxy = new ComputedDataProxy(this.computedKeys);\n- }\n-\n+ let proxy = isTemplateString ? proxyByTemplateString : proxyByProxy;\nlet varsUsed = await proxy.findVarsUsed(computed, data);\n+\ndebug(\"%o accesses %o variables\", key, varsUsed);\nlet filteredVarsUsed = varsUsed.filter(varUsed => {\nreturn (\n"
},
{
"change_type": "MODIFY",
"old_path": "src/ComputedDataProxy.js",
"new_path": "src/ComputedDataProxy.js",
"diff": "@@ -2,6 +2,7 @@ const lodashSet = require(\"lodash/set\");\nconst lodashGet = require(\"lodash/get\");\nconst lodashIsPlainObject = require(\"lodash/isPlainObject\");\n+/* Calculates computed data using Proxies */\nclass ComputedDataProxy {\nconstructor(computedKeys) {\nif (Array.isArray(computedKeys)) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/ComputedDataQueue.js",
"new_path": "src/ComputedDataQueue.js",
"diff": "const DependencyGraph = require(\"dependency-graph\").DepGraph;\n+/* Keeps track of the dependency graph between computed data variables\n+ * Removes keys from the graph when they are computed.\n+ */\nclass ComputedDataQueue {\nconstructor() {\nthis.graph = new DependencyGraph();\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | A little performance optimization for computed data |
699 | 29.04.2020 13:53:59 | 18,000 | 68f75053071aaefc3efb8c2ebdbdae8361117b48 | v0.11.0-beta.4 coverage | [
{
"change_type": "MODIFY",
"old_path": "docs-src/_data/coverage.json",
"new_path": "docs-src/_data/coverage.json",
"diff": "-{\"total\": {\"lines\":{\"total\":3241,\"covered\":2856,\"skipped\":0,\"pct\":88.12},\"statements\":{\"total\":3263,\"covered\":2877,\"skipped\":0,\"pct\":88.17},\"functions\":{\"total\":778,\"covered\":673,\"skipped\":0,\"pct\":86.5},\"branches\":{\"total\":1405,\"covered\":1135,\"skipped\":0,\"pct\":80.78}}\n-,\"/Users/zachleat/Code/eleventy/src/Benchmark.js\": {\"lines\":{\"total\":15,\"covered\":13,\"skipped\":0,\"pct\":86.67},\"functions\":{\"total\":7,\"covered\":5,\"skipped\":0,\"pct\":71.43},\"statements\":{\"total\":15,\"covered\":13,\"skipped\":0,\"pct\":86.67},\"branches\":{\"total\":6,\"covered\":4,\"skipped\":0,\"pct\":66.67}}\n-,\"/Users/zachleat/Code/eleventy/src/BenchmarkGroup.js\": {\"lines\":{\"total\":38,\"covered\":23,\"skipped\":0,\"pct\":60.53},\"functions\":{\"total\":7,\"covered\":5,\"skipped\":0,\"pct\":71.43},\"statements\":{\"total\":38,\"covered\":23,\"skipped\":0,\"pct\":60.53},\"branches\":{\"total\":12,\"covered\":3,\"skipped\":0,\"pct\":25}}\n-,\"/Users/zachleat/Code/eleventy/src/BenchmarkManager.js\": {\"lines\":{\"total\":17,\"covered\":13,\"skipped\":0,\"pct\":76.47},\"functions\":{\"total\":7,\"covered\":5,\"skipped\":0,\"pct\":71.43},\"statements\":{\"total\":17,\"covered\":13,\"skipped\":0,\"pct\":76.47},\"branches\":{\"total\":4,\"covered\":3,\"skipped\":0,\"pct\":75}}\n-,\"/Users/zachleat/Code/eleventy/src/ComputedData.js\": {\"lines\":{\"total\":52,\"covered\":51,\"skipped\":0,\"pct\":98.08},\"functions\":{\"total\":7,\"covered\":6,\"skipped\":0,\"pct\":85.71},\"statements\":{\"total\":52,\"covered\":51,\"skipped\":0,\"pct\":98.08},\"branches\":{\"total\":18,\"covered\":16,\"skipped\":0,\"pct\":88.89}}\n+{\"total\": {\"lines\":{\"total\":3428,\"covered\":3039,\"skipped\":0,\"pct\":88.65},\"statements\":{\"total\":3450,\"covered\":3060,\"skipped\":0,\"pct\":88.7},\"functions\":{\"total\":811,\"covered\":708,\"skipped\":0,\"pct\":87.3},\"branches\":{\"total\":1482,\"covered\":1204,\"skipped\":0,\"pct\":81.24}}\n+,\"/Users/zachleat/Code/eleventy/src/Benchmark.js\": {\"lines\":{\"total\":18,\"covered\":17,\"skipped\":0,\"pct\":94.44},\"functions\":{\"total\":7,\"covered\":7,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":18,\"covered\":17,\"skipped\":0,\"pct\":94.44},\"branches\":{\"total\":6,\"covered\":5,\"skipped\":0,\"pct\":83.33}}\n+,\"/Users/zachleat/Code/eleventy/src/BenchmarkGroup.js\": {\"lines\":{\"total\":46,\"covered\":34,\"skipped\":0,\"pct\":73.91},\"functions\":{\"total\":9,\"covered\":6,\"skipped\":0,\"pct\":66.67},\"statements\":{\"total\":46,\"covered\":34,\"skipped\":0,\"pct\":73.91},\"branches\":{\"total\":21,\"covered\":11,\"skipped\":0,\"pct\":52.38}}\n+,\"/Users/zachleat/Code/eleventy/src/BenchmarkManager.js\": {\"lines\":{\"total\":27,\"covered\":21,\"skipped\":0,\"pct\":77.78},\"functions\":{\"total\":8,\"covered\":6,\"skipped\":0,\"pct\":75},\"statements\":{\"total\":27,\"covered\":21,\"skipped\":0,\"pct\":77.78},\"branches\":{\"total\":8,\"covered\":6,\"skipped\":0,\"pct\":75}}\n+,\"/Users/zachleat/Code/eleventy/src/ComputedData.js\": {\"lines\":{\"total\":44,\"covered\":44,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":7,\"covered\":7,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":44,\"covered\":44,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":17,\"covered\":17,\"skipped\":0,\"pct\":100}}\n+,\"/Users/zachleat/Code/eleventy/src/ComputedDataProxy.js\": {\"lines\":{\"total\":38,\"covered\":38,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":7,\"covered\":7,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":38,\"covered\":38,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":24,\"covered\":24,\"skipped\":0,\"pct\":100}}\n+,\"/Users/zachleat/Code/eleventy/src/ComputedDataQueue.js\": {\"lines\":{\"total\":21,\"covered\":21,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":10,\"covered\":10,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":21,\"covered\":21,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":11,\"covered\":8,\"skipped\":0,\"pct\":72.73}}\n+,\"/Users/zachleat/Code/eleventy/src/ComputedDataTemplateString.js\": {\"lines\":{\"total\":24,\"covered\":24,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":4,\"covered\":4,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":24,\"covered\":24,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":6,\"covered\":5,\"skipped\":0,\"pct\":83.33}}\n,\"/Users/zachleat/Code/eleventy/src/Config.js\": {\"lines\":{\"total\":5,\"covered\":5,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":5,\"covered\":5,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100}}\n-,\"/Users/zachleat/Code/eleventy/src/Eleventy.js\": {\"lines\":{\"total\":209,\"covered\":115,\"skipped\":0,\"pct\":55.02},\"functions\":{\"total\":39,\"covered\":19,\"skipped\":0,\"pct\":48.72},\"statements\":{\"total\":210,\"covered\":115,\"skipped\":0,\"pct\":54.76},\"branches\":{\"total\":66,\"covered\":27,\"skipped\":0,\"pct\":40.91}}\n+,\"/Users/zachleat/Code/eleventy/src/Eleventy.js\": {\"lines\":{\"total\":222,\"covered\":121,\"skipped\":0,\"pct\":54.5},\"functions\":{\"total\":40,\"covered\":20,\"skipped\":0,\"pct\":50},\"statements\":{\"total\":223,\"covered\":121,\"skipped\":0,\"pct\":54.26},\"branches\":{\"total\":74,\"covered\":32,\"skipped\":0,\"pct\":43.24}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyBaseError.js\": {\"lines\":{\"total\":6,\"covered\":6,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":1,\"covered\":1,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":6,\"covered\":6,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyCommandCheck.js\": {\"lines\":{\"total\":28,\"covered\":28,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":5,\"covered\":5,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":28,\"covered\":28,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":8,\"covered\":7,\"skipped\":0,\"pct\":87.5}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyConfig.js\": {\"lines\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyErrorHandler.js\": {\"lines\":{\"total\":39,\"covered\":35,\"skipped\":0,\"pct\":89.74},\"functions\":{\"total\":8,\"covered\":8,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":39,\"covered\":35,\"skipped\":0,\"pct\":89.74},\"branches\":{\"total\":43,\"covered\":29,\"skipped\":0,\"pct\":67.44}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyErrorUtil.js\": {\"lines\":{\"total\":23,\"covered\":23,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":7,\"covered\":7,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":23,\"covered\":23,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":19,\"covered\":19,\"skipped\":0,\"pct\":100}}\n-,\"/Users/zachleat/Code/eleventy/src/EleventyExtensionMap.js\": {\"lines\":{\"total\":59,\"covered\":59,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":22,\"covered\":22,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":59,\"covered\":59,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":29,\"covered\":29,\"skipped\":0,\"pct\":100}}\n-,\"/Users/zachleat/Code/eleventy/src/EleventyFiles.js\": {\"lines\":{\"total\":157,\"covered\":147,\"skipped\":0,\"pct\":93.63},\"functions\":{\"total\":40,\"covered\":36,\"skipped\":0,\"pct\":90},\"statements\":{\"total\":157,\"covered\":147,\"skipped\":0,\"pct\":93.63},\"branches\":{\"total\":61,\"covered\":51,\"skipped\":0,\"pct\":83.61}}\n+,\"/Users/zachleat/Code/eleventy/src/EleventyExtensionMap.js\": {\"lines\":{\"total\":64,\"covered\":64,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":23,\"covered\":23,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":64,\"covered\":64,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":31,\"covered\":31,\"skipped\":0,\"pct\":100}}\n+,\"/Users/zachleat/Code/eleventy/src/EleventyFiles.js\": {\"lines\":{\"total\":165,\"covered\":155,\"skipped\":0,\"pct\":93.94},\"functions\":{\"total\":40,\"covered\":36,\"skipped\":0,\"pct\":90},\"statements\":{\"total\":165,\"covered\":155,\"skipped\":0,\"pct\":93.94},\"branches\":{\"total\":61,\"covered\":51,\"skipped\":0,\"pct\":83.61}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyServe.js\": {\"lines\":{\"total\":59,\"covered\":22,\"skipped\":0,\"pct\":37.29},\"functions\":{\"total\":16,\"covered\":9,\"skipped\":0,\"pct\":56.25},\"statements\":{\"total\":59,\"covered\":22,\"skipped\":0,\"pct\":37.29},\"branches\":{\"total\":36,\"covered\":10,\"skipped\":0,\"pct\":27.78}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyWatch.js\": {\"lines\":{\"total\":33,\"covered\":33,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":16,\"covered\":16,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":35,\"covered\":35,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":17,\"covered\":15,\"skipped\":0,\"pct\":88.24}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyWatchTargets.js\": {\"lines\":{\"total\":49,\"covered\":45,\"skipped\":0,\"pct\":91.84},\"functions\":{\"total\":21,\"covered\":18,\"skipped\":0,\"pct\":85.71},\"statements\":{\"total\":49,\"covered\":45,\"skipped\":0,\"pct\":91.84},\"branches\":{\"total\":15,\"covered\":14,\"skipped\":0,\"pct\":93.33}}\n-,\"/Users/zachleat/Code/eleventy/src/Template.js\": {\"lines\":{\"total\":298,\"covered\":283,\"skipped\":0,\"pct\":94.97},\"functions\":{\"total\":53,\"covered\":52,\"skipped\":0,\"pct\":98.11},\"statements\":{\"total\":300,\"covered\":285,\"skipped\":0,\"pct\":95},\"branches\":{\"total\":111,\"covered\":98,\"skipped\":0,\"pct\":88.29}}\n+,\"/Users/zachleat/Code/eleventy/src/Template.js\": {\"lines\":{\"total\":307,\"covered\":292,\"skipped\":0,\"pct\":95.11},\"functions\":{\"total\":55,\"covered\":54,\"skipped\":0,\"pct\":98.18},\"statements\":{\"total\":309,\"covered\":294,\"skipped\":0,\"pct\":95.15},\"branches\":{\"total\":111,\"covered\":98,\"skipped\":0,\"pct\":88.29}}\n,\"/Users/zachleat/Code/eleventy/src/TemplateCache.js\": {\"lines\":{\"total\":9,\"covered\":9,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":6,\"covered\":6,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":9,\"covered\":9,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/TemplateCollection.js\": {\"lines\":{\"total\":31,\"covered\":28,\"skipped\":0,\"pct\":90.32},\"functions\":{\"total\":15,\"covered\":14,\"skipped\":0,\"pct\":93.33},\"statements\":{\"total\":34,\"covered\":31,\"skipped\":0,\"pct\":91.18},\"branches\":{\"total\":10,\"covered\":7,\"skipped\":0,\"pct\":70}}\n,\"/Users/zachleat/Code/eleventy/src/TemplateConfig.js\": {\"lines\":{\"total\":62,\"covered\":55,\"skipped\":0,\"pct\":88.71},\"functions\":{\"total\":10,\"covered\":6,\"skipped\":0,\"pct\":60},\"statements\":{\"total\":62,\"covered\":55,\"skipped\":0,\"pct\":88.71},\"branches\":{\"total\":26,\"covered\":24,\"skipped\":0,\"pct\":92.31}}\n-,\"/Users/zachleat/Code/eleventy/src/TemplateContent.js\": {\"lines\":{\"total\":87,\"covered\":83,\"skipped\":0,\"pct\":95.4},\"functions\":{\"total\":18,\"covered\":18,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":87,\"covered\":83,\"skipped\":0,\"pct\":95.4},\"branches\":{\"total\":36,\"covered\":33,\"skipped\":0,\"pct\":91.67}}\n-,\"/Users/zachleat/Code/eleventy/src/TemplateData.js\": {\"lines\":{\"total\":214,\"covered\":205,\"skipped\":0,\"pct\":95.79},\"functions\":{\"total\":40,\"covered\":39,\"skipped\":0,\"pct\":97.5},\"statements\":{\"total\":217,\"covered\":208,\"skipped\":0,\"pct\":95.85},\"branches\":{\"total\":78,\"covered\":68,\"skipped\":0,\"pct\":87.18}}\n-,\"/Users/zachleat/Code/eleventy/src/TemplateEngineManager.js\": {\"lines\":{\"total\":22,\"covered\":22,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":7,\"covered\":7,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":22,\"covered\":22,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":8,\"covered\":8,\"skipped\":0,\"pct\":100}}\n+,\"/Users/zachleat/Code/eleventy/src/TemplateContent.js\": {\"lines\":{\"total\":98,\"covered\":94,\"skipped\":0,\"pct\":95.92},\"functions\":{\"total\":18,\"covered\":18,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":98,\"covered\":94,\"skipped\":0,\"pct\":95.92},\"branches\":{\"total\":36,\"covered\":33,\"skipped\":0,\"pct\":91.67}}\n+,\"/Users/zachleat/Code/eleventy/src/TemplateData.js\": {\"lines\":{\"total\":221,\"covered\":212,\"skipped\":0,\"pct\":95.93},\"functions\":{\"total\":40,\"covered\":39,\"skipped\":0,\"pct\":97.5},\"statements\":{\"total\":224,\"covered\":215,\"skipped\":0,\"pct\":95.98},\"branches\":{\"total\":78,\"covered\":68,\"skipped\":0,\"pct\":87.18}}\n+,\"/Users/zachleat/Code/eleventy/src/TemplateEngineManager.js\": {\"lines\":{\"total\":28,\"covered\":28,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":7,\"covered\":7,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":28,\"covered\":28,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":10,\"covered\":10,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/TemplateFileSlug.js\": {\"lines\":{\"total\":22,\"covered\":22,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":4,\"covered\":4,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":22,\"covered\":22,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":8,\"covered\":8,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/TemplateGlob.js\": {\"lines\":{\"total\":15,\"covered\":14,\"skipped\":0,\"pct\":93.33},\"functions\":{\"total\":4,\"covered\":4,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":15,\"covered\":14,\"skipped\":0,\"pct\":93.33},\"branches\":{\"total\":8,\"covered\":7,\"skipped\":0,\"pct\":87.5}}\n-,\"/Users/zachleat/Code/eleventy/src/TemplateLayout.js\": {\"lines\":{\"total\":73,\"covered\":73,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":10,\"covered\":10,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":74,\"covered\":74,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":16,\"covered\":16,\"skipped\":0,\"pct\":100}}\n-,\"/Users/zachleat/Code/eleventy/src/TemplateLayoutPathResolver.js\": {\"lines\":{\"total\":47,\"covered\":45,\"skipped\":0,\"pct\":95.74},\"functions\":{\"total\":11,\"covered\":11,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":47,\"covered\":45,\"skipped\":0,\"pct\":95.74},\"branches\":{\"total\":18,\"covered\":16,\"skipped\":0,\"pct\":88.89}}\n-,\"/Users/zachleat/Code/eleventy/src/TemplateMap.js\": {\"lines\":{\"total\":237,\"covered\":232,\"skipped\":0,\"pct\":97.89},\"functions\":{\"total\":32,\"covered\":31,\"skipped\":0,\"pct\":96.88},\"statements\":{\"total\":237,\"covered\":232,\"skipped\":0,\"pct\":97.89},\"branches\":{\"total\":125,\"covered\":113,\"skipped\":0,\"pct\":90.4}}\n-,\"/Users/zachleat/Code/eleventy/src/TemplatePassthrough.js\": {\"lines\":{\"total\":35,\"covered\":33,\"skipped\":0,\"pct\":94.29},\"functions\":{\"total\":9,\"covered\":8,\"skipped\":0,\"pct\":88.89},\"statements\":{\"total\":35,\"covered\":33,\"skipped\":0,\"pct\":94.29},\"branches\":{\"total\":12,\"covered\":10,\"skipped\":0,\"pct\":83.33}}\n-,\"/Users/zachleat/Code/eleventy/src/TemplatePassthroughManager.js\": {\"lines\":{\"total\":82,\"covered\":71,\"skipped\":0,\"pct\":86.59},\"functions\":{\"total\":23,\"covered\":21,\"skipped\":0,\"pct\":91.3},\"statements\":{\"total\":82,\"covered\":71,\"skipped\":0,\"pct\":86.59},\"branches\":{\"total\":32,\"covered\":23,\"skipped\":0,\"pct\":71.88}}\n+,\"/Users/zachleat/Code/eleventy/src/TemplateLayout.js\": {\"lines\":{\"total\":76,\"covered\":75,\"skipped\":0,\"pct\":98.68},\"functions\":{\"total\":10,\"covered\":10,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":77,\"covered\":76,\"skipped\":0,\"pct\":98.7},\"branches\":{\"total\":18,\"covered\":17,\"skipped\":0,\"pct\":94.44}}\n+,\"/Users/zachleat/Code/eleventy/src/TemplateLayoutPathResolver.js\": {\"lines\":{\"total\":49,\"covered\":46,\"skipped\":0,\"pct\":93.88},\"functions\":{\"total\":11,\"covered\":11,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":49,\"covered\":46,\"skipped\":0,\"pct\":93.88},\"branches\":{\"total\":20,\"covered\":17,\"skipped\":0,\"pct\":85}}\n+,\"/Users/zachleat/Code/eleventy/src/TemplateMap.js\": {\"lines\":{\"total\":243,\"covered\":238,\"skipped\":0,\"pct\":97.94},\"functions\":{\"total\":33,\"covered\":32,\"skipped\":0,\"pct\":96.97},\"statements\":{\"total\":243,\"covered\":238,\"skipped\":0,\"pct\":97.94},\"branches\":{\"total\":125,\"covered\":113,\"skipped\":0,\"pct\":90.4}}\n+,\"/Users/zachleat/Code/eleventy/src/TemplatePassthrough.js\": {\"lines\":{\"total\":45,\"covered\":43,\"skipped\":0,\"pct\":95.56},\"functions\":{\"total\":12,\"covered\":11,\"skipped\":0,\"pct\":91.67},\"statements\":{\"total\":45,\"covered\":43,\"skipped\":0,\"pct\":95.56},\"branches\":{\"total\":12,\"covered\":10,\"skipped\":0,\"pct\":83.33}}\n+,\"/Users/zachleat/Code/eleventy/src/TemplatePassthroughManager.js\": {\"lines\":{\"total\":82,\"covered\":72,\"skipped\":0,\"pct\":87.8},\"functions\":{\"total\":22,\"covered\":20,\"skipped\":0,\"pct\":90.91},\"statements\":{\"total\":82,\"covered\":72,\"skipped\":0,\"pct\":87.8},\"branches\":{\"total\":34,\"covered\":25,\"skipped\":0,\"pct\":73.53}}\n,\"/Users/zachleat/Code/eleventy/src/TemplatePath.js\": {\"lines\":{\"total\":93,\"covered\":93,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":30,\"covered\":29,\"skipped\":0,\"pct\":96.67},\"statements\":{\"total\":94,\"covered\":94,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":48,\"covered\":48,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/TemplatePermalink.js\": {\"lines\":{\"total\":32,\"covered\":32,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":7,\"covered\":7,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":32,\"covered\":32,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":27,\"covered\":26,\"skipped\":0,\"pct\":96.3}}\n,\"/Users/zachleat/Code/eleventy/src/TemplatePermalinkNoWrite.js\": {\"lines\":{\"total\":3,\"covered\":3,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":3,\"covered\":3,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100}}\n-,\"/Users/zachleat/Code/eleventy/src/TemplateRender.js\": {\"lines\":{\"total\":87,\"covered\":83,\"skipped\":0,\"pct\":95.4},\"functions\":{\"total\":23,\"covered\":22,\"skipped\":0,\"pct\":95.65},\"statements\":{\"total\":87,\"covered\":83,\"skipped\":0,\"pct\":95.4},\"branches\":{\"total\":48,\"covered\":45,\"skipped\":0,\"pct\":93.75}}\n-,\"/Users/zachleat/Code/eleventy/src/TemplateWriter.js\": {\"lines\":{\"total\":113,\"covered\":90,\"skipped\":0,\"pct\":79.65},\"functions\":{\"total\":32,\"covered\":24,\"skipped\":0,\"pct\":75},\"statements\":{\"total\":113,\"covered\":90,\"skipped\":0,\"pct\":79.65},\"branches\":{\"total\":28,\"covered\":14,\"skipped\":0,\"pct\":50}}\n-,\"/Users/zachleat/Code/eleventy/src/UserConfig.js\": {\"lines\":{\"total\":209,\"covered\":122,\"skipped\":0,\"pct\":58.37},\"functions\":{\"total\":57,\"covered\":26,\"skipped\":0,\"pct\":45.61},\"statements\":{\"total\":210,\"covered\":123,\"skipped\":0,\"pct\":58.57},\"branches\":{\"total\":88,\"covered\":41,\"skipped\":0,\"pct\":46.59}}\n+,\"/Users/zachleat/Code/eleventy/src/TemplateRender.js\": {\"lines\":{\"total\":80,\"covered\":79,\"skipped\":0,\"pct\":98.75},\"functions\":{\"total\":22,\"covered\":22,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":80,\"covered\":79,\"skipped\":0,\"pct\":98.75},\"branches\":{\"total\":46,\"covered\":45,\"skipped\":0,\"pct\":97.83}}\n+,\"/Users/zachleat/Code/eleventy/src/TemplateWriter.js\": {\"lines\":{\"total\":112,\"covered\":88,\"skipped\":0,\"pct\":78.57},\"functions\":{\"total\":32,\"covered\":23,\"skipped\":0,\"pct\":71.88},\"statements\":{\"total\":112,\"covered\":88,\"skipped\":0,\"pct\":78.57},\"branches\":{\"total\":28,\"covered\":14,\"skipped\":0,\"pct\":50}}\n+,\"/Users/zachleat/Code/eleventy/src/UserConfig.js\": {\"lines\":{\"total\":215,\"covered\":128,\"skipped\":0,\"pct\":59.53},\"functions\":{\"total\":57,\"covered\":26,\"skipped\":0,\"pct\":45.61},\"statements\":{\"total\":216,\"covered\":129,\"skipped\":0,\"pct\":59.72},\"branches\":{\"total\":88,\"covered\":41,\"skipped\":0,\"pct\":46.59}}\n,\"/Users/zachleat/Code/eleventy/src/defaultConfig.js\": {\"lines\":{\"total\":14,\"covered\":11,\"skipped\":0,\"pct\":78.57},\"functions\":{\"total\":4,\"covered\":1,\"skipped\":0,\"pct\":25},\"statements\":{\"total\":14,\"covered\":11,\"skipped\":0,\"pct\":78.57},\"branches\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/Engines/Custom.js\": {\"lines\":{\"total\":19,\"covered\":12,\"skipped\":0,\"pct\":63.16},\"functions\":{\"total\":5,\"covered\":3,\"skipped\":0,\"pct\":60},\"statements\":{\"total\":19,\"covered\":12,\"skipped\":0,\"pct\":63.16},\"branches\":{\"total\":12,\"covered\":6,\"skipped\":0,\"pct\":50}}\n,\"/Users/zachleat/Code/eleventy/src/Engines/Ejs.js\": {\"lines\":{\"total\":19,\"covered\":18,\"skipped\":0,\"pct\":94.74},\"functions\":{\"total\":7,\"covered\":6,\"skipped\":0,\"pct\":85.71},\"statements\":{\"total\":19,\"covered\":18,\"skipped\":0,\"pct\":94.74},\"branches\":{\"total\":9,\"covered\":8,\"skipped\":0,\"pct\":88.89}}\n,\"/Users/zachleat/Code/eleventy/src/Engines/Haml.js\": {\"lines\":{\"total\":9,\"covered\":9,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":3,\"covered\":3,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":9,\"covered\":9,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/Engines/Handlebars.js\": {\"lines\":{\"total\":30,\"covered\":30,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":9,\"covered\":9,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":30,\"covered\":30,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":6,\"covered\":5,\"skipped\":0,\"pct\":83.33}}\n,\"/Users/zachleat/Code/eleventy/src/Engines/Html.js\": {\"lines\":{\"total\":9,\"covered\":9,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":3,\"covered\":3,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":9,\"covered\":9,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100}}\n-,\"/Users/zachleat/Code/eleventy/src/Engines/JavaScript.js\": {\"lines\":{\"total\":57,\"covered\":56,\"skipped\":0,\"pct\":98.25},\"functions\":{\"total\":13,\"covered\":13,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":58,\"covered\":57,\"skipped\":0,\"pct\":98.28},\"branches\":{\"total\":46,\"covered\":41,\"skipped\":0,\"pct\":89.13}}\n+,\"/Users/zachleat/Code/eleventy/src/Engines/JavaScript.js\": {\"lines\":{\"total\":61,\"covered\":59,\"skipped\":0,\"pct\":96.72},\"functions\":{\"total\":13,\"covered\":13,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":62,\"covered\":60,\"skipped\":0,\"pct\":96.77},\"branches\":{\"total\":50,\"covered\":43,\"skipped\":0,\"pct\":86}}\n,\"/Users/zachleat/Code/eleventy/src/Engines/JavaScriptTemplateLiteral.js\": {\"lines\":{\"total\":18,\"covered\":17,\"skipped\":0,\"pct\":94.44},\"functions\":{\"total\":3,\"covered\":3,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":18,\"covered\":17,\"skipped\":0,\"pct\":94.44},\"branches\":{\"total\":6,\"covered\":6,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/Engines/Liquid.js\": {\"lines\":{\"total\":77,\"covered\":74,\"skipped\":0,\"pct\":96.1},\"functions\":{\"total\":27,\"covered\":26,\"skipped\":0,\"pct\":96.3},\"statements\":{\"total\":77,\"covered\":74,\"skipped\":0,\"pct\":96.1},\"branches\":{\"total\":20,\"covered\":17,\"skipped\":0,\"pct\":85}}\n,\"/Users/zachleat/Code/eleventy/src/Engines/Markdown.js\": {\"lines\":{\"total\":32,\"covered\":29,\"skipped\":0,\"pct\":90.63},\"functions\":{\"total\":9,\"covered\":8,\"skipped\":0,\"pct\":88.89},\"statements\":{\"total\":32,\"covered\":29,\"skipped\":0,\"pct\":90.63},\"branches\":{\"total\":16,\"covered\":13,\"skipped\":0,\"pct\":81.25}}\n,\"/Users/zachleat/Code/eleventy/src/Engines/Mustache.js\": {\"lines\":{\"total\":10,\"covered\":10,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":4,\"covered\":4,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":10,\"covered\":10,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/Engines/Nunjucks.js\": {\"lines\":{\"total\":87,\"covered\":78,\"skipped\":0,\"pct\":89.66},\"functions\":{\"total\":24,\"covered\":23,\"skipped\":0,\"pct\":95.83},\"statements\":{\"total\":87,\"covered\":78,\"skipped\":0,\"pct\":89.66},\"branches\":{\"total\":33,\"covered\":31,\"skipped\":0,\"pct\":93.94}}\n,\"/Users/zachleat/Code/eleventy/src/Engines/Pug.js\": {\"lines\":{\"total\":17,\"covered\":17,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":5,\"covered\":5,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":17,\"covered\":17,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":9,\"covered\":8,\"skipped\":0,\"pct\":88.89}}\n-,\"/Users/zachleat/Code/eleventy/src/Engines/TemplateEngine.js\": {\"lines\":{\"total\":49,\"covered\":49,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":18,\"covered\":18,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":51,\"covered\":51,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":6,\"covered\":6,\"skipped\":0,\"pct\":100}}\n+,\"/Users/zachleat/Code/eleventy/src/Engines/TemplateEngine.js\": {\"lines\":{\"total\":58,\"covered\":58,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":21,\"covered\":21,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":60,\"covered\":60,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":10,\"covered\":10,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/Errors/TemplateContentPrematureUseError.js\": {\"lines\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/Errors/UsingCircularTemplateContentReferenceError.js\": {\"lines\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/Filters/GetCollectionItem.js\": {\"lines\":{\"total\":10,\"covered\":10,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":1,\"covered\":1,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":10,\"covered\":10,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":14,\"covered\":13,\"skipped\":0,\"pct\":92.86}}\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/coverage.md",
"new_path": "docs/coverage.md",
"diff": "-# Code Coverage for Eleventy v0.11.0-beta.3\n+# Code Coverage for Eleventy v0.11.0-beta.4\n| Filename | % Lines | % Statements | % Functions | % Branches |\n| ---------------------------------------------------------- | ------- | ------------ | ----------- | ---------- |\n-| `total` | 88.12% | 88.17% | 86.5% | 80.78% |\n-| `src/Benchmark.js` | 86.67% | 86.67% | 71.43% | 66.67% |\n-| `src/BenchmarkGroup.js` | 60.53% | 60.53% | 71.43% | 25% |\n-| `src/BenchmarkManager.js` | 76.47% | 76.47% | 71.43% | 75% |\n-| `src/ComputedData.js` | 98.08% | 98.08% | 85.71% | 88.89% |\n+| `total` | 88.65% | 88.7% | 87.3% | 81.24% |\n+| `src/Benchmark.js` | 94.44% | 94.44% | 100% | 83.33% |\n+| `src/BenchmarkGroup.js` | 73.91% | 73.91% | 66.67% | 52.38% |\n+| `src/BenchmarkManager.js` | 77.78% | 77.78% | 75% | 75% |\n+| `src/ComputedData.js` | 100% | 100% | 100% | 100% |\n+| `src/ComputedDataProxy.js` | 100% | 100% | 100% | 100% |\n+| `src/ComputedDataQueue.js` | 100% | 100% | 100% | 72.73% |\n+| `src/ComputedDataTemplateString.js` | 100% | 100% | 100% | 83.33% |\n| `src/Config.js` | 100% | 100% | 100% | 100% |\n-| `src/Eleventy.js` | 55.02% | 54.76% | 48.72% | 40.91% |\n+| `src/Eleventy.js` | 54.5% | 54.26% | 50% | 43.24% |\n| `src/EleventyBaseError.js` | 100% | 100% | 100% | 100% |\n| `src/EleventyCommandCheck.js` | 100% | 100% | 100% | 87.5% |\n| `src/EleventyConfig.js` | 100% | 100% | 100% | 100% |\n| `src/EleventyErrorHandler.js` | 89.74% | 89.74% | 100% | 67.44% |\n| `src/EleventyErrorUtil.js` | 100% | 100% | 100% | 100% |\n| `src/EleventyExtensionMap.js` | 100% | 100% | 100% | 100% |\n-| `src/EleventyFiles.js` | 93.63% | 93.63% | 90% | 83.61% |\n+| `src/EleventyFiles.js` | 93.94% | 93.94% | 90% | 83.61% |\n| `src/EleventyServe.js` | 37.29% | 37.29% | 56.25% | 27.78% |\n| `src/EleventyWatch.js` | 100% | 100% | 100% | 88.24% |\n| `src/EleventyWatchTargets.js` | 91.84% | 91.84% | 85.71% | 93.33% |\n-| `src/Template.js` | 94.97% | 95% | 98.11% | 88.29% |\n+| `src/Template.js` | 95.11% | 95.15% | 98.18% | 88.29% |\n| `src/TemplateCache.js` | 100% | 100% | 100% | 100% |\n| `src/TemplateCollection.js` | 90.32% | 91.18% | 93.33% | 70% |\n| `src/TemplateConfig.js` | 88.71% | 88.71% | 60% | 92.31% |\n-| `src/TemplateContent.js` | 95.4% | 95.4% | 100% | 91.67% |\n-| `src/TemplateData.js` | 95.79% | 95.85% | 97.5% | 87.18% |\n+| `src/TemplateContent.js` | 95.92% | 95.92% | 100% | 91.67% |\n+| `src/TemplateData.js` | 95.93% | 95.98% | 97.5% | 87.18% |\n| `src/TemplateEngineManager.js` | 100% | 100% | 100% | 100% |\n| `src/TemplateFileSlug.js` | 100% | 100% | 100% | 100% |\n| `src/TemplateGlob.js` | 93.33% | 93.33% | 100% | 87.5% |\n-| `src/TemplateLayout.js` | 100% | 100% | 100% | 100% |\n-| `src/TemplateLayoutPathResolver.js` | 95.74% | 95.74% | 100% | 88.89% |\n-| `src/TemplateMap.js` | 97.89% | 97.89% | 96.88% | 90.4% |\n-| `src/TemplatePassthrough.js` | 94.29% | 94.29% | 88.89% | 83.33% |\n-| `src/TemplatePassthroughManager.js` | 86.59% | 86.59% | 91.3% | 71.88% |\n+| `src/TemplateLayout.js` | 98.68% | 98.7% | 100% | 94.44% |\n+| `src/TemplateLayoutPathResolver.js` | 93.88% | 93.88% | 100% | 85% |\n+| `src/TemplateMap.js` | 97.94% | 97.94% | 96.97% | 90.4% |\n+| `src/TemplatePassthrough.js` | 95.56% | 95.56% | 91.67% | 83.33% |\n+| `src/TemplatePassthroughManager.js` | 87.8% | 87.8% | 90.91% | 73.53% |\n| `src/TemplatePath.js` | 100% | 100% | 96.67% | 100% |\n| `src/TemplatePermalink.js` | 100% | 100% | 100% | 96.3% |\n| `src/TemplatePermalinkNoWrite.js` | 100% | 100% | 100% | 100% |\n-| `src/TemplateRender.js` | 95.4% | 95.4% | 95.65% | 93.75% |\n-| `src/TemplateWriter.js` | 79.65% | 79.65% | 75% | 50% |\n-| `src/UserConfig.js` | 58.37% | 58.57% | 45.61% | 46.59% |\n+| `src/TemplateRender.js` | 98.75% | 98.75% | 100% | 97.83% |\n+| `src/TemplateWriter.js` | 78.57% | 78.57% | 71.88% | 50% |\n+| `src/UserConfig.js` | 59.53% | 59.72% | 45.61% | 46.59% |\n| `src/defaultConfig.js` | 78.57% | 78.57% | 25% | 100% |\n| `src/Engines/Custom.js` | 63.16% | 63.16% | 60% | 50% |\n| `src/Engines/Ejs.js` | 94.74% | 94.74% | 85.71% | 88.89% |\n| `src/Engines/Haml.js` | 100% | 100% | 100% | 100% |\n| `src/Engines/Handlebars.js` | 100% | 100% | 100% | 83.33% |\n| `src/Engines/Html.js` | 100% | 100% | 100% | 100% |\n-| `src/Engines/JavaScript.js` | 98.25% | 98.28% | 100% | 89.13% |\n+| `src/Engines/JavaScript.js` | 96.72% | 96.77% | 100% | 86% |\n| `src/Engines/JavaScriptTemplateLiteral.js` | 94.44% | 94.44% | 100% | 100% |\n| `src/Engines/Liquid.js` | 96.1% | 96.1% | 96.3% | 85% |\n| `src/Engines/Markdown.js` | 90.63% | 90.63% | 88.89% | 81.25% |\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | v0.11.0-beta.4 coverage |
699 | 30.04.2020 12:51:00 | 18,000 | a1ce30a478123765ba7211955b5c2a58c624cfd9 | Test was already passing for | [
{
"change_type": "MODIFY",
"old_path": "src/ComputedData.js",
"new_path": "src/ComputedData.js",
"diff": "@@ -48,7 +48,7 @@ class ComputedData {\nlet varsUsed = await proxy.findVarsUsed(computed, data);\ndebug(\"%o accesses %o variables\", key, varsUsed);\n- let filteredVarsUsed = varsUsed.filter(varUsed => {\n+ let filteredVarsUsed = varsUsed.filter((varUsed) => {\nreturn (\n(varUsed !== key && this.computedKeys.has(varUsed)) ||\nvarUsed.startsWith(\"collections.\")\n@@ -64,9 +64,9 @@ class ComputedData {\nfor (let key of order) {\nlet computed = lodashGet(this.computed, key);\n-\nif (typeof computed === \"function\") {\n- lodashSet(data, key, await computed(data));\n+ let ret = await computed(data);\n+ lodashSet(data, key, ret);\n} else if (computed !== undefined) {\nlodashSet(data, key, computed);\n}\n@@ -81,6 +81,7 @@ class ComputedData {\nif (orderFilter && typeof orderFilter === \"function\") {\norder = order.filter(orderFilter.bind(this.queue));\n}\n+\nawait this._setupDataEntry(data, order);\nthis.queue.markComputed(order);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateMapTest-ComputedData.js",
"new_path": "test/TemplateMapTest-ComputedData.js",
"diff": "@@ -4,7 +4,7 @@ import TemplateData from \"../src/TemplateData\";\nimport TemplateMap from \"../src/TemplateMap\";\nimport getNewTemplate from \"./_getNewTemplateForTests\";\n-test(\"Computed data can see tag generated collections\", async t => {\n+test(\"Computed data can see tag generated collections\", async (t) => {\nlet tm = new TemplateMap();\nlet dataObj = new TemplateData(\"./test/stubs-computed-collections/\");\n@@ -44,3 +44,56 @@ test(\"Computed data can see tag generated collections\", async t => {\n// THEY ARE THE SAME\nt.is(map[0].data.dogCollection, map[0].data.collections.dog);\n});\n+\n+test(\"Computed data can see paginated data, Issue #1138\", async (t) => {\n+ let tm = new TemplateMap();\n+\n+ let dataObj = new TemplateData(\"./test/stubs-computed-pagination/\");\n+ let tmpl = getNewTemplate(\n+ \"./test/stubs-computed-pagination/paginated.njk\",\n+ \"./test/stubs-computed-pagination/\",\n+ \"./dist\",\n+ dataObj\n+ );\n+\n+ await tm.add(tmpl);\n+\n+ let dataObj2 = new TemplateData(\"./test/stubs-computed-pagination/\");\n+ let tmpl2 = getNewTemplate(\n+ \"./test/stubs-computed-pagination/child.11ty.js\",\n+ \"./test/stubs-computed-pagination/\",\n+ \"./dist\",\n+ dataObj2\n+ );\n+\n+ await tm.add(tmpl2);\n+\n+ await tm.cache();\n+\n+ let map = tm.getMap();\n+\n+ t.is(map.length, 2);\n+\n+ // paginated template tests\n+ t.is(map[0].inputPath.endsWith(\"paginated.njk\"), true);\n+ t.is(map[0]._pages.length, 2);\n+\n+ t.is(map[0]._pages[0].data.venue, \"first\");\n+ t.is(map[0]._pages[0].data.title, \"first\");\n+ t.is(map[0]._pages[0].url, \"/venues/first/\");\n+ t.truthy(map[0]._pages[0].data.collections);\n+ t.truthy(map[0]._pages[0].data.collections.venue);\n+ t.is(map[0]._pages[0].data.collections.venue.length, 2);\n+\n+ t.is(map[0]._pages[1].data.venue, \"second\");\n+ t.is(map[0]._pages[1].data.title, \"second\");\n+ t.is(map[0]._pages[1].url, \"/venues/second/\");\n+ t.truthy(map[0]._pages[1].data.collections.venue);\n+ t.is(map[0]._pages[1].data.collections.venue.length, 2);\n+\n+ // consumer of paginated template tests\n+ t.is(map[1]._pages.length, 1);\n+ // computed prop from venues\n+ t.truthy(map[1]._pages[0].data.venues);\n+ t.is(map[1]._pages[0].data.venues.length, 2);\n+});\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs-computed-pagination/child.11ty.js",
"diff": "+module.exports.data = {\n+ eleventyComputed: {\n+ venues: (data) => {\n+ return data.collections.venue;\n+ },\n+ },\n+};\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs-computed-pagination/paginated.njk",
"diff": "+---\n+venues:\n+ - first\n+ - second\n+pagination:\n+ data: venues\n+ size: 1\n+ alias: venue\n+ addAllPagesToCollections: true\n+permalink: \"venues/{{ venue }}/\"\n+tags: venue\n+eleventyComputed:\n+ title: \"{{ venue }}\"\n+---\n\\ No newline at end of file\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Test was already passing for #1138 |
665 | 01.05.2020 14:13:06 | 18,000 | e8f4004d749a0bf9f023e0a04c955e19acf52113 | Add before/after build events | [
{
"change_type": "MODIFY",
"old_path": "src/Eleventy.js",
"new_path": "src/Eleventy.js",
"diff": "@@ -736,10 +736,13 @@ Arguments:\nEleventyErrorHandler.logger = this.logger;\n}\n+ this.config.events.emit(\"beforeBuild\");\n+\ntry {\nlet promise = this.writer.write();\nret = await promise;\n+ this.config.events.emit(\"afterBuild\");\n} catch (e) {\nEleventyErrorHandler.initialMessage(\n\"Problem writing Eleventy templates\",\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Add before/after build events |
699 | 06.05.2020 21:45:23 | 18,000 | e3121f911d7f635de6fcf03a4e4e08fd7c37cd5a | Better initialization check for Custom engines will wait for init to finish if already running. | [
{
"change_type": "MODIFY",
"old_path": "src/Engines/Custom.js",
"new_path": "src/Engines/Custom.js",
"diff": "const TemplateEngine = require(\"./TemplateEngine\");\n+const getJavaScriptData = require(\"../Util/GetJavaScriptData\");\nclass CustomEngine extends TemplateEngine {\nconstructor(name, includesDir) {\n@@ -7,6 +8,7 @@ class CustomEngine extends TemplateEngine {\nthis.entry = this.getExtensionMapEntry();\nthis.needsInit =\n\"init\" in this.entry && typeof this.entry.init === \"function\";\n+ this.initStarted = false;\nthis.initFinished = false;\n}\n@@ -31,11 +33,42 @@ class CustomEngine extends TemplateEngine {\nreturn true;\n}\n- async compile(str, inputPath) {\n- if (this.needsInit && !this.initFinished) {\n- await this.entry.init.bind({ config: this.config })();\n+ // If we init from multiple places, wait for the first init to finish\n+ // before continuing on.\n+ async _runningInit() {\n+ if (this.needsInit) {\n+ if (this.initStarted) {\n+ await this.initStarted;\n+ } else if (!this.initFinished) {\n+ this.initStarted = this.entry.init.bind({ config: this.config })();\n+ await this.initStarted;\nthis.initFinished = true;\n}\n+ }\n+ }\n+\n+ async getExtraDataFromFile(inputPath) {\n+ await this._runningInit();\n+\n+ if (\"getData\" in this.entry) {\n+ if (typeof this.entry.getData === \"function\") {\n+ return await this.entry.getData(inputPath);\n+ } else {\n+ if (!(\"getInstanceFromInputPath\" in this.entry)) {\n+ return Promise.reject(\n+ new Error(\n+ `getInstanceFromInputPath callback missing from ${this.name} template engine plugin.`\n+ )\n+ );\n+ }\n+ let inst = await this.entry.getInstanceFromInputPath(inputPath);\n+ return await getJavaScriptData(inst, inputPath);\n+ }\n+ }\n+ }\n+\n+ async compile(str, inputPath) {\n+ await this._runningInit();\n// TODO generalize this (look at JavaScript.js)\nreturn this.entry.compile.bind({ config: this.config })(str, inputPath);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/JavaScript.js",
"new_path": "src/Engines/JavaScript.js",
"diff": "@@ -2,8 +2,8 @@ const TemplateEngine = require(\"./TemplateEngine\");\nconst TemplatePath = require(\"../TemplatePath\");\nconst EleventyBaseError = require(\"../EleventyBaseError\");\nconst deleteRequireCache = require(\"../Util/DeleteRequireCache\");\n+const getJavaScriptData = require(\"../Util/GetJavaScriptData\");\n-class JavaScriptTemplateInvalidDataFormatError extends EleventyBaseError {}\nclass JavaScriptTemplateNotDefined extends EleventyBaseError {}\nclass JavaScript extends TemplateEngine {\n@@ -91,19 +91,7 @@ class JavaScript extends TemplateEngine {\nasync getExtraDataFromFile(inputPath) {\nlet inst = this.getInstanceFromInputPath(inputPath);\n- if (inst && \"data\" in inst) {\n- // get extra data from `data` method,\n- // either as a function or getter or object literal\n- let result = await (typeof inst.data === \"function\"\n- ? inst.data()\n- : inst.data);\n- if (typeof result !== \"object\") {\n- throw new JavaScriptTemplateInvalidDataFormatError(\n- `Invalid data format returned from ${inputPath}: typeof ${typeof result}`\n- );\n- }\n- return result;\n- }\n+ return await getJavaScriptData(inst, inputPath);\n}\ngetJavaScriptFunctions(inst) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateEngineManager.js",
"new_path": "src/TemplateEngineManager.js",
"diff": "@@ -29,7 +29,7 @@ class TemplateEngineManager {\npug: \"Pug\",\nnjk: \"Nunjucks\",\nliquid: \"Liquid\",\n- \"11ty.js\": \"JavaScript\"\n+ \"11ty.js\": \"JavaScript\",\n};\nif (\"extensionMap\" in this.config) {\n@@ -69,6 +69,8 @@ class TemplateEngineManager {\ninstance.config = this.config;\ninstance.engineManager = this;\n+ // Make sure cache key is based on name and not path\n+ // Custom class is used for all plugins, cache once per plugin\nthis.engineCache[name] = instance;\nreturn instance;\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Util/GetJavaScriptData.js",
"diff": "+const EleventyBaseError = require(\"../EleventyBaseError\");\n+\n+class JavaScriptInvalidDataFormatError extends EleventyBaseError {}\n+\n+module.exports = async function (inst, inputPath, key = \"data\") {\n+ if (inst && key in inst) {\n+ // get extra data from `data` method,\n+ // either as a function or getter or object literal\n+ let result = await (typeof inst[key] === \"function\"\n+ ? inst[key]()\n+ : inst[key]);\n+ if (typeof result !== \"object\") {\n+ throw new JavaScriptInvalidDataFormatError(\n+ `Invalid data format returned from ${inputPath}: typeof ${typeof result}`\n+ );\n+ }\n+ return result;\n+ }\n+};\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Better initialization check for Custom engines will wait for init to finish if already running. |
699 | 10.05.2020 14:02:44 | 18,000 | 50d0b5f244efbb3affb2623a22c22f8bd69d69f3 | Make sure it outputs 0 files when 0 files are written (avoid "in 0.03 seconds (v0.11.0)" bug) | [
{
"change_type": "MODIFY",
"old_path": "src/Eleventy.js",
"new_path": "src/Eleventy.js",
"diff": "@@ -250,13 +250,12 @@ class Eleventy {\n);\n}\n- if (writeCount || skippedCount) {\nslashRet.push(\n`Wrote ${writeCount} ${simplePlural(writeCount, \"file\", \"files\")}${\nskippedCount ? ` (skipped ${skippedCount})` : \"\"\n}`\n);\n- }\n+\nif (slashRet.length) {\nret.push(slashRet.join(\" / \"));\n}\n@@ -500,7 +499,7 @@ Arguments:\n// Is a CSS input file and is not in the includes folder\n// TODO check output path file extension of this template (not input path)\n// TODO add additional API for this, maybe a config callback?\n- let onlyCssChanges = this.watchManager.hasAllQueueFiles(path => {\n+ let onlyCssChanges = this.watchManager.hasAllQueueFiles((path) => {\nreturn (\npath.endsWith(\".css\") &&\n// TODO how to make this work with relative includes?\n@@ -627,7 +626,7 @@ Arguments:\nreturn Object.assign(\n{\nignored: ignores,\n- ignoreInitial: true\n+ ignoreInitial: true,\n// also interesting: awaitWriteFinish\n},\nconfigOptions\n@@ -684,12 +683,12 @@ Arguments:\n}\n}\n- watcher.on(\"change\", async path => {\n+ watcher.on(\"change\", async (path) => {\nconsole.log(\"File changed:\", path);\nawait watchRun.call(this, path);\n});\n- watcher.on(\"add\", async path => {\n+ watcher.on(\"add\", async (path) => {\nconsole.log(\"File added:\", path);\nawait watchRun.call(this, path);\n});\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Make sure it outputs 0 files when 0 files are written (avoid "in 0.03 seconds (v0.11.0)" bug) |
699 | 10.05.2020 14:04:13 | 18,000 | 36c5022d885d147b5677fc08ef157eb849b8437a | Made another commit to 0.11.0 | [
{
"change_type": "MODIFY",
"old_path": "docs-src/_data/coverage.json",
"new_path": "docs-src/_data/coverage.json",
"diff": "-{\"total\": {\"lines\":{\"total\":3464,\"covered\":3062,\"skipped\":0,\"pct\":88.39},\"statements\":{\"total\":3486,\"covered\":3083,\"skipped\":0,\"pct\":88.44},\"functions\":{\"total\":818,\"covered\":714,\"skipped\":0,\"pct\":87.29},\"branches\":{\"total\":1503,\"covered\":1213,\"skipped\":0,\"pct\":80.71}}\n+{\"total\": {\"lines\":{\"total\":3463,\"covered\":3064,\"skipped\":0,\"pct\":88.48},\"statements\":{\"total\":3485,\"covered\":3085,\"skipped\":0,\"pct\":88.52},\"functions\":{\"total\":818,\"covered\":714,\"skipped\":0,\"pct\":87.29},\"branches\":{\"total\":1499,\"covered\":1213,\"skipped\":0,\"pct\":80.92}}\n,\"/Users/zachleat/Code/eleventy/src/Benchmark.js\": {\"lines\":{\"total\":18,\"covered\":17,\"skipped\":0,\"pct\":94.44},\"functions\":{\"total\":7,\"covered\":7,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":18,\"covered\":17,\"skipped\":0,\"pct\":94.44},\"branches\":{\"total\":6,\"covered\":5,\"skipped\":0,\"pct\":83.33}}\n-,\"/Users/zachleat/Code/eleventy/src/BenchmarkGroup.js\": {\"lines\":{\"total\":46,\"covered\":34,\"skipped\":0,\"pct\":73.91},\"functions\":{\"total\":9,\"covered\":6,\"skipped\":0,\"pct\":66.67},\"statements\":{\"total\":46,\"covered\":34,\"skipped\":0,\"pct\":73.91},\"branches\":{\"total\":21,\"covered\":11,\"skipped\":0,\"pct\":52.38}}\n+,\"/Users/zachleat/Code/eleventy/src/BenchmarkGroup.js\": {\"lines\":{\"total\":46,\"covered\":35,\"skipped\":0,\"pct\":76.09},\"functions\":{\"total\":9,\"covered\":6,\"skipped\":0,\"pct\":66.67},\"statements\":{\"total\":46,\"covered\":35,\"skipped\":0,\"pct\":76.09},\"branches\":{\"total\":21,\"covered\":13,\"skipped\":0,\"pct\":61.9}}\n,\"/Users/zachleat/Code/eleventy/src/BenchmarkManager.js\": {\"lines\":{\"total\":27,\"covered\":21,\"skipped\":0,\"pct\":77.78},\"functions\":{\"total\":8,\"covered\":6,\"skipped\":0,\"pct\":75},\"statements\":{\"total\":27,\"covered\":21,\"skipped\":0,\"pct\":77.78},\"branches\":{\"total\":8,\"covered\":6,\"skipped\":0,\"pct\":75}}\n,\"/Users/zachleat/Code/eleventy/src/ComputedData.js\": {\"lines\":{\"total\":46,\"covered\":46,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":8,\"covered\":8,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":46,\"covered\":46,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":17,\"covered\":17,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/ComputedDataProxy.js\": {\"lines\":{\"total\":51,\"covered\":50,\"skipped\":0,\"pct\":98.04},\"functions\":{\"total\":10,\"covered\":10,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":51,\"covered\":50,\"skipped\":0,\"pct\":98.04},\"branches\":{\"total\":32,\"covered\":29,\"skipped\":0,\"pct\":90.63}}\n,\"/Users/zachleat/Code/eleventy/src/ComputedDataQueue.js\": {\"lines\":{\"total\":21,\"covered\":21,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":10,\"covered\":10,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":21,\"covered\":21,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":11,\"covered\":8,\"skipped\":0,\"pct\":72.73}}\n,\"/Users/zachleat/Code/eleventy/src/ComputedDataTemplateString.js\": {\"lines\":{\"total\":24,\"covered\":24,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":4,\"covered\":4,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":24,\"covered\":24,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":6,\"covered\":5,\"skipped\":0,\"pct\":83.33}}\n,\"/Users/zachleat/Code/eleventy/src/Config.js\": {\"lines\":{\"total\":5,\"covered\":5,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":5,\"covered\":5,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100}}\n-,\"/Users/zachleat/Code/eleventy/src/Eleventy.js\": {\"lines\":{\"total\":222,\"covered\":121,\"skipped\":0,\"pct\":54.5},\"functions\":{\"total\":40,\"covered\":20,\"skipped\":0,\"pct\":50},\"statements\":{\"total\":223,\"covered\":121,\"skipped\":0,\"pct\":54.26},\"branches\":{\"total\":74,\"covered\":32,\"skipped\":0,\"pct\":43.24}}\n+,\"/Users/zachleat/Code/eleventy/src/Eleventy.js\": {\"lines\":{\"total\":221,\"covered\":122,\"skipped\":0,\"pct\":55.2},\"functions\":{\"total\":40,\"covered\":20,\"skipped\":0,\"pct\":50},\"statements\":{\"total\":222,\"covered\":122,\"skipped\":0,\"pct\":54.95},\"branches\":{\"total\":70,\"covered\":30,\"skipped\":0,\"pct\":42.86}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyBaseError.js\": {\"lines\":{\"total\":6,\"covered\":6,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":1,\"covered\":1,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":6,\"covered\":6,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyCommandCheck.js\": {\"lines\":{\"total\":28,\"covered\":28,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":5,\"covered\":5,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":28,\"covered\":28,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":8,\"covered\":7,\"skipped\":0,\"pct\":87.5}}\n,\"/Users/zachleat/Code/eleventy/src/EleventyConfig.js\": {\"lines\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100},\"functions\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100},\"statements\":{\"total\":2,\"covered\":2,\"skipped\":0,\"pct\":100},\"branches\":{\"total\":0,\"covered\":0,\"skipped\":0,\"pct\":100}}\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/coverage.md",
"new_path": "docs/coverage.md",
"diff": "| Filename | % Lines | % Statements | % Functions | % Branches |\n| ---------------------------------------------------------- | ------- | ------------ | ----------- | ---------- |\n-| `total` | 88.39% | 88.44% | 87.29% | 80.71% |\n+| `total` | 88.48% | 88.52% | 87.29% | 80.92% |\n| `src/Benchmark.js` | 94.44% | 94.44% | 100% | 83.33% |\n-| `src/BenchmarkGroup.js` | 73.91% | 73.91% | 66.67% | 52.38% |\n+| `src/BenchmarkGroup.js` | 76.09% | 76.09% | 66.67% | 61.9% |\n| `src/BenchmarkManager.js` | 77.78% | 77.78% | 75% | 75% |\n| `src/ComputedData.js` | 100% | 100% | 100% | 100% |\n| `src/ComputedDataProxy.js` | 98.04% | 98.04% | 100% | 90.63% |\n| `src/ComputedDataQueue.js` | 100% | 100% | 100% | 72.73% |\n| `src/ComputedDataTemplateString.js` | 100% | 100% | 100% | 83.33% |\n| `src/Config.js` | 100% | 100% | 100% | 100% |\n-| `src/Eleventy.js` | 54.5% | 54.26% | 50% | 43.24% |\n+| `src/Eleventy.js` | 55.2% | 54.95% | 50% | 42.86% |\n| `src/EleventyBaseError.js` | 100% | 100% | 100% | 100% |\n| `src/EleventyCommandCheck.js` | 100% | 100% | 100% | 87.5% |\n| `src/EleventyConfig.js` | 100% | 100% | 100% | 100% |\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Made another commit to 0.11.0 |
661 | 13.05.2020 12:54:49 | 25,200 | 13fc3d88de76d081c5734b09646d6ca6c96ca5fa | Fix argument for setTimeout vs new Promise | [
{
"change_type": "MODIFY",
"old_path": "src/Eleventy.js",
"new_path": "src/Eleventy.js",
"diff": "@@ -658,8 +658,8 @@ Arguments:\nawait new Promise((resolve, reject) => {\nwatchDelay = setTimeout(async () => {\nthis._watch().then(resolve, reject);\n- });\n}, this.config.watchThrottleWaitTime);\n+ });\n} catch (e) {\nif (e instanceof EleventyBaseError) {\nEleventyErrorHandler.error(e, \"Eleventy watch error\");\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Fix argument for setTimeout vs new Promise |
693 | 24.05.2020 09:17:01 | 14,400 | 42650fffc46bb29bc26b4e4d1c2eda8d866a66ba | Pass data to pagination before callback. | [
{
"change_type": "MODIFY",
"old_path": "test/PaginationTest.js",
"new_path": "test/PaginationTest.js",
"diff": "@@ -606,6 +606,18 @@ test(\"Pagination `before` Callback\", async t => {\nt.deepEqual(templates[0].data.myalias, \"item6\");\n});\n+test(\"Pagination `before` Callback with metadata\", async t => {\n+ let tmpl = new Template(\n+ \"./test/stubs/paged/paged-before-metadata.njk\",\n+ \"./test/stubs/\",\n+ \"./dist\"\n+ );\n+\n+ let data = await tmpl.getData();\n+ let templates = await tmpl.getTemplates(data);\n+ t.deepEqual(templates[0].data.pagination.items, [\"item3\"]);\n+});\n+\ntest(\"Pagination `before` Callback with a Filter\", async t => {\nlet tmpl = new Template(\n\"./test/stubs/paged/paged-before-filter.njk\",\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "test/stubs/paged/paged-before-metadata.njk",
"diff": "+---js\n+{\n+ keyword: \"item3\",\n+ pagination: {\n+ data: \"items\",\n+ size: 1,\n+ before: function(data, metadata) {\n+ return data.filter(el => el === metadata.keyword);\n+ }\n+ },\n+ items: [\"item1\", \"item2\", \"item3\", \"item4\", \"item5\", \"item6\"]\n+}\n+---\n+<ol>{% for item in pagination.items %}<li>{{ item }}</li>{% endfor %}</ol>\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Pass data to pagination before callback. |
676 | 17.06.2020 13:47:30 | 25,200 | c2e0dc506ec476d3b0392b1bf78c66dff90fd751 | Initial, cleaned-up cut of performance tuning patches.
Benchmark results:
API compatible; all tests pass. | [
{
"change_type": "MODIFY",
"old_path": "src/Benchmark.js",
"new_path": "src/Benchmark.js",
"diff": "@@ -18,6 +18,8 @@ class Benchmark {\nthis.beforeTimers = [];\n}\n+ // TODO(slightlyoff):\n+ // disable all of these hrtime requests when not benchmarking\nbefore() {\nthis.timesCalled++;\nthis.beforeTimers.push(this.getNewTimestamp());\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Html.js",
"new_path": "src/Engines/Html.js",
"diff": "const TemplateEngine = require(\"./TemplateEngine\");\nclass Html extends TemplateEngine {\n+ constructor(name, includesDir) {\n+ super(name, includesDir);\n+ this.cacheable = true;\n+ }\n+\nasync compile(str, inputPath, preTemplateEngine) {\nif (preTemplateEngine) {\nlet engine = this.engineManager.getEngine(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Liquid.js",
"new_path": "src/Engines/Liquid.js",
"diff": "@@ -20,6 +20,7 @@ class Liquid extends TemplateEngine {\nkeyword: /[a-zA-Z0-9\\.\\-\\_]+/,\n\"ignore:whitespace\": /[, \\t]+/ // includes comma separator\n});\n+ this.cacheable = true;\n}\nsetLibrary(lib) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Markdown.js",
"new_path": "src/Engines/Markdown.js",
"diff": "@@ -9,6 +9,8 @@ class Markdown extends TemplateEngine {\nthis.markdownOptions = {};\nthis.setLibrary(this.config.libraryOverrides.md);\n+\n+ this.cacheable = true;\n}\nsetLibrary(mdLib) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Nunjucks.js",
"new_path": "src/Engines/Nunjucks.js",
"diff": "@@ -11,6 +11,8 @@ class Nunjucks extends TemplateEngine {\nsuper(name, includesDir);\nthis.setLibrary(this.config.libraryOverrides.njk);\n+\n+ this.cacheable = true;\n}\nsetLibrary(env) {\n@@ -225,6 +227,11 @@ class Nunjucks extends TemplateEngine {\n}\nasync compile(str, inputPath) {\n+ let needsCompile = (str.indexOf(\"{{\") != -1) || (str.indexOf(\"{%\") != -1);\n+ if (!needsCompile) {\n+ return async function() { return str; };\n+ }\n+\nlet tmpl;\nif (!inputPath || inputPath === \"njk\" || inputPath === \"md\") {\ntmpl = NunjucksLib.compile(str, this.njkEnv);\n@@ -232,6 +239,7 @@ class Nunjucks extends TemplateEngine {\ntmpl = NunjucksLib.compile(str, this.njkEnv, inputPath);\n}\nreturn async function(data) {\n+\nreturn new Promise(function(resolve, reject) {\ntmpl.render(data, function(err, res) {\nif (err) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/TemplateEngine.js",
"new_path": "src/Engines/TemplateEngine.js",
"diff": "@@ -12,6 +12,7 @@ class TemplateEngine {\nthis.partialsHaveBeenCached = false;\nthis.partials = [];\nthis.engineLib = null;\n+ this.cacheable = false;\n}\nget config() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Template.js",
"new_path": "src/Template.js",
"diff": "@@ -127,7 +127,11 @@ class Template extends TemplateContent {\ndebugDev(\"Not using dynamicPermalinks, using %o\", permalink);\npermalinkValue = permalink;\n} else {\n+ // if (this.engine.cacheable && permalink.indexOf(\"{\") == -1) {\n+ // permalinkValue = permalink;\n+ // } else {\npermalinkValue = await super.render(permalink, data, true);\n+ // }\ndebug(\n\"Rendering permalink for %o: %s becomes %o\",\nthis.inputPath,\n@@ -459,6 +463,8 @@ class Template extends TemplateContent {\nawait this.computedData.processRemainingData(data);\n}\n+ _templatesResultsCache = new Map();\n+\nasync getTemplates(data) {\n// TODO cache this\nlet results = [];\n@@ -664,6 +670,8 @@ class Template extends TemplateContent {\n}\nasync getMappedDate(data) {\n+ // TODO(slightlyoff): lots of I/O!\n+\n// should we use Luxon dates everywhere? Right now using built-in `Date`\nif (\"date\" in data && data.date) {\ndebug(\n@@ -676,7 +684,7 @@ class Template extends TemplateContent {\ndebug(\"getMappedDate: YAML parsed it: %o\", data.date);\nreturn data.date;\n} else {\n- let stat = await fs.stat(this.inputPath);\n+ let stat = fs.statSync(this.inputPath);\n// string\nif (data.date.toLowerCase() === \"last modified\") {\nreturn new Date(stat.ctimeMs);\n@@ -713,7 +721,7 @@ class Template extends TemplateContent {\nreturn dateObj;\n}\n- let stat = await fs.stat(this.inputPath);\n+ let stat = fs.statSync(this.inputPath);\nlet createdDate = new Date(stat.birthtimeMs);\ndebug(\n\"getMappedDate: using file created time for %o of %o (from %o)\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateCollection.js",
"new_path": "src/TemplateCollection.js",
"diff": "@@ -33,16 +33,32 @@ class TemplateCollection extends Sortable {\nreturn globs;\n}\n+ _filteredByGlobsCache = new Map();\n+\ngetFilteredByGlob(globs) {\nglobs = this.getGlobs(globs);\n- return this.getAllSorted().filter(item => {\n+ let key = globs.join(\"::\");\n+ if (!this._dirty) {\n+ // Try to find a pre-sorted list and clone it.\n+ if (this._filteredByGlobsCache.has(key)) {\n+ return [...(this._filteredByGlobsCache.get(key))];\n+ }\n+ } else if (this._filteredByGlobsCache.size) {\n+ // Blow away cache\n+ this._filteredByGlobsCache = new Map();\n+ }\n+\n+ let filtered = this.getAllSorted().filter(item => {\nif (multimatch([item.inputPath], globs).length) {\nreturn true;\n}\nreturn false;\n});\n+ this._dirty = false;\n+ this._filteredByGlobsCache.set(key, [...filtered]);\n+ return filtered;\n}\ngetFilteredByTag(tagName) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateContent.js",
"new_path": "src/TemplateContent.js",
"diff": "@@ -18,6 +18,8 @@ class TemplateContentFrontMatterError extends EleventyBaseError {}\nclass TemplateContentCompileError extends EleventyBaseError {}\nclass TemplateContentRenderError extends EleventyBaseError {}\n+let inputContentCache = new Map();\n+\nclass TemplateContent {\nconstructor(inputPath, inputDir) {\nthis.inputPath = inputPath;\n@@ -120,10 +122,16 @@ class TemplateContent {\nif (!this.engine.needsToReadFileContents()) {\nreturn \"\";\n}\n+ let content = \"\";\nlet templateBenchmark = bench.get(\"Template Read\");\ntemplateBenchmark.before();\n- let content = await fs.readFile(this.inputPath, \"utf-8\");\n+ if(inputContentCache.has(this.inputPath)){\n+ content = inputContentCache.get(this.inputPath);\n+ } else {\n+ content = await fs.readFile(this.inputPath, \"utf-8\");\n+ inputContentCache.set(this.inputPath, content);\n+ }\ntemplateBenchmark.after();\nreturn content;\n@@ -175,6 +183,20 @@ class TemplateContent {\n}\n}\n+ static _compileEngineCache = new Map();\n+\n+ _getCompileCache(str, bypassMarkdown) {\n+ let engineName = this.engine.getName() + \"::\" + (!!bypassMarkdown);\n+ let engineMap = TemplateContent._compileEngineCache.get(engineName);\n+ if (!engineMap) {\n+ engineMap = new Map();\n+ TemplateContent._compileEngineCache.set(engineName, engineMap);\n+ }\n+\n+ let cacheable = this.engine.cacheable;\n+ return [ cacheable, str , engineMap ];\n+ }\n+\nasync compile(str, bypassMarkdown) {\nawait this.setupTemplateRender(bypassMarkdown);\n@@ -185,11 +207,23 @@ class TemplateContent {\n);\ntry {\n+ let [ cacheable, key, cache ] =\n+ this._getCompileCache(str, bypassMarkdown);\n+ if (cacheable && cache.has(key)) {\n+ return cache.get(key);\n+ }\n+\n+ // Compilation is async, so we eagerly cache a Promise that eventually\n+ // resolves to the compiled function\n+ let res;\n+ cache.set(key, new Promise((resolve) => { res = resolve; }));\n+\nlet templateBenchmark = bench.get(\"Template Compile\");\ntemplateBenchmark.before();\nlet fn = await this.templateRender.getCompiledTemplate(str);\ntemplateBenchmark.after();\ndebugDev(\"%o getCompiledTemplate function created\", this.inputPath);\n+ res(fn);\nreturn fn;\n} catch (e) {\ndebug(`Having trouble compiling template ${this.inputPath}: %O`, str);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateMap.js",
"new_path": "src/TemplateMap.js",
"diff": "@@ -22,6 +22,7 @@ class TemplateMap {\nthis.cached = false;\nthis.configCollections = null;\nthis.verboseOutput = true;\n+ this.collection = new TemplateCollection();\n}\nget tagPrefix() {\n@@ -38,13 +39,6 @@ class TemplateMap {\nreturn this.map;\n}\n- get collection() {\n- if (!this._collection) {\n- this._collection = new TemplateCollection();\n- }\n- return this._collection;\n- }\n-\ngetTagTarget(str) {\nif (str.startsWith(\"collections.\")) {\nreturn str.substr(\"collections.\".length);\n@@ -107,13 +101,14 @@ class TemplateMap {\nif (entry.data.tags) {\nfor (let tag of entry.data.tags) {\n- if (!graph.hasNode(tagPrefix + tag)) {\n- graph.addNode(tagPrefix + tag);\n+ let tagWithPrefix = tagPrefix + tag;\n+ if (!graph.hasNode(tagWithPrefix)) {\n+ graph.addNode(tagWithPrefix);\n}\n// collections.tagName\n// Dependency from tag to inputPath\n- graph.addDependency(tagPrefix + tag, entry.inputPath);\n+ graph.addDependency(tagWithPrefix, entry.inputPath);\n}\n}\n}\n@@ -129,6 +124,7 @@ class TemplateMap {\ngraph.addNode(tagPrefix + \"all\");\nlet userConfigCollections = this.getUserConfigCollectionNames();\n+\n// Add tags from named user config collections\nfor (let tag of userConfigCollections) {\ngraph.addNode(tagPrefix + tag);\n@@ -156,18 +152,20 @@ class TemplateMap {\nif (entry.data.tags) {\nfor (let tag of entry.data.tags) {\n- if (!graph.hasNode(tagPrefix + tag)) {\n- graph.addNode(tagPrefix + tag);\n+ let tagWithPrefix = tagPrefix + tag;\n+ if (!graph.hasNode(tagWithPrefix)) {\n+ graph.addNode(tagWithPrefix);\n}\n// collections.tagName\n// Dependency from tag to inputPath\n- graph.addDependency(tagPrefix + tag, entry.inputPath);\n+ graph.addDependency(tagWithPrefix, entry.inputPath);\n}\n}\n}\n}\n}\n- return graph.overallOrder();\n+ let order = graph.overallOrder();\n+ return order;\n}\ngetPaginatedOverCollectionsMappedDependencies() {\n@@ -228,6 +226,7 @@ class TemplateMap {\nreturn graph.overallOrder();\n}\n+ // TODO(slightlyoff): major bottleneck\nasync initDependencyMap(dependencyMap) {\nlet tagPrefix = this.tagPrefix;\nfor (let depEntry of dependencyMap) {\n@@ -275,6 +274,7 @@ class TemplateMap {\nentry.data.collections = this.collectionsData;\n}\n+\nlet dependencyMap = this.getMappedDependencies();\nawait this.initDependencyMap(dependencyMap);\n@@ -308,6 +308,7 @@ class TemplateMap {\nthis.checkForDuplicatePermalinks();\n}\n+ // TODO(slightlyoff): hot inner loop?\ngetMapEntryForInputPath(inputPath) {\nfor (let map of this.map) {\nif (map.inputPath === inputPath) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Util/Sortable.js",
"new_path": "src/Util/Sortable.js",
"diff": "@@ -5,6 +5,7 @@ class Sortable {\nthis.isSortAscending = true;\nthis.isSortNumeric = false;\nthis.items = [];\n+ this._dirty = true;\nthis.sortFunctionStringMap = {\n\"A-Z\": \"Ascending\",\n@@ -19,6 +20,7 @@ class Sortable {\n}\nadd(item) {\n+ this._dirty = true;\nthis.items.push(item);\n}\n@@ -33,7 +35,7 @@ class Sortable {\nsortFunction = Sortable[\"sortFunction\" + capitalize(sortFunction)];\n}\n- return this.items.filter(() => true).sort(sortFunction);\n+ return this.items.slice().sort(sortFunction);\n}\nsortAscending() {\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Initial, cleaned-up cut of performance tuning patches.
Benchmark results:
https://gist.github.com/slightlyoff/4a2c2709c8a4ef80ef074010b0be6a65
API compatible; all tests pass. |
676 | 20.06.2020 15:12:06 | 25,200 | a7274b3c1e67d310984523371d0be80d6a51c4d1 | Invalidate input caches in watch mode. | [
{
"change_type": "MODIFY",
"old_path": "src/Eleventy.js",
"new_path": "src/Eleventy.js",
"diff": "const pkg = require(\"../package.json\");\nconst TemplatePath = require(\"./TemplatePath\");\nconst TemplateData = require(\"./TemplateData\");\n+const TemplateContent = require(\"./TemplateContent\");\nconst TemplateWriter = require(\"./TemplateWriter\");\nconst EleventyExtensionMap = require(\"./EleventyExtensionMap\");\nconst EleventyErrorHandler = require(\"./EleventyErrorHandler\");\n@@ -443,6 +444,7 @@ Arguments:\n* @param {String} changedFilePath - File that triggered a re-run (added or modified)\n*/\nasync _addFileToWatchQueue(changedFilePath) {\n+ TemplateContent.deleteCached(changedFilePath);\nthis.watchManager.addToPendingQueue(changedFilePath);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateContent.js",
"new_path": "src/TemplateContent.js",
"diff": "@@ -7,6 +7,7 @@ const lodashSet = require(\"lodash/set\");\nconst EleventyExtensionMap = require(\"./EleventyExtensionMap\");\nconst TemplateData = require(\"./TemplateData\");\nconst TemplateRender = require(\"./TemplateRender\");\n+const TemplatePath = require(\"./TemplatePath\");\nconst EleventyBaseError = require(\"./EleventyBaseError\");\nconst EleventyErrorUtil = require(\"./EleventyErrorUtil\");\nconst config = require(\"./Config\");\n@@ -18,8 +19,6 @@ class TemplateContentFrontMatterError extends EleventyBaseError {}\nclass TemplateContentCompileError extends EleventyBaseError {}\nclass TemplateContentRenderError extends EleventyBaseError {}\n-let inputContentCache = new Map();\n-\nclass TemplateContent {\nconstructor(inputPath, inputDir) {\nthis.inputPath = inputPath;\n@@ -118,19 +117,31 @@ class TemplateContent {\n}\n}\n+ static _inputCache = new Map();\n+\n+ static cache(path, content) {\n+ this._inputCache.set(TemplatePath.absolutePath(path), content);\n+ }\n+\n+ static getCached(path) {\n+ return this._inputCache.get(TemplatePath.absolutePath(path));\n+ }\n+\n+ static deleteCached(path) {\n+ this._inputCache.delete(TemplatePath.absolutePath(path));\n+ }\n+\nasync getInputContent() {\nif (!this.engine.needsToReadFileContents()) {\nreturn \"\";\n}\n- let content = \"\";\nlet templateBenchmark = bench.get(\"Template Read\");\ntemplateBenchmark.before();\n- if(inputContentCache.has(this.inputPath)){\n- content = inputContentCache.get(this.inputPath);\n- } else {\n+ let content = TemplateContent.getCached(this.inputPath);\n+ if(!content) {\ncontent = await fs.readFile(this.inputPath, \"utf-8\");\n- inputContentCache.set(this.inputPath, content);\n+ TemplateContent.cache(this.inputPath, content);\n}\ntemplateBenchmark.after();\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Invalidate input caches in watch mode. |
670 | 23.06.2020 14:17:21 | -36,000 | ae894e6c3f9cae0a4b06c677aa3e1fbb82a513fe | Add global data | [
{
"change_type": "MODIFY",
"old_path": "src/TemplateData.js",
"new_path": "src/TemplateData.js",
"diff": "@@ -177,14 +177,37 @@ class TemplateData {\nreturn globalData;\n}\n+ async getInitialGlobalData() {\n+ let globalData = {};\n+ if (this.config.globalData) {\n+ let keys = Object.keys(this.config.globalData);\n+ for (let j = 0; j < keys.length; j++) {\n+ let returnValue = this.config.globalData[keys[j]];\n+\n+ if (typeof returnValue === \"function\") {\n+ returnValue = await returnValue();\n+ }\n+ globalData[keys[j]] = returnValue;\n+ }\n+ }\n+ return globalData;\n+ }\n+\nasync getData() {\nlet rawImports = this.getRawImports();\n+ let initialGlobalData = await this.getInitialGlobalData();\n+\nif (!this.globalData) {\nlet globalJson = await this.getAllGlobalData();\n// OK: Shallow merge when combining rawImports (pkg) with global data files\n- this.globalData = Object.assign({}, globalJson, rawImports);\n+ this.globalData = Object.assign(\n+ {},\n+ initialGlobalData,\n+ globalJson,\n+ rawImports\n+ );\n}\nreturn this.globalData;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/UserConfig.js",
"new_path": "src/UserConfig.js",
"diff": "@@ -54,6 +54,7 @@ class UserConfig {\n// this.templateExtensionAliases = {};\nthis.watchJavaScriptDependencies = true;\nthis.browserSyncConfig = {};\n+ this.globalData = {};\n}\nversionCheck(expected) {\n@@ -208,6 +209,11 @@ class UserConfig {\nthis.nunjucksTags[name] = bench.add(`\"${name}\" Nunjucks Custom Tag`, tagFn);\n}\n+ addGlobalData(name, callback) {\n+ name = this.getNamespacedName(name);\n+ this.globalData[name] = callback;\n+ }\n+\naddTransform(name, callback) {\nname = this.getNamespacedName(name);\n@@ -510,6 +516,7 @@ class UserConfig {\ntemplateFormats: this.templateFormats,\nfilters: this.filters, // now called transforms\nlinters: this.linters,\n+ globalData: this.globalData,\nlayoutAliases: this.layoutAliases,\npassthroughCopies: this.passthroughCopies,\nliquidOptions: this.liquidOptions,\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateConfigTest.js",
"new_path": "test/TemplateConfigTest.js",
"diff": "@@ -108,7 +108,6 @@ test(\"Add universal filter\", t => {\nt.not(Object.keys(cfg.handlebarsHelpers).indexOf(\"myFilterName\"), -1);\nt.not(Object.keys(cfg.nunjucksFilters).indexOf(\"myFilterName\"), -1);\n});\n-\ntest(\"Add namespaced universal filter\", t => {\neleventyConfig.reset();\neleventyConfig.namespace(\"testNamespace\", function() {\n@@ -311,6 +310,20 @@ test(\"libraryOverrides\", t => {\nt.deepEqual(mdLib, cfg.libraryOverrides.md);\n});\n+test(\"addGlobalData\", t => {\n+ eleventyConfig.reset();\n+ eleventyConfig.addGlobalData(\"buildTime\", function() {\n+ return new Date();\n+ });\n+\n+ let templateCfg = new TemplateConfig(\n+ require(\"../config.js\"),\n+ \"./test/stubs/config.js\"\n+ );\n+ let cfg = templateCfg.getConfig();\n+ t.not(Object.keys(cfg.globalData).indexOf(\"buildTime\"), -1);\n+});\n+\ntest(\"Properly throws error on missing module #182\", t => {\nt.throws(function() {\nnew TemplateConfig(\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateDataTest.js",
"new_path": "test/TemplateDataTest.js",
"diff": "@@ -162,6 +162,29 @@ test(\"getAllGlobalData() with js function data file\", async t => {\nt.is(data.globalDataFn.datakeyfromjsfn, \"howdy\");\n});\n+test(\"getAllGlobalData() with config globalData\", async t => {\n+ let dataObj = new TemplateData(\"./test/stubs/\");\n+\n+ dataObj._setConfig({\n+ ...dataObj.config,\n+ globalData: {\n+ example: () => {\n+ return \"one\";\n+ },\n+ example2: async () => {\n+ return \"two\";\n+ },\n+ example3: \"static\"\n+ }\n+ });\n+\n+ let data = await dataObj.cacheData(true);\n+\n+ t.is(data.example, \"one\");\n+ t.is(data.example2, \"two\");\n+ t.is(data.example3, \"static\");\n+});\n+\ntest(\"getDataValue() without a dataTemplateEngine\", async t => {\nlet dataObj = new TemplateData(\"./test/stubs/\");\ndataObj.setDataTemplateEngine(false);\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Add global data |
670 | 23.06.2020 18:03:24 | -36,000 | 1bb0d0caaa20d86b4a4f5b25360fe0547deca27c | chore: fix eslint warnings | [
{
"change_type": "MODIFY",
"old_path": "src/Engines/Haml.js",
"new_path": "src/Engines/Haml.js",
"diff": "const HamlLib = require(\"hamljs\");\nconst TemplateEngine = require(\"./TemplateEngine\");\n-const config = require(\"../Config\");\nclass Haml extends TemplateEngine {\nconstructor(name, includesDir) {\n@@ -14,7 +13,7 @@ class Haml extends TemplateEngine {\nthis.setEngineLib(lib);\n}\n- async compile(str, inputPath) {\n+ async compile(str) {\nreturn this.hamlLib.compile(str);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Handlebars.js",
"new_path": "src/Engines/Handlebars.js",
"diff": "const HandlebarsLib = require(\"handlebars\");\nconst TemplateEngine = require(\"./TemplateEngine\");\n-const config = require(\"../Config\");\nclass Handlebars extends TemplateEngine {\nconstructor(name, includesDir) {\n@@ -55,7 +54,7 @@ class Handlebars extends TemplateEngine {\n}\n}\n- async compile(str, inputPath) {\n+ async compile(str) {\nlet fn = this.handlebarsLib.compile(str);\nreturn function (data) {\nreturn fn(data);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Html.js",
"new_path": "src/Engines/Html.js",
"diff": "@@ -14,7 +14,7 @@ class Html extends TemplateEngine {\nreturn fn(data);\n};\n} else {\n- return function(data) {\n+ return function () {\n// do nothing with data if parseHtmlWith is falsy\nreturn str;\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/JavaScriptTemplateLiteral.js",
"new_path": "src/Engines/JavaScriptTemplateLiteral.js",
"diff": "@@ -28,7 +28,7 @@ class JavaScriptTemplateLiteral extends TemplateEngine {\nreturn str;\n}\n- async compile(str, inputPath) {\n+ async compile(str) {\nreturn function (data) {\n// avoid `with`\nlet dataStr = \"\";\n@@ -38,7 +38,7 @@ class JavaScriptTemplateLiteral extends TemplateEngine {\nnull,\nnull,\n{\n- references: true\n+ references: true,\n}\n)};\\n`;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Liquid.js",
"new_path": "src/Engines/Liquid.js",
"diff": "@@ -17,8 +17,8 @@ class Liquid extends TemplateEngine {\nnumber: /[0-9]+\\.*[0-9]*/,\ndoubleQuoteString: /\"(?:\\\\[\"\\\\]|[^\\n\"\\\\])*\"/,\nsingleQuoteString: /'(?:\\\\['\\\\]|[^\\n'\\\\])*'/,\n- keyword: /[a-zA-Z0-9\\.\\-\\_]+/,\n- \"ignore:whitespace\": /[, \\t]+/ // includes comma separator\n+ keyword: /[a-zA-Z0-9.\\-_]+/,\n+ \"ignore:whitespace\": /[, \\t]+/, // includes comma separator\n});\n}\n@@ -48,7 +48,7 @@ class Liquid extends TemplateEngine {\nroot: [super.getIncludesDir()], // overrides in compile with inputPath below\nextname: \".liquid\",\ndynamicPartials: false,\n- strict_filters: false\n+ strict_filters: false,\n};\nlet options = Object.assign(defaults, this.liquidOptions || {});\n@@ -135,13 +135,13 @@ class Liquid extends TemplateEngine {\naddShortcode(shortcodeName, shortcodeFn) {\nlet _t = this;\n- this.addTag(shortcodeName, function(liquidEngine) {\n+ this.addTag(shortcodeName, function () {\nreturn {\n- parse: function(tagToken, remainTokens) {\n+ parse: function (tagToken) {\nthis.name = tagToken.name;\nthis.args = tagToken.args;\n},\n- render: function(scope, hash) {\n+ render: function (scope) {\nlet argArray = Liquid.parseArguments(_t.argLexer, this.args, scope);\nreturn Promise.resolve(\nshortcodeFn.call(\n@@ -149,7 +149,7 @@ class Liquid extends TemplateEngine {\n...argArray\n)\n);\n- }\n+ },\n};\n});\n}\n@@ -165,18 +165,18 @@ class Liquid extends TemplateEngine {\nvar stream = liquidEngine.parser\n.parseStream(remainTokens)\n- .on(\"template\", tpl => this.templates.push(tpl))\n- .on(\"tag:end\" + shortcodeName, token => stream.stop())\n- .on(\"end\", x => {\n+ .on(\"template\", (tpl) => this.templates.push(tpl))\n+ .on(\"tag:end\" + shortcodeName, () => stream.stop())\n+ .on(\"end\", () => {\nthrow new Error(`tag ${tagToken.raw} not closed`);\n});\nstream.start();\n},\n- render: function(scope, hash) {\n+ render: function (scope) {\nlet argArray = Liquid.parseArguments(_t.argLexer, this.args, scope);\n- return new Promise((resolve, reject) => {\n+ return new Promise((resolve) => {\nliquidEngine.renderer\n.renderTemplates(this.templates, scope)\n.then(function (html) {\n@@ -189,7 +189,7 @@ class Liquid extends TemplateEngine {\n);\n});\n});\n- }\n+ },\n};\n});\n}\n@@ -205,7 +205,7 @@ class Liquid extends TemplateEngine {\n} else {\noptions.root = [\nsuper.getIncludesDir(),\n- TemplatePath.getDirFromFilePath(inputPath)\n+ TemplatePath.getDirFromFilePath(inputPath),\n];\n}\nreturn async function (data) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Mustache.js",
"new_path": "src/Engines/Mustache.js",
"diff": "@@ -13,7 +13,7 @@ class Mustache extends TemplateEngine {\nthis.setEngineLib(this.mustacheLib);\n}\n- async compile(str, inputPath) {\n+ async compile(str) {\nlet partials = super.getPartials();\nreturn function (data) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Nunjucks.js",
"new_path": "src/Engines/Nunjucks.js",
"diff": "@@ -19,7 +19,7 @@ class Nunjucks extends TemplateEngine {\nnew NunjucksLib.Environment(\nnew NunjucksLib.FileSystemLoader([\nsuper.getIncludesDir(),\n- TemplatePath.getWorkingDir()\n+ TemplatePath.getWorkingDir(),\n])\n);\nthis.setEngineLib(this.njkEnv);\n@@ -87,7 +87,7 @@ class Nunjucks extends TemplateEngine {\nfunction ShortcodeFunction() {\nthis.tags = [shortcodeName];\n- this.parse = function(parser, nodes, lexer) {\n+ this.parse = function (parser, nodes) {\nlet args;\nlet tok = parser.nextToken();\n@@ -158,7 +158,7 @@ class Nunjucks extends TemplateEngine {\nfunction PairedShortcodeFunction() {\nthis.tags = [shortcodeName];\n- this.parse = function(parser, nodes, lexer) {\n+ this.parse = function (parser, nodes) {\nvar tok = parser.nextToken();\nvar args = parser.parseSignature(true, true);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/Pug.js",
"new_path": "src/Engines/Pug.js",
"diff": "const PugLib = require(\"pug\");\nconst TemplateEngine = require(\"./TemplateEngine\");\n-const TemplatePath = require(\"../TemplatePath\");\nclass Pug extends TemplateEngine {\nconstructor(name, includesDir) {\n@@ -27,7 +26,7 @@ class Pug extends TemplateEngine {\nreturn Object.assign(\n{\nbasedir: includesDir,\n- filename: includesDir\n+ filename: includesDir,\n},\nthis.pugOptions || {}\n);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Engines/TemplateEngine.js",
"new_path": "src/Engines/TemplateEngine.js",
"diff": "@@ -84,7 +84,7 @@ class TemplateEngine {\npartialFiles = partialFiles.concat(\nfastglob.sync(prefix + extension, {\ncaseSensitiveMatch: false,\n- dot: true\n+ dot: true,\n})\n);\n});\n@@ -139,11 +139,11 @@ class TemplateEngine {\nreturn true;\n}\n- getExtraDataFromFile(inputPath) {\n+ getExtraDataFromFile() {\nreturn {};\n}\n- initRequireCache(inputPath) {\n+ initRequireCache() {\n// do nothing\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateLayoutPathResolver.js",
"new_path": "src/TemplateLayoutPathResolver.js",
"diff": "const fs = require(\"fs-extra\");\nconst config = require(\"./Config\");\n-const EleventyExtensionMap = require(\"./EleventyExtensionMap\");\nconst TemplatePath = require(\"./TemplatePath\");\n-const debug = require(\"debug\")(\"Eleventy:TemplateLayoutPathResolver\");\n+// const debug = require(\"debug\")(\"Eleventy:TemplateLayoutPathResolver\");\nclass TemplateLayoutPathResolver {\nconstructor(path, inputDir, extensionMap) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplatePassthroughManager.js",
"new_path": "src/TemplatePassthroughManager.js",
"diff": "@@ -183,7 +183,7 @@ class TemplatePassthroughManager {\nlet promises = [];\ndebug(\"TemplatePassthrough copy started.\");\nfor (let path of this.getConfigPaths()) {\n- debug(`TemplatePassthrough copying from config: %o`, path);\n+ debug(\"TemplatePassthrough copying from config: %o\", path);\npromises.push(this.copyPath(path));\n}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | chore: fix eslint warnings |
699 | 10.07.2020 22:02:49 | 18,000 | 6c8addfa4cf6d0a3f88bff325b1942e494765bd0 | Include reference to issue | [
{
"change_type": "MODIFY",
"old_path": "test/TemplateRenderLiquidTest.js",
"new_path": "test/TemplateRenderLiquidTest.js",
"diff": "@@ -977,42 +977,42 @@ test(\"Liquid Render a false #1069\", async t => {\nt.is(await fn({ falseValue: false }), \"false\");\n});\n-test(\"Liquid Render Square Brackets dash single quotes\", async t => {\n+test(\"Liquid Render Square Brackets #680 dash single quotes\", async t => {\nlet fn = await new TemplateRender(\"liquid\").getCompiledTemplate(\n\"<p>{{ test['hey-a'] }}</p>\"\n);\nt.is(await fn({ test: { \"hey-a\": 1 } }), \"<p>1</p>\");\n});\n-test.skip(\"Liquid Render Square Brackets dash single quotes spaces\", async t => {\n+test.skip(\"Liquid Render Square Brackets #680 dash single quotes spaces\", async t => {\nlet fn = await new TemplateRender(\"liquid\").getCompiledTemplate(\n\"<p>{{ test[ 'hey-a' ] }}</p>\"\n);\nt.is(await fn({ test: { \"hey-a\": 1 } }), \"<p>1</p>\");\n});\n-test(\"Liquid Render Square Brackets dash double quotes\", async t => {\n+test(\"Liquid Render Square Brackets #680 dash double quotes\", async t => {\nlet fn = await new TemplateRender(\"liquid\").getCompiledTemplate(\n'<p>{{ test[\"hey-a\"] }}</p>'\n);\nt.is(await fn({ test: { \"hey-a\": 1 } }), \"<p>1</p>\");\n});\n-test.skip(\"Liquid Render Square Brackets dash double quotes spaces\", async t => {\n+test.skip(\"Liquid Render Square Brackets #680 dash double quotes spaces\", async t => {\nlet fn = await new TemplateRender(\"liquid\").getCompiledTemplate(\n'<p>{{ test[ \"hey-a\" ] }}</p>'\n);\nt.is(await fn({ test: { \"hey-a\": 1 } }), \"<p>1</p>\");\n});\n-test(\"Liquid Render Square Brackets variable reference\", async t => {\n+test(\"Liquid Render Square Brackets #680 variable reference\", async t => {\nlet fn = await new TemplateRender(\"liquid\").getCompiledTemplate(\n\"<p>{{ test[ref] }}</p>\"\n);\nt.is(await fn({ test: { \"hey-a\": 1 }, ref: \"hey-a\" }), \"<p>1</p>\");\n});\n-test.skip(\"Liquid Render Square Brackets variable reference array\", async t => {\n+test.skip(\"Liquid Render Square Brackets #680 variable reference array\", async t => {\nlet fn = await new TemplateRender(\"liquid\").getCompiledTemplate(\n\"<p>{{ test[ref[0]] }}</p>\"\n);\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Include reference to issue #680 |
670 | 19.07.2020 11:18:01 | -36,000 | 95278987c9e4c507051a1fcb9ecf3a06f09473e8 | Change method to take an object | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "eleventy",
"diff": "+/eleventy\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateConfig.js",
"new_path": "src/TemplateConfig.js",
"diff": "@@ -104,7 +104,7 @@ class TemplateConfig {\nthrow new EleventyConfigError(\n`Error in your Eleventy config file '${path}'.` +\n(err.message.includes(\"Cannot find module\")\n- ? chalk.blueBright(\" You may need to run `npm install`.\")\n+ ? chalk.blue(\" You may need to run `npm install`.\")\n: \"\"),\nerr\n);\n@@ -117,7 +117,7 @@ class TemplateConfig {\n// remove special merge keys from object\nlet savedForSpecialMerge = {\n- templateFormatsAdded: eleventyConfigApiMergingObject.templateFormatsAdded\n+ templateFormatsAdded: eleventyConfigApiMergingObject.templateFormatsAdded,\n};\ndelete eleventyConfigApiMergingObject.templateFormatsAdded;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/UserConfig.js",
"new_path": "src/UserConfig.js",
"diff": "@@ -228,9 +228,11 @@ class UserConfig {\nthis.nunjucksTags[name] = bench.add(`\"${name}\" Nunjucks Custom Tag`, tagFn);\n}\n- addGlobalData(name, callback) {\n- name = this.getNamespacedName(name);\n- this.globalData[name] = callback;\n+ addGlobalData(data) {\n+ for (const [key, value] of Object.entries(data)) {\n+ const name = this.getNamespacedName(key);\n+ this.globalData[name] = value;\n+ }\n}\naddTransform(name, callback) {\n@@ -331,7 +333,9 @@ class UserConfig {\n_normalizeTemplateFormats(templateFormats) {\nif (typeof templateFormats === \"string\") {\n- templateFormats = templateFormats.split(\",\").map(format => format.trim());\n+ templateFormats = templateFormats\n+ .split(\",\")\n+ .map((format) => format.trim());\n}\nreturn templateFormats;\n}\n@@ -635,7 +639,7 @@ class UserConfig {\nObject.assign(\n{\nkey: fileExtension,\n- extension: fileExtension\n+ extension: fileExtension,\n},\noptions\n)\n@@ -687,7 +691,7 @@ class UserConfig {\ndataExtensions: this.dataExtensions,\nextensionMap: this.extensionMap,\nquietMode: this.quietMode,\n- events: this.events\n+ events: this.events,\n};\n}\n}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Change method to take an object |
670 | 19.07.2020 17:25:46 | -36,000 | e0dbea3092afd32116ae955cb13dfe460f47009b | Pass template dir options to plugins | [
{
"change_type": "MODIFY",
"old_path": "src/TemplateConfig.js",
"new_path": "src/TemplateConfig.js",
"diff": "@@ -7,6 +7,7 @@ const EleventyBaseError = require(\"./EleventyBaseError\");\nconst eleventyConfig = require(\"./EleventyConfig\");\nconst debug = require(\"debug\")(\"Eleventy:TemplateConfig\");\nconst deleteRequireCache = require(\"./Util/DeleteRequireCache\");\n+const aggregateBench = require(\"./BenchmarkManager\").get(\"Aggregate\");\nclass EleventyConfigError extends EleventyBaseError {}\n@@ -22,7 +23,7 @@ class TemplateConfig {\nthis.customRootConfig = null;\n}\nthis.initializeRootConfig();\n- this.config = this.mergeConfig(this.localProjectConfigPath);\n+ this.config = this.mergeConfig();\n}\ngetLocalProjectConfigFile() {\n@@ -40,7 +41,7 @@ class TemplateConfig {\nreset() {\neleventyConfig.reset();\nthis.initializeRootConfig();\n- this.config = this.mergeConfig(this.localProjectConfigPath);\n+ this.config = this.mergeConfig();\n}\ngetConfig() {\n@@ -61,7 +62,6 @@ class TemplateConfig {\ninitializeRootConfig() {\nthis.rootConfig = this.customRootConfig || require(\"./defaultConfig.js\");\n-\nif (typeof this.rootConfig === \"function\") {\nthis.rootConfig = this.rootConfig(eleventyConfig);\n// debug( \"rootConfig is a function, after calling, eleventyConfig is %o\", eleventyConfig );\n@@ -69,11 +69,39 @@ class TemplateConfig {\ndebug(\"rootConfig %o\", this.rootConfig);\n}\n- mergeConfig(localProjectConfigPath) {\n+ processPlugins(localConfig) {\n+ // eleventyConfig.plugins\n+ eleventyConfig.plugins.forEach(({ plugin, options }) => {\n+ eleventyConfig.dir = localConfig.dir;\n+ // TODO support function.name in plugin config functions\n+ debug(\"Adding plugin (unknown name: check your config file).\");\n+ let pluginBench = aggregateBench.get(\"Configuration addPlugin\");\n+ if (typeof plugin === \"function\") {\n+ pluginBench.before();\n+ let configFunction = plugin;\n+ configFunction(eleventyConfig, options);\n+ pluginBench.after();\n+ } else if (plugin && plugin.configFunction) {\n+ pluginBench.before();\n+ if (options && typeof options.init === \"function\") {\n+ options.init.call(eleventyConfig, plugin.initArguments || {});\n+ }\n+\n+ plugin.configFunction(eleventyConfig, options);\n+ pluginBench.after();\n+ } else {\n+ throw new UserConfigError(\n+ \"Invalid EleventyConfig.addPlugin signature. Should be a function or a valid Eleventy plugin object.\"\n+ );\n+ }\n+ });\n+ }\n+\n+ mergeConfig() {\nlet localConfig = {};\nlet path = TemplatePath.join(\nTemplatePath.getWorkingDir(),\n- localProjectConfigPath\n+ this.localProjectConfigPath\n);\ndebug(`Merging config with ${path}`);\n@@ -86,7 +114,6 @@ class TemplateConfig {\nlocalConfig = require(path);\n// debug( \"localConfig require return value: %o\", localConfig );\n-\nif (typeof localConfig === \"function\") {\nlocalConfig = localConfig(eleventyConfig);\n// debug( \"localConfig is a function, after calling, eleventyConfig is %o\", eleventyConfig );\n@@ -113,11 +140,17 @@ class TemplateConfig {\ndebug(\"Eleventy local project config file not found, skipping.\");\n}\n+ // Delay processing plugins until after the result of localConfig is returned\n+ // But BEFORE the rest of the config options are merged\n+ // this way we can pass directories and other template information to plugins\n+ this.processPlugins(localConfig);\n+\nlet eleventyConfigApiMergingObject = eleventyConfig.getMergingConfigObject();\n// remove special merge keys from object\n+\nlet savedForSpecialMerge = {\n- templateFormatsAdded: eleventyConfigApiMergingObject.templateFormatsAdded\n+ templateFormatsAdded: eleventyConfigApiMergingObject.templateFormatsAdded,\n};\ndelete eleventyConfigApiMergingObject.templateFormatsAdded;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/UserConfig.js",
"new_path": "src/UserConfig.js",
"diff": "@@ -4,7 +4,6 @@ const semver = require(\"semver\");\nconst { DateTime } = require(\"luxon\");\nconst EleventyBaseError = require(\"./EleventyBaseError\");\nconst bench = require(\"./BenchmarkManager\").get(\"Configuration\");\n-const aggregateBench = require(\"./BenchmarkManager\").get(\"Aggregate\");\nconst debug = require(\"debug\")(\"Eleventy:UserConfig\");\nconst pkg = require(\"../package.json\");\n@@ -64,6 +63,8 @@ class UserConfig {\nthis.dataExtensions = new Map();\nthis.quietMode = false;\n+\n+ this.plugins = [];\n}\nversionCheck(expected) {\n@@ -264,27 +265,7 @@ class UserConfig {\n}\naddPlugin(plugin, options) {\n- // TODO support function.name in plugin config functions\n- debug(\"Adding plugin (unknown name: check your config file).\");\n- let pluginBench = aggregateBench.get(\"Configuration addPlugin\");\n- if (typeof plugin === \"function\") {\n- pluginBench.before();\n- let configFunction = plugin;\n- configFunction(this, options);\n- pluginBench.after();\n- } else if (plugin && plugin.configFunction) {\n- pluginBench.before();\n- if (options && typeof options.init === \"function\") {\n- options.init.call(this, plugin.initArguments || {});\n- }\n-\n- plugin.configFunction(this, options);\n- pluginBench.after();\n- } else {\n- throw new UserConfigError(\n- \"Invalid EleventyConfig.addPlugin signature. Should be a function or a valid Eleventy plugin object.\"\n- );\n- }\n+ this.plugins.push({ plugin, options });\n}\ngetNamespacedName(name) {\n@@ -325,7 +306,9 @@ class UserConfig {\n_normalizeTemplateFormats(templateFormats) {\nif (typeof templateFormats === \"string\") {\n- templateFormats = templateFormats.split(\",\").map(format => format.trim());\n+ templateFormats = templateFormats\n+ .split(\",\")\n+ .map((format) => format.trim());\n}\nreturn templateFormats;\n}\n@@ -629,7 +612,7 @@ class UserConfig {\nObject.assign(\n{\nkey: fileExtension,\n- extension: fileExtension\n+ extension: fileExtension,\n},\noptions\n)\n@@ -680,7 +663,7 @@ class UserConfig {\ndataExtensions: this.dataExtensions,\nextensionMap: this.extensionMap,\nquietMode: this.quietMode,\n- events: this.events\n+ events: this.events,\n};\n}\n}\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Pass template dir options to plugins |
699 | 01.08.2020 19:56:26 | 18,000 | cad14d15c721f2b28d47c89327f95b7e5c8ed6ea | Fix Node 10 issue with syntax. | [
{
"change_type": "MODIFY",
"old_path": "src/TemplateData.js",
"new_path": "src/TemplateData.js",
"diff": "@@ -21,7 +21,9 @@ const bench = require(\"./BenchmarkManager\").get(\"Data\");\nconst aggregateBench = require(\"./BenchmarkManager\").get(\"Aggregate\");\nclass FSExistsCache {\n- _cache = new Map();\n+ constructor() {\n+ this._cache = new Map();\n+ }\nhas(path) {\nreturn this._cache.has(path);\n}\n@@ -148,12 +150,12 @@ class TemplateData {\nlet paths = [\n`${dir}/**/*.json`, // covers .11tydata.json too\n`${dir}/**/*${this.config.jsDataFileSuffix}.cjs`,\n- `${dir}/**/*${this.config.jsDataFileSuffix}.js`,\n+ `${dir}/**/*${this.config.jsDataFileSuffix}.js`\n];\nif (this.hasUserDataExtensions()) {\nlet userPaths = this.getUserDataExtensions().map(\n- (extension) => `${dir}/**/*.${extension}` // covers .11tydata.{extension} too\n+ extension => `${dir}/**/*.${extension}` // covers .11tydata.{extension} too\n);\npaths = userPaths.concat(paths);\n}\n@@ -164,7 +166,7 @@ class TemplateData {\nasync getTemplateJavaScriptDataFileGlob() {\nlet dir = await this.getInputDir();\nreturn TemplatePath.addLeadingDotSlashArray([\n- `${dir}/**/*${this.config.jsDataFileSuffix}.js`,\n+ `${dir}/**/*${this.config.jsDataFileSuffix}.js`\n]);\n}\n@@ -200,7 +202,7 @@ class TemplateData {\nfsBench.before();\nlet paths = fastglob.sync(await this.getGlobalDataGlob(), {\ncaseSensitiveMatch: false,\n- dot: true,\n+ dot: true\n});\nfsBench.after();\n@@ -287,7 +289,7 @@ class TemplateData {\n}\n// Filter out files we know don't exist to avoid overhead for checking\n- localDataPaths = localDataPaths.filter((path) => {\n+ localDataPaths = localDataPaths.filter(path => {\nreturn this._fsExistsCache.exists(path);\n});\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Fix Node 10 issue with syntax. |
699 | 01.08.2020 20:40:26 | 18,000 | 917c0d4e0ae54526e7d8775d623ea0910b2a8b66 | Use Node 10/12/14 | [
{
"change_type": "MODIFY",
"old_path": ".github/workflows/ci.yml",
"new_path": ".github/workflows/ci.yml",
"diff": "@@ -8,7 +8,7 @@ jobs:\nstrategy:\nmatrix:\nos: [\"ubuntu-latest\", \"macos-latest\", \"windows-latest\"]\n- node: [\"8\", \"10\", \"12\"]\n+ node: [\"10\", \"12\", \"14\"]\nname: Node.js ${{ matrix.node }} on ${{ matrix.os }}\nsteps:\n- uses: actions/checkout@v2\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Use Node 10/12/14 |
699 | 01.08.2020 20:42:32 | 18,000 | 232cb9b21fed147a1f1660696723fcd5fb060c4d | Adds GitHub Actions link from Readme | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -13,7 +13,9 @@ Works with HTML, Markdown, Liquid, Nunjucks, Handlebars, Mustache, EJS, Haml, Pu\n- Support [11ty on Open Collective](https://opencollective.com/11ty)\n- [11ty on npm](https://www.npmjs.com/org/11ty)\n- [11ty on GitHub](https://github.com/11ty)\n-- [11ty/eleventy on Travis CI](https://travis-ci.org/11ty/eleventy)\n+- Continuous Integration:\n+ - [Travis CI](https://travis-ci.org/11ty/eleventy)\n+ - [GitHub Actions](https://github.com/11ty/eleventy/actions?query=workflow%3A.github%2Fworkflows%2Fci.yml)\n[](https://www.npmjs.com/package/@11ty/eleventy) [](https://github.com/11ty/eleventy/issues) [](https://github.com/prettier/prettier) [](https://www.npmjs.com/package/@11ty/eleventy)\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Adds GitHub Actions link from Readme |
670 | 06.08.2020 12:00:38 | -36,000 | c8e628aa79b0cdcd16da1965fc4213769329b1fe | Remove Merge master | [
{
"change_type": "DELETE",
"old_path": "eleventy",
"new_path": null,
"diff": "-/eleventy\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateConfig.js",
"new_path": "src/TemplateConfig.js",
"diff": "@@ -104,7 +104,7 @@ class TemplateConfig {\nthrow new EleventyConfigError(\n`Error in your Eleventy config file '${path}'.` +\n(err.message.includes(\"Cannot find module\")\n- ? chalk.blue(\" You may need to run `npm install`.\")\n+ ? chalk.blueBright(\" You may need to run `npm install`.\")\n: \"\"),\nerr\n);\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Remove Merge master |
670 | 06.08.2020 12:01:34 | -36,000 | bad56c0260a535cfba9179b40209900beee59fb3 | Update src/TemplateConfig.js | [
{
"change_type": "MODIFY",
"old_path": "src/TemplateConfig.js",
"new_path": "src/TemplateConfig.js",
"diff": "@@ -117,7 +117,7 @@ class TemplateConfig {\n// remove special merge keys from object\nlet savedForSpecialMerge = {\n- templateFormatsAdded: eleventyConfigApiMergingObject.templateFormatsAdded,\n+ templateFormatsAdded: eleventyConfigApiMergingObject.templateFormatsAdded\n};\ndelete eleventyConfigApiMergingObject.templateFormatsAdded;\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Update src/TemplateConfig.js |
699 | 10.08.2020 22:51:06 | 18,000 | cdb1191360a53ba7defc2b93b1ec2895d031c368 | Update a few dependencies for 1.0 | [
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "{\n\"name\": \"@11ty/eleventy\",\n- \"version\": \"0.11.0\",\n+ \"version\": \"1.0.0-beta.0\",\n\"description\": \"Transform a directory of templates into HTML.\",\n\"publishConfig\": {\n\"access\": \"public\"\n\"main\": \"src/Eleventy.js\",\n\"license\": \"MIT\",\n\"engines\": {\n- \"node\": \">=8\"\n+ \"node\": \">=10\"\n},\n\"funding\": {\n\"type\": \"opencollective\",\n\"devDependencies\": {\n\"@11ty/eleventy-plugin-syntaxhighlight\": \"^3.0.1\",\n\"@ava/babel\": \"^1.0.1\",\n- \"ava\": \"^3.8.2\",\n+ \"ava\": \"^3.11.1\",\n\"husky\": \"^4.2.5\",\n\"ink-docstrap\": \"1.3.2\",\n- \"js-yaml\": \"^3.13.1\",\n- \"jsdoc\": \"3.6.4\",\n- \"lint-staged\": \"^10.2.2\",\n+ \"js-yaml\": \"^3.14.0\",\n+ \"jsdoc\": \"3.6.5\",\n+ \"lint-staged\": \"^10.2.11\",\n\"markdown-it-emoji\": \"^1.4.0\",\n\"node-sass\": \"^4.14.1\",\n- \"nyc\": \"^15.0.1\",\n+ \"nyc\": \"^15.1.0\",\n\"prettier\": \"^2.0.5\",\n\"rimraf\": \"^3.0.2\",\n\"toml\": \"^3.0.0\",\n},\n\"dependencies\": {\n\"@11ty/dependency-tree\": \"^1.0.0\",\n- \"browser-sync\": \"^2.26.7\",\n+ \"browser-sync\": \"^2.26.12\",\n\"chalk\": \"^3.0.0\",\n- \"chokidar\": \"^3.4.0\",\n+ \"chokidar\": \"^3.4.2\",\n\"debug\": \"^4.1.1\",\n\"dependency-graph\": \"^0.9.0\",\n\"ejs\": \"^2.7.4\",\n- \"fast-glob\": \"^3.2.2\",\n+ \"fast-glob\": \"^3.2.4\",\n\"fs-extra\": \"^8.1.0\",\n\"gray-matter\": \"^4.0.2\",\n\"hamljs\": \"^0.6.2\",\n\"handlebars\": \"^4.7.6\",\n\"javascript-stringify\": \"^2.0.1\",\n\"liquidjs\": \"^6.4.3\",\n- \"lodash\": \"^4.17.15\",\n+ \"lodash\": \"^4.17.19\",\n\"luxon\": \"^1.24.1\",\n\"markdown-it\": \"^10.0.0\",\n\"minimist\": \"^1.2.5\",\n\"multimatch\": \"^4.0.0\",\n\"mustache\": \"^2.3.2\",\n\"normalize-path\": \"^3.0.0\",\n- \"nunjucks\": \"^3.2.1\",\n+ \"nunjucks\": \"^3.2.2\",\n\"parse-filepath\": \"^1.0.2\",\n\"please-upgrade-node\": \"^3.2.0\",\n\"pretty\": \"^2.0.0\",\n\"pug\": \"^2.0.4\",\n\"recursive-copy\": \"^2.0.10\",\n\"semver\": \"^7.3.2\",\n- \"slugify\": \"^1.4.0\",\n+ \"slugify\": \"^1.4.5\",\n\"time-require\": \"^0.1.2\",\n\"valid-url\": \"^1.0.9\"\n},\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Update a few dependencies for 1.0 |
699 | 10.08.2020 22:54:50 | 18,000 | b2db452194a56abd1ea4c31ef3098e09e3da7092 | Two major dep updates both moving to Node 10+ | [
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"dependencies\": {\n\"@11ty/dependency-tree\": \"^1.0.0\",\n\"browser-sync\": \"^2.26.12\",\n- \"chalk\": \"^3.0.0\",\n+ \"chalk\": \"^4.1.0\",\n\"chokidar\": \"^3.4.2\",\n\"debug\": \"^4.1.1\",\n\"dependency-graph\": \"^0.9.0\",\n\"ejs\": \"^2.7.4\",\n\"fast-glob\": \"^3.2.4\",\n- \"fs-extra\": \"^8.1.0\",\n+ \"fs-extra\": \"^9.0.1\",\n\"gray-matter\": \"^4.0.2\",\n\"hamljs\": \"^0.6.2\",\n\"handlebars\": \"^4.7.6\",\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | Two major dep updates both moving to Node 10+ |
687 | 17.08.2020 16:38:45 | -7,200 | 554d7928308d52c128a88e716600cde8ff740d90 | add async EventEmitter | [
{
"change_type": "MODIFY",
"old_path": "src/Eleventy.js",
"new_path": "src/Eleventy.js",
"diff": "@@ -459,7 +459,7 @@ Arguments:\nreturn;\n}\n- this.config.events.emit(\"beforeWatch\");\n+ await this.config.events.emit(\"beforeWatch\");\nthis.watchManager.setBuildRunning();\n@@ -737,13 +737,13 @@ Arguments:\nEleventyErrorHandler.logger = this.logger;\n}\n- this.config.events.emit(\"beforeBuild\");\n+ await this.config.events.emit(\"beforeBuild\");\ntry {\nlet promise = this.writer.write();\nret = await promise;\n- this.config.events.emit(\"afterBuild\");\n+ await this.config.events.emit(\"afterBuild\");\n} catch (e) {\nEleventyErrorHandler.initialMessage(\n\"Problem writing Eleventy templates\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/UserConfig.js",
"new_path": "src/UserConfig.js",
"diff": "-const EventEmitter = require(\"events\");\nconst chalk = require(\"chalk\");\nconst semver = require(\"semver\");\nconst { DateTime } = require(\"luxon\");\n+const EventEmitter = require(\"./Util/AsyncEventEmitter\");\nconst EleventyBaseError = require(\"./EleventyBaseError\");\nconst bench = require(\"./BenchmarkManager\").get(\"Configuration\");\nconst aggregateBench = require(\"./BenchmarkManager\").get(\"Aggregate\");\n@@ -325,7 +325,9 @@ class UserConfig {\n_normalizeTemplateFormats(templateFormats) {\nif (typeof templateFormats === \"string\") {\n- templateFormats = templateFormats.split(\",\").map(format => format.trim());\n+ templateFormats = templateFormats\n+ .split(\",\")\n+ .map((format) => format.trim());\n}\nreturn templateFormats;\n}\n@@ -629,7 +631,7 @@ class UserConfig {\nObject.assign(\n{\nkey: fileExtension,\n- extension: fileExtension\n+ extension: fileExtension,\n},\noptions\n)\n@@ -680,7 +682,7 @@ class UserConfig {\ndataExtensions: this.dataExtensions,\nextensionMap: this.extensionMap,\nquietMode: this.quietMode,\n- events: this.events\n+ events: this.events,\n};\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Util/AsyncEventEmitter.js",
"diff": "+const EventEmitter = require(\"events\");\n+const lodashGet = require(\"lodash/get\");\n+const lodashIsEmpty = require(\"lodash/isEmpty\");\n+\n+class AsyncEventEmitter extends EventEmitter {\n+ async emit(type, ...args) {\n+ const handler = lodashGet(this._events, type);\n+ if (lodashIsEmpty(handler) && typeof handler !== \"function\") {\n+ return;\n+ }\n+\n+ if (typeof handler === \"function\") {\n+ await handler.apply(this, args);\n+ } else {\n+ await Promise.all(handler.map((h) => h.apply(this, args)));\n+ }\n+\n+ return true;\n+ }\n+}\n+\n+module.exports = AsyncEventEmitter;\n"
},
{
"change_type": "MODIFY",
"old_path": "test/EleventyConfigTest.js",
"new_path": "test/EleventyConfigTest.js",
"diff": "@@ -3,7 +3,7 @@ import eleventyConfig from \"../src/EleventyConfig\";\n// more in TemplateConfigTest.js\n-test.cb(\"Events\", t => {\n+test.cb(\"Events\", (t) => {\neleventyConfig.on(\"testEvent\", function (arg1, arg2, arg3) {\nt.is(arg1, \"arg1\");\nt.is(arg2, \"arg2\");\n@@ -14,12 +14,32 @@ test.cb(\"Events\", t => {\neleventyConfig.emit(\"testEvent\", \"arg1\", \"arg2\", \"arg3\");\n});\n-test(\"Add Collections\", t => {\n+test.cb(\"Async Events\", (t) => {\n+ let arg1;\n+\n+ eleventyConfig.on(\n+ \"asyncTestEvent\",\n+ (_arg1) =>\n+ new Promise((resolve) => {\n+ setTimeout(() => {\n+ arg1 = _arg1;\n+ resolve();\n+ }, 10);\n+ })\n+ );\n+\n+ eleventyConfig.emit(\"asyncTestEvent\", \"arg1\").then(() => {\n+ t.is(arg1, \"arg1\");\n+ t.end();\n+ });\n+});\n+\n+test(\"Add Collections\", (t) => {\neleventyConfig.addCollection(\"myCollection\", function (collection) {});\nt.deepEqual(Object.keys(eleventyConfig.getCollections()), [\"myCollection\"]);\n});\n-test(\"Add Collections throws error on key collision\", t => {\n+test(\"Add Collections throws error on key collision\", (t) => {\neleventyConfig.addCollection(\"myCollectionCollision\", function (\ncollection\n) {});\n@@ -31,13 +51,13 @@ test(\"Add Collections throws error on key collision\", t => {\n});\n});\n-test(\"Set manual Pass-through File Copy (single call)\", t => {\n+test(\"Set manual Pass-through File Copy (single call)\", (t) => {\neleventyConfig.addPassthroughCopy(\"img\");\nt.is(eleventyConfig.passthroughCopies[\"img\"], true);\n});\n-test(\"Set manual Pass-through File Copy (chained calls)\", t => {\n+test(\"Set manual Pass-through File Copy (chained calls)\", (t) => {\neleventyConfig\n.addPassthroughCopy(\"css\")\n.addPassthroughCopy(\"js\")\n@@ -50,10 +70,10 @@ test(\"Set manual Pass-through File Copy (chained calls)\", t => {\nt.is(eleventyConfig.passthroughCopies[\"./src/empty\"], \"./\");\n});\n-test(\"Set manual Pass-through File Copy (glob patterns)\", t => {\n+test(\"Set manual Pass-through File Copy (glob patterns)\", (t) => {\neleventyConfig.addPassthroughCopy({\n\"./src/static/**/*\": \"renamed\",\n- \"./src/markdown/*.md\": \"\"\n+ \"./src/markdown/*.md\": \"\",\n});\n// does not exist\n@@ -65,27 +85,27 @@ test(\"Set manual Pass-through File Copy (glob patterns)\", t => {\nt.is(eleventyConfig.passthroughCopies[\"./src/markdown/*.md\"], \"\");\n});\n-test(\"Set Template Formats (string)\", t => {\n+test(\"Set Template Formats (string)\", (t) => {\neleventyConfig.setTemplateFormats(\"ejs, njk, liquid\");\nt.deepEqual(eleventyConfig.templateFormats, [\"ejs\", \"njk\", \"liquid\"]);\n});\n-test(\"Set Template Formats (array)\", t => {\n+test(\"Set Template Formats (array)\", (t) => {\neleventyConfig.setTemplateFormats([\"ejs\", \"njk\", \"liquid\"]);\nt.deepEqual(eleventyConfig.templateFormats, [\"ejs\", \"njk\", \"liquid\"]);\n});\n-test(\"Set Template Formats (js passthrough copy)\", t => {\n+test(\"Set Template Formats (js passthrough copy)\", (t) => {\neleventyConfig.setTemplateFormats(\"ejs, njk, liquid, js\");\nt.deepEqual(eleventyConfig.templateFormats, [\"ejs\", \"njk\", \"liquid\", \"js\"]);\n});\n-test(\"Set Template Formats (11ty.js)\", t => {\n+test(\"Set Template Formats (11ty.js)\", (t) => {\neleventyConfig.setTemplateFormats(\"ejs, njk, liquid, 11ty.js\");\nt.deepEqual(eleventyConfig.templateFormats, [\n\"ejs\",\n\"njk\",\n\"liquid\",\n- \"11ty.js\"\n+ \"11ty.js\",\n]);\n});\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | add async EventEmitter |
670 | 02.09.2020 04:04:46 | -36,000 | 08334a88a87b5a075f2b5cbc9d941083b0c6352d | back to orig sig | [
{
"change_type": "MODIFY",
"old_path": "src/UserConfig.js",
"new_path": "src/UserConfig.js",
"diff": "@@ -228,11 +228,10 @@ class UserConfig {\nthis.nunjucksTags[name] = bench.add(`\"${name}\" Nunjucks Custom Tag`, tagFn);\n}\n- addGlobalData(data) {\n- for (const [key, value] of Object.entries(data)) {\n- const name = this.getNamespacedName(key);\n- this.globalData[name] = value;\n- }\n+ addGlobalData(name, data) {\n+ name = this.getNamespacedName(name);\n+ this.globalData[name] = data;\n+ return this;\n}\naddTransform(name, callback) {\n"
},
{
"change_type": "MODIFY",
"old_path": "test/TemplateConfigTest.js",
"new_path": "test/TemplateConfigTest.js",
"diff": "@@ -370,9 +370,7 @@ test(\"libraryOverrides\", (t) => {\ntest(\"addGlobalData\", (t) => {\neleventyConfig.reset();\n- eleventyConfig.addGlobalData({\n- function: () => new Date(),\n- });\n+ eleventyConfig.addGlobalData(\"function\", () => new Date());\nlet templateCfg = new TemplateConfig(\nrequire(\"../src/defaultConfig.js\"),\n"
}
]
| JavaScript | MIT License | 11ty/eleventy | back to orig sig |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.