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

Jump to bottom

Fix amphtml href with nested amp page #6741

Merged
merged 4 commits into from
Mar 20, 2019
Merged

Fix amphtml href with nested amp page #6741

merged 4 commits into from
Mar 20, 2019

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Mar 20, 2019

This makes sure /docs/index.amp is /docs.amp during export in the amphtml link tag

@github-actions
Copy link
Contributor

Stats from current PR

Click to expand stats
zeit/next.js canary ijjk/next.js fix/amphtml-href Change
Build Duration 13.1s 12.8s -2.05%
Client _app Size 3.03 kB 3.03 kB ✓
Client _app gzip Size 1.29 kB 1.29 kB ✓
Client _error Size 7.91 kB 7.91 kB ✓
Client _error gzip Size 3.17 kB 3.17 kB ✓
Client pages/index Size 298 B 298 B ✓
Client pages/index gzip Size 235 B 235 B ✓
Client pages/link Size 3.31 kB 3.31 kB ✓
Client pages/link gzip Size 1.5 kB 1.5 kB ✓
Client pages/routerDirect Size 426 B 426 B ✓
Client pages/routerDirect gzip Size 305 B 305 B ✓
Client pages/withRouter Size 408 B 408 B ✓
Client pages/withRouter gzip Size 294 B 294 B ✓
Client main Size 21.5 kB 21.5 kB ✓
Client main gzip Size 7.18 kB 7.18 kB ✓
Client commons Size 186 kB 186 kB ✓
Client commons gzip Size 60.4 kB 60.4 kB ✓
Client webpack Size 1.49 kB 1.49 kB ✓
Client webpack gzip Size 774 B 774 B ✓
Base Rendered Size 1.2 kB 1.2 kB ✓
Build Dir Size 409 kB 409 kB ✓
Average Memory Usage 128 MB 128 MB -0.3%
Max Memory Usage 166 MB 168 MB ⚠️ +0.87%
Average CPU Usage 92.34% 93.06% ⚠️ +0.78%
Max CPU Usage 111.11% 111.11% ✓
node_modules Size 43.1 MB 43.1 MB ⚠️ +0%
Click to expand serverless stats
zeit/next.js canary ijjk/next.js fix/amphtml-href Change
Build Duration 17.1s 16.8s -1.98%
Client _app Size 3.03 kB 3.03 kB ✓
Client _app gzip Size 1.29 kB 1.29 kB ✓
Client _error Size 7.91 kB 7.91 kB ✓
Client _error gzip Size 3.17 kB 3.17 kB ✓
Client pages/index Size 298 B 298 B ✓
Client pages/index gzip Size 235 B 235 B ✓
Client pages/link Size 3.31 kB 3.31 kB ✓
Client pages/link gzip Size 1.5 kB 1.5 kB ✓
Client pages/routerDirect Size 426 B 426 B ✓
Client pages/routerDirect gzip Size 305 B 305 B ✓
Client pages/withRouter Size 408 B 408 B ✓
Client pages/withRouter gzip Size 294 B 294 B ✓
Client main Size 21.5 kB 21.5 kB ✓
Client main gzip Size 7.18 kB 7.18 kB ✓
Client commons Size 186 kB 186 kB ✓
Client commons gzip Size 60.4 kB 60.4 kB ✓
Client webpack Size 1.49 kB 1.49 kB ✓
Client webpack gzip Size 774 B 774 B ✓
Serverless pages/link Size 227 kB 227 kB ✓
Serverless pages/link gzip Size 59.2 kB 59.2 kB ✓
Serverless pages/index Size 222 kB 222 kB ✓
Serverless pages/index gzip Size 58 kB 58 kB ✓
Serverless pages/_error Size 224 kB 224 kB ✓
Serverless pages/_error gzip Size 58 kB 58 kB ✓
Serverless pages/routerDirect Size 223 kB 223 kB ✓
Serverless pages/routerDirect gzip Size 58 kB 58 kB ✓
Serverless pages/withRouter Size 223 kB 223 kB ✓
Serverless pages/withRouter gzip Size 58 kB 58 kB ⚠️ +0%
Build Dir Size 1.34 MB 1.34 MB ✓
Average Memory Usage 144 MB 144 MB ⚠️ +0.28%
Max Memory Usage 189 MB 189 MB -0.01%
Average CPU Usage 94.48% 94.96% ⚠️ +0.51%
Max CPU Usage 120% 111.11% -7.41%
node_modules Size 43.1 MB 43.1 MB ⚠️ +0%

Timer
Timer requested changes Mar 20, 2019
View reviewed changes
packages/next/export/worker.js Outdated Show resolved Hide resolved
packages/next/export/worker.js Outdated Show resolved Hide resolved
@github-actions
Copy link
Contributor

