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.

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

Ensure i18n support with AMP #17923

Merged
merged 5 commits into from Oct 15, 2020
Merged

Ensure i18n support with AMP #17923

merged 5 commits into from Oct 15, 2020

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Oct 15, 2020

This makes sure i18n works with AMP pages it also fixes needed render options not being passed when rendering the AMP page variant with hybrid AMP and serverless mode noticed in #17461.

This also fixes a case with i18n support where defaultMap[page].page could be undefined when generating pages for a build and a cache is present.

x-ref: #17370

@ijjk ijjk mentioned this pull request Oct 15, 2020
Merged
@ijjk
Copy link
Member Author

ijjk commented Oct 15, 2020

Stats from current PR

Default Server Mode (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/test-amp Change
buildDuration 10.9s 11.8s ⚠️ +839ms
nodeModulesSize 64.3 MB 64.3 MB ⚠️ +2.23 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary ijjk/next.js i18n/test-amp Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.137 2.326 ⚠️ +0.19
/ avg req/sec 1169.84 1074.97 ⚠️ -94.87
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.153 1.234 ⚠️ +0.08
/error-in-render avg req/sec 2168.28 2026.49 ⚠️ -141.79
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js i18n/test-amp Change
677f882d2ed8..0989.js gzip 11.1 kB 11.1 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-43e96dd..7c44.js gzip 7.3 kB 7.3 kB ✓
webpack-e067..f178.js gzip 751 B 751 B ✓
Overall change 58.1 kB 58.1 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary ijjk/next.js i18n/test-amp Change
677f882d2ed8..dule.js gzip 6.91 kB 6.91 kB ✓
framework.HA..dule.js gzip 39 kB 39 kB ✓
main-ee66c17..dule.js gzip 6.29 kB 6.29 kB ✓
webpack-07c5..dule.js gzip 751 B 751 B ✓
Overall change 52.9 kB 52.9 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js i18n/test-amp Change
polyfills-4b..e242.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB ✓
_error-ed1b0..8fbd.js gzip 3.44 kB 3.44 kB ✓
hooks-89731c..c609.js gzip 887 B 887 B ✓
index-17468f..5d83.js gzip 227 B 227 B ✓
link-89ad9e7..25bb.js gzip 1.34 kB 1.34 kB ✓
routerDirect..924c.js gzip 284 B 284 B ✓
withRouter-7..c13d.js gzip 284 B 284 B ✓
Overall change 7.74 kB 7.74 kB ✓
Client Pages Modern
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_app-75d3a82..dule.js gzip 625 B 625 B ✓
_error-4469a..dule.js gzip 2.29 kB 2.29 kB ✓
hooks-cbf13f..dule.js gzip 387 B 387 B ✓
index-b9a643..dule.js gzip 226 B 226 B ✓
link-aeb707b..dule.js gzip 1.29 kB 1.29 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-f..dule.js gzip 282 B 282 B ✓
Overall change 5.39 kB 5.39 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_buildManifest.js gzip 322 B 322 B ✓
_buildManife..dule.js gzip 329 B 329 B ✓
Overall change 651 B 651 B ✓
Rendered Page Sizes
vercel/next.js canary ijjk/next.js i18n/test-amp Change
index.html gzip 1 kB 1 kB ✓
link.html gzip 1.01 kB 1.01 kB ✓
withRouter.html gzip 995 B 995 B ✓
Overall change 3 kB 3 kB ✓
Serverless Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/test-amp Change
buildDuration 13.8s 13s -776ms
nodeModulesSize 64.3 MB 64.3 MB ⚠️ +2.23 kB
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js i18n/test-amp Change
677f882d2ed8..0989.js gzip 11.1 kB 11.1 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-43e96dd..7c44.js gzip 7.3 kB 7.3 kB ✓
webpack-e067..f178.js gzip 751 B 751 B ✓
Overall change 58.1 kB 58.1 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary ijjk/next.js i18n/test-amp Change
677f882d2ed8..dule.js gzip 6.91 kB 6.91 kB ✓
framework.HA..dule.js gzip 39 kB 39 kB ✓
main-ee66c17..dule.js gzip 6.29 kB 6.29 kB ✓
webpack-07c5..dule.js gzip 751 B 751 B ✓
Overall change 52.9 kB 52.9 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js i18n/test-amp Change
polyfills-4b..e242.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB ✓
_error-ed1b0..8fbd.js gzip 3.44 kB 3.44 kB ✓
hooks-89731c..c609.js gzip 887 B 887 B ✓
index-17468f..5d83.js gzip 227 B 227 B ✓
link-89ad9e7..25bb.js gzip 1.34 kB 1.34 kB ✓
routerDirect..924c.js gzip 284 B 284 B ✓
withRouter-7..c13d.js gzip 284 B 284 B ✓
Overall change 7.74 kB 7.74 kB ✓
Client Pages Modern
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_app-75d3a82..dule.js gzip 625 B 625 B ✓
_error-4469a..dule.js gzip 2.29 kB 2.29 kB ✓
hooks-cbf13f..dule.js gzip 387 B 387 B ✓
index-b9a643..dule.js gzip 226 B 226 B ✓
link-aeb707b..dule.js gzip 1.29 kB 1.29 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-f..dule.js gzip 282 B 282 B ✓
Overall change 5.39 kB 5.39 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_buildManifest.js gzip 322 B 322 B ✓
_buildManife..dule.js gzip 329 B 329 B ✓
Overall change 651 B 651 B ✓
Serverless bundles Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_error.js 1.06 MB 1.06 MB ⚠️ +489 B
404.html 4.34 kB 4.34 kB ✓
hooks.html 3.92 kB 3.92 kB ✓
index.js 1.06 MB 1.06 MB ⚠️ +489 B
link.js 1.1 MB 1.1 MB ⚠️ +489 B
routerDirect.js 1.1 MB 1.1 MB ⚠️ +489 B
withRouter.js 1.1 MB 1.1 MB ⚠️ +489 B
Overall change 5.41 MB 5.41 MB ⚠️ +2.44 kB
Commit: fc0715d

timneutkens
timneutkens previously approved these changes Oct 15, 2020
View reviewed changes
@ijjk
Copy link
Member Author

ijjk commented Oct 15, 2020

Stats from current PR

Default Server Mode (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/test-amp Change
buildDuration 13.8s 13.8s -52ms
nodeModulesSize 64.3 MB 64.3 MB ⚠️ +2.23 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary ijjk/next.js i18n/test-amp Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.627 2.798 ⚠️ +0.17
/ avg req/sec 951.67 893.46 ⚠️ -58.21
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.569 1.689 ⚠️ +0.12
/error-in-render avg req/sec 1592.94 1479.91 ⚠️ -113.03
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js i18n/test-amp Change
677f882d2ed8..7765.js gzip 11.1 kB 11.1 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-43e96dd..7c44.js gzip 7.3 kB 7.3 kB ✓
webpack-e067..f178.js gzip 751 B 751 B ✓
Overall change 58.1 kB 58.1 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary ijjk/next.js i18n/test-amp Change
677f882d2ed8..dule.js gzip 6.94 kB 6.94 kB ✓
framework.HA..dule.js gzip 39 kB 39 kB ✓
main-ee66c17..dule.js gzip 6.29 kB 6.29 kB ✓
webpack-07c5..dule.js gzip 751 B 751 B ✓
Overall change 53 kB 53 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js i18n/test-amp Change
polyfills-4b..e242.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB ✓
_error-ed1b0..8fbd.js gzip 3.44 kB 3.44 kB ✓
hooks-89731c..c609.js gzip 887 B 887 B ✓
index-17468f..5d83.js gzip 227 B 227 B ✓
link-89ad9e7..25bb.js gzip 1.34 kB 1.34 kB ✓
routerDirect..924c.js gzip 284 B 284 B ✓
withRouter-7..c13d.js gzip 284 B 284 B ✓
Overall change 7.74 kB 7.74 kB ✓
Client Pages Modern
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_app-75d3a82..dule.js gzip 625 B 625 B ✓
_error-4469a..dule.js gzip 2.29 kB 2.29 kB ✓
hooks-cbf13f..dule.js gzip 387 B 387 B ✓
index-b9a643..dule.js gzip 226 B 226 B ✓
link-aeb707b..dule.js gzip 1.29 kB 1.29 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-f..dule.js gzip 282 B 282 B ✓
Overall change 5.39 kB 5.39 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_buildManifest.js gzip 322 B 322 B ✓
_buildManife..dule.js gzip 329 B 329 B ✓
Overall change 651 B 651 B ✓
Rendered Page Sizes
vercel/next.js canary ijjk/next.js i18n/test-amp Change
index.html gzip 1 kB 1 kB ✓
link.html gzip 1.01 kB 1.01 kB ✓
withRouter.html gzip 995 B 995 B ✓
Overall change 3.01 kB 3.01 kB ✓
Serverless Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/test-amp Change
buildDuration 15.4s 15.1s -359ms
nodeModulesSize 64.3 MB 64.3 MB ⚠️ +2.23 kB
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js i18n/test-amp Change
677f882d2ed8..7765.js gzip 11.1 kB 11.1 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-43e96dd..7c44.js gzip 7.3 kB 7.3 kB ✓
webpack-e067..f178.js gzip 751 B 751 B ✓
Overall change 58.1 kB 58.1 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary ijjk/next.js i18n/test-amp Change
677f882d2ed8..dule.js gzip 6.94 kB 6.94 kB ✓
framework.HA..dule.js gzip 39 kB 39 kB ✓
main-ee66c17..dule.js gzip 6.29 kB 6.29 kB ✓
webpack-07c5..dule.js gzip 751 B 751 B ✓
Overall change 53 kB 53 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js i18n/test-amp Change
polyfills-4b..e242.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB ✓
_error-ed1b0..8fbd.js gzip 3.44 kB 3.44 kB ✓
hooks-89731c..c609.js gzip 887 B 887 B ✓
index-17468f..5d83.js gzip 227 B 227 B ✓
link-89ad9e7..25bb.js gzip 1.34 kB 1.34 kB ✓
routerDirect..924c.js gzip 284 B 284 B ✓
withRouter-7..c13d.js gzip 284 B 284 B ✓
Overall change 7.74 kB 7.74 kB ✓
Client Pages Modern
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_app-75d3a82..dule.js gzip 625 B 625 B ✓
_error-4469a..dule.js gzip 2.29 kB 2.29 kB ✓
hooks-cbf13f..dule.js gzip 387 B 387 B ✓
index-b9a643..dule.js gzip 226 B 226 B ✓
link-aeb707b..dule.js gzip 1.29 kB 1.29 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-f..dule.js gzip 282 B 282 B ✓
Overall change 5.39 kB 5.39 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_buildManifest.js gzip 322 B 322 B ✓
_buildManife..dule.js gzip 329 B 329 B ✓
Overall change 651 B 651 B ✓
Serverless bundles Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_error.js 1.06 MB 1.06 MB ⚠️ +489 B
404.html 4.34 kB 4.34 kB ✓
hooks.html 3.92 kB 3.92 kB ✓
index.js 1.06 MB 1.06 MB ⚠️ +489 B
link.js 1.1 MB 1.1 MB ⚠️ +489 B
routerDirect.js 1.1 MB 1.1 MB ⚠️ +489 B
withRouter.js 1.1 MB 1.1 MB ⚠️ +489 B
Overall change 5.41 MB 5.42 MB ⚠️ +2.44 kB
Commit: 912838d

@ijjk
Copy link
Member Author

ijjk commented Oct 15, 2020

Failing test suites

Commit: 912838d

test/integration/size-limit/test/index.test.js

  • Production response size > should not increase the overall response size of default build
Expand output

● Production response size › should not increase the overall response size of default build

expect(received).toBeLessThanOrEqual(expected)

Expected: <= 1024
Received:    1045

  82 |     // These numbers are without gzip compression!
  83 |     const delta = responseSizesBytes - 280 * 1024
> 84 |     expect(delta).toBeLessThanOrEqual(1024) // don't increase size more than 1kb
     |                   ^
  85 |     expect(delta).toBeGreaterThanOrEqual(-1024) // don't decrease size more than 1kb without updating target
  86 |   })
  87 | 

  at Object.<anonymous> (integration/size-limit/test/index.test.js:84:19)

