@analogjs/platform 0.1.0-beta.21 → 0.1.0-beta.22

package/package.json

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

package/src/lib/nx-plugin/package.json

@@ -6,8 +6,7 @@
     "semver": "7.3.8"
   },
   "peerDependencies": {
-    "nx": "15.7.0",
-    "tslib": "^2.4.0"
+    "tslib": "2.4.0"
   },
   "types": "./src/index.d.ts"
 }

package/src/lib/nx-plugin/src/generators/app/files/template-angular-v15/vite.config.ts__template__

@@ -37,9 +37,9 @@ export default defineConfig(({ mode }) => {
             { baseName: 'public', dir: `./dist/apps/<%= projectName %>/client` },
           ],
           buildDir: '../../dist/apps/<%= projectName %>/.nitro',
-          prerender: {
-            routes: ['/'],
-          },
+        },
+        prerender: {
+          routes: ['/'],
         },
       }),
       tsConfigPaths({

package/src/lib/nx-plugin/src/generators/app/files/template-angular-v16/src/main.server.ts__template__

@@ -1,8 +1,10 @@
 import 'zone.js/node';
 import { enableProdMode } from '@angular/core';
-import { renderApplication } from '@angular/platform-server';
-import { provideFileRouter } from '@analogjs/router';
-import { withEnabledBlockingInitialNavigation } from '@angular/router';
+import { bootstrapApplication } from '@angular/platform-browser';
+import {
+  provideServerRendering,
+  renderApplication,
+} from '@angular/platform-server';
 
 import { AppComponent } from './app/app.component';
 import { mainProviders } from './main.providers';
@@ -11,12 +13,19 @@ if (import.meta.env.PROD) {
   enableProdMode();
 }
 
+export function bootstrap() {
+  return bootstrapApplication(AppComponent, {
+    providers: [
+      mainProviders,
+      provideServerRendering(),
+    ],
+  });
+}
+
 export default async function render(url: string, document: string) {
-  const html = await renderApplication(AppComponent, {
-    appId: '<%= fileName %>',
+  const html = await renderApplication(bootstrap, {
     document,
     url,
-    providers: [provideFileRouter(withEnabledBlockingInitialNavigation()), ...mainProviders],
   });
 
   return html;

package/src/lib/nx-plugin/src/generators/app/files/template-angular-v16/vite.config.ts__template__

@@ -37,9 +37,9 @@ export default defineConfig(({ mode }) => {
             { baseName: 'public', dir: `./dist/apps/<%= projectName %>/client` },
           ],
           buildDir: '../../dist/apps/<%= projectName %>/.nitro',
-          prerender: {
-            routes: ['/'],
-          },
+        },
+        prerender: {
+          routes: ['/'],
         },
       }),
       tsConfigPaths({

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

@@ -9,7 +9,7 @@
 import { eventHandler } from 'h3';
 
 export default eventHandler(async (event) => {
-  const apiPrefix = import.meta.env.RUNTIME_CONFIG?.apiPrefix ?? '/api';
+  const apiPrefix = `/${import.meta.env.RUNTIME_CONFIG?.apiPrefix ?? 'api'}`;
   if (event.req.url?.startsWith(apiPrefix)) {
     return $fetch(`${event.req.url?.replace(apiPrefix, '')}`);
   }

package/src/lib/ssr/ssr-build-plugin.js

@@ -15,16 +15,16 @@ function ssrBuildPlugin() {
             };
         },
         transform(code, id) {
-            // Remove usage of `with()` in sloppy.js file
-            if (id.includes((0, vite_1.normalizePath)('domino/lib/sloppy.js'))) {
+            if (id.includes('platform-server')) {
+                code = code.replace(/global\./g, 'globalThis.');
                 return {
-                    code: code.replace(/with\(/gi, 'if('),
+                    code: code.replace('new xhr2.XMLHttpRequest', 'new (xhr2.default.XMLHttpRequest || xhr2.default)'),
                 };
             }
-            // Convert usage of xhr2 default import
-            if (code.includes('new xhr2.')) {
+            // Remove usage of `with()` in sloppy.js file
+            if (id.includes((0, vite_1.normalizePath)('domino/lib/sloppy.js'))) {
                 return {
-                    code: code.replace('new xhr2.XMLHttpRequest', 'new xhr2.default.XMLHttpRequest'),
+                    code: code.replace(/with\(/gi, 'if('),
                 };
             }
             return;
@@ -32,4 +32,4 @@ function ssrBuildPlugin() {
     };
 }
 exports.ssrBuildPlugin = ssrBuildPlugin;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3NyLWJ1aWxkLXBsdWdpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3BsYXRmb3JtL3NyYy9saWIvc3NyL3Nzci1idWlsZC1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsK0JBQTZDO0FBRTdDLFNBQWdCLGNBQWM7SUFDNUIsT0FBTztRQUNMLElBQUksRUFBRSwyQkFBMkI7UUFDakMsTUFBTSxDQUFDLE9BQU87WUFDWixPQUFPO2dCQUNMLE9BQU8sRUFBRTtvQkFDUCxLQUFLLEVBQUU7d0JBQ0wsY0FBYyxFQUFFLGtDQUFrQztxQkFDbkQ7aUJBQ0Y7YUFDRixDQUFDO1FBQ0osQ0FBQztRQUNELFNBQVMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUNoQiw2Q0FBNkM7WUFDN0MsSUFBSSxFQUFFLENBQUMsUUFBUSxDQUFDLElBQUEsb0JBQWEsRUFBQyxzQkFBc0IsQ0FBQyxDQUFDLEVBQUU7Z0JBQ3RELE9BQU87b0JBQ0wsSUFBSSxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEtBQUssQ0FBQztpQkFDdEMsQ0FBQzthQUNIO1lBRUQsdUNBQXVDO1lBQ3ZDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsRUFBRTtnQkFDOUIsT0FBTztvQkFDTCxJQUFJLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FDaEIseUJBQXlCLEVBQ3pCLGlDQUFpQyxDQUNsQztpQkFDRixDQUFDO2FBQ0g7WUFFRCxPQUFPO1FBQ1QsQ0FBQztLQUNGLENBQUM7QUFDSixDQUFDO0FBakNELHdDQWlDQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3NyLWJ1aWxkLXBsdWdpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3BsYXRmb3JtL3NyYy9saWIvc3NyL3Nzci1idWlsZC1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsK0JBQTZDO0FBRTdDLFNBQWdCLGNBQWM7SUFDNUIsT0FBTztRQUNMLElBQUksRUFBRSwyQkFBMkI7UUFDakMsTUFBTSxDQUFDLE9BQU87WUFDWixPQUFPO2dCQUNMLE9BQU8sRUFBRTtvQkFDUCxLQUFLLEVBQUU7d0JBQ0wsY0FBYyxFQUFFLGtDQUFrQztxQkFDbkQ7aUJBQ0Y7YUFDRixDQUFDO1FBQ0osQ0FBQztRQUNELFNBQVMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUNoQixJQUFJLEVBQUUsQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQUMsRUFBRTtnQkFDbEMsSUFBSSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLGFBQWEsQ0FBQyxDQUFDO2dCQUVoRCxPQUFPO29CQUNMLElBQUksRUFBRSxJQUFJLENBQUMsT0FBTyxDQUNoQix5QkFBeUIsRUFDekIsbURBQW1ELENBQ3BEO2lCQUNGLENBQUM7YUFDSDtZQUVELDZDQUE2QztZQUM3QyxJQUFJLEVBQUUsQ0FBQyxRQUFRLENBQUMsSUFBQSxvQkFBYSxFQUFDLHNCQUFzQixDQUFDLENBQUMsRUFBRTtnQkFDdEQsT0FBTztvQkFDTCxJQUFJLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLEVBQUUsS0FBSyxDQUFDO2lCQUN0QyxDQUFDO2FBQ0g7WUFFRCxPQUFPO1FBQ1QsQ0FBQztLQUNGLENBQUM7QUFDSixDQUFDO0FBbENELHdDQWtDQyJ9