Skip to content

Commit 9d5679d

Browse files
committed
test: fix e2e
1 parent 6539637 commit 9d5679d

File tree

2 files changed

+33
-18
lines changed

2 files changed

+33
-18
lines changed

packages/qwik/src/optimizer/src/plugins/rollup.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,16 +230,15 @@ export function normalizeRollupOutputOptionsObject(
230230
return 'build/qwik-city.js';
231231
}
232232

233-
// Sanitize The path to use dashes instead of slashes, to keep the same folder strucutre as without debug:true.
233+
// The chunk name can often be a path. We sanitize it to use dashes instead of slashes, to keep the same folder structure as without debug:true.
234234
// Besides, Rollup doesn't accept absolute or relative paths as inputs for the [name] placeholder for the same reason.
235235
const path = optimizer.sys.path;
236236
const relativePath = path.relative(optimizer.sys.cwd(), chunkInfo.name);
237-
const sanitizedPath = relativePath
237+
const sanitized = relativePath
238238
.replace(/^(\.\.\/)+/, '')
239239
.replace(/^\/+/, '')
240240
.replace(/\//g, '-');
241-
chunkInfo.name = sanitizedPath;
242-
return `build/[name].js`;
241+
return `build/${sanitized}.js`;
243242
};
244243
}
245244
// client production output

packages/qwik/src/optimizer/src/plugins/vite.unit.ts

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,28 @@ import {
1212

1313
const cwd = process.cwd();
1414

15-
const chunkInfoMock: Rollup.PreRenderedChunk = {
16-
exports: [''],
17-
name: 'chunk.tsx',
18-
facadeModuleId: 'chunk.tsx',
19-
isDynamicEntry: false,
20-
isEntry: false,
21-
isImplicitEntry: false,
22-
moduleIds: ['chunk.tsx'],
23-
type: 'chunk',
24-
};
15+
const chunkInfoMocks: Rollup.PreRenderedChunk[] = [
16+
{
17+
exports: [''],
18+
name: 'chunk.tsx',
19+
facadeModuleId: 'chunk.tsx',
20+
isDynamicEntry: false,
21+
isEntry: false,
22+
isImplicitEntry: false,
23+
moduleIds: ['chunk.tsx'],
24+
type: 'chunk',
25+
},
26+
{
27+
exports: [''],
28+
name: '/Users/username/app/chunk.tsx',
29+
facadeModuleId: '/Users/username/app/chunk.tsx',
30+
isDynamicEntry: false,
31+
isEntry: false,
32+
isImplicitEntry: false,
33+
moduleIds: ['/Users/username/app/chunk.tsx'],
34+
type: 'chunk',
35+
},
36+
];
2537

2638
function mockOptimizerOptions(): OptimizerOptions {
2739
return {
@@ -88,8 +100,10 @@ test('command: serve, mode: development', async () => {
88100
assert.deepEqual(rollupOptions.input, normalizePath(resolve(cwd, 'src', 'entry.dev')));
89101

90102
assert.deepEqual(outputOptions.assetFileNames, 'assets/[hash]-[name].[ext]');
91-
assert.deepEqual(chunkFileNames(chunkInfoMock), 'build/[name].js');
92-
assert.deepEqual(entryFileNames(chunkInfoMock), 'build/[name].js');
103+
assert.deepEqual(chunkFileNames(chunkInfoMocks[0]), `build/chunk.tsx.js`);
104+
assert.deepEqual(entryFileNames(chunkInfoMocks[0]), `build/chunk.tsx.js`);
105+
assert.deepEqual(chunkFileNames(chunkInfoMocks[1]), 'build/username-app-chunk.tsx.js');
106+
assert.deepEqual(entryFileNames(chunkInfoMocks[1]), 'build/username-app-chunk.tsx.js');
93107
assert.deepEqual(outputOptions.format, 'es');
94108

95109
assert.deepEqual(build.dynamicImportVarsOptions?.exclude, [/./]);
@@ -167,8 +181,10 @@ test('command: build, mode: development', async () => {
167181
assert.deepEqual(rollupOptions.input, [normalizePath(resolve(cwd, 'src', 'root'))]);
168182

169183
assert.deepEqual(outputOptions.assetFileNames, 'assets/[hash]-[name].[ext]');
170-
assert.deepEqual(chunkFileNames(chunkInfoMock), 'build/[name].js');
171-
assert.deepEqual(entryFileNames(chunkInfoMock), 'build/[name].js');
184+
assert.deepEqual(chunkFileNames(chunkInfoMocks[0]), `build/chunk.tsx.js`);
185+
assert.deepEqual(entryFileNames(chunkInfoMocks[0]), `build/chunk.tsx.js`);
186+
assert.deepEqual(chunkFileNames(chunkInfoMocks[1]), 'build/username-app-chunk.tsx.js');
187+
assert.deepEqual(entryFileNames(chunkInfoMocks[1]), 'build/username-app-chunk.tsx.js');
172188

173189
assert.deepEqual(build.dynamicImportVarsOptions?.exclude, [/./]);
174190
assert.deepEqual(build.ssr, undefined);

0 commit comments

Comments
 (0)