Skip to content

Commit 30c7113

Browse files
committed
Custom lodash build, fixes #2877
1 parent a9323c3 commit 30c7113

11 files changed

+15
-32
lines changed

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
"@11ty/dependency-tree": "^2.0.1",
9999
"@11ty/eleventy-dev-server": "^1.0.4",
100100
"@11ty/eleventy-utils": "^1.0.1",
101+
"@11ty/lodash-custom": "^4.17.21",
101102
"@iarna/toml": "^2.2.5",
102103
"@sindresorhus/slugify": "^1.1.2",
103104
"bcp-47-normalize": "^1.1.1",
@@ -115,9 +116,6 @@
115116
"iso-639-1": "^2.1.15",
116117
"kleur": "^4.1.5",
117118
"liquidjs": "^10.6.1",
118-
"lodash.chunk": "^4.2.0",
119-
"lodash.get": "^4.4.2",
120-
"lodash.set": "^4.3.2",
121119
"luxon": "^3.3.0",
122120
"markdown-it": "^13.0.1",
123121
"micromatch": "^4.0.5",

src/ComputedData.js

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
const lodashGet = require("lodash.get");
2-
const lodashSet = require("lodash.set");
1+
const { set: lodashSet, get: lodashGet } = require("@11ty/lodash-custom");
32

43
const ComputedDataQueue = require("./ComputedDataQueue");
54
const ComputedDataTemplateString = require("./ComputedDataTemplateString");
@@ -39,20 +38,13 @@ class ComputedData {
3938
}
4039
}
4140

42-
addTemplateString(
43-
key,
44-
renderFn,
45-
declaredDependencies = [],
46-
symbolParseFn = undefined
47-
) {
41+
addTemplateString(key, renderFn, declaredDependencies = [], symbolParseFn = undefined) {
4842
this.add(key, renderFn, declaredDependencies, symbolParseFn);
4943
this.templateStringKeyLookup[key] = true;
5044
}
5145

5246
async resolveVarOrder(data) {
53-
let proxyByTemplateString = new ComputedDataTemplateString(
54-
this.computedKeys
55-
);
47+
let proxyByTemplateString = new ComputedDataTemplateString(this.computedKeys);
5648
let proxyByProxy = new ComputedDataProxy(this.computedKeys);
5749

5850
for (let key of this.computedKeys) {

src/ComputedDataProxy.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
const lodashSet = require("lodash.set");
2-
const lodashGet = require("lodash.get");
1+
const { set: lodashSet, get: lodashGet } = require("@11ty/lodash-custom");
32
const { isPlainObject } = require("@11ty/eleventy-utils");
43

54
/* Calculates computed data using Proxies */

src/ComputedDataTemplateString.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const lodashSet = require("lodash.set");
1+
const { set: lodashSet } = require("@11ty/lodash-custom");
2+
23
const debug = require("debug")("Eleventy:ComputedDataTemplateString");
34

45
/* Calculates computed data in Template Strings.
@@ -38,10 +39,7 @@ class ComputedDataTemplateString {
3839
let vars = new Set();
3940
let splits = output.split(this.prefix);
4041
for (let split of splits) {
41-
let varName = split.slice(
42-
0,
43-
split.indexOf(this.suffix) < 0 ? 0 : split.indexOf(this.suffix)
44-
);
42+
let varName = split.slice(0, split.indexOf(this.suffix) < 0 ? 0 : split.indexOf(this.suffix));
4543
if (varName) {
4644
vars.add(varName);
4745
}

src/Engines/Nunjucks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ class Nunjucks extends TemplateEngine {
362362
return ext;
363363
}
364364

365-
/* Outputs an Array of lodash.get selectors */
365+
/* Outputs an Array of lodash get selectors */
366366
parseForSymbols(str) {
367367
const { parser, nodes } = NunjucksLib;
368368
let obj = parser.parse(str, this._getParseExtensions());

src/Plugins/Pagination.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
const lodashChunk = require("lodash.chunk");
2-
const lodashGet = require("lodash.get");
3-
const lodashSet = require("lodash.set");
1+
const { set: lodashSet, get: lodashGet, chunk: lodashChunk } = require("@11ty/lodash-custom");
42
const { isPlainObject } = require("@11ty/eleventy-utils");
53

64
const EleventyBaseError = require("../EleventyBaseError");

src/Template.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ const mkdir = util.promisify(fs.mkdir);
66
const os = require("os");
77
const path = require("path");
88
const normalize = require("normalize-path");
9-
const lodashGet = require("lodash.get");
10-
const lodashSet = require("lodash.set");
9+
const { set: lodashSet, get: lodashGet } = require("@11ty/lodash-custom");
1110
const { DateTime } = require("luxon");
1211
const { TemplatePath, isPlainObject } = require("@11ty/eleventy-utils");
1312

src/TemplateContent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const util = require("util");
44
const readFile = util.promisify(fs.readFile);
55
const normalize = require("normalize-path");
66
const matter = require("gray-matter");
7-
const lodashSet = require("lodash.set");
7+
const { set: lodashSet } = require("@11ty/lodash-custom");
88
const { TemplatePath } = require("@11ty/eleventy-utils");
99

1010
const EleventyExtensionMap = require("./EleventyExtensionMap");

src/TemplateData.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const fs = require("fs");
22
const path = require("path");
3-
const lodashset = require("lodash.set");
4-
const lodashget = require("lodash.get");
3+
const { set: lodashset, get: lodashget } = require("@11ty/lodash-custom");
54
const { TemplatePath, isPlainObject } = require("@11ty/eleventy-utils");
65

76
const merge = require("./Util/Merge");

src/TemplateDataInitialGlobalData.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const pkg = require("../package.json");
22
const semver = require("semver");
3-
const lodashset = require("lodash.set");
3+
const { set: lodashset } = require("@11ty/lodash-custom");
44

55
class TemplateDataInitialGlobalData {
66
constructor(templateConfig) {

test/EleventyTest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ ${newContents}
662662
await fsp.writeFile(includeFilePath, previousContents, { encoding: "utf8" });
663663
});
664664

665-
const lodashGet = require("lodash.get");
665+
const { get: lodashGet } = require("@11ty/lodash-custom");
666666
test("Lodash get (for pagination data target) object key with spaces, issue #2851", (t) => {
667667
let data = {
668668
collections: {

0 commit comments

Comments
 (0)