@hyperspan/framework 2.0.0-alpha.16 → 2.0.0-alpha.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperspan/framework",
-  "version": "2.0.0-alpha.16",
+  "version": "2.0.0-alpha.19",
   "description": "Hyperspan Web Framework",
   "type": "module",
   "main": "src/server.ts",
@@ -55,6 +55,10 @@
       "types": "./src/actions.ts",
       "default": "./src/actions.ts"
     },
+    "./html": {
+      "types": "./src/html.ts",
+      "default": "./src/html.ts"
+    },
     "./ssr/install-server-dom-mock": {
       "types": "./src/ssr/install-server-dom-mock.ts",
       "default": "./src/ssr/install-server-dom-mock.ts"
@@ -104,7 +108,7 @@
     "vitest": "^4.1.10"
   },
   "dependencies": {
-    "@hyperspan/html": "^2.0.0-alpha.16",
+    "@hyperspan/html": "^2.0.0-alpha.19",
     "debug": "^4.4.3",
     "isbot": "^5.1.32",
     "zod": "^4.4.3"

package/src/actions.test.ts

@@ -1,7 +1,7 @@
 import { test, expect, describe } from 'vitest';
 import { createAction } from './actions';
 import { createRoute } from './server';
-import { html, render, placeholder, type HSHtml } from '@hyperspan/html';
+import { html, render, placeholder, type HSHtml } from './html';
 import { createContext } from './server';
 import * as z from 'zod';
 

package/src/actions.ts

@@ -1,4 +1,4 @@
-import { html } from '@hyperspan/html';
+import { html } from './html';
 import { createRoute, HTTPResponseException, returnHTMLResponse } from './server';
 import * as z from 'zod';
 import type { Hyperspan as HS } from './types';

package/src/client/js.test.ts

@@ -3,7 +3,7 @@ import { mkdtempSync, writeFileSync, existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
 import { pathToFileURL } from 'node:url';
-import { render } from '@hyperspan/html';
+import { render } from '../html';
 import { assetHash } from '../utils';
 import { setAssetManifest } from './manifest';
 import {

package/src/client/js.ts

@@ -1,7 +1,7 @@
 import { readFileSync, existsSync } from 'node:fs';
 import { isAbsolute, join, relative } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { html } from '@hyperspan/html';
+import { html } from '../html';
 import { assetHash as assetHashFn } from '../utils';
 import { getImportMap, registerImport, resolveImport } from './manifest';
 import type { Hyperspan as HS } from '../types';

package/src/html.test.ts

@@ -0,0 +1,13 @@
+import { describe, expect, test } from 'vitest';
+import { html, placeholder, render, type HSHtml } from './html';
+
+describe('@hyperspan/framework/html', () => {
+  test('re-exports html helpers and types from @hyperspan/html', () => {
+    const tmpl: HSHtml = html`<p>
+      ${placeholder(html`<span>loading</span>`, Promise.resolve('ok'))}
+    </p>`;
+
+    expect(render(tmpl)).toContain('<p>');
+    expect(render(tmpl)).toContain('loading');
+  });
+});

package/src/html.ts

@@ -0,0 +1 @@
+export * from '@hyperspan/html';

package/src/island.ts

@@ -1,4 +1,4 @@
-import { html } from '@hyperspan/html';
+import { html } from './html';
 
 type IslandComponent = {
   __HS_ISLAND?: {

package/src/layout.test.ts

@@ -1,5 +1,5 @@
 import { test, expect } from 'vitest';
-import { render } from '@hyperspan/html';
+import { render } from './html';
 import { hyperspanScriptTags } from './layout';
 import { streamingClient } from './client/js';
 

package/src/layout.ts

@@ -1,4 +1,4 @@
-import { html } from '@hyperspan/html';
+import { html } from './html';
 import { CSS_PUBLIC_PATH } from './client/css';
 import { getImportMap, getRouteCss } from './client/manifest';
 import { actionsClient, streamingClient } from './client/js';

package/src/server.test.ts

@@ -1,7 +1,7 @@
 import { test, expect, describe } from 'vitest';
 import { createRoute, createServer, createContext, initServerRoutes } from './server';
 import { createAction } from './actions';
-import { html, placeholder } from '@hyperspan/html';
+import { html, placeholder } from './html';
 import type { Hyperspan as HS } from './types';
 
 test('route fetch() returns a Response', async () => {

package/src/server.ts

@@ -1,13 +1,5 @@
 import './ssr/install-server-dom-mock';
-import {
-  HSHtml,
-  html,
-  isHSHtml,
-  renderStream,
-  renderAsync,
-  render,
-  _typeOf,
-} from '@hyperspan/html';
+import { HSHtml, html, isHSHtml, renderStream, renderAsync, render, _typeOf } from './html';
 import { isbot } from 'isbot';
 import { executeMiddleware } from './middleware';
 import { buildUrl, parsePath, removeUndefined } from './utils';

package/src/types.ts

@@ -1,4 +1,4 @@
-import { HSHtml } from '@hyperspan/html';
+import { HSHtml } from './html';
 import * as z from 'zod';
 
 /**