Skip to content

Commit

Permalink
tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Hannes Bornö committed Sep 6, 2022
1 parent e491e75 commit e7bed87
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 41 deletions.
7 changes: 2 additions & 5 deletions packages/next/build/index.ts
View file
Expand Up @@ -819,12 +819,9 @@ export default async function build(
? [
path.join(SERVER_DIRECTORY, FLIGHT_MANIFEST + '.js'),
path.join(SERVER_DIRECTORY, FLIGHT_MANIFEST + '.json'),
path.join(EDGE_DIRECTORY, FLIGHT_SERVER_CSS_MANIFEST + '.js'),
path.join(
SERVER_DIRECTORY,
FLIGHT_SERVER_CSS_MANIFEST + '.js'
),
path.join(
SERVER_DIRECTORY,
EDGE_DIRECTORY,
FLIGHT_SERVER_CSS_MANIFEST + '.json'
),
]
Expand Down
8 changes: 4 additions & 4 deletions packages/next/build/webpack-config.ts
View file
Expand Up @@ -710,10 +710,10 @@ export default async function getBaseWebpackConfig(
isNodeServer || isEdgeServer
? path.join(
distDir,
isLikeServerless
? SERVERLESS_DIRECTORY
: isEdgeServer
isEdgeServer
? EDGE_DIRECTORY
: isLikeServerless
? SERVERLESS_DIRECTORY
: SERVER_DIRECTORY
)
: distDir
Expand Down Expand Up @@ -1692,7 +1692,7 @@ export default async function getBaseWebpackConfig(
filename: REACT_LOADABLE_MANIFEST,
pagesDir,
runtimeAsset: hasConcurrentFeatures
? `edge/${MIDDLEWARE_REACT_LOADABLE_MANIFEST}.js`
? `server/${MIDDLEWARE_REACT_LOADABLE_MANIFEST}.js`
: undefined,
dev,
}),
Expand Down
2 changes: 1 addition & 1 deletion packages/next/build/webpack/loaders/next-middleware-asset-loader.ts
View file
Expand Up @@ -9,7 +9,7 @@ export default function MiddlewareAssetLoader(this: any, source: Buffer) {
const filePath = `edge-chunks/asset_${name}`
const buildInfo = getModuleBuildInfo(this._module)
buildInfo.nextAssetMiddlewareBinding = {
filePath: `server/${filePath}`,
filePath: `edge/${filePath}`,
name,
}
this.emitFile(filePath, source)
Expand Down
2 changes: 1 addition & 1 deletion packages/next/build/webpack/loaders/next-middleware-wasm-loader.ts
View file
Expand Up @@ -9,7 +9,7 @@ export default function MiddlewareWasmLoader(this: any, source: Buffer) {
const name = `wasm_${sha1(source)}`
const filePath = `edge-chunks/${name}.wasm`
const buildInfo = getModuleBuildInfo(this._module)
buildInfo.nextWasmMiddlewareBinding = { filePath: `server/${filePath}`, name }
buildInfo.nextWasmMiddlewareBinding = { filePath: `edge/${filePath}`, name }
this.emitFile(`/${filePath}`, source, null)
return `module.exports = ${name};`
}
Expand Down
7 changes: 4 additions & 3 deletions packages/next/build/webpack/plugins/build-manifest-plugin.ts
View file
Expand Up @@ -241,9 +241,10 @@ export default class BuildManifestPlugin {
)

if (this.exportRuntime) {
assets[`edge/${MIDDLEWARE_BUILD_MANIFEST}.js`] = new sources.RawSource(
`self.__BUILD_MANIFEST=${JSON.stringify(assetMap)}`
)
assets[`server/${MIDDLEWARE_BUILD_MANIFEST}.js`] =
new sources.RawSource(
`self.__BUILD_MANIFEST=${JSON.stringify(assetMap)}`
)
}

if (!this.isDevFallback) {
Expand Down
8 changes: 4 additions & 4 deletions packages/next/build/webpack/plugins/middleware-plugin.ts
View file
Expand Up @@ -78,7 +78,7 @@ function getEntryFiles(entryFiles: string[], meta: EntryMetadata) {
const files: string[] = []
if (meta.edgeSSR) {
if (meta.edgeSSR.isServerComponent) {
files.push(`edge/${FLIGHT_MANIFEST}.js`)
files.push(`server/${FLIGHT_MANIFEST}.js`)
files.push(`edge/${FLIGHT_SERVER_CSS_MANIFEST}.js`)
files.push(
...entryFiles
Expand All @@ -88,16 +88,16 @@ function getEntryFiles(entryFiles: string[], meta: EntryMetadata) {
)
.map(
(file) =>
'edge/' +
'server/' +
// TODO-APP: seems this should be removed.
file.replace('.js', NEXT_CLIENT_SSR_ENTRY_SUFFIX + '.js')
)
)
}

files.push(
`edge/${MIDDLEWARE_BUILD_MANIFEST}.js`,
`edge/${MIDDLEWARE_REACT_LOADABLE_MANIFEST}.js`
`server/${MIDDLEWARE_BUILD_MANIFEST}.js`,
`server/${MIDDLEWARE_REACT_LOADABLE_MANIFEST}.js`
)
}

Expand Down
2 changes: 1 addition & 1 deletion packages/next/server/next-server.ts
View file
Expand Up @@ -1003,7 +1003,7 @@ export default class NextNodeServer extends BaseServer {
if (!this.nextConfig.experimental.serverComponents) return undefined
return require(join(
this.distDir,
'server',
EDGE_DIRECTORY,
FLIGHT_SERVER_CSS_MANIFEST + '.json'
))
}
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/edge-can-use-wasm-files/index.test.ts
View file
Expand Up @@ -103,14 +103,14 @@ describe('middleware can use wasm files', () => {
it('lists the necessary wasm bindings in the manifest', async () => {
const manifestPath = path.join(
next.testDir,
'.next/server/middleware-manifest.json'
'.next/edge/middleware-manifest.json'
)
const manifest = await fs.readJSON(manifestPath)
expect(manifest.middleware['/']).toMatchObject({
wasm: [
{
filePath:
'server/edge-chunks/wasm_58ccff8b2b94b5dac6ef8957082ecd8f6d34186d.wasm',
'edge/edge-chunks/wasm_58ccff8b2b94b5dac6ef8957082ecd8f6d34186d.wasm',
name: 'wasm_58ccff8b2b94b5dac6ef8957082ecd8f6d34186d',
},
],
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/middleware-general/test/index.test.ts
View file
Expand Up @@ -107,7 +107,7 @@ describe('Middleware Runtime', () => {
if ((global as any).isNextStart) {
it('should have valid middleware field in manifest', async () => {
const manifest = await fs.readJSON(
join(next.testDir, '.next/server/middleware-manifest.json')
join(next.testDir, '.next/edge/middleware-manifest.json')
)
expect(manifest.middleware).toEqual({
'/': {
Expand All @@ -116,7 +116,7 @@ describe('Middleware Runtime', () => {
'ANOTHER_MIDDLEWARE_TEST',
'STRING_ENV_VAR',
],
files: ['server/edge-runtime-webpack.js', 'server/middleware.js'],
files: ['edge/edge-runtime-webpack.js', 'edge/middleware.js'],
name: 'middleware',
page: '/',
matchers: [{ regexp: '^/.*$' }],
Expand All @@ -128,12 +128,12 @@ describe('Middleware Runtime', () => {

it('should have correct files in manifest', async () => {
const manifest = await fs.readJSON(
join(next.testDir, '.next/server/middleware-manifest.json')
join(next.testDir, '.next/edge/middleware-manifest.json')
)
for (const key of Object.keys(manifest.middleware)) {
const middleware = manifest.middleware[key]
expect(middleware.files).toContainEqual(
expect.stringContaining('server/edge-runtime-webpack')
expect.stringContaining('edge/edge-runtime-webpack')
)
expect(middleware.files).not.toContainEqual(
expect.stringContaining('static/chunks/')
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/middleware-trailing-slash/test/index.test.ts
View file
Expand Up @@ -51,11 +51,11 @@ describe('Middleware Runtime trailing slash', () => {
if ((global as any).isNextStart) {
it('should have valid middleware field in manifest', async () => {
const manifest = await fs.readJSON(
join(next.testDir, '.next/server/middleware-manifest.json')
join(next.testDir, '.next/edge/middleware-manifest.json')
)
expect(manifest.middleware).toEqual({
'/': {
files: ['server/edge-runtime-webpack.js', 'server/middleware.js'],
files: ['edge/edge-runtime-webpack.js', 'edge/middleware.js'],
name: 'middleware',
env: [],
page: '/',
Expand All @@ -68,12 +68,12 @@ describe('Middleware Runtime trailing slash', () => {

it('should have correct files in manifest', async () => {
const manifest = await fs.readJSON(
join(next.testDir, '.next/server/middleware-manifest.json')
join(next.testDir, '.next/edge/middleware-manifest.json')
)
for (const key of Object.keys(manifest.middleware)) {
const middleware = manifest.middleware[key]
expect(middleware.files).toContainEqual(
expect.stringContaining('server/edge-runtime-webpack')
expect.stringContaining('edge/edge-runtime-webpack')
)
expect(middleware.files).not.toContainEqual(
expect.stringContaining('static/chunks/')
Expand Down
20 changes: 10 additions & 10 deletions test/e2e/switchable-runtime/index.test.ts
View file
Expand Up @@ -172,15 +172,15 @@ describe('Switchable runtime', () => {

if (!(global as any).isNextDeploy) {
const manifest = await readJson(
join(context.appDir, '.next/server/middleware-manifest.json')
join(context.appDir, '.next/edge/middleware-manifest.json')
)
expect(manifest).toMatchObject({
functions: {
'/api/hello': {
env: [],
files: [
'server/edge-runtime-webpack.js',
'server/pages/api/hello.js',
'edge/edge-runtime-webpack.js',
'edge/pages/api/hello.js',
],
name: 'pages/api/hello',
page: '/api/hello',
Expand All @@ -190,8 +190,8 @@ describe('Switchable runtime', () => {
'/api/edge': {
env: [],
files: [
'server/edge-runtime-webpack.js',
'server/pages/api/edge.js',
'edge/edge-runtime-webpack.js',
'edge/pages/api/edge.js',
],
name: 'pages/api/edge',
page: '/api/edge',
Expand Down Expand Up @@ -316,15 +316,15 @@ describe('Switchable runtime', () => {

if (!(global as any).isNextDeploy) {
const manifest = await readJson(
join(context.appDir, '.next/server/middleware-manifest.json')
join(context.appDir, '.next/edge/middleware-manifest.json')
)
expect(manifest).toMatchObject({
functions: {
'/api/hello': {
env: [],
files: [
'server/edge-runtime-webpack.js',
'server/pages/api/hello.js',
'edge/edge-runtime-webpack.js',
'edge/pages/api/hello.js',
],
name: 'pages/api/hello',
page: '/api/hello',
Expand All @@ -334,8 +334,8 @@ describe('Switchable runtime', () => {
'/api/edge': {
env: [],
files: [
'server/edge-runtime-webpack.js',
'server/pages/api/edge.js',
'edge/edge-runtime-webpack.js',
'edge/pages/api/edge.js',
],
name: 'pages/api/edge',
page: '/api/edge',
Expand Down
4 changes: 2 additions & 2 deletions test/production/required-server-files.test.ts
View file
Expand Up @@ -300,12 +300,12 @@ describe('should set-up next', () => {
it('should output middleware correctly', async () => {
expect(
await fs.pathExists(
join(next.testDir, 'standalone/.next/server/edge-runtime-webpack.js')
join(next.testDir, 'standalone/.next/edge/edge-runtime-webpack.js')
)
).toBe(true)
expect(
await fs.pathExists(
join(next.testDir, 'standalone/.next/server/middleware.js')
join(next.testDir, 'standalone/.next/edge/middleware.js')
)
).toBe(true)
})
Expand Down

0 comments on commit e7bed87

Please sign in to comment.