Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug/issue 1353 handle pages with no wrapping <html> tag when building up final output HTML #1360

Merged
merged 1 commit into from
Dec 28, 2024
Merged

bug/issue 1353 handle pages with no wrapping <html> tag when building up final output HTML #1360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/cli/src/lib/layout-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ async function getAppLayout(pageLayoutContents, compilation, customImports = [],
: matchingRoute.label;
}

const mergedHtml = pageRoot && pageRoot.querySelector('html').rawAttrs !== ''
const mergedHtml = pageRoot && pageRoot.querySelector('html') && pageRoot.querySelector('html')?.rawAttrs !== ''
? `<html ${pageRoot.querySelector('html').rawAttrs}>`
: appRoot.querySelector('html').rawAttrs !== ''
: appRoot && appRoot.querySelector('html') && appRoot.querySelector('html')?.rawAttrs !== ''
? `<html ${appRoot.querySelector('html').rawAttrs}>`
: '<html>';

Expand Down
56 changes: 52 additions & 4 deletions ...layouts-page-and-app-dynamic/build.default.workspace-layouts-page-and-app-dynamic.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
* User Workspace
* src/
* pages/
* index.md
* about.md
* index.html
* layouts/
* app.js
* page.js
Expand Down Expand Up @@ -50,7 +51,7 @@ describe('Build Greenwood With: ', function() {

runSmokeTest(['public'], LABEL);

describe('Custom App and Page Layout', function() {
describe('Custom App and page with no <html> wrapping element', function() {
let dom;

before(async function() {
Expand All @@ -71,6 +72,53 @@ describe('Build Greenwood With: ', function() {
expect(heading[0].textContent).to.equal('App Layout');
});

it('should not have the expected <h2> tag from the dynamic page layout', function() {
const heading = dom.window.document.querySelectorAll('h2');

expect(heading.length).to.equal(0);
});

it('should have the expected content from the index.md', function() {
const heading = dom.window.document.querySelectorAll('h3');
const paragraph = dom.window.document.querySelectorAll('p');

expect(heading.length).to.equal(1);
expect(heading[0].textContent).to.equal('Home Page');

expect(paragraph.length).to.equal(1);
expect(paragraph[0].textContent).to.equal('Coffey was here');
});

it('should have the expected <footer> tag from the dynamic app layout', function() {
const year = new Date().getFullYear();
const footer = dom.window.document.querySelectorAll('footer');

expect(footer.length).to.equal(1);
expect(footer[0].textContent).to.equal(`${year}`);
});
});

describe('Custom App and Page Layout', function() {
let dom;

before(async function() {
dom = await JSDOM.fromFile(path.resolve(this.context.publicDir, 'about/index.html'));
});

it('should have the expected <title> tag from the dynamic app layout', function() {
const title = dom.window.document.querySelectorAll('head title');

expect(title.length).to.equal(1);
expect(title[0].textContent).to.equal('App Layout');
});

it('should have the expected <h1> tag from the dynamic app layout', function() {
const heading = dom.window.document.querySelectorAll('h1');

expect(heading.length).to.equal(1);
expect(heading[0].textContent).to.equal('App Layout');
});

it('should have the expected <h2> tag from the dynamic page layout', function() {
const heading = dom.window.document.querySelectorAll('h2');

Expand All @@ -83,10 +131,10 @@ describe('Build Greenwood With: ', function() {
const paragraph = dom.window.document.querySelectorAll('p');

expect(heading.length).to.equal(1);
expect(heading[0].textContent).to.equal('Home Page');
expect(heading[0].textContent).to.equal('About Page');

expect(paragraph.length).to.equal(1);
expect(paragraph[0].textContent).to.equal('Coffey was here');
expect(paragraph[0].textContent).to.equal('Learn more about us');
});

it('should have the expected <footer> tag from the dynamic app layout', function() {
Expand Down
10 changes: 6 additions & 4 deletions ...s/cli/test/cases/build.default.workspace-layouts-page-and-app-dynamic/src/layouts/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
export default class PageLayout extends HTMLElement {
async connectedCallback() {
this.innerHTML = `
<body>
<h2>Page Layout</h2>
<content-outlet></content-outlet>
</body>
<html>
<body>
<h2>Page Layout</h2>
<content-outlet></content-outlet>
</body>
</html>
`;
}
}
3 changes: 3 additions & 0 deletions ...t/cases/build.default.workspace-layouts-page-and-app-dynamic/src/pages/about.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### About Page

Learn more about us
5 changes: 5 additions & 0 deletions .../cli/test/cases/build.default.workspace-layouts-page-and-app-dynamic/src/pages/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

<body>
<h3>Home Page</h3>
<p>Coffey was here</p>
</body>
3 changes: 0 additions & 3 deletions ...t/cases/build.default.workspace-layouts-page-and-app-dynamic/src/pages/index.md
View file
Open in desktop

This file was deleted.

Loading