Unverified Commit b274fe39 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Update method for attaching GS(S)P identifier to page (#10859)

* Update to use separate export instead of attaching to Component to identify GS(S)P pages

* Handle initialProps being undefined
parent 744b50d5
...@@ -6,8 +6,6 @@ import { ...@@ -6,8 +6,6 @@ import {
SERVER_PROPS_ID, SERVER_PROPS_ID,
} from '../../../next-server/lib/constants' } from '../../../next-server/lib/constants'
const pageComponentVar = '__NEXT_COMP'
export const EXPORT_NAME_GET_STATIC_PROPS = 'getStaticProps' export const EXPORT_NAME_GET_STATIC_PROPS = 'getStaticProps'
export const EXPORT_NAME_GET_STATIC_PATHS = 'getStaticPaths' export const EXPORT_NAME_GET_STATIC_PATHS = 'getStaticPaths'
export const EXPORT_NAME_GET_SERVER_PROPS = 'getServerSideProps' export const EXPORT_NAME_GET_SERVER_PROPS = 'getServerSideProps'
...@@ -37,64 +35,42 @@ function decorateSsgExport( ...@@ -37,64 +35,42 @@ function decorateSsgExport(
path: NodePath<BabelTypes.Program>, path: NodePath<BabelTypes.Program>,
state: PluginState state: PluginState
) { ) {
path.traverse({ const gsspName = state.isPrerender ? STATIC_PROPS_ID : SERVER_PROPS_ID
ExportDefaultDeclaration(path) { const gsspId = t.identifier(gsspName)
if (state.done) {
return
}
state.done = true
const prev = path.node.declaration const addGsspExport = (
if (prev.type.endsWith('Declaration')) { path: NodePath<
prev.type = prev.type.replace(/Declaration$/, 'Expression') as any BabelTypes.ExportDefaultDeclaration | BabelTypes.ExportNamedDeclaration
} >
) => {
if (state.done) {
return
}
state.done = true
// @ts-ignore invalid return type // @ts-ignore invalid return type
const [pageCompPath] = path.replaceWithMultiple([ const [pageCompPath] = path.replaceWithMultiple([
t.exportNamedDeclaration(
t.variableDeclaration( t.variableDeclaration(
// We use 'var' instead of 'let' or 'const' for ES5 support. Since // We use 'var' instead of 'let' or 'const' for ES5 support. Since
// this runs in `Program#exit`, no ES2015 transforms (preset env) // this runs in `Program#exit`, no ES2015 transforms (preset env)
// will be ran against this code. // will be ran against this code.
'var', 'var',
[t.variableDeclarator(t.identifier(pageComponentVar), prev as any)] [t.variableDeclarator(gsspId, t.booleanLiteral(true))]
),
t.assignmentExpression(
'=',
t.memberExpression(
t.identifier(pageComponentVar),
t.identifier(state.isPrerender ? STATIC_PROPS_ID : SERVER_PROPS_ID)
),
t.booleanLiteral(true)
), ),
t.exportDefaultDeclaration(t.identifier(pageComponentVar)), [t.exportSpecifier(gsspId, gsspId)]
]) ),
path.scope.registerDeclaration(pageCompPath) path.node,
])
path.scope.registerDeclaration(pageCompPath)
}
path.traverse({
ExportDefaultDeclaration(path) {
addGsspExport(path)
}, },
ExportNamedDeclaration(path) { ExportNamedDeclaration(path) {
if (state.done) { addGsspExport(path)
return
}
// Look for a `export { _ as default }` specifier
const defaultSpecifier = path.node.specifiers.find(s => {
return s.exported.name === 'default'
})
if (!defaultSpecifier) {
return
}
state.done = true
path.replaceWithMultiple([
t.assignmentExpression(
'=',
t.memberExpression(
t.identifier((defaultSpecifier as any).local.name),
t.identifier(state.isPrerender ? STATIC_PROPS_ID : SERVER_PROPS_ID)
),
t.booleanLiteral(true)
),
path.node,
])
}, },
}) })
} }
......
...@@ -100,7 +100,7 @@ class Container extends React.Component { ...@@ -100,7 +100,7 @@ class Container extends React.Component {
(isFallback || (isFallback ||
(data.nextExport && (data.nextExport &&
(isDynamicRoute(router.pathname) || location.search)) || (isDynamicRoute(router.pathname) || location.search)) ||
(Component && Component.__N_SSG && location.search)) (props.__N_SSG && location.search))
) { ) {
// update query on mount for exported pages // update query on mount for exported pages
router.replace( router.replace(
...@@ -180,7 +180,7 @@ export default async ({ webpackHMR: passedWebpackHMR } = {}) => { ...@@ -180,7 +180,7 @@ export default async ({ webpackHMR: passedWebpackHMR } = {}) => {
let initialErr = err let initialErr = err
try { try {
Component = await pageLoader.loadPage(page) ;({ page: Component } = await pageLoader.loadPage(page))
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
const { isValidElementType } = require('react-is') const { isValidElementType } = require('react-is')
...@@ -273,8 +273,7 @@ export async function renderError(props) { ...@@ -273,8 +273,7 @@ export async function renderError(props) {
// Make sure we log the error to the console, otherwise users can't track down issues. // Make sure we log the error to the console, otherwise users can't track down issues.
console.error(err) console.error(err)
;({ page: ErrorComponent } = await pageLoader.loadPage('/_error'))
ErrorComponent = await pageLoader.loadPage('/_error')
// In production we do a normal render with the `ErrorComponent` as component. // In production we do a normal render with the `ErrorComponent` as component.
// If we've gotten here upon initial render, we can use the props from the server. // If we've gotten here upon initial render, we can use the props from the server.
......
...@@ -175,7 +175,7 @@ export default class PageLoader { ...@@ -175,7 +175,7 @@ export default class PageLoader {
} }
loadPage(route) { loadPage(route) {
return this.loadPageScript(route).then(v => v.page) return this.loadPageScript(route)
} }
loadPageScript(route) { loadPageScript(route) {
......
...@@ -31,6 +31,8 @@ const prepareRoute = (path: string) => ...@@ -31,6 +31,8 @@ const prepareRoute = (path: string) =>
type Url = UrlObject | string type Url = UrlObject | string
type ComponentRes = { page: ComponentType; mod: any }
export type BaseRouter = { export type BaseRouter = {
route: string route: string
pathname: string pathname: string
...@@ -57,6 +59,8 @@ export type PrefetchOptions = { ...@@ -57,6 +59,8 @@ export type PrefetchOptions = {
type RouteInfo = { type RouteInfo = {
Component: ComponentType Component: ComponentType
__N_SSG?: boolean
__N_SSP?: boolean
props?: any props?: any
err?: Error err?: Error
error?: any error?: any
...@@ -179,7 +183,13 @@ export default class Router implements BaseRouter { ...@@ -179,7 +183,13 @@ export default class Router implements BaseRouter {
// Otherwise, this cause issues when when going back and // Otherwise, this cause issues when when going back and
// come again to the errored page. // come again to the errored page.
if (pathname !== '/_error') { if (pathname !== '/_error') {
this.components[this.route] = { Component, props: initialProps, err } this.components[this.route] = {
Component,
props: initialProps,
err,
__N_SSG: initialProps && initialProps.__N_SSG,
__N_SSP: initialProps && initialProps.__N_SSP,
}
} }
this.components['/_app'] = { Component: App } this.components['/_app'] = { Component: App }
...@@ -284,7 +294,12 @@ export default class Router implements BaseRouter { ...@@ -284,7 +294,12 @@ export default class Router implements BaseRouter {
throw new Error(`Cannot update unavailable route: ${route}`) throw new Error(`Cannot update unavailable route: ${route}`)
} }
const newData = { ...data, Component } const newData = {
...data,
Component,
__N_SSG: mod.__N_SSG,
__N_SSP: mod.__N_SSP,
}
this.components[route] = newData this.components[route] = newData
// pages/_app.js updated // pages/_app.js updated
...@@ -542,7 +557,8 @@ export default class Router implements BaseRouter { ...@@ -542,7 +557,8 @@ export default class Router implements BaseRouter {
resolve( resolve(
this.fetchComponent('/_error') this.fetchComponent('/_error')
.then(Component => { .then(res => {
const { page: Component } = res
const routeInfo: RouteInfo = { Component, err } const routeInfo: RouteInfo = { Component, err }
return new Promise(resolve => { return new Promise(resolve => {
this.getInitialProps(Component, { this.getInitialProps(Component, {
...@@ -578,12 +594,17 @@ export default class Router implements BaseRouter { ...@@ -578,12 +594,17 @@ export default class Router implements BaseRouter {
} }
this.fetchComponent(route).then( this.fetchComponent(route).then(
Component => resolve({ Component }), res =>
resolve({
Component: res.page,
__N_SSG: res.mod.__N_SSG,
__N_SSP: res.mod.__N_SSP,
}),
reject reject
) )
}) as Promise<RouteInfo>) }) as Promise<RouteInfo>)
.then((routeInfo: RouteInfo) => { .then((routeInfo: RouteInfo) => {
const { Component } = routeInfo const { Component, __N_SSG, __N_SSP } = routeInfo
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
const { isValidElementType } = require('react-is') const { isValidElementType } = require('react-is')
...@@ -595,9 +616,9 @@ export default class Router implements BaseRouter { ...@@ -595,9 +616,9 @@ export default class Router implements BaseRouter {
} }
return this._getData<RouteInfo>(() => return this._getData<RouteInfo>(() =>
(Component as any).__N_SSG __N_SSG
? this._getStaticData(as) ? this._getStaticData(as)
: (Component as any).__N_SSP : __N_SSP
? this._getServerData(as) ? this._getServerData(as)
: this.getInitialProps( : this.getInitialProps(
Component, Component,
...@@ -726,13 +747,13 @@ export default class Router implements BaseRouter { ...@@ -726,13 +747,13 @@ export default class Router implements BaseRouter {
}) })
} }
async fetchComponent(route: string): Promise<ComponentType> { async fetchComponent(route: string): Promise<ComponentRes> {
let cancelled = false let cancelled = false
const cancel = (this.clc = () => { const cancel = (this.clc = () => {
cancelled = true cancelled = true
}) })
const Component = await this.pageLoader.loadPage(route) const componentResult = await this.pageLoader.loadPage(route)
if (cancelled) { if (cancelled) {
const error: any = new Error( const error: any = new Error(
...@@ -746,7 +767,7 @@ export default class Router implements BaseRouter { ...@@ -746,7 +767,7 @@ export default class Router implements BaseRouter {
this.clc = null this.clc = null
} }
return Component return componentResult
} }
_getData<T>(fn: () => Promise<T>): Promise<T> { _getData<T>(fn: () => Promise<T>): Promise<T> {
......
...@@ -134,6 +134,8 @@ export type AppPropsType< ...@@ -134,6 +134,8 @@ export type AppPropsType<
> = AppInitialProps & { > = AppInitialProps & {
Component: NextComponentType<NextPageContext, any, P> Component: NextComponentType<NextPageContext, any, P>
router: R router: R
__N_SSG?: boolean
__N_SSP?: boolean
} }
export type DocumentContext = NextPageContext & { export type DocumentContext = NextPageContext & {
......
...@@ -3,8 +3,6 @@ import { ...@@ -3,8 +3,6 @@ import {
CLIENT_STATIC_FILES_PATH, CLIENT_STATIC_FILES_PATH,
REACT_LOADABLE_MANIFEST, REACT_LOADABLE_MANIFEST,
SERVER_DIRECTORY, SERVER_DIRECTORY,
STATIC_PROPS_ID,
SERVER_PROPS_ID,
} from '../lib/constants' } from '../lib/constants'
import { join } from 'path' import { join } from 'path'
import { requirePage } from './require' import { requirePage } from './require'
...@@ -22,20 +20,6 @@ export function interopDefault(mod: any) { ...@@ -22,20 +20,6 @@ export function interopDefault(mod: any) {
return mod.default || mod return mod.default || mod
} }
function addComponentPropsId(
Component: any,
getStaticProps: any,
getServerSideProps: any
) {
// Mark the component with the SSG or SSP id here since we don't run
// the SSG babel transform for server mode
if (getStaticProps) {
Component[STATIC_PROPS_ID] = true
} else if (getServerSideProps) {
Component[SERVER_PROPS_ID] = true
}
}
export type ManifestItem = { export type ManifestItem = {
id: number | string id: number | string
name: string name: string
...@@ -68,8 +52,6 @@ export async function loadComponents( ...@@ -68,8 +52,6 @@ export async function loadComponents(
const Component = await requirePage(pathname, distDir, serverless) const Component = await requirePage(pathname, distDir, serverless)
const { getStaticProps, getStaticPaths, getServerSideProps } = Component const { getStaticProps, getStaticPaths, getServerSideProps } = Component
addComponentPropsId(Component, getStaticProps, getServerSideProps)
return { return {
Component, Component,
pageConfig: Component.config || {}, pageConfig: Component.config || {},
...@@ -118,8 +100,6 @@ export async function loadComponents( ...@@ -118,8 +100,6 @@ export async function loadComponents(
const { getServerSideProps, getStaticProps, getStaticPaths } = ComponentMod const { getServerSideProps, getStaticProps, getStaticPaths } = ComponentMod
addComponentPropsId(Component, getStaticProps, getServerSideProps)
return { return {
App, App,
Document, Document,
......
...@@ -10,7 +10,11 @@ import { ...@@ -10,7 +10,11 @@ import {
} from '../../lib/constants' } from '../../lib/constants'
import { isInAmpMode } from '../lib/amp' import { isInAmpMode } from '../lib/amp'
import { AmpStateContext } from '../lib/amp-context' import { AmpStateContext } from '../lib/amp-context'
import { AMP_RENDER_TARGET } from '../lib/constants' import {
AMP_RENDER_TARGET,
STATIC_PROPS_ID,
SERVER_PROPS_ID,
} from '../lib/constants'
import Head, { defaultHead } from '../lib/head' import Head, { defaultHead } from '../lib/head'
import Loadable from '../lib/loadable' import Loadable from '../lib/loadable'
import { LoadableContext } from '../lib/loadable-context' import { LoadableContext } from '../lib/loadable-context'
...@@ -471,6 +475,11 @@ export async function renderToHTML( ...@@ -471,6 +475,11 @@ export async function renderToHTML(
router, router,
ctx, ctx,
}) })
if (isSSG) {
props[STATIC_PROPS_ID] = true
}
let previewData: string | false | object | undefined let previewData: string | false | object | undefined
if ((isSSG || getServerSideProps) && !isFallback) { if ((isSSG || getServerSideProps) && !isFallback) {
...@@ -534,6 +543,10 @@ export async function renderToHTML( ...@@ -534,6 +543,10 @@ export async function renderToHTML(
;(renderOpts as any).pageData = props ;(renderOpts as any).pageData = props
} }
if (getServerSideProps) {
props[SERVER_PROPS_ID] = true
}
if (getServerSideProps && !isFallback) { if (getServerSideProps && !isFallback) {
const data = await getServerSideProps({ const data = await getServerSideProps({
req, req,
......
...@@ -41,7 +41,8 @@ export default class App<P = {}, CP = {}, S = {}> extends React.Component< ...@@ -41,7 +41,8 @@ export default class App<P = {}, CP = {}, S = {}> extends React.Component<
} }
render() { render() {
const { router, Component, pageProps } = this.props as AppProps<CP> const { router, Component, pageProps, __N_SSG, __N_SSP } = this
.props as AppProps<CP>
return ( return (
<Component <Component
...@@ -49,9 +50,7 @@ export default class App<P = {}, CP = {}, S = {}> extends React.Component< ...@@ -49,9 +50,7 @@ export default class App<P = {}, CP = {}, S = {}> extends React.Component<
{ {
// we don't add the legacy URL prop if it's using non-legacy // we don't add the legacy URL prop if it's using non-legacy
// methods like getStaticProps and getServerSideProps // methods like getStaticProps and getServerSideProps
...(!((Component as any).__N_SSG || (Component as any).__N_SSP) ...(!(__N_SSG || __N_SSP) ? { url: createUrl(router) } : {})
? { url: createUrl(router) }
: {})
} }
/> />
) )
......
...@@ -40,7 +40,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -40,7 +40,7 @@ describe('babel plugin (next-ssg-transform)', () => {
} }
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"var __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"export var __N_SSG=true;export default function Test(){return __jsx(\\"div\\",null);}"`
) )
}) })
...@@ -53,7 +53,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -53,7 +53,7 @@ describe('babel plugin (next-ssg-transform)', () => {
} }
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"var __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"export var __N_SSG=true;export default function Test(){return __jsx(\\"div\\",null);}"`
) )
}) })
...@@ -66,7 +66,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -66,7 +66,7 @@ describe('babel plugin (next-ssg-transform)', () => {
} }
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"export{foo,bar as baz}from'.';var __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"export var __N_SSG=true;export{foo,bar as baz}from'.';export default function Test(){return __jsx(\\"div\\",null);}"`
) )
}) })
...@@ -86,7 +86,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -86,7 +86,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"var __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"export var __N_SSG=true;export default function Test(){return __jsx(\\"div\\",null);}"`
) )
}) })
...@@ -106,7 +106,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -106,7 +106,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"var __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"export var __N_SSG=true;export default function Test(){return __jsx(\\"div\\",null);}"`
) )
}) })
...@@ -124,7 +124,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -124,7 +124,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"export function Noop(){}var __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"export var __N_SSG=true;export function Noop(){}export default function Test(){return __jsx(\\"div\\",null);}"`
) )
}) })
...@@ -144,7 +144,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -144,7 +144,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"var __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"export var __N_SSG=true;export default function Test(){return __jsx(\\"div\\",null);}"`
) )
}) })
...@@ -164,7 +164,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -164,7 +164,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"var __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"export var __N_SSG=true;export default function Test(){return __jsx(\\"div\\",null);}"`
) )
}) })
...@@ -184,7 +184,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -184,7 +184,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"export const foo=2;var __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"export var __N_SSG=true;export const foo=2;export default function Test(){return __jsx(\\"div\\",null);}"`
) )
}) })
...@@ -202,7 +202,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -202,7 +202,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"var __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"export var __N_SSG=true;export default function Test(){return __jsx(\\"div\\",null);}"`
) )
}) })
...@@ -220,7 +220,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -220,7 +220,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"const a=2;var __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"const a=2;export var __N_SSG=true;export default function Test(){return __jsx(\\"div\\",null);}"`
) )
}) })
...@@ -238,7 +238,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -238,7 +238,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"var __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"export var __N_SSG=true;export default function Test(){return __jsx(\\"div\\",null);}"`
) )
}) })
...@@ -258,7 +258,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -258,7 +258,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"export class MyClass{}var __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"export var __N_SSG=true;export class MyClass{}export default function Test(){return __jsx(\\"div\\",null);}"`
) )
}) })
...@@ -305,7 +305,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -305,7 +305,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"import keep_me from'hello';import{keep_me2}from'hello2';import*as keep_me3 from'hello3';import{but_not_me}from'bar';var leave_me_alone=1;function dont_bug_me_either(){}var __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"import keep_me from'hello';import{keep_me2}from'hello2';import*as keep_me3 from'hello3';import{but_not_me}from'bar';var leave_me_alone=1;function dont_bug_me_either(){}export var __N_SSG=true;export default function Test(){return __jsx(\\"div\\",null);}"`
) )
}) })
...@@ -346,7 +346,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -346,7 +346,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"var __NEXT_COMP=class Test extends React.Component{render(){return __jsx(\\"div\\",null);}};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"export var __N_SSG=true;export default class Test extends React.Component{render(){return __jsx(\\"div\\",null);}}"`
) )
}) })
...@@ -366,7 +366,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -366,7 +366,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"class Test extends React.Component{render(){return __jsx(\\"div\\",null);}}var __NEXT_COMP=Test;__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"class Test extends React.Component{render(){return __jsx(\\"div\\",null);}}export var __N_SSG=true;export default Test;"`
) )
}) })
...@@ -384,7 +384,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -384,7 +384,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"function El(){return __jsx(\\"div\\",null);}El.__N_SSG=true export{El as default};"` `"function El(){return __jsx(\\"div\\",null);}export var __N_SSG=true;export{El as default};"`
) )
}) })
...@@ -404,7 +404,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -404,7 +404,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"function El(){return __jsx(\\"div\\",null);}const a=5;El.__N_SSG=true export{El as default,a};"` `"function El(){return __jsx(\\"div\\",null);}const a=5;export var __N_SSG=true;export{El as default,a};"`
) )
}) })
...@@ -426,7 +426,7 @@ describe('babel plugin (next-ssg-transform)', () => { ...@@ -426,7 +426,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`) `)
expect(output).toMatchInlineSnapshot( expect(output).toMatchInlineSnapshot(
`"class El extends React.Component{render(){return __jsx(\\"div\\",null);}}const a=5;El.__N_SSG=true export{El as default,a};"` `"class El extends React.Component{render(){return __jsx(\\"div\\",null);}}const a=5;export var __N_SSG=true;export{El as default,a};"`
) )
}) })
}) })
......
...@@ -303,7 +303,7 @@ describe('next-babel-loader', () => { ...@@ -303,7 +303,7 @@ describe('next-babel-loader', () => {
{ resourcePath: pageFile, isServer: false } { resourcePath: pageFile, isServer: false }
) )
expect(code).toMatchInlineSnapshot( expect(code).toMatchInlineSnapshot(
`"import\\"core-js\\";import{bar}from\\"a\\";import baz from\\"b\\";import*as React from\\"react\\";import{yeet}from\\"c\\";import baz3,{cats}from\\"d\\";import{c,d}from\\"e\\";import{e as ee}from\\"f\\";var __NEXT_COMP=function(){return cats+bar();};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"import\\"core-js\\";import{bar}from\\"a\\";import baz from\\"b\\";import*as React from\\"react\\";import{yeet}from\\"c\\";import baz3,{cats}from\\"d\\";import{c,d}from\\"e\\";import{e as ee}from\\"f\\";export var __N_SSG=true;export default function(){return cats+bar();}"`
) )
}) })
...@@ -325,7 +325,7 @@ describe('next-babel-loader', () => { ...@@ -325,7 +325,7 @@ describe('next-babel-loader', () => {
{ resourcePath: pageFile, isServer: false } { resourcePath: pageFile, isServer: false }
) )
expect(code).toMatchInlineSnapshot( expect(code).toMatchInlineSnapshot(
`"var __jsx=React.createElement;import\\"core-js\\";import{bar}from\\"a\\";import baz from\\"b\\";import*as React from\\"react\\";import{yeet}from\\"c\\";import baz3,{cats}from\\"d\\";import{c,d}from\\"e\\";import{e as ee}from\\"f\\";var __NEXT_COMP=function(){return __jsx(\\"div\\",null,cats+bar());};__NEXT_COMP.__N_SSG=true export default __NEXT_COMP;"` `"var __jsx=React.createElement;import\\"core-js\\";import{bar}from\\"a\\";import baz from\\"b\\";import*as React from\\"react\\";import{yeet}from\\"c\\";import baz3,{cats}from\\"d\\";import{c,d}from\\"e\\";import{e as ee}from\\"f\\";export var __N_SSG=true;export default function(){return __jsx(\\"div\\",null,cats+bar());}"`
) )
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment