From 0d5fbe0393dc40a01907f3ce2eb4537f84cb2093 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Mon, 9 Mar 2020 19:04:57 -0600 Subject: [PATCH] fix casing of resolvePageURL UI helper * rename from resolvePageUrl to resolvePageURL --- CHANGELOG.adoc | 1 + packages/page-composer/lib/create-page-composer.js | 4 ++-- packages/page-composer/test/compose-page-test.js | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index b88dba02b..f58a27775 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -28,6 +28,7 @@ This project utilizes semantic versioning. * *content-classifier*: Don't assign out property when adding file to content catalog if out property has falsy value (#563) * *content-classifier*: Rename `asciidocConfig` property on component version to `asciidoc` (#542) * *asciidoc-loader*: Don't relativize absolute pub URL (#564) +* *page-composer*: Rename resolvePageUrl UI helper to resolvePageURL (#589) * *page-composer*: Upgrade Handlebars to fix performance regression (#551) * *page-composer*: Fix resolvePage and resolvePageUrl helpers to retrieve content catalog independent of template context (#554) * *page-composer*: Make resolvePage and resolvePageUrl helpers resilient against falsy page spec (#554) diff --git a/packages/page-composer/lib/create-page-composer.js b/packages/page-composer/lib/create-page-composer.js index de27bdca2..85d591411 100644 --- a/packages/page-composer/lib/create-page-composer.js +++ b/packages/page-composer/lib/create-page-composer.js @@ -4,7 +4,7 @@ const handlebars = require('handlebars') const { posix: path } = require('path') const relativizeHelper = require('./helpers/relativize') const resolvePageHelper = require('./helpers/resolve-page') -const resolvePageUrlHelper = require('./helpers/resolve-page-url') +const resolvePageURLHelper = require('./helpers/resolve-page-url') const requireFromString = require('require-from-string') const { URL } = require('url') @@ -32,7 +32,7 @@ const { version: VERSION } = require('../package.json') function createPageComposer (playbook, contentCatalog, uiCatalog, env = process.env) { handlebars.registerHelper('relativize', relativizeHelper) handlebars.registerHelper('resolvePage', resolvePageHelper) - handlebars.registerHelper('resolvePageUrl', resolvePageUrlHelper) + handlebars.registerHelper('resolvePageURL', resolvePageURLHelper) uiCatalog .findByType('helper') diff --git a/packages/page-composer/test/compose-page-test.js b/packages/page-composer/test/compose-page-test.js index 0dfc88d86..f50369c36 100644 --- a/packages/page-composer/test/compose-page-test.js +++ b/packages/page-composer/test/compose-page-test.js @@ -497,7 +497,7 @@ describe('createPageComposer()', () => { definePartial( 'body-resolve-page-url', heredoc` -

{{resolvePageUrl 'the-component::the-page.adoc'}}

+

{{resolvePageURL 'the-component::the-page.adoc'}}

` ) replaceCallToBodyPartial('{{> body-resolve-page-url}}') @@ -527,7 +527,7 @@ describe('createPageComposer()', () => { definePartial( 'body-resolve-page-url-falsy', heredoc` -

{{resolvePageUrl page.attributes.no-such-page}}

+

{{resolvePageURL page.attributes.no-such-page}}

` ) replaceCallToBodyPartial('{{> body-resolve-page-url-falsy}}') @@ -558,7 +558,7 @@ describe('createPageComposer()', () => { 'body-resolve-page-url-inside-with', heredoc` {{#with page.component}} -

{{resolvePageUrl 'the-component::the-page.adoc'}}

+

{{resolvePageURL 'the-component::the-page.adoc'}}

{{/with}} ` ) @@ -587,7 +587,7 @@ describe('createPageComposer()', () => { definePartial( 'body-resolve-page-url-from-context', heredoc` -

{{resolvePageUrl 'the-page.adoc' component=page.component.name version='0.9'}}

+

{{resolvePageURL 'the-page.adoc' component=page.component.name version='0.9'}}

` ) replaceCallToBodyPartial('{{> body-resolve-page-url-from-context}}') -- GitLab