Merge branch 'refactor/utils/objects' of github.com:Zearin/eleventy i…

…nto Zearin-refactor/utils/objects
11ty · Jun 10, 2024 · d4c5f85 · d4c5f85
2 parents 75286bf + 66a6432
commit d4c5f85
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 11 deletions.
diff --git a/src/Data/TemplateData.js b/src/Data/TemplateData.js
@@ -5,14 +5,14 @@ import lodash from "@11ty/lodash-custom";
 import { Merge, TemplatePath, isPlainObject } from "@11ty/eleventy-utils";
 import debugUtil from "debug";
 
-import unique from "../Util/Unique.js";
+import unique from "../Util/Objects/Unique.js";
 import TemplateGlob from "../TemplateGlob.js";
 import EleventyExtensionMap from "../EleventyExtensionMap.js";
 import EleventyBaseError from "../Errors/EleventyBaseError.js";
 import TemplateDataInitialGlobalData from "./TemplateDataInitialGlobalData.js";
 import { getEleventyPackageJson, getWorkingProjectPackageJson } from "../Util/ImportJsonSync.js";
 import { EleventyImport, EleventyLoadContent } from "../Util/Require.js";
-import { DeepFreeze } from "../Util/DeepFreeze.js";
+import { DeepFreeze } from "../Util/Objects/DeepFreeze.js";
 
 const { set: lodashSet, get: lodashGet } = lodash;
 

diff --git a/src/Plugins/Pagination.js b/src/Plugins/Pagination.js
@@ -3,8 +3,8 @@ import lodash from "@11ty/lodash-custom";
 import { DeepCopy } from "@11ty/eleventy-utils";
 
 import EleventyBaseError from "../Errors/EleventyBaseError.js";
-import { ProxyWrap } from "../Util/ProxyWrap.js";
-// import { DeepFreeze } from "../Util/DeepFreeze.js";
+import { ProxyWrap } from "../Util/Objects/ProxyWrap.js";
+// import { DeepFreeze } from "../Util/Objects/DeepFreeze.js";
 import TemplateData from "../Data/TemplateData.js";
 
 const { set: lodashSet, get: lodashGet, chunk: lodashChunk } = lodash;

diff --git a/src/Plugins/RenderPlugin.js b/src/Plugins/RenderPlugin.js
@@ -7,7 +7,7 @@ const fsExists = util.promisify(fs.exists);
 
 // TODO add a first-class Markdown component to expose this using Markdown-only syntax (will need to be synchronous for markdown-it)
 
-import { ProxyWrap } from "../Util/ProxyWrap.js";
+import { ProxyWrap } from "../Util/Objects/ProxyWrap.js";
 import TemplateDataInitialGlobalData from "../Data/TemplateDataInitialGlobalData.js";
 import EleventyShortcodeError from "../Errors/EleventyShortcodeError.js";
 import TemplateRender from "../TemplateRender.js";

diff --git a/src/TemplateCollection.js b/src/TemplateCollection.js
@@ -1,7 +1,7 @@
 import multimatch from "multimatch";
 import { TemplatePath } from "@11ty/eleventy-utils";
 
-import Sortable from "./Util/Sortable.js";
+import Sortable from "./Util/Objects/Sortable.js";
 import TemplateData from "./Data/TemplateData.js";
 
 class TemplateCollection extends Sortable {

diff --git a/src/Util/DeepFreeze.js → src/Util/Objects/DeepFreeze.js b/src/Util/DeepFreeze.js → src/Util/Objects/DeepFreeze.js
diff --git a/src/Util/ProxyWrap.js → src/Util/Objects/ProxyWrap.js b/src/Util/ProxyWrap.js → src/Util/Objects/ProxyWrap.js
diff --git a/src/Util/Sortable.js → src/Util/Objects/Sortable.js b/src/Util/Sortable.js → src/Util/Objects/Sortable.js
diff --git a/src/Util/Unique.js → src/Util/Objects/Unique.js b/src/Util/Unique.js → src/Util/Objects/Unique.js
diff --git a/test/LodashTest.js b/test/LodashTest.js
@@ -1,7 +1,7 @@
 import test from "ava";
 import lodash from "@11ty/lodash-custom";
-import { ProxyWrap } from "../src/Util/ProxyWrap.js";
-import { DeepFreeze } from "../src/Util/DeepFreeze.js";
+import { ProxyWrap } from "../src/Util/Objects/ProxyWrap.js";
+import { DeepFreeze } from "../src/Util/Objects/DeepFreeze.js";
 
 const { set: lodashSet } = lodash;
 

diff --git a/test/ProxyWrapTest.js b/test/ProxyWrapTest.js
@@ -1,5 +1,5 @@
 import test from "ava";
-import { ProxyWrap } from "../src/Util/ProxyWrap.js";
+import { ProxyWrap } from "../src/Util/Objects/ProxyWrap.js";
 
 test("Basic wrap", (t) => {
  let test = ProxyWrap({}, { a: 1 });

diff --git a/test/SortableTest.js b/test/SortableTest.js
@@ -1,7 +1,7 @@
 import test from "ava";
 import { DateTime } from "luxon";
 
-import Sortable from "../src/Util/Sortable.js";
+import Sortable from "../src/Util/Objects/Sortable.js";
 
 test("get Sort Function", (t) => {
  let s = new Sortable();

diff --git a/test/TemplateCollectionTest.js b/test/TemplateCollectionTest.js
@@ -2,7 +2,7 @@ import test from "ava";
 import multimatch from "multimatch";
 
 import Collection from "../src/TemplateCollection.js";
-import Sortable from "../src/Util/Sortable.js";
+import Sortable from "../src/Util/Objects/Sortable.js";
 
 import getNewTemplateForTests from "../test/_getNewTemplateForTests.js";
 import { getTemplateConfigInstance } from "./_testHelpers.js";