@analogjs/platform 0.1.0-beta.4 → 0.1.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@analogjs/platform",
-  "version": "0.1.0-beta.4",
+  "version": "0.1.0-beta.6",
   "type": "commonjs",
   "description": "The fullstack meta-framework for Angular",
   "author": "Brandon Roberts <robertsbt@gmail.com>",

package/src/lib/runtime/api-middleware.js

@@ -1,9 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const h3_1 = require("h3");
-exports.default = (0, h3_1.eventHandler)(async (event) => {
-    if (event.req.url?.startsWith('/api')) {
-        return $fetch(`${event.req.url?.replace('/api', '')}`);
-    }
+/**
+ * This file is written in JavaScript
+ * because it is used by Nitro to build
+ * the renderer for SSR.
+ *
+ * The package is shipped as commonjs
+ * which won't be parsed by Nitro correctly.
+ */
+import { eventHandler } from 'h3';
+
+export default eventHandler(async (event) => {
+  if (event.req.url?.startsWith('/api')) {
+    return $fetch(`${event.req.url?.replace('/api', '')}`);
+  }
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpLW1pZGRsZXdhcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL3J1bnRpbWUvYXBpLW1pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwyQkFBa0M7QUFFbEMsa0JBQWUsSUFBQSxpQkFBWSxFQUFDLEtBQUssRUFBRSxLQUFLLEVBQUUsRUFBRTtJQUMxQyxJQUFJLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxNQUFNLENBQUMsRUFBRTtRQUNyQyxPQUFPLE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0tBQ3hEO0FBQ0gsQ0FBQyxDQUFDLENBQUMifQ==

package/src/lib/runtime/renderer.js

@@ -1,14 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const h3_1 = require("h3");
-// @ts-ignore
-const _imports_1 = require("#imports");
-exports.default = (0, h3_1.eventHandler)(async (event) => {
-    // @ts-ignore
-    const render = (await Promise.resolve().then(() => require('#build/../ssr/main.server.mjs')))['default'];
-    // @ts-ignore
-    const template = await (0, _imports_1.useStorage)().getItem(`/assets/public:index.html`);
-    const html = await render(event.req.url, template);
-    return html;
+/**
+ * This file is written in JavaScript
+ * because it is used by Nitro to build
+ * the renderer for SSR.
+ *
+ * The package is shipped as commonjs
+ * which won't be parsed by Nitro correctly.
+ */
+import { eventHandler } from 'h3';
+import { useStorage } from '#imports';
+
+export default eventHandler(async (event) => {
+  const render = (await import('#build/../ssr/main.server.mjs'))['default'];
+  const template = await useStorage().getItem(`/assets/public:index.html`);
+
+  const html = await render(event.req.url, template);
+
+  return html;
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVuZGVyZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL3J1bnRpbWUvcmVuZGVyZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwyQkFBa0M7QUFDbEMsYUFBYTtBQUNiLHVDQUFzQztBQUV0QyxrQkFBZSxJQUFBLGlCQUFZLEVBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxFQUFFO0lBQzFDLGFBQWE7SUFDYixNQUFNLE1BQU0sR0FBRyxDQUFDLDJDQUFhLCtCQUErQixFQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUUxRSxhQUFhO0lBQ2IsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFBLHFCQUFVLEdBQUUsQ0FBQyxPQUFPLENBQUMsMkJBQTJCLENBQUMsQ0FBQztJQUV6RSxNQUFNLElBQUksR0FBRyxNQUFNLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUVuRCxPQUFPLElBQUksQ0FBQztBQUNkLENBQUMsQ0FBQyxDQUFDIn0=

package/src/lib/vite-nitro-plugin.js

@@ -15,6 +15,7 @@ function viteNitroPlugin(options, nitroOptions) {
         scanDirs: [`${rootDir}/src/server`],
         output: {
             dir: '../dist/server',
+            publicDir: '../dist/server/public',
             ...nitroOptions?.output,
         },
         buildDir: './dist/.nitro',
@@ -22,26 +23,6 @@ function viteNitroPlugin(options, nitroOptions) {
             generateTsConfig: false,
         },
     };
-    if (options?.ssr) {
-        nitroConfig = {
-            ...nitroConfig,
-            publicAssets: [{ dir: `../dist/client` }],
-            serverAssets: [{ baseName: 'public', dir: `./dist/client` }],
-            externals: {
-                inline: ['zone.js/node'],
-                external: ['rxjs', 'node-fetch-native/dist/polyfill', 'destr'],
-            },
-            moduleSideEffects: ['zone.js/bundles/zone-node.umd.js'],
-            renderer: `${__dirname}/runtime/renderer`,
-            handlers: [
-                { handler: `${__dirname}/runtime/api-middleware`, middleware: true },
-            ],
-        };
-    }
-    nitroConfig = {
-        ...nitroConfig,
-        ...nitroOptions,
-    };
     let isBuild = false;
     let isServe = false;
     let ssrBuild = false;
@@ -53,6 +34,29 @@ function viteNitroPlugin(options, nitroOptions) {
             isBuild = command === 'build';
             ssrBuild = _config.build?.ssr === true;
             config = _config;
+            if (isBuild && ssrBuild) {
+                nitroConfig = {
+                    ...nitroConfig,
+                    publicAssets: [{ dir: `../dist/client` }],
+                    serverAssets: [{ baseName: 'public', dir: `./dist/client` }],
+                    externals: {
+                        inline: ['zone.js/node'],
+                        external: ['rxjs', 'node-fetch-native/dist/polyfill', 'destr'],
+                    },
+                    moduleSideEffects: ['zone.js/bundles/zone-node.umd.js'],
+                    renderer: `${__dirname}/runtime/renderer`,
+                    handlers: [
+                        {
+                            handler: `${__dirname}/runtime/api-middleware`,
+                            middleware: true,
+                        },
+                    ],
+                };
+            }
+            nitroConfig = {
+                ...nitroConfig,
+                ...nitroOptions,
+            };
         },
         async configureServer(viteServer) {
             if (isServe && !isTest) {
@@ -85,4 +89,4 @@ function viteNitroPlugin(options, nitroOptions) {
     };
 }
 exports.viteNitroPlugin = viteNitroPlugin;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidml0ZS1uaXRyby1wbHVnaW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL3ZpdGUtbml0cm8tcGx1Z2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLCtFQUFpRjtBQUVqRiwyQkFBb0M7QUFHcEMsaURBQTZDO0FBQzdDLHVDQUEwQztBQUUxQyxTQUFnQixlQUFlLENBQzdCLE9BQWlCLEVBQ2pCLFlBQTBCO0lBRTFCLE1BQU0sT0FBTyxHQUFHLFlBQVksRUFBRSxPQUFPLElBQUksR0FBRyxDQUFDO0lBQzdDLE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEtBQUssTUFBTSxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBRTdFLElBQUksV0FBVyxHQUFnQjtRQUM3QixPQUFPO1FBQ1AsUUFBUSxFQUFFLENBQUM7UUFDWCxNQUFNLEVBQUUsR0FBRyxPQUFPLE1BQU07UUFDeEIsUUFBUSxFQUFFLENBQUMsR0FBRyxPQUFPLGFBQWEsQ0FBQztRQUNuQyxNQUFNLEVBQUU7WUFDTixHQUFHLEVBQUUsZ0JBQWdCO1lBQ3JCLEdBQUcsWUFBWSxFQUFFLE1BQU07U0FDeEI7UUFDRCxRQUFRLEVBQUUsZUFBZTtRQUN6QixVQUFVLEVBQUU7WUFDVixnQkFBZ0IsRUFBRSxLQUFLO1NBQ3hCO0tBQ0YsQ0FBQztJQUVGLElBQUksT0FBTyxFQUFFLEdBQUcsRUFBRTtRQUNoQixXQUFXLEdBQUc7WUFDWixHQUFHLFdBQVc7WUFDZCxZQUFZLEVBQUUsQ0FBQyxFQUFFLEdBQUcsRUFBRSxnQkFBZ0IsRUFBRSxDQUFDO1lBQ3pDLFlBQVksRUFBRSxDQUFDLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxHQUFHLEVBQUUsZUFBZSxFQUFFLENBQUM7WUFDNUQsU0FBUyxFQUFFO2dCQUNULE1BQU0sRUFBRSxD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidml0ZS1uaXRyby1wbHVnaW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL3ZpdGUtbml0cm8tcGx1Z2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLCtFQUFpRjtBQUVqRiwyQkFBb0M7QUFHcEMsaURBQTZDO0FBQzdDLHVDQUEwQztBQUUxQyxTQUFnQixlQUFlLENBQzdCLE9BQWlCLEVBQ2pCLFlBQTBCO0lBRTFCLE1BQU0sT0FBTyxHQUFHLFlBQVksRUFBRSxPQUFPLElBQUksR0FBRyxDQUFDO0lBQzdDLE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEtBQUssTUFBTSxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBRTdFLElBQUksV0FBVyxHQUFnQjtRQUM3QixPQUFPO1FBQ1AsUUFBUSxFQUFFLENBQUM7UUFDWCxNQUFNLEVBQUUsR0FBRyxPQUFPLE1BQU07UUFDeEIsUUFBUSxFQUFFLENBQUMsR0FBRyxPQUFPLGFBQWEsQ0FBQztRQUNuQyxNQUFNLEVBQUU7WUFDTixHQUFHLEVBQUUsZ0JBQWdCO1lBQ3JCLFNBQVMsRUFBRSx1QkFBdUI7WUFDbEMsR0FBRyxZQUFZLEVBQUUsTUFBTTtTQUN4QjtRQUNELFFBQVEsRUFBRSxlQUFlO1FBQ3pCLFVBQVUsRUFBRTtZQUNWLGdCQUFnQixFQUFFLEtBQUs7U0FDeEI7S0FDRixDQUFDO0lBRUYsSUFBSSxPQUFPLEdBQUcsS0FBSyxDQUFDO0lBQ3BCLElBQUksT0FBTyxHQUFHLEtBQUssQ0FBQztJQUNwQixJQUFJLFFBQVEsR0FBRyxLQUFLLENBQUM7SUFDckIsSUFBSSxNQUFrQixDQUFDO0lBRXZCLE9BQU87UUFDTCxJQUFJLEVBQUUsNEJBQTRCO1FBQ2xDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsRUFBRSxPQUFPLEVBQUU7WUFDekIs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

package/src/lib/runtime/api-middleware.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("h3").EventHandler<unknown>;
-export default _default;

package/src/lib/runtime/renderer.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("h3").EventHandler<any>;
-export default _default;