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
48 changes: 48 additions & 0 deletions e2e/integrations.e2e.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,38 @@ const renderRequireProbe = `${renderExportSmoke}
process.exit(1);
});`;

const solidEmailBrowserImportProbe = `
const resolved = import.meta.resolve('@akin01/solid-email');
const mod = await import('@akin01/solid-email');

for (const name of ['render', 'Section', 'Row', 'Heading']) {
if (typeof mod[name] !== 'function') {
throw new Error(\`missing solid-email export: \${name}\`);
}
}

const html = await mod.render(() =>
mod.Section({
style: { padding: '12px' },
children: mod.Row({
children: mod.Heading({
as: 'h2',
style: { color: 'blue' },
children: 'Solid Email browser condition smoke',
}),
}),
}),
);

if (!html.includes('<h2') || !html.includes('Solid Email browser condition smoke')) {
throw new Error(\`missing rendered heading: \${html}\`);
}
if (!html.includes('style="width:100%"') || !html.includes('color:blue')) {
throw new Error(\`missing server-rendered style output: \${html}\`);
}

process.stdout.write(resolved.replaceAll('\\\\', '/') + '\\n', () => process.exit(0));`;

type PnpmError = ExecFileException & {
stderr?: string;
stdout?: string;
Expand Down Expand Up @@ -318,6 +350,22 @@ describe('published package integration fixtures', () => {
}
});

it('loads solid-email under browser import conditions', async () => {
const { stdout } = await execFileAsync(
'node',
[
'--conditions=browser',
'--input-type=module',
'--eval',
solidEmailBrowserImportProbe,
],
{ cwd: root },
);

expect(stdout.trim().replaceAll('\\', '/')).toContain(
'/packages/solid-email/dist/index.mjs',
);
});
it('builds and renders in a Solid Vite SSR fixture', async () => {
const fixtureRoot = await installAndBuildFixture('vite');
const html = await execFileAsync('node', ['dist/entry-server.mjs'], {
Expand Down
2 changes: 1 addition & 1 deletion packages/render/src/shared/slots.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { JSX } from 'solid-js';
import { ssr } from 'solid-js/web';
import { ssr } from 'solid-js/web/dist/server.js';

const MARKER_PREFIX = '__SM_';
const CONTENT_START = `${MARKER_PREFIX}CNT_`;
Expand Down
7 changes: 6 additions & 1 deletion packages/render/src/shared/solid-js-web-server.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
declare module 'solid-js/web/dist/server.js' {
export { renderToString, renderToStringAsync } from 'solid-js/web';
export {
Dynamic,
renderToString,
renderToStringAsync,
ssr,
} from 'solid-js/web';
}
2 changes: 1 addition & 1 deletion packages/solid-email/src/components/heading/heading.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { splitProps } from 'solid-js';
import { Dynamic } from 'solid-js/web';
import { Dynamic } from 'solid-js/web/dist/server.js';
import {
cls,
type IntrinsicProps,
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-email/src/components/tailwind/tailwind.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type CssNode, generate, List, type StyleSheet } from 'css-tree';
import { createResource, type JSX, Suspense } from 'solid-js';
import { ssr } from 'solid-js/web';
import { ssr } from 'solid-js/web/dist/server.js';
import type { Config } from 'tailwindcss';
import type { SolidStyle } from '../shared';
import { sanitizeStyleSheet } from './sanitize-stylesheet';
Expand Down
9 changes: 9 additions & 0 deletions packages/solid-email/src/render-shim.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,12 @@ declare module '@solid-email/render' {
options?: CompileSyncOptions,
): CompiledTemplate<TSlots>;
}

declare module 'solid-js/web/dist/server.js' {
export {
Dynamic,
renderToString,
renderToStringAsync,
ssr,
} from 'solid-js/web';
}
10 changes: 9 additions & 1 deletion packages/solid-email/tsdown.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,13 @@ export default defineConfig({
deps: { neverBundle: ['solid-js', 'solid-js/web', '@solid-email/render'] },
format: ['cjs', 'esm'],
outDir: './dist',
plugins: [solid({ solid: { generate: 'ssr', hydratable: false } })],
plugins: [
solid({
solid: {
generate: 'ssr',
hydratable: false,
moduleName: 'solid-js/web/dist/server.js',
},
}),
],
});
Loading