Stats from current PR

Click to expand stats
zeit/next.js canary ijjk/next.js fix/amphtml-href Change
Build Duration 12.1s 11.6s -4.64%
Client _app Size 3.03 kB 3.03 kB ✓
Client _app gzip Size 1.29 kB 1.29 kB ✓
Client _error Size 7.91 kB 7.91 kB ✓
Client _error gzip Size 3.17 kB 3.17 kB ✓
Client pages/index Size 298 B 298 B ✓
Client pages/index gzip Size 235 B 235 B ✓
Client pages/link Size 3.31 kB 3.31 kB ✓
Client pages/link gzip Size 1.5 kB 1.5 kB ✓
Client pages/routerDirect Size 426 B 426 B ✓
Client pages/routerDirect gzip Size 305 B 305 B ✓
Client pages/withRouter Size 408 B 408 B ✓
Client pages/withRouter gzip Size 294 B 294 B ✓
Client main Size 21.5 kB 21.5 kB ✓
Client main gzip Size 7.18 kB 7.18 kB ✓
Client commons Size 186 kB 186 kB ✓
Client commons gzip Size 60.4 kB 60.4 kB ✓
Client webpack Size 1.49 kB 1.49 kB ✓
Client webpack gzip Size 774 B 774 B ✓
Base Rendered Size 1.2 kB 1.2 kB ✓
Build Dir Size 409 kB 409 kB ✓
Average Memory Usage 128 MB 129 MB ⚠️ +0.36%
Max Memory Usage 167 MB 168 MB ⚠️ +0.49%
Average CPU Usage 92.39% 93.13% ⚠️ +0.8%
Max CPU Usage 110% 122.22% ⚠️ +11.11%
node_modules Size 43.1 MB 43.1 MB ⚠️ +0%
Click to expand serverless stats
zeit/next.js canary ijjk/next.js fix/amphtml-href Change
Build Duration 15.6s 15.3s -1.87%
Client _app Size 3.03 kB 3.03 kB ✓
Client _app gzip Size 1.29 kB 1.29 kB ✓
Client _error Size 7.91 kB 7.91 kB ✓
Client _error gzip Size 3.17 kB 3.17 kB ✓
Client pages/index Size 298 B 298 B ✓
Client pages/index gzip Size 235 B 235 B ✓
Client pages/link Size 3.31 kB 3.31 kB ✓
Client pages/link gzip Size 1.5 kB 1.5 kB ✓
Client pages/routerDirect Size 426 B 426 B ✓
Client pages/routerDirect gzip Size 305 B 305 B ✓
Client pages/withRouter Size 408 B 408 B ✓
Client pages/withRouter gzip Size 294 B 294 B ✓
Client main Size 21.5 kB 21.5 kB ✓
Client main gzip Size 7.18 kB 7.18 kB ✓
Client commons Size 186 kB 186 kB ✓
Client commons gzip Size 60.4 kB 60.4 kB ✓
Client webpack Size 1.49 kB 1.49 kB ✓
Client webpack gzip Size 774 B 774 B ✓
Serverless pages/link Size 227 kB 227 kB ✓
Serverless pages/link gzip Size 59.2 kB 59.2 kB -0.01%
Serverless pages/index Size 222 kB 222 kB ✓
Serverless pages/index gzip Size 58 kB 58 kB 0%
Serverless pages/_error Size 224 kB 224 kB ✓
Serverless pages/_error gzip Size 58 kB 58 kB -0.01%
Serverless pages/routerDirect Size 223 kB 223 kB ✓
Serverless pages/routerDirect gzip Size 58 kB 58 kB -0.01%
Serverless pages/withRouter Size 223 kB 223 kB ✓
Serverless pages/withRouter gzip Size 58 kB 58 kB -0.01%
Build Dir Size 1.34 MB 1.34 MB ✓
Average Memory Usage 144 MB 144 MB -0.25%
Max Memory Usage 189 MB 188 MB -0.47%
Average CPU Usage 94.67% 94.18% -0.52%
Max CPU Usage 122.22% 111.11% -9.09%
node_modules Size 43.1 MB 43.1 MB ⚠️ +0%

@Timer Timer merged commit 5a48272 into vercel:canary Mar 20, 2019
@ijjk ijjk deleted the fix/amphtml-href branch March 26, 2019 18:59
@lock lock bot locked as resolved and limited conversation to collaborators Mar 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Timer Timer Timer approved these changes

@dav-is dav-is Awaiting requested review from dav-is

@timneutkens timneutkens Awaiting requested review from timneutkens

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ijjk @Timer