diff --git a/src/Data/TemplateData.js b/src/Data/TemplateData.js index 9a1d57900..1a230654c 100644 --- a/src/Data/TemplateData.js +++ b/src/Data/TemplateData.js @@ -5,15 +5,15 @@ import lodash from "@11ty/lodash-custom"; import { TemplatePath, isPlainObject } from "@11ty/eleventy-utils"; import debugUtil from "debug"; -import merge from "../Util/Merge.js"; -import unique from "../Util/Unique.js"; +import merge from "../Util/Objects/Merge.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/EleventyServe.js b/src/EleventyServe.js index 2217b50eb..17b184cd5 100644 --- a/src/EleventyServe.js +++ b/src/EleventyServe.js @@ -6,7 +6,7 @@ import debugUtil from "debug"; import EleventyBaseError from "./Errors/EleventyBaseError.js"; import ConsoleLogger from "./Util/ConsoleLogger.js"; import PathPrefixer from "./Util/PathPrefixer.js"; -import merge, { DeepCopy } from "./Util/Merge.js"; +import merge, { DeepCopy } from "./Util/Objects/Merge.js"; import checkPassthroughCopyBehavior from "./Util/PassthroughCopyBehaviorCheck.js"; import { getModulePackageJson } from "./Util/ImportJsonSync.js"; import { EleventyImport } from "./Util/Require.js"; diff --git a/src/Plugins/HtmlBasePlugin.js b/src/Plugins/HtmlBasePlugin.js index 3e95f8429..19ddf259c 100644 --- a/src/Plugins/HtmlBasePlugin.js +++ b/src/Plugins/HtmlBasePlugin.js @@ -1,6 +1,6 @@ import urlFilter from "../Filters/Url.js"; import PathPrefixer from "../Util/PathPrefixer.js"; -import { DeepCopy } from "../Util/Merge.js"; +import { DeepCopy } from "../Util/Objects/Merge.js"; import { HtmlTransformer } from "../Util/HtmlTransformer.js"; function isValidUrl(url) { diff --git a/src/Plugins/I18nPlugin.js b/src/Plugins/I18nPlugin.js index 9e599c070..962acae55 100644 --- a/src/Plugins/I18nPlugin.js +++ b/src/Plugins/I18nPlugin.js @@ -1,7 +1,7 @@ import { bcp47Normalize } from "bcp-47-normalize"; import iso639 from "iso-639-1"; -import { DeepCopy } from "../Util/Merge.js"; +import { DeepCopy } from "../Util/Objects/Merge.js"; // pathPrefix note: // When using `locale_url` filter with the `url` filter, `locale_url` must run first like diff --git a/src/Plugins/Pagination.js b/src/Plugins/Pagination.js index 219f4832e..1d62edb86 100755 --- a/src/Plugins/Pagination.js +++ b/src/Plugins/Pagination.js @@ -2,9 +2,9 @@ import { isPlainObject } from "@11ty/eleventy-utils"; import lodash from "@11ty/lodash-custom"; import EleventyBaseError from "../Errors/EleventyBaseError.js"; -import { DeepCopy } from "../Util/Merge.js"; -import { ProxyWrap } from "../Util/ProxyWrap.js"; -// import { DeepFreeze } from "../Util/DeepFreeze.js"; +import { DeepCopy } from "../Util/Objects/Merge.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 index 1d35a3cfc..2042926b5 100644 --- a/src/Plugins/RenderPlugin.js +++ b/src/Plugins/RenderPlugin.js @@ -7,8 +7,8 @@ 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 Merge from "../Util/Merge.js"; -import { ProxyWrap } from "../Util/ProxyWrap.js"; +import Merge from "../Util/Objects/Merge.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 index edee17176..cb32a9105 100755 --- 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/TemplateConfig.js b/src/TemplateConfig.js index 4bb71a67c..d3ba98cc3 100644 --- a/src/TemplateConfig.js +++ b/src/TemplateConfig.js @@ -8,7 +8,7 @@ import EleventyBaseError from "./Errors/EleventyBaseError.js"; import UserConfig from "./UserConfig.js"; import GlobalDependencyMap from "./GlobalDependencyMap.js"; import ExistsCache from "./Util/ExistsCache.js"; -import merge from "./Util/Merge.js"; +import merge from "./Util/Objects/Merge.js"; import eventBus from "./EventBus.js"; import ProjectTemplateFormats from "./Util/ProjectTemplateFormats.js"; diff --git a/src/UserConfig.js b/src/UserConfig.js index dedc9a231..9af556cbe 100644 --- a/src/UserConfig.js +++ b/src/UserConfig.js @@ -8,7 +8,7 @@ import EventEmitter from "./Util/AsyncEventEmitter.js"; import EleventyCompatibility from "./Util/Compatibility.js"; import EleventyBaseError from "./Errors/EleventyBaseError.js"; import BenchmarkManager from "./Benchmark/BenchmarkManager.js"; -import { DeepCopy } from "./Util/Merge.js"; +import { DeepCopy } from "./Util/Objects/Merge.js"; const debug = debugUtil("Eleventy:UserConfig"); diff --git a/src/Util/DeepFreeze.js b/src/Util/Objects/DeepFreeze.js similarity index 100% rename from src/Util/DeepFreeze.js rename to src/Util/Objects/DeepFreeze.js diff --git a/src/Util/Merge.js b/src/Util/Objects/Merge.js similarity index 100% rename from src/Util/Merge.js rename to src/Util/Objects/Merge.js diff --git a/src/Util/ProxyWrap.js b/src/Util/Objects/ProxyWrap.js similarity index 100% rename from src/Util/ProxyWrap.js rename to src/Util/Objects/ProxyWrap.js diff --git a/src/Util/Sortable.js b/src/Util/Objects/Sortable.js similarity index 100% rename from src/Util/Sortable.js rename to src/Util/Objects/Sortable.js diff --git a/src/Util/Unique.js b/src/Util/Objects/Unique.js similarity index 100% rename from src/Util/Unique.js rename to src/Util/Objects/Unique.js diff --git a/test/LodashTest.js b/test/LodashTest.js index 56af90374..7f63db7e2 100644 --- 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/MergeTest.js b/test/MergeTest.js index 42e7bcfea..4d5a82df3 100644 --- a/test/MergeTest.js +++ b/test/MergeTest.js @@ -1,6 +1,6 @@ import test from "ava"; -import { default as Merge, DeepCopy } from "../src/Util/Merge.js"; +import { default as Merge, DeepCopy } from "../src/Util/Objects/Merge.js"; test("Shallow Merge", (t) => { t.deepEqual(Merge({}, {}), {}); diff --git a/test/ProxyWrapTest.js b/test/ProxyWrapTest.js index f8e60f66b..212a74e75 100644 --- 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 index 455e64f7e..5ded66a7f 100644 --- 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 index c4994c4e8..443a1b4c9 100644 --- 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";