@ijjk ijjk requested a review from timneutkens October 15, 2020 22:30
@ijjk
Copy link
Member Author

ijjk commented Oct 15, 2020

Stats from current PR

Default Server Mode (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/test-amp Change
buildDuration 12.4s 12.2s -186ms
nodeModulesSize 64.3 MB 64.3 MB ⚠️ +2.23 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary ijjk/next.js i18n/test-amp Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.33 2.312 -0.02
/ avg req/sec 1072.98 1081.37 +8.39
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.438 1.474 ⚠️ +0.04
/error-in-render avg req/sec 1738.74 1695.64 ⚠️ -43.1
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js i18n/test-amp Change
677f882d2ed8..7765.js gzip 11.1 kB 11.1 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-43e96dd..7c44.js gzip 7.3 kB 7.3 kB ✓
webpack-e067..f178.js gzip 751 B 751 B ✓
Overall change 58.1 kB 58.1 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary ijjk/next.js i18n/test-amp Change
677f882d2ed8..dule.js gzip 6.94 kB 6.94 kB ✓
framework.HA..dule.js gzip 39 kB 39 kB ✓
main-ee66c17..dule.js gzip 6.29 kB 6.29 kB ✓
webpack-07c5..dule.js gzip 751 B 751 B ✓
Overall change 53 kB 53 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js i18n/test-amp Change
polyfills-4b..e242.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB ✓
_error-ed1b0..8fbd.js gzip 3.44 kB 3.44 kB ✓
hooks-89731c..c609.js gzip 887 B 887 B ✓
index-17468f..5d83.js gzip 227 B 227 B ✓
link-89ad9e7..25bb.js gzip 1.34 kB 1.34 kB ✓
routerDirect..924c.js gzip 284 B 284 B ✓
withRouter-7..c13d.js gzip 284 B 284 B ✓
Overall change 7.74 kB 7.74 kB ✓
Client Pages Modern
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_app-75d3a82..dule.js gzip 625 B 625 B ✓
_error-4469a..dule.js gzip 2.29 kB 2.29 kB ✓
hooks-cbf13f..dule.js gzip 387 B 387 B ✓
index-b9a643..dule.js gzip 226 B 226 B ✓
link-aeb707b..dule.js gzip 1.29 kB 1.29 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-f..dule.js gzip 282 B 282 B ✓
Overall change 5.39 kB 5.39 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_buildManifest.js gzip 322 B 322 B ✓
_buildManife..dule.js gzip 329 B 329 B ✓
Overall change 651 B 651 B ✓
Rendered Page Sizes
vercel/next.js canary ijjk/next.js i18n/test-amp Change
index.html gzip 1 kB 1 kB ✓
link.html gzip 1.01 kB 1.01 kB ✓
withRouter.html gzip 995 B 995 B ✓
Overall change 3.01 kB 3.01 kB ✓
Serverless Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/test-amp Change
buildDuration 14s 13.9s -176ms
nodeModulesSize 64.3 MB 64.3 MB ⚠️ +2.23 kB
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js i18n/test-amp Change
677f882d2ed8..7765.js gzip 11.1 kB 11.1 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-43e96dd..7c44.js gzip 7.3 kB 7.3 kB ✓
webpack-e067..f178.js gzip 751 B 751 B ✓
Overall change 58.1 kB 58.1 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary ijjk/next.js i18n/test-amp Change
677f882d2ed8..dule.js gzip 6.94 kB 6.94 kB ✓
framework.HA..dule.js gzip 39 kB 39 kB ✓
main-ee66c17..dule.js gzip 6.29 kB 6.29 kB ✓
webpack-07c5..dule.js gzip 751 B 751 B ✓
Overall change 53 kB 53 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js i18n/test-amp Change
polyfills-4b..e242.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB ✓
_error-ed1b0..8fbd.js gzip 3.44 kB 3.44 kB ✓
hooks-89731c..c609.js gzip 887 B 887 B ✓
index-17468f..5d83.js gzip 227 B 227 B ✓
link-89ad9e7..25bb.js gzip 1.34 kB 1.34 kB ✓
routerDirect..924c.js gzip 284 B 284 B ✓
withRouter-7..c13d.js gzip 284 B 284 B ✓
Overall change 7.74 kB 7.74 kB ✓
Client Pages Modern
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_app-75d3a82..dule.js gzip 625 B 625 B ✓
_error-4469a..dule.js gzip 2.29 kB 2.29 kB ✓
hooks-cbf13f..dule.js gzip 387 B 387 B ✓
index-b9a643..dule.js gzip 226 B 226 B ✓
link-aeb707b..dule.js gzip 1.29 kB 1.29 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-f..dule.js gzip 282 B 282 B ✓
Overall change 5.39 kB 5.39 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_buildManifest.js gzip 322 B 322 B ✓
_buildManife..dule.js gzip 329 B 329 B ✓
Overall change 651 B 651 B ✓
Serverless bundles Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/test-amp Change
_error.js 1.06 MB 1.06 MB ⚠️ +489 B
404.html 4.34 kB 4.34 kB ✓
hooks.html 3.92 kB 3.92 kB ✓
index.js 1.06 MB 1.06 MB ⚠️ +489 B
link.js 1.1 MB 1.1 MB ⚠️ +489 B
routerDirect.js 1.1 MB 1.1 MB ⚠️ +489 B
withRouter.js 1.1 MB 1.1 MB ⚠️ +489 B
Overall change 5.41 MB 5.42 MB ⚠️ +2.44 kB
Commit: b1ec046

@ijjk ijjk merged commit 4b126cc into vercel:canary Oct 15, 2020
@ijjk ijjk deleted the i18n/test-amp branch October 15, 2020 23:00
@vercel vercel locked as resolved and limited conversation to collaborators Jan 29, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@timneutkens timneutkens timneutkens approved these changes

@lfades lfades Awaiting requested review from lfades

@Timer Timer Awaiting requested review from Timer

Assignees
No one assigned
Labels
type: next
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ijjk @timneutkens