archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow for shortened names for certain items (#9949)

Browse source 
* Use smaller name as it's not shortened

* Remove export as it's not used and it'll be shortened

* Update size

Co-authored-by: Joe Haddad <timer150@gmail.com>
This commit is contained in:
Tim Neutkens 2020-01-04 21:53:33 +01:00 committed by Joe Haddad
parent 1db6764c52
commit 32ec4f6913
4 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packages/next/client/index.js
View file

@ -4,11 +4,7 @@ import ReactDOM from 'react-dom'
import HeadManager from './head-manager' import HeadManager from './head-manager'
import { createRouter, makePublicRouterInstance } from 'next/router' import { createRouter, makePublicRouterInstance } from 'next/router'
import mitt from '../next-server/lib/mitt' import mitt from '../next-server/lib/mitt'
import { import { loadGetInitialProps, getURL, ST } from '../next-server/lib/utils'
loadGetInitialProps,
getURL,
SUPPORTS_PERFORMANCE_USER_TIMING,
} from '../next-server/lib/utils'
import PageLoader from './page-loader' import PageLoader from './page-loader'
import * as envConfig from '../next-server/lib/runtime-config' import * as envConfig from '../next-server/lib/runtime-config'
import { HeadManagerContext } from '../next-server/lib/head-manager-context' import { HeadManagerContext } from '../next-server/lib/head-manager-context'
@ -70,7 +66,7 @@ const appElement = document.getElementById('__next')
let lastAppProps let lastAppProps
let webpackHMR let webpackHMR
export let router export let router
export let ErrorComponent let ErrorComponent
let Component let Component
let App, onPerfEntry let App, onPerfEntry
@ -187,7 +183,7 @@ export default async ({ webpackHMR: passedWebpackHMR } = {}) => {
wrapApp, wrapApp,
err: initialErr, err: initialErr,
subscription: ({ Component, props, err }, App) => { subscription: ({ Component, props, err }, App) => {
render({ App, Component, props, err, emitter }) render({ App, Component, props, err })
}, },
}) })
@ -203,7 +199,7 @@ export default async ({ webpackHMR: passedWebpackHMR } = {}) => {
}) })
} }
const renderCtx = { App, Component, props, err: initialErr, emitter } const renderCtx = { App, Component, props, err: initialErr }
render(renderCtx) render(renderCtx)
return emitter return emitter
@ -272,7 +268,7 @@ let isInitialRender = typeof ReactDOM.hydrate === 'function'
let reactRoot = null let reactRoot = null
function renderReactElement(reactEl, domEl) { function renderReactElement(reactEl, domEl) {
// mark start of hydrate/render // mark start of hydrate/render
if (SUPPORTS_PERFORMANCE_USER_TIMING) { if (ST) {
performance.mark('beforeRender') performance.mark('beforeRender')
} }
@ -297,7 +293,7 @@ function renderReactElement(reactEl, domEl) {
} }
} }
if (onPerfEntry && SUPPORTS_PERFORMANCE_USER_TIMING) { if (onPerfEntry && ST) {
if (!(PerformanceObserver in window)) { if (!(PerformanceObserver in window)) {
window.addEventListener('load', () => { window.addEventListener('load', () => {
performance.getEntriesByType('paint').forEach(onPerfEntry) performance.getEntriesByType('paint').forEach(onPerfEntry)
@ -312,7 +308,7 @@ function renderReactElement(reactEl, domEl) {
} }
function markHydrateComplete() { function markHydrateComplete() {
if (!SUPPORTS_PERFORMANCE_USER_TIMING) return if (!ST) return
performance.mark('afterHydrate') // mark end of hydration performance.mark('afterHydrate') // mark end of hydration
@ -330,7 +326,7 @@ function markHydrateComplete() {
} }
function markRenderComplete() { function markRenderComplete() {
if (!SUPPORTS_PERFORMANCE_USER_TIMING) return if (!ST) return
performance.mark('afterRender') // mark end of render performance.mark('afterRender') // mark end of render
const navStartEntries = performance.getEntriesByName('routeChange', 'mark') const navStartEntries = performance.getEntriesByName('routeChange', 'mark')

4
packages/next/next-server/lib/router/router.ts
View file

@ -11,7 +11,7 @@ import {
getURL, getURL,
loadGetInitialProps, loadGetInitialProps,
NextPageContext, NextPageContext,
SUPPORTS_PERFORMANCE_USER_TIMING, ST,
} from '../utils' } from '../utils'
import { isDynamicRoute } from './utils/is-dynamic' import { isDynamicRoute } from './utils/is-dynamic'
import { getRouteMatcher } from './utils/route-matcher' import { getRouteMatcher } from './utils/route-matcher'
@ -268,7 +268,7 @@ export default class Router implements BaseRouter {
this.isSsr = false this.isSsr = false
} }
// marking route changes as a navigation start entry // marking route changes as a navigation start entry
if (SUPPORTS_PERFORMANCE_USER_TIMING) { if (ST) {
performance.mark('routeChange') performance.mark('routeChange')
} }

6
packages/next/next-server/lib/utils.ts
View file

@ -325,8 +325,8 @@ export function formatWithValidation(
return format(url as any, options) return format(url as any, options)
} }
export const SUPPORTS_PERFORMANCE = typeof performance !== 'undefined' export const SP = typeof performance !== 'undefined'
export const SUPPORTS_PERFORMANCE_USER_TIMING = export const ST =
SUPPORTS_PERFORMANCE && SP &&
typeof performance.mark === 'function' && typeof performance.mark === 'function' &&
typeof performance.measure === 'function' typeof performance.measure === 'function'

2
test/integration/size-limit/test/index.test.js
View file

@ -81,7 +81,7 @@ describe('Production response size', () => {
) )
// These numbers are without gzip compression! // These numbers are without gzip compression!
const delta = responseSizeKilobytes - 230 const delta = responseSizeKilobytes - 228
expect(delta).toBeLessThanOrEqual(0) // don't increase size expect(delta).toBeLessThanOrEqual(0) // don't increase size
expect(delta).toBeGreaterThanOrEqual(-1) // don't decrease size without updating target expect(delta).toBeGreaterThanOrEqual(-1) // don't decrease size without updating target
}) })