Skip to content

project viewport key #126

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

Merged
Mortaro merged 4 commits into from
Dec 8, 2021
Merged

project viewport key #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
551555e
Merge pull request #125 from nullstack/next
Mortaro Dec 7, 2021
747514c
:sparkles: project viewport key
AnnyFigueira Dec 7, 2021
3660a8e
:white_check_mark: update test to use non default value
AnnyFigueira Dec 7, 2021
6efc02d
:art: setting the default value in project.viewport instead of in the…
AnnyFigueira Dec 8, 2021
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
2 changes: 1 addition & 1 deletion server/project.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ project.domain = process.env['NULLSTACK_PROJECT_DOMAIN']
project.name = process.env['NULLSTACK_PROJECT_NAME']
project.shortName = process.env['NULLSTACK_PROJECT_SHORT_NAME']
project.color = process.env['NULLSTACK_PROJECT_COLOR']

project.viewport = process.env['NULLSTACK_PROJECT_VIEWPORT'] || 'width=device-width, initial-scale=1, shrink-to-fit=no';
project.type = 'website';
project.display = 'standalone';
project.orientation = 'portrait';
Expand Down
2 changes: 1 addition & 1 deletion server/template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function ({ head, body, context, instances }) {
${project.name ? `<meta name="apple-mobile-web-app-title" content="${project.name}">` : ''}
${page.robots ? `<meta name="robots" content="${page.robots}" />` : ''}
<meta name="msapplication-starturl" content="/">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
${project.viewport ? `<meta name="viewport" content="${project.viewport}">` : ''}
<link rel="stylesheet" href="${cdn(`/client.css?fingerprint=${environment.key}${timestamp}`)}" integrity="${integrities['client.css'] || ''}" crossorigin="anonymous">
${page.schema ? `<script type="application/ld+json">${JSON.stringify(page.schema)}</script>` : ''}
${project.icons['180'] ? `<link rel="apple-touch-icon" sizes="180x180" href="${cdn(project.icons['180'])}">` : ''}
Expand Down
2 changes: 2 additions & 0 deletions tests/src/ContextProject.njs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class ContextProject extends Nullstack {
project.favicon = '/favicon-96x96.png';
project.disallow = ['/admin'];
project.sitemap = true;
project.viewport = 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no viewport-fit=cover';
}

render({ project }) {
Expand All @@ -39,6 +40,7 @@ class ContextProject extends Nullstack {
<div data-disallow={!!project.disallow} />
<div data-disallow-admin={project.disallow[0]} />
<div data-sitemap={project.sitemap} />
<div data-viewport={project.viewport} />
</div>
)
}
Expand Down
7 changes: 6 additions & 1 deletion tests/src/ContextProject.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ describe('ContextProject', () => {
expect(element).toBeTruthy();
});

test('has a viewport key', async () => {
const element = await page.$('[data-viewport="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no viewport-fit=cover"]');
expect(element).toBeTruthy();
});

test('css bundle can use a cdn', async () => {
const text = await page.$eval('[rel="stylesheet"]', (element) => element.href);
expect(text).toMatch(/127\.0\.0\.1:6969/);
Expand All @@ -142,7 +147,7 @@ describe('ContextProject', () => {
expect(text).toMatch('');
});


});

describe('robots.txt', () => {
Expand Down