Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const appBundleSsr = async (options: ReplInputOptions, result: ReplResult
buildMode: options.buildMode,
debug: options.debug,
srcInputs: getInputs(options),
entryStrategy: options.entryStrategy,
entryStrategy: { type: 'inline' },
manifestInput: result.manifest,
};

Expand Down
11 changes: 8 additions & 3 deletions packages/qwik/src/core/render/notify-render.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { assertDefined } from '../assert/assert';
import { QHostAttr } from '../util/markers';
import { QContainerAttr, QHostAttr } from '../util/markers';
import { executeContextWithSlots, printRenderStats, RenderContext } from './cursor';
import { getContext, resumeIfNeeded } from '../props/props';
import { qTest } from '../util/qdev';
import { qDev, qTest } from '../util/qdev';
import { getPlatform } from '../platform/platform';
import { getDocument } from '../util/dom';
import { renderComponent } from './render-component';
Expand Down Expand Up @@ -37,7 +37,12 @@ export const notifyRender = async (hostElement: Element): Promise<RenderContext
assertDefined(containerEl);

const state = getContainerState(containerEl);
if (state.$platform$.isServer && !qTest) {
if (
qDev &&
!qTest &&
state.$platform$.isServer &&
directGetAttribute(containerEl, QContainerAttr) === 'paused'
) {
logWarn('Can not rerender in server platform');
return undefined;
}
Expand Down
6 changes: 5 additions & 1 deletion packages/qwik/src/optimizer/src/plugins/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,11 @@ export function createPlugin(optimizerOptions: OptimizerOptions = {}) {
if (opts.buildMode === 'development') {
opts.entryStrategy = { type: 'hook' };
} else {
opts.entryStrategy = { type: 'smart' };
if (opts.target === 'ssr') {
opts.entryStrategy = { type: 'inline' };
} else {
opts.entryStrategy = { type: 'smart' };
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/qwik/src/optimizer/src/plugins/plugin.unit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ describe('qwik plugin', () => {
const opts = plugin.normalizeOptions({ buildMode: 'production', target: 'ssr' });
expect(opts.target).toBe('ssr');
expect(opts.buildMode).toBe('production');
expect(opts.entryStrategy).toEqual({ type: 'smart' });
expect(opts.entryStrategy).toEqual({ type: 'inline' });
expect(opts.forceFullBuild).toBe(true);
expect(opts.debug).toBe(false);
expect(opts.rootDir).toBe(cwd);
Expand Down
2 changes: 1 addition & 1 deletion packages/qwik/src/optimizer/src/plugins/rollup.unit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ describe('rollup plugin', () => {
const opts: NormalizedQwikPluginOptions = plugin.api.getOptions();
expect(opts.target).toBe('ssr');
expect(opts.buildMode).toBe('production');
expect(opts.entryStrategy).toEqual({ type: 'smart' });
expect(opts.entryStrategy).toEqual({ type: 'inline' });
expect(opts.forceFullBuild).toEqual(true);
});

Expand Down
2 changes: 1 addition & 1 deletion packages/qwik/src/optimizer/src/plugins/vite.unit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ describe('vite plugin', () => {

expect(opts.target).toBe('ssr');
expect(opts.buildMode).toBe('production');
expect(opts.entryStrategy).toEqual({ type: 'smart' });
expect(opts.entryStrategy).toEqual({ type: 'inline' });
expect(opts.debug).toBe(false);
expect(opts.forceFullBuild).toBe(true);

Expand Down